From 7768e1dabda73009d0c772d88562b647161c0a7f Mon Sep 17 00:00:00 2001 From: Juri Wolf Date: Fri, 15 Sep 2023 19:37:32 +0200 Subject: [PATCH] Introduce alpha ref (#232) * update docs * introduce alpha ref * update compile targets * rename mini x into Vx * separate Dal and Codal ble settings * update pxt.json descriptions * add 'neu.md' * rename libs/mini-X -> libs/vX * update settings & codal target * Update userConfig options * V1 & V2: no pairing, V3 pairing required * fix typo --- docs/alpha-ref.json | 3 ++ docs/beta-ref.json | 2 +- docs/boards/calliope-mini-1.md | 2 +- docs/boards/calliope-mini-2.md | 4 +- docs/calliope/neu.md | 22 ++++++++++ docs/calliope/templates/SUMMARY.md | 6 +++ docs/calliope/templates/calliope-mini-1.md | 12 ++++++ docs/calliope/templates/calliope-mini-2.md | 12 ++++++ docs/calliope/templates/info.png | Bin 0 -> 3458 bytes docs/calliope/templates/info_L.png | Bin 0 -> 3458 bytes docs/calliope/templates/new-project-pxt4.md | 28 +++++++++++++ libs/core-mini-codal/pxt.json | 39 +++++++++++++++++- libs/core-mini-dal/pxt.json | 39 +++++++++++++++++- libs/core/pxt.json | 15 ------- libs/{mini-1 => v1}/README.md | 0 .../_locales/V1-jsdoc-strings.json} | 0 .../_locales/V1-strings.json} | 0 .../_locales/core-mini-v1-jsdoc-strings.json} | 0 .../_locales/core-mini-v1-strings.json} | 0 .../_locales/mini-1-jsdoc-strings.json} | 0 .../_locales/mini-1-strings.json} | 0 .../_locales/mini-v1-jsdoc-strings.json} | 0 .../_locales/mini-v1-strings.json} | 0 libs/{mini-1 => v1}/board.json | 0 libs/{mini-1 => v1}/board.svg | 0 libs/{mini-1 => v1}/boardhd.svg | 0 libs/{mini-1 => v1}/pxt.json | 4 +- libs/{mini-2 => v2}/README.md | 0 .../_locales/V2-jsdoc-strings.json} | 0 .../_locales/V2-strings.json} | 0 .../_locales/core-mini-v2-jsdoc-strings.json} | 0 .../_locales/core-mini-v2-strings.json} | 0 .../_locales/mini-2-jsdoc-strings.json} | 0 .../_locales/mini-2-strings.json} | 0 .../_locales/mini-v2-jsdoc-strings.json} | 0 .../_locales/mini-v2-strings.json} | 0 libs/{mini-2 => v2}/board.json | 0 libs/{mini-2 => v2}/board.svg | 0 libs/{mini-2 => v2}/boardhd.svg | 0 libs/{mini-2 => v2}/pxt.json | 4 +- libs/{mini-3 => v3}/README.md | 0 libs/v3/_locales/V3-jsdoc-strings.json | 1 + libs/v3/_locales/V3-strings.json | 1 + libs/v3/_locales/mini-3-jsdoc-strings.json | 1 + libs/v3/_locales/mini-3-strings.json | 1 + libs/v3/_locales/mini-v3-jsdoc-strings.json | 1 + libs/v3/_locales/mini-v3-strings.json | 1 + libs/{mini-3 => v3}/board.json | 0 libs/{mini-3 => v3}/board.svg | 0 libs/{mini-3 => v3}/boardhd.svg | 0 libs/{mini-3 => v3}/pxt.json | 4 +- pxtarget.json | 12 +++--- targetconfig.json | 2 +- 53 files changed, 182 insertions(+), 34 deletions(-) create mode 100644 docs/alpha-ref.json create mode 100644 docs/calliope/neu.md create mode 100644 docs/calliope/templates/SUMMARY.md create mode 100644 docs/calliope/templates/calliope-mini-1.md create mode 100644 docs/calliope/templates/calliope-mini-2.md create mode 100644 docs/calliope/templates/info.png create mode 100644 docs/calliope/templates/info_L.png create mode 100644 docs/calliope/templates/new-project-pxt4.md rename libs/{mini-1 => v1}/README.md (100%) rename libs/{mini-1/_locales/core-mini-v1-jsdoc-strings.json => v1/_locales/V1-jsdoc-strings.json} (100%) rename libs/{mini-1/_locales/core-mini-v1-strings.json => v1/_locales/V1-strings.json} (100%) rename libs/{mini-1/_locales/mini-1-jsdoc-strings.json => v1/_locales/core-mini-v1-jsdoc-strings.json} (100%) rename libs/{mini-1/_locales/mini-1-strings.json => v1/_locales/core-mini-v1-strings.json} (100%) rename libs/{mini-1/_locales/mini-v1-jsdoc-strings.json => v1/_locales/mini-1-jsdoc-strings.json} (100%) rename libs/{mini-1/_locales/mini-v1-strings.json => v1/_locales/mini-1-strings.json} (100%) rename libs/{mini-2/_locales/core-mini-v2-jsdoc-strings.json => v1/_locales/mini-v1-jsdoc-strings.json} (100%) rename libs/{mini-2/_locales/core-mini-v2-strings.json => v1/_locales/mini-v1-strings.json} (100%) rename libs/{mini-1 => v1}/board.json (100%) rename libs/{mini-1 => v1}/board.svg (100%) rename libs/{mini-1 => v1}/boardhd.svg (100%) rename libs/{mini-1 => v1}/pxt.json (90%) rename libs/{mini-2 => v2}/README.md (100%) rename libs/{mini-2/_locales/mini-2-jsdoc-strings.json => v2/_locales/V2-jsdoc-strings.json} (100%) rename libs/{mini-2/_locales/mini-2-strings.json => v2/_locales/V2-strings.json} (100%) rename libs/{mini-2/_locales/mini-v2-jsdoc-strings.json => v2/_locales/core-mini-v2-jsdoc-strings.json} (100%) rename libs/{mini-2/_locales/mini-v2-strings.json => v2/_locales/core-mini-v2-strings.json} (100%) rename libs/{mini-3/_locales/mini-3-jsdoc-strings.json => v2/_locales/mini-2-jsdoc-strings.json} (100%) rename libs/{mini-3/_locales/mini-3-strings.json => v2/_locales/mini-2-strings.json} (100%) rename libs/{mini-3/_locales/mini-v3-jsdoc-strings.json => v2/_locales/mini-v2-jsdoc-strings.json} (100%) rename libs/{mini-3/_locales/mini-v3-strings.json => v2/_locales/mini-v2-strings.json} (100%) rename libs/{mini-2 => v2}/board.json (100%) rename libs/{mini-2 => v2}/board.svg (100%) rename libs/{mini-2 => v2}/boardhd.svg (100%) rename libs/{mini-2 => v2}/pxt.json (87%) rename libs/{mini-3 => v3}/README.md (100%) create mode 100644 libs/v3/_locales/V3-jsdoc-strings.json create mode 100644 libs/v3/_locales/V3-strings.json create mode 100644 libs/v3/_locales/mini-3-jsdoc-strings.json create mode 100644 libs/v3/_locales/mini-3-strings.json create mode 100644 libs/v3/_locales/mini-v3-jsdoc-strings.json create mode 100644 libs/v3/_locales/mini-v3-strings.json rename libs/{mini-3 => v3}/board.json (100%) rename libs/{mini-3 => v3}/board.svg (100%) rename libs/{mini-3 => v3}/boardhd.svg (100%) rename libs/{mini-3 => v3}/pxt.json (81%) diff --git a/docs/alpha-ref.json b/docs/alpha-ref.json new file mode 100644 index 000000000..58f715cc1 --- /dev/null +++ b/docs/alpha-ref.json @@ -0,0 +1,3 @@ +{ + "appref": "v" +} diff --git a/docs/beta-ref.json b/docs/beta-ref.json index 58f715cc1..4a964b936 100644 --- a/docs/beta-ref.json +++ b/docs/beta-ref.json @@ -1,3 +1,3 @@ { - "appref": "v" + "appref": "v6.0.18" } diff --git a/docs/boards/calliope-mini-1.md b/docs/boards/calliope-mini-1.md index 0588fd22e..441421bb2 100644 --- a/docs/boards/calliope-mini-1.md +++ b/docs/boards/calliope-mini-1.md @@ -5,5 +5,5 @@ basic.showString("mini 1") ``` ```package -mini-1 +v1 ``` \ No newline at end of file diff --git a/docs/boards/calliope-mini-2.md b/docs/boards/calliope-mini-2.md index 5efe3f2c8..a21cf6d3d 100644 --- a/docs/boards/calliope-mini-2.md +++ b/docs/boards/calliope-mini-2.md @@ -1,9 +1,9 @@ # Calliope mini v2 ```sim -basic.showString("mini 2") +basic.showString("calliope mini 2") ``` ```package -mini-2 +v2 ``` \ No newline at end of file diff --git a/docs/calliope/neu.md b/docs/calliope/neu.md new file mode 100644 index 000000000..efa192b4e --- /dev/null +++ b/docs/calliope/neu.md @@ -0,0 +1,22 @@ +# Choosing the right template for Calliope mini + +No matter which version of Calliope mini you have or whether you’re programming on a mobile device or PC, you can always create a **`|New Project|`** and start programming. + +If you’re using a Calliope mini 2, we suggest to use the optimized template **`|input:Calliope mini 2.x|`**. This allows you to transfer programs faster via Bluetooth and create more complex programs, due to partial flashing and a full usage of the available RAM. The settings loaded with the **`|input:Calliope mini 2.x|`** template can also be activated in any existing project through the settings menu. + +If you encounter issues with the default template (**`|functions:Calliope mini 1.x|`** or **`|New Project|`**) and your Calliope mini freezes, it may be due to limited available program memory (RAM). To free up more memory for your program we suggest switching on “Manual Bluetooth activation”. In this case each time you transfer programs you have to set the Calliope mini into Bluetooth mode. To do this, perform the “brace grip”: hold down buttons **`A`** and **`B`**, briefly tap the **`Reset`** button, and continue holding **`A`** and **`B`** until the pattern appears on the LED matrix. + +## Additional Notes for iOS Users: + +**We recommend that every user of the Calliope mini 2.x updates their device with the Demo Program once.** + +If you have previously programmed your Calliope mini with another editor or flashed it with the last **`|input:Calliope mini 2.x|`** template, you cannot transfer the default project template directly from mobile. The Bluetooth settings have changed in this template, so one of the following steps is necessary so that you can transfer your program to mobile devices without any problems: + +### Option A: Load program 25 (Demo Program): +To load the Program with the number **`25`** onto your Calliope mini, follow these steps: +1. Press and hold the reset button on your Calliope mini for approximately 5 seconds until all LEDs briefly light up and then turn off. +2. Press the **`A`** button to go back one step. This will illuminate the 25th LED on the display. +3. Press the **`A`** and **`B`** buttons simultaneously to confirm your selection and load Program 25. This process also resolves any other transfer issues. Once completed, your Calliope mini will be restored to its default state. + +### Option B: Load the Demo Program: +In the Calliope mini app, navigate to the **`Editors and Programs`** section and locate the **`Start Program`** option. Load this program onto your Calliope mini, and you’ll be able to use the standard project template without any concerns. diff --git a/docs/calliope/templates/SUMMARY.md b/docs/calliope/templates/SUMMARY.md new file mode 100644 index 000000000..5ba207006 --- /dev/null +++ b/docs/calliope/templates/SUMMARY.md @@ -0,0 +1,6 @@ +# Boards + +* [Calliope](/boards/calliope) + * [Calliope mini Ref. 1.x](/boards/calliope-mini-v1) + * [Calliope mini Ref. 2](/boards/calliope-mini-v2) + diff --git a/docs/calliope/templates/calliope-mini-1.md b/docs/calliope/templates/calliope-mini-1.md new file mode 100644 index 000000000..5ccf5971b --- /dev/null +++ b/docs/calliope/templates/calliope-mini-1.md @@ -0,0 +1,12 @@ +# Calliope mini v1 + +```blocks +basic.showString("Hi!") +basic.forever(function () { + +}) +``` + +```package +core +``` \ No newline at end of file diff --git a/docs/calliope/templates/calliope-mini-2.md b/docs/calliope/templates/calliope-mini-2.md new file mode 100644 index 000000000..e3e3e0eeb --- /dev/null +++ b/docs/calliope/templates/calliope-mini-2.md @@ -0,0 +1,12 @@ +# Calliope mini v2 + +```blocks +basic.showString("Hi!") +basic.forever(function () { + +}) +``` + +```package +mini2 +``` \ No newline at end of file diff --git a/docs/calliope/templates/info.png b/docs/calliope/templates/info.png new file mode 100644 index 0000000000000000000000000000000000000000..ca34edbe3a26b7e1c8f6af7d27a8d17538c3d556 GIT binary patch literal 3458 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 literal 0 HcmV?d00001 diff --git a/docs/calliope/templates/info_L.png b/docs/calliope/templates/info_L.png new file mode 100644 index 0000000000000000000000000000000000000000..ca34edbe3a26b7e1c8f6af7d27a8d17538c3d556 GIT binary patch literal 3458 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 literal 0 HcmV?d00001 diff --git a/docs/calliope/templates/new-project-pxt4.md b/docs/calliope/templates/new-project-pxt4.md new file mode 100644 index 000000000..e2c754690 --- /dev/null +++ b/docs/calliope/templates/new-project-pxt4.md @@ -0,0 +1,28 @@ +# Calliope + +## mini + +### ~ codecard + +* name: Calliope mini 2.x +* url: /calliope/templates/calliope-mini-2 +* cardType: template +* imageUrl: /calliope/templates/32KB.png +* description: Project template for all Calliope mini 2.x + +--- + +* name: Calliope mini 1.x +* url: /calliope/templates/calliope-mini-1 +* cardType: template +* imageUrl: /calliope/templates/16KB.png +* description: Project template for all Calliope mini 1.x + +--- + +* name: Which template? +* url: /calliope/neu +* imageUrl: /calliope/templates/info.png +* description: Not sure which template is right for you? Here you will find the necessary information. + +### ~ diff --git a/libs/core-mini-codal/pxt.json b/libs/core-mini-codal/pxt.json index 80d01a987..13703f94a 100644 --- a/libs/core-mini-codal/pxt.json +++ b/libs/core-mini-codal/pxt.json @@ -17,5 +17,42 @@ "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 + } + } + } + } + ] + } } diff --git a/libs/core-mini-dal/pxt.json b/libs/core-mini-dal/pxt.json index 61e0986d2..c595ef680 100644 --- a/libs/core-mini-dal/pxt.json +++ b/libs/core-mini-dal/pxt.json @@ -13,5 +13,42 @@ "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 + } + } + } + } + ] + } } \ No newline at end of file diff --git a/libs/core/pxt.json b/libs/core/pxt.json index 7f859226f..dbe158000 100644 --- a/libs/core/pxt.json +++ b/libs/core/pxt.json @@ -114,9 +114,6 @@ "event_service": 0, "device_info_service": 1, "private_addressing": 0, - "open": 1, - "security_level": null, - "whitelist": 0, "advertising_timeout": 0, "tx_power": 6 }, @@ -147,18 +144,6 @@ } } } - }, - { - "description": "Bluetooth: Require Pariring (Solves an Android 13+ bug)", - "config": { - "microbit-dal": { - "bluetooth": { - "open": 0, - "security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM", - "whitelist": 1 - } - } - } } ] } diff --git a/libs/mini-1/README.md b/libs/v1/README.md similarity index 100% rename from libs/mini-1/README.md rename to libs/v1/README.md diff --git a/libs/mini-1/_locales/core-mini-v1-jsdoc-strings.json b/libs/v1/_locales/V1-jsdoc-strings.json similarity index 100% rename from libs/mini-1/_locales/core-mini-v1-jsdoc-strings.json rename to libs/v1/_locales/V1-jsdoc-strings.json diff --git a/libs/mini-1/_locales/core-mini-v1-strings.json b/libs/v1/_locales/V1-strings.json similarity index 100% rename from libs/mini-1/_locales/core-mini-v1-strings.json rename to libs/v1/_locales/V1-strings.json diff --git a/libs/mini-1/_locales/mini-1-jsdoc-strings.json b/libs/v1/_locales/core-mini-v1-jsdoc-strings.json similarity index 100% rename from libs/mini-1/_locales/mini-1-jsdoc-strings.json rename to libs/v1/_locales/core-mini-v1-jsdoc-strings.json diff --git a/libs/mini-1/_locales/mini-1-strings.json b/libs/v1/_locales/core-mini-v1-strings.json similarity index 100% rename from libs/mini-1/_locales/mini-1-strings.json rename to libs/v1/_locales/core-mini-v1-strings.json diff --git a/libs/mini-1/_locales/mini-v1-jsdoc-strings.json b/libs/v1/_locales/mini-1-jsdoc-strings.json similarity index 100% rename from libs/mini-1/_locales/mini-v1-jsdoc-strings.json rename to libs/v1/_locales/mini-1-jsdoc-strings.json diff --git a/libs/mini-1/_locales/mini-v1-strings.json b/libs/v1/_locales/mini-1-strings.json similarity index 100% rename from libs/mini-1/_locales/mini-v1-strings.json rename to libs/v1/_locales/mini-1-strings.json diff --git a/libs/mini-2/_locales/core-mini-v2-jsdoc-strings.json b/libs/v1/_locales/mini-v1-jsdoc-strings.json similarity index 100% rename from libs/mini-2/_locales/core-mini-v2-jsdoc-strings.json rename to libs/v1/_locales/mini-v1-jsdoc-strings.json diff --git a/libs/mini-2/_locales/core-mini-v2-strings.json b/libs/v1/_locales/mini-v1-strings.json similarity index 100% rename from libs/mini-2/_locales/core-mini-v2-strings.json rename to libs/v1/_locales/mini-v1-strings.json diff --git a/libs/mini-1/board.json b/libs/v1/board.json similarity index 100% rename from libs/mini-1/board.json rename to libs/v1/board.json diff --git a/libs/mini-1/board.svg b/libs/v1/board.svg similarity index 100% rename from libs/mini-1/board.svg rename to libs/v1/board.svg diff --git a/libs/mini-1/boardhd.svg b/libs/v1/boardhd.svg similarity index 100% rename from libs/mini-1/boardhd.svg rename to libs/v1/boardhd.svg diff --git a/libs/mini-1/pxt.json b/libs/v1/pxt.json similarity index 90% rename from libs/mini-1/pxt.json rename to libs/v1/pxt.json index f14d4b4c4..862b2e849 100644 --- a/libs/mini-1/pxt.json +++ b/libs/v1/pxt.json @@ -1,7 +1,7 @@ { - "name": "mini-1", + "name": "v1", "version": "1.0.0", - "description": "The calliope mini 1 core library", + "description": "Calliope mini 1", "compileServiceVariant": "minidal", "disablesVariants": [ "minicodal" diff --git a/libs/mini-2/README.md b/libs/v2/README.md similarity index 100% rename from libs/mini-2/README.md rename to libs/v2/README.md diff --git a/libs/mini-2/_locales/mini-2-jsdoc-strings.json b/libs/v2/_locales/V2-jsdoc-strings.json similarity index 100% rename from libs/mini-2/_locales/mini-2-jsdoc-strings.json rename to libs/v2/_locales/V2-jsdoc-strings.json diff --git a/libs/mini-2/_locales/mini-2-strings.json b/libs/v2/_locales/V2-strings.json similarity index 100% rename from libs/mini-2/_locales/mini-2-strings.json rename to libs/v2/_locales/V2-strings.json diff --git a/libs/mini-2/_locales/mini-v2-jsdoc-strings.json b/libs/v2/_locales/core-mini-v2-jsdoc-strings.json similarity index 100% rename from libs/mini-2/_locales/mini-v2-jsdoc-strings.json rename to libs/v2/_locales/core-mini-v2-jsdoc-strings.json diff --git a/libs/mini-2/_locales/mini-v2-strings.json b/libs/v2/_locales/core-mini-v2-strings.json similarity index 100% rename from libs/mini-2/_locales/mini-v2-strings.json rename to libs/v2/_locales/core-mini-v2-strings.json diff --git a/libs/mini-3/_locales/mini-3-jsdoc-strings.json b/libs/v2/_locales/mini-2-jsdoc-strings.json similarity index 100% rename from libs/mini-3/_locales/mini-3-jsdoc-strings.json rename to libs/v2/_locales/mini-2-jsdoc-strings.json diff --git a/libs/mini-3/_locales/mini-3-strings.json b/libs/v2/_locales/mini-2-strings.json similarity index 100% rename from libs/mini-3/_locales/mini-3-strings.json rename to libs/v2/_locales/mini-2-strings.json diff --git a/libs/mini-3/_locales/mini-v3-jsdoc-strings.json b/libs/v2/_locales/mini-v2-jsdoc-strings.json similarity index 100% rename from libs/mini-3/_locales/mini-v3-jsdoc-strings.json rename to libs/v2/_locales/mini-v2-jsdoc-strings.json diff --git a/libs/mini-3/_locales/mini-v3-strings.json b/libs/v2/_locales/mini-v2-strings.json similarity index 100% rename from libs/mini-3/_locales/mini-v3-strings.json rename to libs/v2/_locales/mini-v2-strings.json diff --git a/libs/mini-2/board.json b/libs/v2/board.json similarity index 100% rename from libs/mini-2/board.json rename to libs/v2/board.json diff --git a/libs/mini-2/board.svg b/libs/v2/board.svg similarity index 100% rename from libs/mini-2/board.svg rename to libs/v2/board.svg diff --git a/libs/mini-2/boardhd.svg b/libs/v2/boardhd.svg similarity index 100% rename from libs/mini-2/boardhd.svg rename to libs/v2/boardhd.svg diff --git a/libs/mini-2/pxt.json b/libs/v2/pxt.json similarity index 87% rename from libs/mini-2/pxt.json rename to libs/v2/pxt.json index 16a8a3a80..f28a73a52 100644 --- a/libs/mini-2/pxt.json +++ b/libs/v2/pxt.json @@ -1,7 +1,7 @@ { - "name": "mini-2", + "name": "v2", "version": "1.0.0", - "description": "The calliope mini 2 core library", + "description": "Calliope mini 2", "compileServiceVariant": "minidal", "disablesVariants": [ "minicodal" diff --git a/libs/mini-3/README.md b/libs/v3/README.md similarity index 100% rename from libs/mini-3/README.md rename to libs/v3/README.md diff --git a/libs/v3/_locales/V3-jsdoc-strings.json b/libs/v3/_locales/V3-jsdoc-strings.json new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/libs/v3/_locales/V3-jsdoc-strings.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/libs/v3/_locales/V3-strings.json b/libs/v3/_locales/V3-strings.json new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/libs/v3/_locales/V3-strings.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/libs/v3/_locales/mini-3-jsdoc-strings.json b/libs/v3/_locales/mini-3-jsdoc-strings.json new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/libs/v3/_locales/mini-3-jsdoc-strings.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/libs/v3/_locales/mini-3-strings.json b/libs/v3/_locales/mini-3-strings.json new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/libs/v3/_locales/mini-3-strings.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/libs/v3/_locales/mini-v3-jsdoc-strings.json b/libs/v3/_locales/mini-v3-jsdoc-strings.json new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/libs/v3/_locales/mini-v3-jsdoc-strings.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/libs/v3/_locales/mini-v3-strings.json b/libs/v3/_locales/mini-v3-strings.json new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/libs/v3/_locales/mini-v3-strings.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/libs/mini-3/board.json b/libs/v3/board.json similarity index 100% rename from libs/mini-3/board.json rename to libs/v3/board.json diff --git a/libs/mini-3/board.svg b/libs/v3/board.svg similarity index 100% rename from libs/mini-3/board.svg rename to libs/v3/board.svg diff --git a/libs/mini-3/boardhd.svg b/libs/v3/boardhd.svg similarity index 100% rename from libs/mini-3/boardhd.svg rename to libs/v3/boardhd.svg diff --git a/libs/mini-3/pxt.json b/libs/v3/pxt.json similarity index 81% rename from libs/mini-3/pxt.json rename to libs/v3/pxt.json index 20aee719b..20ee17855 100644 --- a/libs/mini-3/pxt.json +++ b/libs/v3/pxt.json @@ -1,6 +1,6 @@ { - "name": "mini-3", - "description": "The calliope mini 3 core library", + "name": "v3", + "description": "Calliope mini 3", "core": true, "compileServiceVariant": "minicodal", "disablesVariants": [ diff --git a/pxtarget.json b/pxtarget.json index afabc51de..5d1cdf853 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -10,8 +10,8 @@ "libs/core-mini", "libs/core-mini-dal", "libs/core-mini-codal", - "libs/mini-1", - "libs/mini-2", + "libs/v1", + "libs/v2", "libs/radio", "libs/devices", "libs/bluetooth", @@ -147,9 +147,9 @@ "yottaTarget": "calliope-mini-classic-gcc@https://github.com/calliope-mini/target-calliope-mini-classic-gcc#v1.2.4", "yottaCorePackage": "microbit", "githubCorePackage": "calliope-mini/microbit", - "gittag": "master-iss", + "gittag": "v2.2.0-rc6-calliope1.1", "serviceId": "calliope", - "dockerImage": "pext/yotta:update-yotta3" + "dockerImage": "pext/yotta:gcc5" }, "variants": { "minidal": { @@ -171,14 +171,14 @@ "codalTarget": { "name": "codal-microbit-v2", "url": "https://github.com/calliope-edu/codal-microbit-v2", - "branch": "v0.2.57-calliope", + "branch": "v0.2.57-calliope-1.4", "type": "git" }, "codalBinary": "MICROBIT", "githubCorePackage": "calliope-edu/microbit-v2-samples", "gittag": "v0.2.13-calliope", "serviceId": "mbcodal2", - "dockerImage": "pext/yotta:update-yotta3", + "dockerImage": "pext/yotta:latest", "yottaConfigCompatibility": true } } diff --git a/targetconfig.json b/targetconfig.json index 7d0f25375..e30252d2e 100644 --- a/targetconfig.json +++ b/targetconfig.json @@ -314,7 +314,7 @@ "preferred": true }, "calliope-edu/pxt-jacdac": { - "tags": [ "jacdac", "mini 3" ], + "tags": [ "jacdac", "V3" ], "preferred": true } },