Adjusted generec machine defaults

LaserWeb · Jun 5, 2017 · da5d087 · da5d087
1 parent 27ccb20
commit da5d087
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 21 deletions.
diff --git a/machines/default.json b/machines/default.json
@@ -17,7 +17,9 @@
       "gcodeHoming": "$H",
       "gcodeToolOn": "",
       "gcodeToolOff": "",
-      "gcodeSMaxValue": 1000
+      "gcodeSMaxValue": 1000,
+      "toolGridWidth": 400,
+      "toolGridHeight": 300
     }
   },
   "*gen_smoothie": {
@@ -38,7 +40,9 @@
       "gcodeHoming": "",
       "gcodeToolOn": "",
       "gcodeToolOff": "",
-      "gcodeSMaxValue": 1
+      "gcodeSMaxValue": 1,
+      "toolGridWidth": 400,
+      "toolGridHeight": 300
     }
   }
 }
diff --git a/machines/emblaser2.json b/machines/emblaser2.json
@@ -88,21 +88,11 @@
       "gcodeCheckSizePower": 1,
       "gcodeToolTestPower": 50,
       "gcodeToolTestDuration": 1000,
-      "comServerVersion": "4.0.78",
-      "comServerIP": "localhost:8000",
-      "comServerConnect": false,
-      "comInterfaces": [
-        "USB",
-        "ESP8266",
-        "Telnet"
-      ],
       "connectVia": "USB",
-      "connectPort": "",
       "connectBaud": "115200",
       "jogStepsize": 1,
       "jogFeedXY": 6000,
       "jogFeedZ": 1000,
-      "jogAccumulatedJobTime": 579,
       "macros": {
         "*GotoXY0": {
           "label": "Goto XY zero",

diff --git a/machines/fabkit.json b/machines/fabkit.json
@@ -11,10 +11,12 @@
             "machineZMatThickness": 0,
             "machineZToolOffset": 0,
             "machineBlowerEnabled": false,
+            "machineAEnabled": false,
             "machineBlowerGcodeOn": "",
             "machineBlowerGcodeOff": "",
             "pxPerInch": 72,
             "dpiRasterBmp": 300,
+            "dpiBitmap": 300,
             "toolSafetyLockDisabled": false,
             "toolCncMode": false,
             "toolImagePosition": "BL",
@@ -66,20 +68,15 @@
             "gcodeSMaxValue": 1,
             "gcodeToolTestPower": 0,
             "gcodeToolTestDuration": 0,
-            "comServerIP": "localhost:8000",
-            "comServerConnect": false,
-            "comInterfaces": [
-                "USB",
-                "ESP8266"
-            ],
             "connectVia": "USB",
-            "connectPort": "COM10",
             "connectBaud": "115200",
-            "connectIP": "",
             "jogStepsize": 100,
             "jogFeedXY": 500,
             "jogFeedZ": 5,
-            "dpiBitmap": 300
+            "machineBottomLeftX": 0,
+            "machineBottomLeftY": 0,
+            "toolGridWidth": 800,
+            "toolGridHeight": 600
         }
     }
 }