Merge branch 'master' into extension-add-craft-and-code

martinwork · Nov 26, 2024 · 7bf19e8 · 7bf19e8
2 parents 669d113 + 8ebd67b
commit 7bf19e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/pxtarget.json b/pxtarget.json
@@ -261,12 +261,6 @@
                 "localHostUrl": "http://localhost:3000/microbit-robot/?parentOrigin=$PARENT_ORIGIN$",
                 "aspectRatio": 1.22,
                 "permanent": true
-            },
-            "arcadeshield": {
-                "url": "https://microsoft.github.io/pxt-arcadeshield/?parentOrigin=$PARENT_ORIGIN$",
-                "localHostUrl": "http://localhost:3000/?parentOrigin=$PARENT_ORIGIN$",
-                "aspectRatio": 1.22,
-                "permanent": true
             }
         },
         "testSimulatorExtensions": {},

diff --git a/targetconfig.json b/targetconfig.json
@@ -465,21 +465,27 @@
             "pythom1234/pxt-oled": { "tags": [ "Lights and Display" ] },
             "softsmyth/lectrify-b4k": { "tags": [ "Robotics" ] },
             "davidnsousa/sonification": { "tags": [ "Software" ] },
+            "shahart/heb-microbit": { "tags": [ "Software" ] },
+            "kitronikltd/pxt-kitronik-craft-and-code": { "tags": [ "Robotics" ] },
             "microsoft/pxt-simx-sample": {
                 "simx": {
                     "sha": "7301f5900879b85127482d79bab48f03c25690a8",
                     "devUrl": "http://localhost:5173"
                 }
             },
-            "shahart/heb-microbit": { "tags": [ "Software" ] },
             "microbit-foundation/pxt-microbit-ml": { 
                 "simx": {
                     "sha": "e349a2feaae9f84a24ebd56716209ef74e1758d2",
                     "devUrl": "http://localhost:5173",
                     "aspectRatio": 3.45
                 }
             },
-            "kitronikltd/pxt-kitronik-craft-and-code": { "tags": [ "Robotics" ] }
+            "microbit-apps/pxt-arcadeshield": {
+                "simx": {
+                    "sha": "5bac5ff5b80621b53b746e4bbe252e406b992bdb",
+                    "devUrl": "http://localhost:3000"
+                }
+            }
         },
         "approvedEditorExtensionUrls": [
             "https://microsoft.github.io/ml4f/",