Check serialport connection before sending periodical commands

cncjs · Mar 27, 2017 · e51a9fb · e51a9fb
1 parent f2c118e
commit e51a9fb
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/src/app/controllers/Grbl/GrblController.js b/src/app/controllers/Grbl/GrblController.js
@@ -391,9 +391,11 @@ class GrblController {
                 return;
             }
 
-            this.actionMask.queryStatusReport = true;
-            this.actionTime.queryStatusReport = now;
-            this.serialport.write('?');
+            if (this.isOpen()) {
+                this.actionMask.queryStatusReport = true;
+                this.actionTime.queryStatusReport = now;
+                this.serialport.write('?');
+            }
         };
 
         const queryParserState = _.throttle(() => {
@@ -416,10 +418,12 @@ class GrblController {
                 return;
             }
 
-            this.actionMask.queryParserState.state = true;
-            this.actionMask.queryParserState.reply = false;
-            this.actionTime.queryParserState = now;
-            this.serialport.write('$G\n');
+            if (this.isOpen()) {
+                this.actionMask.queryParserState.state = true;
+                this.actionMask.queryParserState.reply = false;
+                this.actionTime.queryParserState = now;
+                this.serialport.write('$G\n');
+            }
         }, 500);
 
         this.queryTimer = setInterval(() => {

diff --git a/src/app/controllers/Smoothie/SmoothieController.js b/src/app/controllers/Smoothie/SmoothieController.js
@@ -345,9 +345,11 @@ class SmoothieController {
                 return;
             }
 
-            this.actionMask.queryStatusReport = true;
-            this.actionTime.queryStatusReport = now;
-            this.serialport.write('?');
+            if (this.isOpen()) {
+                this.actionMask.queryStatusReport = true;
+                this.actionTime.queryStatusReport = now;
+                this.serialport.write('?');
+            }
         };
 
         const queryParserState = _.throttle(() => {
@@ -370,10 +372,12 @@ class SmoothieController {
                 return;
             }
 
-            this.actionMask.queryParserState.state = true;
-            this.actionMask.queryParserState.reply = false;
-            this.actionTime.queryParserState = now;
-            this.serialport.write('$G\n');
+            if (this.isOpen()) {
+                this.actionMask.queryParserState.state = true;
+                this.actionMask.queryParserState.reply = false;
+                this.actionTime.queryParserState = now;
+                this.serialport.write('$G\n');
+            }
         }, 500);
 
         this.queryTimer = setInterval(() => {