Merge branch 'main' of https://github.com/microbit-apps/microcode-v2 into switchPageDebug

Author: thomasjball

.github/workflows/makecode-release.yml

@@ -11,7 +11,7 @@ jobs:
             contents: write
         strategy:
             matrix:
-                node-version: [16.x]
+                node-version: [18.x]
         steps:
             - uses: actions/checkout@v4
               with:
@@ -37,10 +37,9 @@ jobs:
                   makecode
             - name: copy files
               run: |
-                  cp ./built/binary.js ./assets/js/binary.js
-                  cp ./built/n3/binary.hex ./assets/microcode.hex
+                  cp ./built/binary.hex ./assets/microcode.hex
             - name: upload modified assets
               uses: stefanzweifel/git-auto-commit-action@v4
               with:
-                  file_pattern: "assets/* _includes/*"
+                  file_pattern: "assets/*"
                   branch: main

.github/workflows/makecode.yml

@@ -37,11 +37,3 @@ jobs:
             - name: build hex file
               run: |
                   makecode
-            - name: copy files
-              run: |
-                  cp ./built/binary.hex ./assets/microcode.hex
-            - name: upload modified assets
-              uses: stefanzweifel/git-auto-commit-action@v4
-              with:
-                  file_pattern: "assets/*"
-                  branch: main

assets.ts

@@ -26,7 +26,6 @@ namespace microcode {
     function jacdacImages(name: string | number) {
         if (name == Tid.TID_FILTER_KITA_KEY_1) return icondb.kita_key_1
         if (name == Tid.TID_FILTER_KITA_KEY_2) return icondb.kita_key_2
-        if (name == Tid.TID_SENSOR_MAGNET) return icondb.magnet
         if (name == Tid.TID_SENSOR_SLIDER) return icondb.kita_slider
         if (name == Tid.TID_SENSOR_ROTARY) return icondb.kita_rotary
         if (name == Tid.TID_FILTER_ROTARY_LEFT) return icondb.kita_rotary_left
@@ -125,7 +124,7 @@ namespace microcode {
             if (name == Tid.TID_MODIFIER_LOOP) return icondb.loop
 
             // variables
-
+            if (name == Tid.TID_SENSOR_MAGNET) return icondb.magnet
             if (name == Tid.TID_SENSOR_CUP_X_WRITTEN) return icondb.cupXwritten
             if (name == Tid.TID_SENSOR_CUP_Y_WRITTEN) return icondb.cupYwritten
             if (name == Tid.TID_SENSOR_CUP_Z_WRITTEN) return icondb.cupZwritten