Fixes an issue that toolpath may be empty due to incorrect motion mode

Author: cheton

src/Interpreter.js

@@ -10,8 +10,10 @@ import {
 const noop = () => {};
 
 /**
- * fromPairs([['a', 1], ['b', 2]]);
- * // => { 'a': 1, 'b': 2 }
+ * Returns an object composed from arrays of property names and values.
+ * @example
+ *   fromPairs([['a', 1], ['b', 2]]);
+ *   // => { 'a': 1, 'b': 2 }
  */
 const fromPairs = (pairs) => {
     let index = -1;
@@ -55,25 +57,52 @@ const interpret = (self, data) => {
         const words = groups[i];
         const word = words[0] || [];
         const letter = word[0];
-        const arg = word[1];
-        let cmd = (letter + arg);
+        const code = word[1];
+        let cmd = '';
         let args = {};
 
-        if ((letter === 'G') || (letter === 'M')) {
-            self.cmd = cmd;
-            args = fromPairs(words.slice(1)); // returns an object composed from arrays of property names and values
-        } else {
-            // Use the same command if the line does not start with Gxx or Mxx.
-            // For example:
-            // G0 Z0.25
-            //  X-0.5 Y0.
-            //  Z0.1
-            // G01 Z0. F5.
-            //  X0.5 Y0. I0. J-0.5
-            //  X0. Y-0.5 I-0.5 J0.
-            //  X-0.5 Y0. I0. J0.5
-            cmd = self.cmd;
-            args = fromPairs(words); // returns an object composed from arrays of property names and values.
+        if (letter === 'G') {
+            cmd = (letter + code);
+            args = fromPairs(words.slice(1));
+
+            // Motion Mode
+            if (code === 0 || code === 1 || code === 2 || code === 3 || code === 38.2 || code === 38.3 || code === 38.4 || code === 38.5) {
+                self.motionMode = cmd;
+            } else if (code === 80) {
+                self.motionMode = '';
+            }
+        } else if (letter === 'M') {
+            cmd = (letter + code);
+            args = fromPairs(words.slice(1));
+        } else if (letter === 'T') { // T1 ; w/o M6
+            cmd = letter;
+            args = code;
+        } else if (letter === 'F') { // F750 ; w/o motion command
+            cmd = letter;
+            args = code;
+        } else if (letter === 'X' || letter === 'Y' || letter === 'Z' || letter === 'A' || letter === 'B' || letter === 'C' || letter === 'I' || letter === 'J' || letter === 'K') {
+            // Use previous motion command if the line does not start with G-code or M-code.
+            // @example
+            //   G0 Z0.25
+            //   X-0.5 Y0.
+            //   Z0.1
+            //   G01 Z0. F5.
+            //   G2 X0.5 Y0. I0. J-0.5
+            //   X0. Y-0.5 I-0.5 J0.
+            //   X-0.5 Y0. I0. J0.5
+            // @example
+            //   G01
+            //   M03 S0
+            //   X5.2 Y0.2 M03 S0
+            //   X5.3 Y0.1 M03 S1000
+            //   X5.4 Y0 M03 S0
+            //   X5.5 Y0 M03 S0
+            cmd = self.motionMode;
+            args = fromPairs(words);
+        }
+
+        if (!cmd) {
+            continue;
         }
 
         if (typeof self.handlers[cmd] === 'function') {
@@ -89,7 +118,7 @@ const interpret = (self, data) => {
 };
 
 class Interpreter {
-    cmd = '';
+    motionMode = 'G0';
     handlers = {};
 
     constructor(options) {

test/fixtures/t2laser.nc

@@ -0,0 +1,52 @@
+( Generated by T2Laser )
+( Image2Gcode for Grbl )
+( Start Point: Center )
+( Frame Mode : Abs. )
+( X Maximum : 84.4 )
+( Y Maximum : 99.9 )
+( Laser Max : 1000 )
+( Feed Rate : 750 )
+( Resolution : 0.1 )
+( Image Name : text4272.png )
+M6 T1
+T2
+G21
+G90
+F750
+M05
+G00X0Y0F750
+G92X42.2Y49.95
+G90
+G00 X0 Y0
+G01
+M03 S0
+X5.2 Y0.2 M03 S0
+X5.3 Y0.1 M03 S1000
+X5.4 Y0 M03 S0
+X5.5 Y0 M03 S0
+X5.4 Y0.1 M03 S1000
+X5.2 Y0.3 M03 S1000
+X5.1 Y0.4 M03 S0
+X5.2 Y0.4 M03 S0
+X5.3 Y0.3 M03 S1000
+X5.5 Y0.1 M03 S1000
+X5.6 Y0 M03 S0
+X5.7 Y0 M03 S0
+X5.6 Y0.1 M03 S1000
+X5.2 Y0.5 M03 S1000
+X5.1 Y0.6 M03 S0
+X5.2 Y0.6 M03 S0
+X5.3 Y0.5 M03 S1000
+X5.7 Y0.1 M03 S1000
+X5.8 Y0 M03 S0
+X5.9 Y0 M03 S0
+X5.8 Y0.1 M03 S1000
+X5.2 Y0.7 M03 S1000
+X5.1 Y0.8 M03 S0
+X5.2 Y0.8 M03 S0
+X5.3 Y0.7 M03 S1000
+X5.9 Y0.1 M03 S1000
+X6 Y0 M03 S0
+X6.1 Y0 M03 S0
+X6 Y0.1 M03 S1000
+X5.2 Y0.9 M03 S1000

test/index.js

@@ -240,4 +240,72 @@ describe('G-code Interpreter', () => {
         });
     });
 
+    describe('G-code: T2Laser', () => {
+        class Runner extends Interpreter {
+            calls = {};
+
+            constructor(options) {
+                super(options);
+            }
+            M3(args) {
+                expect(args).to.be.an('object');
+                this.calls.M3 = (this.calls.M3 || 0) + 1;
+            }
+            M5(args) {
+                expect(args).to.be.an('object');
+                this.calls.M5 = (this.calls.M5 || 0) + 1;
+            }
+            M6(args) {
+                expect(args).to.be.an('object');
+                expect(args.T).to.equal(1);
+                this.calls.M6 = (this.calls.M6 || 0) + 1;
+            }
+            T(args) {
+                expect(args).to.be.an('number');
+                expect(args).to.equal(2);
+                this.calls.T = (this.calls.T || 0) + 1;
+            }
+            F(args) {
+                expect(args).to.be.an('number');
+                this.calls.F = (this.calls.F || 0) + 1;
+            }
+            G0(args) {
+                expect(args).to.be.an('object');
+                this.calls.G0 = (this.calls.G0 || 0) + 1;
+            }
+            G1(args) {
+                expect(args).to.be.an('object');
+                this.calls.G1 = (this.calls.G1 || 0) + 1;
+            }
+        }
+
+        it('should call each function with the expected number of times.', (done) => {
+            const file = 'test/fixtures/t2laser.nc';
+            const runner = new Runner();
+            runner.loadFromFileSync(file);
+            expect(runner.calls.M3).to.equal(31);
+            expect(runner.calls.M5).to.equal(1);
+            expect(runner.calls.M6).to.equal(1);
+            expect(runner.calls.T).to.equal(1);
+            expect(runner.calls.F).to.equal(1);
+            expect(runner.calls.G0).to.equal(2);
+            expect(runner.calls.G1).to.equal(31);
+            done();
+        });
+
+        it('should call each function with the expected number of times.', (done) => {
+            const file = 'test/fixtures/t2laser.nc';
+            const string = fs.readFileSync(file, 'utf8');
+            const runner = new Runner();
+            runner.loadFromStringSync(string);
+            expect(runner.calls.M3).to.equal(31);
+            expect(runner.calls.M5).to.equal(1);
+            expect(runner.calls.M6).to.equal(1);
+            expect(runner.calls.T).to.equal(1);
+            expect(runner.calls.F).to.equal(1);
+            expect(runner.calls.G0).to.equal(2);
+            expect(runner.calls.G1).to.equal(31);
+            done();
+        });
+    });
 });