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: 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/) 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": "." 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/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 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``. diff --git a/package-lock.json b/package-lock.json index 47211f47..47758adc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { - "name": "pxt-calliope", - "version": "3.0.33", + "name": "pxt-calliopemini", + "version": "3.0.36", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -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", diff --git a/package.json b/package.json index ffb4552a..d8fde0d5 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)", + "version": "3.0.36", + "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", @@ -46,6 +46,6 @@ }, "dependencies": { "pxt-common-packages": "7.0.4", - "pxt-core": "6.0.23" + "pxt-core": "6.0.24" } } 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 946e67f0..4120d635 100644 --- a/targetconfig.json +++ b/targetconfig.json @@ -124,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" ], @@ -142,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" ]