Merge pull request #2 from microbit-foundation/main

upstream main branch

.vscode/settings.json

@@ -21,6 +21,8 @@
     "a11y-distracting-elements": "ignore",
     "a11y-structure": "ignore",
     "a11y-click-events-have-key-events": "ignore",
-    "a11y-missing-content": "ignore"
+    "a11y-missing-content": "ignore",
+    "a11y-no-noninteractive-element-interactions":"ignore",
+    "a11y-no-static-element-interactions": "ignore"
   }
 }

microbit/v1/source/main.cpp

@@ -46,10 +46,6 @@ void sendString(ManagedString s)
 void onConnected(MicroBitEvent)
 {
     connected = 1; // Set the connected flag
-    uBit.sleep(3000);
-    uart->send(ManagedString("id_prop")); // MUST be sent before vi_ message
-    uart->send(ManagedString("vi_") + ManagedString(buildNumber));
-
     const uint8_t smiley[] {
                           0, 0, 0, 0, 0,
                           0, 1, 0, 1, 0,
@@ -59,6 +55,16 @@ void onConnected(MicroBitEvent)
 
     MicroBitImage happy(5,5,smiley);
     uBit.display.print(happy);
+
+    for (size_t i = 0; i < 12; i++)
+    {
+        if (!connected) {
+            break;
+        }
+        uBit.sleep(1000);
+        uart->send(ManagedString("id_prop")); // MUST be sent before vi_ message
+        uart->send(ManagedString("vi_") + ManagedString(buildNumber));
+    }
 }
 
 /**

microbit/v2/source/main.cpp

@@ -49,11 +49,17 @@ void onConnected(MicroBitEvent)
 {
     connected = 1; // Set the connected flag
 
-    uBit.sleep(3000);
-    uart->send(ManagedString("id_prop")); // MUST be sent before vi_ message
-    uart->send(ManagedString("vi_") + ManagedString(buildNumber));
-
     printSmiley(GLAD_SMILEY);
+
+    for (size_t i = 0; i < 12; i++)
+    {
+        if (!connected) {
+            break;
+        }
+        uBit.sleep(1000);
+        uart->send(ManagedString("id_prop")); // MUST be sent before vi_ message
+        uart->send(ManagedString("vi_") + ManagedString(buildNumber));
+    }
 }
 
 /**

package.json

@@ -9,16 +9,18 @@
     "build": "node prepEnv.js simple && vite build",
     "dev": "node prepEnv.js unbranded && vite",
     "devML": "node prepEnv.js branded && vite",
+    "devSimple": "node prepEnv.js simple && vite",
     "start": "vite dist --host",
     "check": "svelte-check --fail-on-warnings --tsconfig ./tsconfig.json --compiler-warnings 'a11y-aria-attributes:ignore,a11y-click-events-have-key-events:ignore,a11y-media-has-caption:ignore,a11y-structure:ignore,a11y-role-supports-aria-props:ignore,a11y-role-has-required-aria-props:ignore,a11y-media-has-caption:ignore,a11y-no-static-element-interactions:ignore,a11y-no-noninteractive-element-interactions:ignore,a11y-missing-content:ignore'",
     "test": "vitest",
-    "prettier": "prettier --write src/."
+    "prettier": "prettier --write src/.",
+    "checkFormat": "prettier --check src/."
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.23.5",
-    "@sveltejs/vite-plugin-svelte": "^3.0.1",
-    "@testing-library/svelte": "^4.0.0",
-    "@tsconfig/svelte": "^4.0.1",
+    "@babel/preset-env": "^7.24.4",
+    "@sveltejs/vite-plugin-svelte": "^3.1.0",
+    "@testing-library/svelte": "^4.1.0",
+    "@tsconfig/svelte": "^5.0.4",
     "@types/browser-lang": "^0.1.1",
     "@types/d3": "^7.4.1",
     "@types/js-cookie": "^3.0.3",
@@ -33,32 +35,34 @@
     "jsdom": "^23.0.1",
     "prettier": "^3.1.0",
     "prettier-plugin-svelte": "^3.1.2",
-    "svelte": "^4.0.0",
-    "svelte-check": "^3.6.2",
-    "svelte-preprocess": "^5.0.3",
+    "svelte": "^4.2.14",
+    "svelte-check": "^3.6.9",
+    "svelte-preprocess": "^5.1.3",
     "svelte-windicss-preprocess": "^4.2.2",
-    "tslib": "^2.5.0",
-    "typescript": "^5.0.4",
-    "vite": "^5.0.7",
+    "tslib": "^2.6.2",
+    "typescript": "^5.4.5",
+    "vite": "^5.2.8",
     "vite-plugin-environment": "^1.1.3",
     "vite-plugin-windicss": "^1.9.3",
-    "vitest": "^1.0.4"
+    "vitest": "^1.5.0"
   },
   "dependencies": {
-    "@microsoft/applicationinsights-web": "^3.0.0",
+    "@microsoft/applicationinsights-web": "^3.1.2",
     "@tensorflow-models/knn-classifier": "^1.2.6",
-    "@tensorflow/tfjs": "^4.4.0",
+    "@tensorflow/tfjs": "^4.18.0",
+    "arrows-svg": "^1.8.0",
     "bowser": "^2.11.0",
     "browser-lang": "^0.2.1",
-    "chart.js": "^4.2.1",
-    "d3": "^7.8.5",
+    "chart.js": "^4.4.2",
+    "d3": "^7.9.0",
+    "d3-3d": "^1.0.0",
     "dapjs": "^2.3.0",
-    "js-cookie": "^3.0.4",
-    "postcss": "^8.4.23",
+    "js-cookie": "^3.0.5",
+    "postcss": "^8.4.38",
     "smoothie": "^1.36.1",
     "svelte-i18n": "^4.0.0",
     "svelte-skeleton": "^1.3.1",
     "three": "^0.152.2",
     "uuid4": "^2.0.3"
   }
-}
+}

prepEnv.js

@@ -34,7 +34,9 @@ const fileMoveTargets = {
 const availableTargets = Object.getOwnPropertyNames(fileMoveTargets);
 const buildVariantTarget = args[2];
 if (!availableTargets.includes(buildVariantTarget)) {
-    throw new Error("Invalid build variant target!")
+    const listTargets = availableTargets.map(target => `  node prepEnv.js ${target}`).join("\n") + "\n";
+    const errorMessage = `Invalid build variant target!\nUse on of the following build targets: \n${listTargets}`;
+    throw new Error(errorMessage);
 }
 
 // The actual work