Merge branch 'rel-4.1' of https://github.com/GridSpace/grid-apps into docs

.github/workflows/build-test.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Build Electron app
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: npm run build
+        run: npm run build-nopublish
         
   build-windows:
     runs-on: "windows-latest"
@@ -46,7 +46,7 @@ jobs:
       - name: Build Electron app
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: npm run build
+        run: npm run build-nopublish
 
 
 

app.js

@@ -668,7 +668,10 @@ function generateDevices() {
     fs.readdirSync(root).forEach(type => {
         let map = devs[type] = devs[type] || {};
         fs.readdirSync(PATH.join(root,type)).forEach(device => {
-            map[device] = JSON.parse(fs.readFileSync(PATH.join(root,type,device)));
+            let deviceName = device.endsWith('.json')
+                ? device.substring(0,device.length-5)
+                : device;
+            map[deviceName] = JSON.parse(fs.readFileSync(PATH.join(root,type,device)));
         });
     });
     synth.devices = `self.devices = ${JSON.stringify(devs)};`;

links.csv

@@ -5,7 +5,7 @@ src/ext/earcut.js,../../node_modules/earcut/src/earcut.js
 src/ext/tween.js,../../node_modules/@tweenjs/tween.js/src/Tween.js
 src/ext/jszip.js,../../node_modules/jszip/dist/jszip.js
 src/wasm/manifold.wasm,../../node_modules/manifold-3d/manifold.wasm
-src/kiri-dev/fdm/GridBot.Two,GridBot.One
+src/kiri-dev/fdm/GridBot.Two.json,GridBot.One.json
 src/kiri/lang-en.js,../../web/kiri/lang/en.js
 web/fon2,../node_modules/bootstrap-icons/font/
 web/kiri/lang/pl.js,pl-pl.js

package.json

@@ -81,6 +81,7 @@
         "start-dbg": "npm run prebuild && electron . --debugg",
         "start-ddb": "npm run prebuild && electron . --devel --debugg",
         "build": "npm run prebuild && electron-builder",
+        "build-nopublish": "npm run prebuild && electron-builder --publish never",
         "build-debug": "npm run prebuild && DEBUG=electron-builder electron-builder",
         "build-linux": "npm run build -- --linux --x64",
         "build-linux-arm": "npm run build -- --linux --arm64",

src/kiri-dev/fdm/GridBot.Two

@@ -1 +0,0 @@
-GridBot.One

src/kiri-dev/fdm/GridBot.Two.json

@@ -0,0 +1,43 @@
+{
+    "pre":[
+        "M117 Heating                 ; announce heating",
+        "M107                         ; turn off filament cooling fan",
+        "M104 S{temp} T0              ; set extruder temperature",
+        "M140 S{bed_temp} T0          ; set bed temperature",
+        "G90                          ; set absolute positioning mode",
+        "M83                          ; set relative positioning for extruder",
+        "G28                          ; home axes",
+        "G1 F3000                     ; set default move speed",
+        "M190 S{bed_temp} T0          ; wait for bed to reach target temp",
+        "M109 S{temp} T0              ; wait for extruder to reach target temp",
+        "M117 Purge                   ; announce purge",
+        "G92 E0                       ; set extruder position to 0",
+        "G1 E20 F250                  ; purge 20mm from extruder",
+        "G1 X0 Y0 Z0 E1 F3000         ; move to origin / wipe",
+        "M117 Start Print             ; announce start of print"
+    ],
+    "post":[
+        "M117 Done           ; announce done",
+        "M107                ; turn off filament cooling fan",
+        "M104 S0 T0          ; turn off extruder",
+        "M140 S0 T0          ; turn off bed",
+        "G91                 ; relative movement",
+        "G1 Z10 F1200        ; drop bed 10mm",
+        "G90                 ; absolute positioning",
+        "G28 X0 Y0           ; home XY axes",
+        "M84                 ; disable stepper motors"
+    ],
+    "cmd":{
+        "fan_power": "M106 S{fan_speed}",
+        "progress": "M117 {progress}% layer {layer} / {layers}"
+    },
+    "settings":{
+        "image_url": "/decal/gridbot.png",
+        "image_anchor": 0,
+        "image_scale": 1,
+        "origin_center": false,
+        "bed_width": 300,
+        "bed_depth": 300,
+        "build_height": 300
+    }
+}