Merge branch 'master' of https://github.com/Microsoft/pxt-calliope

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}")
         }
 

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",

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
     }
 
 

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 {

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",

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": {