Fixed Runtime stats Error #22

mikecentola · mikecentola · commit 0fca748d6cb6 · 2021-03-10T12:12:42.000-05:00
diff --git a/src/views/providers/gcodeRuntimeParser.ts b/src/views/providers/gcodeRuntimeParser.ts
@@ -106,7 +106,7 @@ export class GCodeRuntimeParser {
 
                 // Feed Rate
                 if (letter === 'E' || letter === 'F') {
-                    state.feedrate = +argument / 60.0; // Convert Per Min to Per Second
+                    state.feedrate = +argument;
                 }
 
                 // Coords
@@ -184,9 +184,12 @@ export class GCodeRuntimeParser {
                 ijkr.r = -1;
             }
 
+            // New Point -> Old Point
+            Object.assign(oldpt, newpt);
+
             if (!state.rapid) {
-                // Calculate Time :: t = d / v
-                state.rt += state.distance / state.feedrate;
+                // Calculate Time :: t = d / v :: Convert Feedrate from IPM to Per Second
+                state.rt += state.distance / (state.feedrate / 60);
             }
         }
         if (!isNaN(state.rt)) {

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ export class GCodeRuntimeParser {`
`106`	`106`
`107`	`107`	`// Feed Rate`
`108`	`108`	`if (letter === 'E' \|\| letter === 'F') {`
`109`		`- state.feedrate = +argument / 60.0; // Convert Per Min to Per Second`
	`109`	`+ state.feedrate = +argument;`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`// Coords`
`@@ -184,9 +184,12 @@ export class GCodeRuntimeParser {`
`184`	`184`	`ijkr.r = -1;`
`185`	`185`	`}`
`186`	`186`
	`187`	`+ // New Point -> Old Point`
	`188`	`+ Object.assign(oldpt, newpt);`
	`189`	`+`
`187`	`190`	`if (!state.rapid) {`
`188`		`- // Calculate Time :: t = d / v`
`189`		`- state.rt += state.distance / state.feedrate;`
	`191`	`+ // Calculate Time :: t = d / v :: Convert Feedrate from IPM to Per Second`
	`192`	`+ state.rt += state.distance / (state.feedrate / 60);`
`190`	`193`	`}`
`191`	`194`	`}`
`192`	`195`	`if (!isNaN(state.rt)) {`