From dac5a21445af2b935fa45ce76be7b8bc641711f3 Mon Sep 17 00:00:00 2001 From: Amerlander Date: Wed, 1 May 2024 10:11:06 +0200 Subject: [PATCH] Minor fixes - remove extension "joernalraun/robot" - fix case in "one-time-pairing" - keep ble disabled for mini 1 --- libs/bluetooth-disabled/README.md | 13 ++++ libs/bluetooth-disabled/pxt.json | 30 +++++++++ libs/core-mini-codal/pxt.json | 2 +- libs/one-time-pairing/pxt.json | 2 +- libs/v1/pxt.json | 3 +- package-lock.json | 107 ++++++++++++++++++++++++++---- pxtarget.json | 1 + targetconfig.json | 2 - 8 files changed, 142 insertions(+), 18 deletions(-) create mode 100644 libs/bluetooth-disabled/README.md create mode 100644 libs/bluetooth-disabled/pxt.json diff --git a/libs/bluetooth-disabled/README.md b/libs/bluetooth-disabled/README.md new file mode 100644 index 000000000..335e80535 --- /dev/null +++ b/libs/bluetooth-disabled/README.md @@ -0,0 +1,13 @@ +# Bluetooth services disabled + +This extensions disables the BLE in the program. + +If this extension is included into the Project it will stop loading the BLE stack. + +Pressing A+B+Reset or Tripple-Reset is then required to restart into DFU-Mode for flashing the Calliope mini via Bluetooth. + +``` +"bluetooth": { + "enabled": 0 +} +``` \ No newline at end of file diff --git a/libs/bluetooth-disabled/pxt.json b/libs/bluetooth-disabled/pxt.json new file mode 100644 index 000000000..295c1fe34 --- /dev/null +++ b/libs/bluetooth-disabled/pxt.json @@ -0,0 +1,30 @@ +{ + "name": "bluetooth-disabled", + "description": "Disables Bluetooth. Require AB+Reset to start bluetooth.", + "dependencies": { + "core": "file:../core" + }, + "files": [ + "README.md" + ], + "public": true, + "weight": 10, + "searchOnly": true, + "icon": "./static/packages/bluetooth/icon.png", + "yotta": { + "config": { + "microbit-dal": { + "bluetooth": { + "enabled": 0 + } + } + }, + "optionalConfig": { + "microbit-dal": { + "bluetooth": { + "enabled": 0 + } + } + } + } +} \ No newline at end of file diff --git a/libs/core-mini-codal/pxt.json b/libs/core-mini-codal/pxt.json index b0d3a194a..f153769c4 100644 --- a/libs/core-mini-codal/pxt.json +++ b/libs/core-mini-codal/pxt.json @@ -4,7 +4,7 @@ "dependencies": { "core": "file:../core", "microphone": "file:../microphone", - "One-Time-Pairing": "file:../one-time-pairing" + "one-time-pairing": "file:../one-time-pairing" }, "disablesVariants": [ "minidal" diff --git a/libs/one-time-pairing/pxt.json b/libs/one-time-pairing/pxt.json index 329b9c6d2..37df01203 100644 --- a/libs/one-time-pairing/pxt.json +++ b/libs/one-time-pairing/pxt.json @@ -1,5 +1,5 @@ { - "name": "One-Time-Pairing", + "name": "one-time-pairing", "description": "Settings for Android and iOS for Calliope mini 3", "dependencies": { "core": "file:../core" diff --git a/libs/v1/pxt.json b/libs/v1/pxt.json index c2cb0f159..44efba021 100644 --- a/libs/v1/pxt.json +++ b/libs/v1/pxt.json @@ -10,7 +10,8 @@ "core": true, "dependencies": { "core": "file:../core", - "core-mini-dal": "file:../core-mini-dal" + "core-mini-dal": "file:../core-mini-dal", + "bluetooth-disabled": "file:../bluetooth-disabled" }, "icon": "./static/devices/mini1.png", "files": [ diff --git a/package-lock.json b/package-lock.json index 1c6180817..c9901c03b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "dependencies": { "pxt-common-packages": "11.0.1", - "pxt-core": "9.0.12" + "pxt-core": "9.0.18" }, "devDependencies": { "@types/dom-mediacapture-record": "^1.0.16", @@ -48,6 +48,17 @@ "blockly": "^6.20210701.0" } }, + "node_modules/@crowdin/crowdin-api-client": { + "version": "1.33.1", + "resolved": "https://registry.npmjs.org/@crowdin/crowdin-api-client/-/crowdin-api-client-1.33.1.tgz", + "integrity": "sha512-OWlp796/Lc+o/ZBvr8ZTLfkz/ZgVNqj6LI2atRfTCTDFBXLW5zxJFYoIwoTh7z0gqsf8z8KNQzz2J5vvQgY9eA==", + "dependencies": { + "axios": "^1" + }, + "engines": { + "node": ">=12.9.0" + } + }, "node_modules/@fortawesome/fontawesome-free": { "version": "5.15.4", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz", @@ -328,6 +339,14 @@ "node": ">=0.4.0" } }, + "node_modules/adm-zip": { + "version": "0.5.12", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.12.tgz", + "integrity": "sha512-6TVU49mK6KZb4qG6xWaaM4C7sA/sgUMLy/JYMOzkcp3BvVLpW0fXDFQiIzAuxFCt/2+xD7fNIiPFAoLZPhVNLQ==", + "engines": { + "node": ">=6.0" + } + }, "node_modules/agent-base": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", @@ -474,6 +493,16 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" }, + "node_modules/axios": { + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", + "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -2413,9 +2442,9 @@ "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==" }, "node_modules/follow-redirects": { - "version": "1.14.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", - "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "funding": [ { "type": "individual", @@ -2439,6 +2468,19 @@ "node": "*" } }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", @@ -5589,16 +5631,19 @@ } }, "node_modules/pxt-core": { - "version": "9.0.12", - "resolved": "https://registry.npmjs.org/pxt-core/-/pxt-core-9.0.12.tgz", - "integrity": "sha512-1+oUIfo9ylF2jsNwxmJ14ZnjwPDxcXwPNGiz0AdfmraZLEPUH88DZJJ/UtgPuuoAYdCEBQYnPIqdpd993PSr/A==", + "version": "9.0.18", + "resolved": "https://registry.npmjs.org/pxt-core/-/pxt-core-9.0.18.tgz", + "integrity": "sha512-2ZwHMT9AQrc/sO8dG2ZQzq19Te8KVcUdI4IY+FYvy2AWfD+3E2KY/fwlK3t8RQijjynQ2OC4Ur9I8zARnR45WA==", "dependencies": { "@blockly/keyboard-navigation": "^0.1.18", "@blockly/plugin-workspace-search": "^4.0.10", + "@crowdin/crowdin-api-client": "^1.33.0", "@fortawesome/fontawesome-free": "^5.15.4", "@microsoft/applicationinsights-web": "^2.8.11", "@microsoft/immersive-reader-sdk": "1.1.0", "@zip.js/zip.js": "2.4.20", + "adm-zip": "^0.5.12", + "axios": "^1.6.8", "browserify": "16.2.3", "chai": "^3.5.0", "cssnano": "4.1.10", @@ -7473,6 +7518,14 @@ "integrity": "sha512-OYvJG9qsYfvicNiAiaxJ4Bn+ixIUnjbXeo+9MaeHt5+9bKwsp2hHp2IeecIpxBDJPtTBn3PG2JPOmRkib7bkoA==", "requires": {} }, + "@crowdin/crowdin-api-client": { + "version": "1.33.1", + "resolved": "https://registry.npmjs.org/@crowdin/crowdin-api-client/-/crowdin-api-client-1.33.1.tgz", + "integrity": "sha512-OWlp796/Lc+o/ZBvr8ZTLfkz/ZgVNqj6LI2atRfTCTDFBXLW5zxJFYoIwoTh7z0gqsf8z8KNQzz2J5vvQgY9eA==", + "requires": { + "axios": "^1" + } + }, "@fortawesome/fontawesome-free": { "version": "5.15.4", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz", @@ -7709,6 +7762,11 @@ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==" }, + "adm-zip": { + "version": "0.5.12", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.12.tgz", + "integrity": "sha512-6TVU49mK6KZb4qG6xWaaM4C7sA/sgUMLy/JYMOzkcp3BvVLpW0fXDFQiIzAuxFCt/2+xD7fNIiPFAoLZPhVNLQ==" + }, "agent-base": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", @@ -7838,6 +7896,16 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" }, + "axios": { + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", + "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", + "requires": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -9411,15 +9479,25 @@ "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==" }, "follow-redirects": { - "version": "1.14.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", - "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==" + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==" }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, + "form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, "fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", @@ -11810,16 +11888,19 @@ } }, "pxt-core": { - "version": "9.0.12", - "resolved": "https://registry.npmjs.org/pxt-core/-/pxt-core-9.0.12.tgz", - "integrity": "sha512-1+oUIfo9ylF2jsNwxmJ14ZnjwPDxcXwPNGiz0AdfmraZLEPUH88DZJJ/UtgPuuoAYdCEBQYnPIqdpd993PSr/A==", + "version": "9.0.18", + "resolved": "https://registry.npmjs.org/pxt-core/-/pxt-core-9.0.18.tgz", + "integrity": "sha512-2ZwHMT9AQrc/sO8dG2ZQzq19Te8KVcUdI4IY+FYvy2AWfD+3E2KY/fwlK3t8RQijjynQ2OC4Ur9I8zARnR45WA==", "requires": { "@blockly/keyboard-navigation": "^0.1.18", "@blockly/plugin-workspace-search": "^4.0.10", + "@crowdin/crowdin-api-client": "^1.33.0", "@fortawesome/fontawesome-free": "^5.15.4", "@microsoft/applicationinsights-web": "^2.8.11", "@microsoft/immersive-reader-sdk": "1.1.0", "@zip.js/zip.js": "2.4.20", + "adm-zip": "^0.5.12", + "axios": "^1.6.8", "browserify": "16.2.3", "chai": "^3.5.0", "cssnano": "4.1.10", diff --git a/pxtarget.json b/pxtarget.json index 9dd349b53..af65b90d5 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -16,6 +16,7 @@ "libs/funk", "libs/devices", "libs/bluetooth", + "libs/bluetooth-disabled", "libs/one-time-pairing", "libs/servo", "libs/radio-broadcast", diff --git a/targetconfig.json b/targetconfig.json index 61f43ec09..c038de974 100644 --- a/targetconfig.json +++ b/targetconfig.json @@ -258,7 +258,6 @@ "microsoft/pxt-microturtle", "microsoft/pxt-neopixel", "calliope-edu/pxt-faces", - "joernalraun/robot", "calliope-net/i2c-liste", "calliope-edu/pxt-storage", "calliope-edu/warte-bis", @@ -363,7 +362,6 @@ ], "preferred": true }, - "joernalraun/robot": {}, "51bit/sfc": {}, "51bit/smarttools": {}, "51bit/dfplayermini": {},