6.0.19 updates

editor/flash.ts

@@ -108,7 +108,7 @@ class DAPWrapper implements pxt.packetio.PacketIOWrapper {
         this.allocDAP();
     }
 
-    icon = "xicon microbit";
+    icon = "icon usb";
 
     private pendingSerial: Uint8Array
     private lastPendingSerial: number

libs/audio-recording/pxt.json

@@ -11,5 +11,8 @@
         "recording.cpp",
         "shims.d.ts"
     ],
-    "public": true
+    "public": true,
+    "disablesVariants": [
+        "minidal"
+    ]
 }

libs/core-mini-codal/pxt.json

@@ -17,42 +17,5 @@
         "soundexpressions.ts",
         "playable.ts",
         "rgbled.ts"
-    ],
-    "yotta": {
-        "optionalConfig": {
-            "microbit-dal": {
-                "bluetooth": {
-                    "open": 0,
-                    "security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM",
-                    "whitelist": 1
-                }
-            }
-        },
-        "userConfigs": [
-            {
-                "description": "Bluetooth: No pairing required (Calliope mini 1 and Calliope mini 2 behaviour)",
-                "config": {
-                    "microbit-dal": {
-                        "bluetooth": {
-                            "open": 1,
-                            "security_level": null,
-                            "whitelist": 0
-                        }
-                    }
-                }
-            },
-            {
-                "description": "Bluetooth: Paring required (Calliope mini 3 default. Fixes Android 13 bug »GATT ERROR 133«, mini must be already flashed with this option)",
-                "config": {
-                    "microbit-dal": {
-                        "bluetooth": {
-                            "open": 0,
-                            "security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM",
-                            "whitelist": 1
-                        }
-                    }
-                }
-            }
-        ]
-    }
+    ]
 }

libs/core-mini-dal/pxt.json

@@ -13,42 +13,5 @@
         "motors.ts",
         "parts/dcmotor.svg",
         "input.cpp"
-    ],
-    "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 (fixes Android 13 »GATT ERROR 133«-Bug, mini must be already flashed with this option)",
-                "config": {
-                    "microbit-dal": {
-                        "bluetooth": {
-                            "open": 0,
-                            "security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM",
-                            "whitelist": 1
-                        }
-                    }
-                }
-            }
-        ]
-    }
+    ]
 }

libs/core-mini/pxt.json

@@ -11,5 +11,42 @@
         "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
+                        }
+                    }
+                }
+            }
+        ]
+    }
 }

libs/core/enums.d.ts

@@ -445,43 +445,52 @@ declare namespace input {
     P2 = 102,  // MICROBIT_ID_IO_P2
     P3 = 103,  // MICROBIT_ID_IO_P3
 
-    //% blockHidden=true
     C4 = 104,  // MICROBIT_ID_IO_P4
+    //% blockHidden=true
     P4 = 104,  // MICROBIT_ID_IO_P4
 
     C5 = 105,  // MICROBIT_ID_IO_P5
+    //% blockHidden=true
     P5 = 105,  // MICROBIT_ID_IO_P5
 
-    //% blockHidden=true
     C6 = 106,  // MICROBIT_ID_IO_P6
+    //% blockHidden=true
     P6 = 106,  // MICROBIT_ID_IO_P6
 
-    //% blockHidden=true
     C7 = 107,  // MICROBIT_ID_IO_P7
+    //% blockHidden=true
     P7 = 107,  // MICROBIT_ID_IO_P7
 
-    //% blockHidden=true
     C8 = 108,  // MICROBIT_ID_IO_P8
+    //% blockHidden=true
     P8 = 108,  // MICROBIT_ID_IO_P8
 
-    //% blockHidden=true
     C9 = 109,  // MICROBIT_ID_IO_P9
+    //% blockHidden=true
     P9 = 109,  // MICROBIT_ID_IO_P9
 
-    //% blockHidden=true
     C10 = 110,  // MICROBIT_ID_IO_P10
+    //% blockHidden=true
     P10 = 110,  // MICROBIT_ID_IO_P10
 
-    //% blockHidden=true
+
     C11 = 111,  // MICROBIT_ID_IO_P11
+    //% blockHidden=true
     P11 = 111,  // MICROBIT_ID_IO_P11
 
-    //% blockHidden=true
     C12 = 112,  // MICROBIT_ID_IO_P12
+    //% blockHidden=true
     P12 = 112,  // MICROBIT_ID_IO_P12
 
+    C13 = 113,  // MICROBIT_ID_IO_P13
+    C14 = 114,  // MICROBIT_ID_IO_P14
+    C15 = 115,  // MICROBIT_ID_IO_P15
+
+    //% blockHidden=true
     P13 = 113,  // MICROBIT_ID_IO_P13
+    //% blockHidden=true
     P14 = 114,  // MICROBIT_ID_IO_P14
+    //% blockHidden=true
     P15 = 115,  // MICROBIT_ID_IO_P15
 
     //% blockHidden=true

libs/core/pins.cpp

@@ -13,43 +13,52 @@ enum class DigitalPin {
     P2 = MICROBIT_ID_IO_P2,    // edge connector 2
     P3 = MICROBIT_ID_IO_P3,   // edge connector 3
 
-    //% blockHidden=true
     C4 = MICROBIT_ID_IO_P4,    // -> P4
+    //% blockHidden=true
     P4 = MICROBIT_ID_IO_P4,    // LED matrix COLUMN 1
 
     C5 = MICROBIT_ID_IO_P5,    // -> P5
+    //% blockHidden=true
     P5 = MICROBIT_ID_IO_P5,    // LED matrix COLUMN 2
 
-    //% blockHidden=true
     C6 = MICROBIT_ID_IO_P6,   // -> P6
+    //% blockHidden=true
     P6 = MICROBIT_ID_IO_P6,   // LED matrix COLUMN 3
 
-    //% blockHidden=true
     C7 = MICROBIT_ID_IO_P7,   // -> P7
+    //% blockHidden=true
     P7 = MICROBIT_ID_IO_P7,   // LED matrix COLUMN 4
 
-    //% blockHidden=true
     C8 = MICROBIT_ID_IO_P8,   // -> P8
+    //% blockHidden=true
     P8 = MICROBIT_ID_IO_P8,   // LED matrix COLUMN 5
 
-    //% blockHidden=true
     C9 = MICROBIT_ID_IO_P9,   // -> P9
+    //% blockHidden=true
     P9 = MICROBIT_ID_IO_P9,   // LED matrix COLUMN 6
 
-    //% blockHidden=true
     C10 = MICROBIT_ID_IO_P10,   // -> P10
+    //% blockHidden=true
     P10 = MICROBIT_ID_IO_P10,   // LED matrix COLUMN 7
 
-    //% blockHidden=true
+
     C11 = MICROBIT_ID_IO_P11,   // -> P11
+    //% blockHidden=true
     P11 = MICROBIT_ID_IO_P11,   // LED matrix COLUMN 8
 
-    //% blockHidden=true
     C12 = MICROBIT_ID_IO_P12,   // -> P12
+    //% blockHidden=true
     P12 = MICROBIT_ID_IO_P12,   // LED matrix COLUMN 9
 
+    C13 = MICROBIT_ID_IO_P13,   // LED matrix ROW 1
+    C14 = MICROBIT_ID_IO_P14,   // LED matrix ROW 2
+    C15 = MICROBIT_ID_IO_P15,   // LED matrix ROW 3
+
+    //% blockHidden=true
     P13 = MICROBIT_ID_IO_P13,   // LED matrix ROW 1
+    //% blockHidden=true
     P14 = MICROBIT_ID_IO_P14,   // LED matrix ROW 2
+    //% blockHidden=true
     P15 = MICROBIT_ID_IO_P15,   // LED matrix ROW 3
 
     //% blockHidden=true

libs/core/touchmode.cpp

@@ -35,7 +35,6 @@ namespace pins {
     //% weight=60
     //% blockId=device_touch_set_type block="set %name to touch mode %mode"
     //% advanced=true
-    //% group="micro:bit (V2)"
     //% help=pins/touch-set-mode
     void touchSetMode(TouchTarget name, TouchTargetMode mode) {
     #if MICROBIT_CODAL

libs/datalogger/datalogger.ts

@@ -64,15 +64,13 @@ namespace datalogger {
     //% value.shadow=math_number
     //% column.shadow=datalogger_columnfield
     //% blockId=dataloggercreatecolumnvalue
-    //% group="micro:bit (V2)"
     //% weight=80 help=datalogger/create-cv
     export function createCV(column: string, value: any): ColumnValue {
         return new ColumnValue(column, value);
     }
 
     //% block="$column"
     //% blockId=datalogger_columnfield
-    //% group="micro:bit (V2)"
     //% blockHidden=true shim=TD_ID
     //% column.fieldEditor="autocomplete" column.fieldOptions.decompileLiterals=true
     //% column.fieldOptions.key="dataloggercolumn"
@@ -88,7 +86,6 @@ namespace datalogger {
     //% blockId=dataloggerlogdata
     //% data.shadow=lists_create_with
     //% data.defl=dataloggercreatecolumnvalue
-    //% group="micro:bit (V2)"
     //% blockHidden=true
     //% weight=100
     export function logData(data: ColumnValue[]): void {
@@ -133,7 +130,6 @@ namespace datalogger {
     //% data10.shadow=dataloggercreatecolumnvalue
     //% inlineInputMode="variable"
     //% inlineInputModeLimit=1
-    //% group="micro:bit (V2)"
     //% weight=100 help=datalogger/log
     export function log(
         data1: datalogger.ColumnValue,
@@ -171,7 +167,6 @@ namespace datalogger {
     //% blockId=dataloggersetcolumns
     //% data.shadow=list_create_with
     //% data.defl=datalogger_columnfield
-    //% group="micro:bit (V2)"
     //% blockHidden=true
     //% weight=70
     export function setColumns(cols: string[]): void {
@@ -198,7 +193,6 @@ namespace datalogger {
     //% blockId=dataloggersetcolumntitles
     //% inlineInputMode="variable"
     //% inlineInputModeLimit=1
-    //% group="micro:bit (V2)"
     //% weight=70 help=datalogger/set-column-titles
     //% col1.shadow=datalogger_columnfield
     //% col2.shadow=datalogger_columnfield
@@ -236,7 +230,6 @@ namespace datalogger {
      */
     //% block="delete log||$deleteType"
     //% blockId=dataloggerdeletelog
-    //% group="micro:bit (V2)"
     //% weight=60 help=datalogger/delete-log
     export function deleteLog(deleteType?: DeleteType): void {
         init();
@@ -250,7 +243,6 @@ namespace datalogger {
      */
     //% block="on log full"
     //% blockId="on log full"
-    //% group="micro:bit (V2)"
     //% weight=40 help=datalogger/on-log-full
     export function onLogFull(handler: () => void): void {
         init();
@@ -264,7 +256,6 @@ namespace datalogger {
     //% block="set timestamp $format"
     //% blockId=dataloggertoggleincludetimestamp
     //% format.defl=FlashLogTimeStampFormat.None
-    //% group="micro:bit (V2)"
     //% weight=30 help=datalogger/include-timestamp
     export function includeTimestamp(format: FlashLogTimeStampFormat): void {
         init();

libs/flashlog/_locales/flashlog-strings.json

@@ -6,6 +6,5 @@
   "FlashLogTimeStampFormat.None|block": "none",
   "FlashLogTimeStampFormat.Seconds|block": "seconds",
   "flashlog|block": "flashlog",
-  "{id:category}Flashlog": "Flashlog",
-  "{id:group}micro:bit (V2)": "micro:bit (V2)"
+  "{id:category}Flashlog": "Flashlog"
 }