diff --git a/jenkins.groovy b/jenkins.groovy index 193e506e..7d73a57d 100644 --- a/jenkins.groovy +++ b/jenkins.groovy @@ -8,6 +8,7 @@ def branch = GithubBranchName def newJobName = InternalUtilities.getFullJobName(project, "Default", isPR) def newJob = job(newJobName) { steps { + shell("chmod +x ./jenkins.sh") shell("./jenkins.sh ${isPR}") } diff --git a/libs/core/_locales/core-strings.json b/libs/core/_locales/core-strings.json index 5fd4824a..33649d06 100644 --- a/libs/core/_locales/core-strings.json +++ b/libs/core/_locales/core-strings.json @@ -168,8 +168,10 @@ "music.setTempo|block": "set tempo to (bpm)|%value", "music.tempo|block": "tempo (bpm)", "music|block": "music", + "pins.analogPitch|block": "analog pitch %frequency|for (ms) %ms", "pins.analogReadPin|block": "analog read|pin %name", "pins.analogSetPeriod|block": "analog set period|pin %pin|to (µs)%micros", + "pins.analogSetPitchPin|block": "analog set pitch pin %name", "pins.analogWritePin|block": "analog write|pin %name|to %value", "pins.digitalReadPin|block": "digital read|pin %name", "pins.digitalWritePin|block": "digital write|pin %name|to %value", diff --git a/libs/core/enums.d.ts b/libs/core/enums.d.ts index 7c6626a1..f305d9b3 100644 --- a/libs/core/enums.d.ts +++ b/libs/core/enums.d.ts @@ -327,15 +327,12 @@ declare namespace motors { declare enum SerialPin { - P0 = 7, // MICROBIT_ID_IO_P0 - P1 = 8, // MICROBIT_ID_IO_P1 - P2 = 9, // MICROBIT_ID_IO_P2 - //P8 = MICROBIT_ID_IO_P8, - //P12 = MICROBIT_ID_IO_P12, - //P13 = MICROBIT_ID_IO_P13, - //P14 = MICROBIT_ID_IO_P14, - //P15 = MICROBIT_ID_IO_P15, - //P16 = MICROBIT_ID_IO_P16 + C16 = 9, // MICROBIT_ID_IO_P2 + C17 = 15, // MICROBIT_ID_IO_P8 + P0 = 19, // MICROBIT_ID_IO_P12 + P1 = 7, // MICROBIT_ID_IO_P0 + P2 = 8, // MICROBIT_ID_IO_P1 + P3 = 23, // MICROBIT_ID_IO_P16 } diff --git a/libs/core/serial.cpp b/libs/core/serial.cpp index bf7f3811..614423fe 100644 --- a/libs/core/serial.cpp +++ b/libs/core/serial.cpp @@ -1,15 +1,12 @@ #include "pxt.h" enum SerialPin { - P0 = MICROBIT_ID_IO_P0, - P1 = MICROBIT_ID_IO_P1, - P2 = MICROBIT_ID_IO_P2, - //P8 = MICROBIT_ID_IO_P8, - //P12 = MICROBIT_ID_IO_P12, - //P13 = MICROBIT_ID_IO_P13, - //P14 = MICROBIT_ID_IO_P14, - //P15 = MICROBIT_ID_IO_P15, - //P16 = MICROBIT_ID_IO_P16 + C16 = MICROBIT_ID_IO_P2, + C17 = MICROBIT_ID_IO_P8, + P0 = MICROBIT_ID_IO_P12, + P1 = MICROBIT_ID_IO_P0, + P2 = MICROBIT_ID_IO_P1, + P3 = MICROBIT_ID_IO_P16, }; enum BaudRate { diff --git a/package.json b/package.json index 6d4a237b..8410c80d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-calliope", - "version": "0.8.12", + "version": "0.8.14", "description": "Calliope Mini editor for PXT", "keywords": [ "JavaScript", diff --git a/pxtarget.json b/pxtarget.json index f086cb3f..e169b44e 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -170,7 +170,7 @@ "yottaTarget": "calliope-mini-classic-gcc", "yottaCorePackage": "microbit", "githubCorePackage": "calliope-mini/microbit", - "gittag": "v2.0.0-rc7-calliope-p8_1", + "gittag": "v2.0.0-rc7-calliope-p9", "serviceId": "calliope" }, "serial": {