Correct typos

cncjs · Apr 24, 2017 · c5b9fcb · c5b9fcb
1 parent c0921eb
commit c5b9fcb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/app/controllers/Smoothie/SmoothieController.js b/src/app/controllers/Smoothie/SmoothieController.js
@@ -179,7 +179,7 @@ class SmoothieController {
 
             // Example
             // "G0 X[posx - 8] Y[ymax]" -> "G0 X2 Y50"
-            line = this.translateWithContext(line, context);
+            line = this.translateLineWithContext(line, context);
 
             this.emitAll('serialport:write', line);
 
@@ -211,7 +211,7 @@ class SmoothieController {
 
             // Example
             // "G0 X[posx - 8] Y[ymax]" -> "G0 X2 Y50"
-            line = this.translateWithContext(line, context);
+            line = this.translateLineWithContext(line, context);
 
             this.serialport.write(line + '\n');
             log.silly(`> ${line}`);

diff --git a/src/app/controllers/TinyG/TinyGController.js b/src/app/controllers/TinyG/TinyGController.js
@@ -379,12 +379,12 @@ class TinyGController {
                 const now = new Date().getTime();
                 const timespan = Math.abs(now - this.actionTime.senderFinishTime);
                 const toleranceTime = 1000; // 1000ms
-                const activeState = _.get(this.state, 'status.activeState');
+                const machineState = _.get(this.state, 'sr.machineState');
                 const isControllerIdle = _.includes([
                     TINYG_MACHINE_STATE_READY,
                     TINYG_MACHINE_STATE_STOP,
                     TINYG_MACHINE_STATE_END
-                ], activeState);
+                ], machineState);
 
                 if (!isControllerIdle) {
                     // Extend the sender finish time if the controller state is not idle
@@ -393,7 +393,7 @@ class TinyGController {
                 }
 
                 if (timespan > toleranceTime) {
-                    log.debug(`Stop workflow: activeState=${activeState}, timespan=${timespan}ms`);
+                    log.debug(`Stop workflow: machineState=${machineState}, timespan=${timespan}ms`);
 
                     this.actionTime.senderFinishTime = 0;