Ack response when sender.state.received is less than `sender.state.…

…sent` when workflow is in paused state
cncjs · Apr 24, 2017 · 38c5524 · 38c5524
1 parent 0e74737
commit 38c5524
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/app/controllers/Grbl/GrblController.js b/src/app/controllers/Grbl/GrblController.js
@@ -8,6 +8,7 @@ import logger from '../../lib/logger';
 import Sender, { SP_TYPE_CHAR_COUNTING } from '../../lib/sender';
 import Workflow, {
     WORKFLOW_STATE_IDLE,
+    WORKFLOW_STATE_PAUSED,
     WORKFLOW_STATE_RUNNING
 } from '../../lib/workflow';
 import config from '../../services/configstore';
@@ -286,6 +287,13 @@ class GrblController {
                 this.sender.next();
                 return;
             }
+            if (this.workflow.state === WORKFLOW_STATE_PAUSED) {
+                const { sent, received } = this.sender.state;
+                if (sent > received) {
+                    this.sender.ack();
+                    return;
+                }
+            }
 
             this.emitAll('serialport:read', res.raw);
 

diff --git a/src/app/controllers/Smoothie/SmoothieController.js b/src/app/controllers/Smoothie/SmoothieController.js
@@ -8,6 +8,7 @@ import logger from '../../lib/logger';
 import Sender, { SP_TYPE_CHAR_COUNTING } from '../../lib/sender';
 import Workflow, {
     WORKFLOW_STATE_IDLE,
+    WORKFLOW_STATE_PAUSED,
     WORKFLOW_STATE_RUNNING
 } from '../../lib/workflow';
 import config from '../../services/configstore';
@@ -284,6 +285,13 @@ class SmoothieController {
                 this.sender.next();
                 return;
             }
+            if (this.workflow.state === WORKFLOW_STATE_PAUSED) {
+                const { sent, received } = this.sender.state;
+                if (sent > received) {
+                    this.sender.ack();
+                    return;
+                }
+            }
 
             this.emitAll('serialport:read', res.raw);