fix calculated time output in cnc mode
This commit is contained in:
parent
43fdeef1a1
commit
eb534a17ff
1 changed files with 3 additions and 3 deletions
|
|
@ -319,7 +319,7 @@ CAM.export = function(print, online) {
|
||||||
|
|
||||||
// update time calculation
|
// update time calculation
|
||||||
time += opt.time >= 0 ? opt.time : (dist / (pos.f || 1000)) * 60;
|
time += opt.time >= 0 ? opt.time : (dist / (pos.f || 1000)) * 60;
|
||||||
|
consts.time = Math.round(time);
|
||||||
// if (comment && !stripComments) {
|
// if (comment && !stripComments) {
|
||||||
// nl.append(" ; ").append(comment);
|
// nl.append(" ; ").append(comment);
|
||||||
// nl.append(" ; ").append(points);
|
// nl.append(" ; ").append(points);
|
||||||
|
|
@ -438,7 +438,7 @@ CAM.export = function(print, online) {
|
||||||
const newOp = newmode && !newmode.silent && mode !== newmode;
|
const newOp = newmode && !newmode.silent && mode !== newmode;
|
||||||
if (newOp) {
|
if (newOp) {
|
||||||
if (mode && !stripComments) {
|
if (mode && !stripComments) {
|
||||||
append("; ending " + mode.type + " op after " + Math.round(time/60) + " seconds");
|
append("; ending " + mode.type + " op after " + Math.round(time) + " seconds");
|
||||||
}
|
}
|
||||||
mode = newmode;
|
mode = newmode;
|
||||||
if (mode) {
|
if (mode) {
|
||||||
|
|
@ -465,7 +465,7 @@ CAM.export = function(print, online) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mode && !stripComments) {
|
if (mode && !stripComments) {
|
||||||
append("; ending " + mode.type + " op after " + Math.round(time/60) + " seconds");
|
append("; ending " + mode.type + " op after " + Math.round(time) + " seconds");
|
||||||
}
|
}
|
||||||
|
|
||||||
// emit gcode post
|
// emit gcode post
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue