remove v3 extensions and references

microsoft · Sep 26, 2023 · bd44ab8 · bd44ab8
1 parent f72c3a9
commit bd44ab8
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 61 deletions.
diff --git a/libs/audio-recording/pxt.json b/libs/audio-recording/pxt.json
@@ -11,5 +11,8 @@
         "recording.cpp",
         "shims.d.ts"
     ],
-    "public": true
+    "public": true,
+    "disablesVariants": [
+        "minidal"
+    ]
 }
diff --git a/libs/core/touchmode.cpp b/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

diff --git a/libs/datalogger/datalogger.ts b/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();

diff --git a/libs/flashlog/_locales/flashlog-strings.json b/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"
 }
diff --git a/libs/flashlog/flashlog.cpp b/libs/flashlog/flashlog.cpp
@@ -32,7 +32,6 @@ namespace flashlog {
 //% help=flashlog/begin-row
 //% parts="flashlog"
 //% blockGap=8
-//% group="micro:bit (V2)"
 int beginRow() {
 #if MICROBIT_CODAL
     return uBit.log.beginRow();
@@ -47,7 +46,6 @@ int beginRow() {
 //% help=flashlog/log-data
 //% parts="flashlog"
 //% blockGap=8
-//% group="micro:bit (V2)"
 int logData(String key, String value) {
     if (NULL == key || NULL == value)
         return DEVICE_INVALID_PARAMETER;
@@ -64,7 +62,6 @@ int logData(String key, String value) {
 //% help=flashlog/log-string
 //% parts="flashlog"
 //% blockGap=8
-//% group="micro:bit (V2)"
 int logString(String value) {
     if (NULL == value)
         return DEVICE_INVALID_PARAMETER;
@@ -81,7 +78,6 @@ int logString(String value) {
 //% help=flashlog/end-row
 //% parts="flashlog"
 //% blockGap=8
-//% group="micro:bit (V2)"
 int endRow() {
 #if MICROBIT_CODAL
     return uBit.log.endRow();
@@ -96,7 +92,6 @@ int endRow() {
 //% help=flashlog/clear
 //% parts="flashlog"
 //% blockGap=8
-//% group="micro:bit (V2)"
 void clear(bool fullErase) {
 #if MICROBIT_CODAL
     uBit.log.clear(fullErase);
@@ -113,7 +108,6 @@ void clear(bool fullErase) {
 //% help=flashlog/set-timestamp
 //% parts="flashlog"
 //% blockGap=8
-//% group="micro:bit (V2)"
 void setTimeStamp(FlashLogTimeStampFormat format) {
 #if MICROBIT_CODAL
     return uBit.log.setTimeStamp((codal::TimeStampFormat)format);
@@ -128,7 +122,6 @@ void setTimeStamp(FlashLogTimeStampFormat format) {
 //% help=flashlog/set-serial-mirroring
 //% parts="flashlog"
 //% blockGap=8
-//% group="micro:bit (V2)"
 void setSerialMirroring(bool enable) {
 #if MICROBIT_CODAL
     return uBit.log.setSerialMirroring(enable);

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/flashlog/shims.d.ts b/libs/flashlog/shims.d.ts
@@ -12,44 +12,39 @@ declare namespace flashlog {
      **/
     //% help=flashlog/begin-row
     //% parts="flashlog"
-    //% blockGap=8
-    //% group="micro:bit (V2)" shim=flashlog::beginRow
+    //% blockGap=8 shim=flashlog::beginRow
     function beginRow(): int32;
 
     /**
      * Populates the current row with the given key/value pair.
      **/
     //% help=flashlog/log-data
     //% parts="flashlog"
-    //% blockGap=8
-    //% group="micro:bit (V2)" shim=flashlog::logData
+    //% blockGap=8 shim=flashlog::logData
     function logData(key: string, value: string): int32;
 
     /**
      * Inject the given row into the log as text, ignoring key/value pairs.
      **/
     //% help=flashlog/log-string
     //% parts="flashlog"
-    //% blockGap=8
-    //% group="micro:bit (V2)" shim=flashlog::logString
+    //% blockGap=8 shim=flashlog::logString
     function logString(value: string): int32;
 
     /**
      * Complete a row in the log, and pushes to persistent storage.
      **/
     //% help=flashlog/end-row
     //% parts="flashlog"
-    //% blockGap=8
-    //% group="micro:bit (V2)" shim=flashlog::endRow
+    //% blockGap=8 shim=flashlog::endRow
     function endRow(): int32;
 
     /**
      * Resets all data stored in persistent storage.
      **/
     //% help=flashlog/clear
     //% parts="flashlog"
-    //% blockGap=8
-    //% group="micro:bit (V2)" shim=flashlog::clear
+    //% blockGap=8 shim=flashlog::clear
     function clear(fullErase: boolean): void;
 
     /**
@@ -61,8 +56,7 @@ declare namespace flashlog {
      */
     //% help=flashlog/set-timestamp
     //% parts="flashlog"
-    //% blockGap=8
-    //% group="micro:bit (V2)" shim=flashlog::setTimeStamp
+    //% blockGap=8 shim=flashlog::setTimeStamp
     function setTimeStamp(format: FlashLogTimeStampFormat): void;
 
     /**
@@ -72,8 +66,7 @@ declare namespace flashlog {
      */
     //% help=flashlog/set-serial-mirroring
     //% parts="flashlog"
-    //% blockGap=8
-    //% group="micro:bit (V2)" shim=flashlog::setSerialMirroring
+    //% blockGap=8 shim=flashlog::setSerialMirroring
     function setSerialMirroring(enable: boolean): void;
 }
 

diff --git a/pxtarget.json b/pxtarget.json
@@ -9,7 +9,6 @@
         "libs/core",
         "libs/core-mini",
         "libs/core-mini-dal",
-        "libs/core-mini-codal",
         "libs/v1",
         "libs/v2",
         "libs/radio",
@@ -18,11 +17,7 @@
         "libs/servo",
         "libs/radio-broadcast",
         "libs/microphone",
-        "libs/settings",
-        "libs/flashlog",
-        "libs/datalogger",
-        "libs/color",
-        "libs/audio-recording"
+        "libs/color"
     ],
     "cloud": {
         "workspace": false,

diff --git a/targetconfig.json b/targetconfig.json
@@ -311,6 +311,24 @@
             "CalliTGS3/pxt-calliope-grovePCF85063TP"
         ],
         "approvedRepoLib": {
+            "tinysuperlab/motionkitv2": {
+                "tags": [
+                    "Motor"
+                ],
+                "preferred": true
+            },
+            "tinysuperlab/motionkit": {
+                "tags": [
+                    "Motor"
+                ],
+                "preferred": true
+            },
+            "tinysuperlab/touchkit": {
+                "tags": [
+                    "Audio"
+                ],
+                "preferred": true
+            },
             "51bit/colorbit": {
                 "tags": [
                     "Display"
@@ -739,8 +757,7 @@
             "makecode-extensions/i2clcd1602": {},
             "microsoft/pxt-jacdac": {
                 "tags": [
-                    "JacDac",
-                    "V3"
+                    "JacDac"
                 ],
                 "preferred": true
             },
@@ -837,24 +854,6 @@
                     "Climate"
                 ]
             },
-            "tinysuperlab/motionkitv2": {
-                "tags": [
-                    "Motor"
-                ],
-                "preferred": true
-            },
-            "tinysuperlab/motionkit": {
-                "tags": [
-                    "Motor"
-                ],
-                "preferred": true
-            },
-            "tinysuperlab/touchkit": {
-                "tags": [
-                    "Audio"
-                ],
-                "preferred": true
-            },
             "calliope-net/i2c-liste": {},
             "vengit/pxt-sbrick": {}
         },