add sainsmart genmitsu 3018

src/dev/cam/Sainsmart.Genmitsu.3018

@@ -0,0 +1,23 @@
+{
+    "file-ext": "nc",
+    "token-space": " ",
+    "strip-comments": true,
+    "pre":[
+        "G21 ; set units to MM (required)",
+        "G90 ; absolute position mode (required)"
+    ],
+    "post":[
+        "M30 ; program end"
+    ],
+    "dwell":[
+        "G4 P{time} ; dwell for {time}ms"
+    ],
+    "spindle": [
+        "M3 {speed}"
+    ],
+    "settings": {
+        "bed_width": 300,
+        "bed_depth": 180,
+        "spindle_max": 1000
+    }
+}

src/kiri/conf.js

@@ -113,9 +113,9 @@
             originCenter: valueOf(set.origin_center, false),
             extrudeAbs: valueOf(set.extrude_abs, false),
             spindleMax: valueOf(set.spindle_max, 0),
-            gcodeFan: valueOf(cmd.fan_power, []),
-            gcodeTrack: valueOf(cmd.progress, []),
-            gcodeLayer: valueOf(cmd.layer, []),
+            gcodeFan: valueOf(cmd.fan_power || code.fan_power, []),
+            gcodeTrack: valueOf(cmd.progress || code.progress, []),
+            gcodeLayer: valueOf(cmd.layer || code.layer, []),
             gcodePre: valueOf(code.pre, []),
             gcodePost: valueOf(code.post, []),
             // post processor script of which only one exists
@@ -124,7 +124,7 @@
             gcodeProc: valueOf(code.proc, ''),
             gcodePause: valueOf(code.pause, []),
             gcodeDwell: valueOf(code.dwell, []),
-            gcodeSpindle: valueOf(cmd.spindle, []),
+            gcodeSpindle: valueOf(code.spindle || cmd.spindle, []),
             gcodeChange: valueOf(code['tool-change'], []),
             gcodeFExt: valueOf(code['file-ext'], 'gcode'),
             gcodeSpace: valueOf(code['token-space'], true),

src/kiri/init.js

@@ -964,7 +964,7 @@
                 first = device;
             }
             let opt = DOC.createElement('option');
-            opt.appendChild(DOC.createTextNode(device));
+            opt.appendChild(DOC.createTextNode(device.replace(/\./g,' ')));
             opt.onclick = function() {
                 selectDevice(device);
             };