Preliminary support for Marlin 3D printer firmware

Author: cheton

src/Controller.js

@@ -8,6 +8,7 @@ import {
     METRIC_UNITS,
     // Controller
     GRBL,
+    MARLIN,
     SMOOTHIE,
     TINYG
 } from './constants';
@@ -350,7 +351,7 @@ class Controller {
     // Gets the machine state.
     // @return {string|number} Returns the machine state.
     getMachineState() {
-        if ([GRBL, SMOOTHIE, TINYG].indexOf(this.type) < 0) {
+        if ([GRBL, MARLIN, SMOOTHIE, TINYG].indexOf(this.type) < 0) {
             return '';
         }
 
@@ -362,6 +363,8 @@ class Controller {
 
         if (this.type === GRBL) {
             machineState = this.state.machineState;
+        } else if (this.type === MARLIN) {
+            machineState = this.state.machineState;
         } else if (this.type === SMOOTHIE) {
             machineState = this.state.machineState;
         } else if (this.type === TINYG) {
@@ -397,6 +400,23 @@ class Controller {
             });
         }
 
+        // Marlin
+        if (this.type === MARLIN) {
+            const { pos, modal = {} } = this.state;
+            const units = {
+                'G20': IMPERIAL_UNITS,
+                'G21': METRIC_UNITS
+            }[modal.units];
+
+            // Machine position are reported in current units
+            return mapValues({
+                ...defaultMachinePosition,
+                ...pos
+            }, (val) => {
+                return (units === IMPERIAL_UNITS) ? in2mm(val) : val;
+            });
+        }
+
         // Smoothieware
         if (this.type === SMOOTHIE) {
             const { mpos, modal = {} } = this.state;
@@ -455,6 +475,23 @@ class Controller {
             });
         }
 
+        // Marlin
+        if (this.type === MARLIN) {
+            const { pos, modal = {} } = this.state;
+            const units = {
+                'G20': IMPERIAL_UNITS,
+                'G21': METRIC_UNITS
+            }[modal.units];
+
+            // Work position are reported in current units
+            return mapValues({
+                ...defaultWorkPosition,
+                ...pos
+            }, (val) => {
+                return (units === IMPERIAL_UNITS) ? in2mm(val) : val;
+            });
+        }
+
         // Smoothieware
         if (this.type === SMOOTHIE) {
             const { wpos, modal = {} } = this.state;
@@ -514,6 +551,13 @@ class Controller {
             };
         }
 
+        if (this.type === MARLIN) {
+            return {
+                ...defaultModalState,
+                ...this.state.modal
+            };
+        }
+
         if (this.type === SMOOTHIE) {
             return {
                 ...defaultModalState,

src/constants.js

@@ -4,6 +4,7 @@ export const METRIC_UNITS = 'mm';
 
 // Controller
 export const GRBL = 'Grbl';
+export const MARLIN = 'Marlin';
 export const SMOOTHIE = 'Smoothie';
 export const TINYG = 'TinyG';