add v3 packages (#234)

microsoft · Oct 9, 2023 · 239c584 · 239c584
1 parent fabecba
commit 239c584
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 51 deletions.
diff --git a/libs/core-mini/pxt.json b/libs/core-mini/pxt.json
@@ -11,42 +11,5 @@
         "storage.ts",
         "rgbled.cpp",
         "rgbled.ts"
-    ],
-    "yotta": {
-        "optionalConfig": {
-            "microbit-dal": {
-                "bluetooth": {
-                    "open": 1,
-                    "security_level": null,
-                    "whitelist": 0
-                }
-            }
-        },
-        "userConfigs": [
-            {
-                "description": "Bluetooth: No pairing required (default)",
-                "config": {
-                    "microbit-dal": {
-                        "bluetooth": {
-                            "open": 1,
-                            "security_level": null,
-                            "whitelist": 0
-                        }
-                    }
-                }
-            },
-            {
-                "description": "Bluetooth: Paring required (Android 13 »GATT ERROR 133«-Bug)",
-                "config": {
-                    "microbit-dal": {
-                        "bluetooth": {
-                            "open": 0,
-                            "security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM",
-                            "whitelist": 1
-                        }
-                    }
-                }
-            }
-        ]
-    }
+    ]
 }
diff --git a/libs/core/input.cpp b/libs/core/input.cpp
@@ -167,7 +167,7 @@ enum class MesDpadButtonInfo {
     _4Up = MES_DPAD_BUTTON_4_UP,
 };
 
-//% color=#B4009E weight=99 icon="\uf192"
+//% color=##C94600 weight=99 icon="\uf192"
 namespace input {
 
 

diff --git a/libs/core/pxt.json b/libs/core/pxt.json
@@ -108,6 +108,10 @@
         "optionalConfig": {
             "microbit-dal": {
                 "bluetooth": {
+                    "enabled": 1,
+                    "open": 1,
+                    "security_level": null,
+                    "whitelist": 0,
                     "pairing_mode": 1,
                     "partial_flashing": 1,
                     "dfu_service": 1,
@@ -144,6 +148,30 @@
                         }
                     }
                 }
+            },
+            {
+                "description": "Bluetooth: No pairing required",
+                "config": {
+                    "microbit-dal": {
+                        "bluetooth": {
+                            "open": 1,
+                            "security_level": null,
+                            "whitelist": 0
+                        }
+                    }
+                }
+            },
+            {
+                "description": "Bluetooth: Pairing required",
+                "config": {
+                    "microbit-dal": {
+                        "bluetooth": {
+                            "open": 0,
+                            "security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM",
+                            "whitelist": 1
+                        }
+                    }
+                }
             }
         ]
     }

diff --git a/libs/core/shims.d.ts b/libs/core/shims.d.ts
@@ -215,7 +215,7 @@ declare namespace basic {
 
 
 
-    //% color=#B4009E weight=99 icon="\uf192"
+    //% color=##C94600 weight=99 icon="\uf192"
 declare namespace input {
 
     /**

diff --git a/libs/datalogger/_locales/datalogger-strings.json b/libs/datalogger/_locales/datalogger-strings.json
@@ -12,6 +12,5 @@
   "datalogger.setColumnTitles|block": "set columns $col1||$col2 $col3 $col4 $col5 $col6 $col7 $col8 $col9 $col10",
   "datalogger.setColumns|block": "set columns $cols",
   "datalogger|block": "Data Logger",
-  "{id:category}Datalogger": "Datalogger",
-  "{id:group}micro:bit (V2)": "micro:bit (V2)"
+  "{id:category}Datalogger": "Datalogger"
 }
diff --git a/libs/flashlog/pxt.json b/libs/flashlog/pxt.json
@@ -16,6 +16,6 @@
         "minidal"
     ],
     "dependencies": {
-        "core": "file:../core",
+        "core": "file:../core"
     }
 }
diff --git a/libs/v3/_locales/mini-3-jsdoc-strings.json b/libs/v3/_locales/mini-3-jsdoc-strings.json
diff --git a/libs/v3/_locales/mini-3-strings.json b/libs/v3/_locales/mini-3-strings.json
diff --git a/libs/v3/_locales/mini-v3-jsdoc-strings.json b/libs/v3/_locales/mini-v3-jsdoc-strings.json
diff --git a/libs/v3/_locales/mini-v3-strings.json b/libs/v3/_locales/mini-v3-strings.json
diff --git a/libs/v3/_locales/V3-jsdoc-strings.json → libs/v3/_locales/v3-jsdoc-strings.json b/libs/v3/_locales/V3-jsdoc-strings.json → libs/v3/_locales/v3-jsdoc-strings.json
diff --git a/libs/v3/_locales/V3-strings.json → libs/v3/_locales/v3-strings.json b/libs/v3/_locales/V3-strings.json → libs/v3/_locales/v3-strings.json
diff --git a/pxtarget.json b/pxtarget.json
@@ -9,6 +9,7 @@
         "libs/core",
         "libs/core-mini",
         "libs/core-mini-dal",
+        "libs/core-mini-codal",
         "libs/v1",
         "libs/v2",
         "libs/radio",
@@ -17,7 +18,11 @@
         "libs/servo",
         "libs/radio-broadcast",
         "libs/microphone",
-        "libs/color"
+        "libs/settings",
+        "libs/flashlog",
+        "libs/datalogger",
+        "libs/color",
+        "libs/audio-recording"
     ],
     "cloud": {
         "workspace": false,
@@ -172,10 +177,10 @@
                     "type": "git"
                 },
                 "codalBinary": "MICROBIT",
-                "githubCorePackage": "calliope-edu/microbit-v2-samples",
-                "gittag": "v0.2.13-calliope",
+                "githubCorePackage": "lancaster-university/microbit-v2-samples",
+                "gittag": "v0.2.13",
                 "serviceId": "mbcodal2",
-                "dockerImage": "pext/yotta:latest",
+                "dockerImage": "pext/yotta:update-yotta3",
                 "yottaConfigCompatibility": true
             }
         }