From d51b5bc1f46b87f083fbc53c497a0cbda239acba Mon Sep 17 00:00:00 2001 From: Amerlander Date: Mon, 21 Sep 2020 15:57:01 +0200 Subject: [PATCH 01/13] bump stable to v3.0.33 and update approved extension list (#122) * remove approved extensions * add approved repo * bump stable to v3.0.33 Co-authored-by: Juri --- docs/index-ref.json | 2 +- targetconfig.json | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/docs/index-ref.json b/docs/index-ref.json index 2e67e9cf..6bebc74e 100644 --- a/docs/index-ref.json +++ b/docs/index-ref.json @@ -1,3 +1,3 @@ { - "appref": "v1.0.25" + "appref": "v3.0.33" } diff --git a/targetconfig.json b/targetconfig.json index 16b0d201..d67a2434 100644 --- a/targetconfig.json +++ b/targetconfig.json @@ -41,7 +41,6 @@ "MKleinSB/ScrollText", "MKleinSB/pxt-calliope-oled96", "KitronikLtd/pxt-kitronik-servo-lite", - "KitronikLtd/pxt-kitronik-motor-driver", "KitronikLtd/pxt-kitronik-I2C-16-servo", "KitronikLtd/pxt-kitronik-stopbit", "KitronikLtd/pxt-kitronik-lampbit", @@ -52,7 +51,6 @@ "KitronikLtd/pxt-kitronik-klef-piano", "Tinkertanker/pxt-ir-receiver", "Tinkertanker/pxt-iot-environment-kit", - "Tinkertanker/pxt-motorbit", "Tinkertanker/pxt-realtimeclock-ds1307", "Tinkertanker/pxt-tinkercademy-tinker-kit", "Tinkertanker/pxt-rotary-encoder-ky040", @@ -60,14 +58,10 @@ "Tinkertanker/pxt-oled-ssd1306", "Tinkertanker/pxt-range-vl53l0x", "Tinkertanker/pxt-continuous-servo", - "Tinkertanker/pxt-joystickbit", - "Tinkertanker/pxt-robit", "Tinkertanker/pxt-smarthome", "Tinkertanker/microDriver_SHT2x", - "Tinkertanker/pxt-ringbitcar", "Tinkertanker/uDriver_PCA9585", "Tinkertanker/pxt-alphanumeric-ht16k33", - "CoderDojoOlney/pxt-olney", "PaulDFoster/pxt-microbit-GY521", "chevyng/pxt-ucl-junkrobot", "sparkfun/pxt-gator-environment", @@ -75,7 +69,6 @@ "mbitfun/pxt-katakana", "jdarling/pxt-pca9685", "pizayanz/pxt-linebeacon", - "sunfounder/pxt-sloth", "vengit/pxt-sbrick", "Annikken/pxt-Andee", "sparkfun/pxt-gator-light", @@ -131,6 +124,7 @@ "MKleinSB/pxt-mpr121", "MKleinSB/pxt-gatorlog-calliope", "MKleinSB/pxt-callibot", + "MKleinSB/pxt-serialmp3", "dl1ekm/pxt-calliope-ADS1x15", "dl1ekm/pxt-calliope-PCF85063-RTC" ], From 3923944a2ed1d28941abae6d025054c6a88051ae Mon Sep 17 00:00:00 2001 From: Amerlander Date: Mon, 21 Sep 2020 16:17:11 +0200 Subject: [PATCH 02/13] Link in package.json to https://github.com/microsoft/pxt-calliope (#123) * Link in package.json https://github.com/microsoft/pxt-calliope * description Co-authored-by: Juri --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index ffb4552a..732dd919 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "pxt-calliopemini", "version": "3.0.33", - "description": "micro:bit target for Microsoft MakeCode (PXT)", + "description": "calliope mini target for Microsoft MakeCode (PXT)", "keywords": [ "JavaScript", "education", @@ -10,11 +10,11 @@ ], "repository": { "type": "git", - "url": "git+https://github.com/Microsoft/pxt-microbit.git" + "url": "git+https://github.com/microsoft/pxt-calliope.git" }, "author": "", "license": "MIT", - "homepage": "https://github.com/Microsoft/pxt-microbit#readme", + "homepage": "https://github.com/microsoft/pxt-calliope#readme", "files": [ "README.md", "pxtarget.json", From 42ee472c589da1c6bc78c14bbd760590cf2b2037 Mon Sep 17 00:00:00 2001 From: peli Date: Mon, 21 Sep 2020 07:17:36 -0700 Subject: [PATCH 03/13] 3.0.34 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 47211f47..036229d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "pxt-calliope", - "version": "3.0.33", + "version": "3.0.34", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 732dd919..4e0ae1dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-calliopemini", - "version": "3.0.33", + "version": "3.0.34", "description": "calliope mini target for Microsoft MakeCode (PXT)", "keywords": [ "JavaScript", From 800c8fb088eb808f7cdda0d01dd77e42b0ac361b Mon Sep 17 00:00:00 2001 From: peli Date: Tue, 22 Sep 2020 23:32:21 -0700 Subject: [PATCH 04/13] bump pxt-core to 6.0.24 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4e0ae1dd..7f585fcb 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,6 @@ }, "dependencies": { "pxt-common-packages": "7.0.4", - "pxt-core": "6.0.23" + "pxt-core": "6.0.24" } } From d624f5c04ac0615eca96447c3448daa8f454004a Mon Sep 17 00:00:00 2001 From: peli Date: Tue, 22 Sep 2020 23:36:13 -0700 Subject: [PATCH 05/13] updated package-lock --- package-lock.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 036229d3..9d692c3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "pxt-calliope", + "name": "pxt-calliopemini", "version": "3.0.34", "lockfileVersion": 1, "requires": true, @@ -405,6 +405,7 @@ "version": "2.10.1", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "optional": true, "requires": { "hoek": "2.x.x" } @@ -2095,7 +2096,8 @@ "hoek": { "version": "2.16.3", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", + "optional": true }, "hsl-regex": { "version": "1.0.0", From ee8c698cc294fee7223a6c1bea443e7048d73a7b Mon Sep 17 00:00:00 2001 From: peli Date: Tue, 22 Sep 2020 23:37:02 -0700 Subject: [PATCH 06/13] 3.0.35 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9d692c3a..c3bd1007 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "pxt-calliopemini", - "version": "3.0.34", + "version": "3.0.35", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 7f585fcb..fed66e1d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-calliopemini", - "version": "3.0.34", + "version": "3.0.35", "description": "calliope mini target for Microsoft MakeCode (PXT)", "keywords": [ "JavaScript", From 738acc328f40eb6e84a87ab855a079db12d25d17 Mon Sep 17 00:00:00 2001 From: Amerlander Date: Wed, 23 Sep 2020 16:23:56 +0200 Subject: [PATCH 07/13] Page for mini.pxt.io shutdown (#124) Co-authored-by: Juri --- docs/mini.pxt.io.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 docs/mini.pxt.io.md diff --git a/docs/mini.pxt.io.md b/docs/mini.pxt.io.md new file mode 100644 index 00000000..d9b502bb --- /dev/null +++ b/docs/mini.pxt.io.md @@ -0,0 +1,12 @@ +![](/static/mb/device/calliope_website.jpg) + + +# MAKECODE UPDATE + +## MakeCode Support nur noch eingeschränkt. + +Der MakeCode Support für die erste Version des Calliope mini (IT-Gipfel) wird nun eingeschränkt. + +Es kann zwar weiterhin die Editorversion [https://MakeCode.calliope.cc](https://MakeCode.calliope.cc) genutzt werden, allerdings ist diese nicht mehr komplett kompatibel zum Calliope mini der ersten Generation. + +Eine Alternative stellt das [Open Roberta Lab](https://lab.open-roberta.org/) dar. \ No newline at end of file From d47ea29d1ab670666156cacef1d3817d9b329e5e Mon Sep 17 00:00:00 2001 From: Amerlander Date: Thu, 29 Oct 2020 09:26:52 +0100 Subject: [PATCH 08/13] Updates (#125) * add pxt-serialmp3 to preferredRepos * remove "moveHexEof" * Decrease UART Buff size to default * Restore UART Buff size Co-authored-by: Juri --- pxtarget.json | 1 - targetconfig.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pxtarget.json b/pxtarget.json index f422961a..50d87560 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -32,7 +32,6 @@ "deployDrives": "MINI", "driveName": "MINI", "hexMimeType": "application/x-microbit-hex", - "moveHexEof": true, "openocdScript": "source [find interface/cmsis-dap.cfg]; source [find target/nrf51.cfg]", "flashUsableEnd": 242688, "flashEnd": 242688, diff --git a/targetconfig.json b/targetconfig.json index d67a2434..4120d635 100644 --- a/targetconfig.json +++ b/targetconfig.json @@ -143,6 +143,7 @@ "MKleinSB/pxt-mpr121", "MKleinSB/pxt-gatorlog-calliope", "MKleinSB/pxt-callibot", + "MKleinSB/pxt-serialmp3", "dl1ekm/pxt-calliope-ADS1x15", "dl1ekm/pxt-calliope-PCF85063-RTC" ] From 4ad347214dcfea832d90cc362350704f82b02a14 Mon Sep 17 00:00:00 2001 From: Marcel Petrick Date: Thu, 29 Oct 2020 09:27:31 +0100 Subject: [PATCH 09/13] begin-melody.md: fixed typo (#127) --- docs/reference/music/begin-melody.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/music/begin-melody.md b/docs/reference/music/begin-melody.md index 6a9af12d..84d6970d 100644 --- a/docs/reference/music/begin-melody.md +++ b/docs/reference/music/begin-melody.md @@ -22,7 +22,7 @@ Melodies are a sequence of notes, each played for some small amount time, one af music.beginMelody(['g4:1', 'c5', 'e', 'g:2', 'e:1', 'g:3'], MelodyOptions.Once) ``` -Melodies are played either in the _foreground_ or _background_. This allows more than one melody to be active at once. If a melody is set to play in the background, it can be interrupeted, or paused, temporarily while a melody set for the foreground is played. If the foreground melody is not set to play ``forever``, then the background melody resumes when the foreground melody is finished. +Melodies are played either in the _foreground_ or _background_. This allows more than one melody to be active at once. If a melody is set to play in the background, it can be interrupted, or paused, temporarily while a melody set for the foreground is played. If the foreground melody is not set to play ``forever``, then the background melody resumes when the foreground melody is finished. You can set options for how you want the melody to play. You can ask that the melody plays just one time, ``once``, or have it keep repeating, ``forever``. With these options the melody will play in the foreground either once or continue to repeat. Of course, if you set ``forever``, any melody that was started in background will never play unless you [stop](/reference/music/stop-melody) the foreground melody. To make a background melody, set the option to ``once in background`` or ``forever in background``. From c5b86dea72710131a9399b74593600a41f7e83eb Mon Sep 17 00:00:00 2001 From: peli Date: Thu, 29 Oct 2020 01:27:47 -0700 Subject: [PATCH 10/13] 3.0.36 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index c3bd1007..47758adc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "pxt-calliopemini", - "version": "3.0.35", + "version": "3.0.36", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index fed66e1d..d8fde0d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-calliopemini", - "version": "3.0.35", + "version": "3.0.36", "description": "calliope mini target for Microsoft MakeCode (PXT)", "keywords": [ "JavaScript", From 8040c1265a758eb4f155c7a7ca5ac4cd20b4aa2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20D=2E=20M=C3=BCller?= Date: Mon, 30 Nov 2020 08:42:35 +0100 Subject: [PATCH 11/13] microbit? -> calliope (#129) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index be1b63f1..7ddd37a9 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ -pxt-calliope is a [Microsoft Programming Experience Toolkit (PXT)](https://github.com/Microsoft/pxt) target that allows you to program a [BBC micro:bit](https://microbit.org/). +pxt-calliope is a [Microsoft Programming Experience Toolkit (PXT)](https://github.com/Microsoft/pxt) target that allows you to program a [Calliope mini](https://calliope.cc/en). * [Try it live](https://makecode.calliope.cc/) From d8167ae9ff3feec6958cf841f572e4402f12f209 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Mon, 30 Nov 2020 08:44:17 +0100 Subject: [PATCH 12/13] fix worksapce --- calliope.code-workspace | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calliope.code-workspace b/calliope.code-workspace index 137d2d35..c925e61c 100644 --- a/calliope.code-workspace +++ b/calliope.code-workspace @@ -1,10 +1,10 @@ { "folders": [ { - "path": "..\\pxt" + "path": "../pxt" }, { - "path": "..\\pxt-common-packages" + "path": "../pxt-common-packages" }, { "path": "." From d0a85fd0d20541510f14a11be41e81769905fdff Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Mon, 30 Nov 2020 08:45:00 +0100 Subject: [PATCH 13/13] only run on demand --- .github/workflows/testghpkgs.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/testghpkgs.yml b/.github/workflows/testghpkgs.yml index d4926702..b9e57f36 100644 --- a/.github/workflows/testghpkgs.yml +++ b/.github/workflows/testghpkgs.yml @@ -1,8 +1,7 @@ name: pxt-testghpkgs on: - schedule: - - cron: '0 0 * * 6' + workflow_dispatch: jobs: build: