c_meyer/pxt-calliope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Peli de Halleux 2017-02-06 14:41:34 -08:00
commit 63268c61a8
6 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jenkins.groovy
View File

@ -8,6 +8,7 @@ def branch = GithubBranchName
def newJobName = InternalUtilities.getFullJobName(project, "Default", isPR) def newJobName = InternalUtilities.getFullJobName(project, "Default", isPR)
def newJob = job(newJobName) { def newJob = job(newJobName) {
steps { steps {
shell("chmod +x ./jenkins.sh")
shell("./jenkins.sh ${isPR}") shell("./jenkins.sh ${isPR}")
} }

2
libs/core/_locales/core-strings.json
View File

@ -168,8 +168,10 @@
"music.setTempo|block": "set tempo to (bpm)|%value", "music.setTempo|block": "set tempo to (bpm)|%value",
"music.tempo|block": "tempo (bpm)", "music.tempo|block": "tempo (bpm)",
"music|block": "music", "music|block": "music",
"pins.analogPitch|block": "analog pitch %frequency|for (ms) %ms",
"pins.analogReadPin|block": "analog read|pin %name", "pins.analogReadPin|block": "analog read|pin %name",
"pins.analogSetPeriod|block": "analog set period|pin %pin|to (µs)%micros", "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.analogWritePin|block": "analog write|pin %name|to %value",
"pins.digitalReadPin|block": "digital read|pin %name", "pins.digitalReadPin|block": "digital read|pin %name",
"pins.digitalWritePin|block": "digital write|pin %name|to %value", "pins.digitalWritePin|block": "digital write|pin %name|to %value",

15
libs/core/enums.d.ts vendored
View File

@ -327,15 +327,12 @@ declare namespace motors {
declare enum SerialPin { declare enum SerialPin {
P0 = 7, // MICROBIT_ID_IO_P0 C16 = 9, // MICROBIT_ID_IO_P2
P1 = 8, // MICROBIT_ID_IO_P1 C17 = 15, // MICROBIT_ID_IO_P8
P2 = 9, // MICROBIT_ID_IO_P2 P0 = 19, // MICROBIT_ID_IO_P12
//P8 = MICROBIT_ID_IO_P8, P1 = 7, // MICROBIT_ID_IO_P0
//P12 = MICROBIT_ID_IO_P12, P2 = 8, // MICROBIT_ID_IO_P1
//P13 = MICROBIT_ID_IO_P13, P3 = 23, // MICROBIT_ID_IO_P16
//P14 = MICROBIT_ID_IO_P14,
//P15 = MICROBIT_ID_IO_P15,
//P16 = MICROBIT_ID_IO_P16
} }

15
libs/core/serial.cpp
View File

@ -1,15 +1,12 @@
#include "pxt.h" #include "pxt.h"
enum SerialPin { enum SerialPin {
P0 = MICROBIT_ID_IO_P0, C16 = MICROBIT_ID_IO_P2,
P1 = MICROBIT_ID_IO_P1, C17 = MICROBIT_ID_IO_P8,
P2 = MICROBIT_ID_IO_P2, P0 = MICROBIT_ID_IO_P12,
//P8 = MICROBIT_ID_IO_P8, P1 = MICROBIT_ID_IO_P0,
//P12 = MICROBIT_ID_IO_P12, P2 = MICROBIT_ID_IO_P1,
//P13 = MICROBIT_ID_IO_P13, P3 = MICROBIT_ID_IO_P16,
//P14 = MICROBIT_ID_IO_P14,
//P15 = MICROBIT_ID_IO_P15,
//P16 = MICROBIT_ID_IO_P16
}; };
enum BaudRate { enum BaudRate {

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "pxt-calliope", "name": "pxt-calliope",
"version": "0.8.12", "version": "0.8.14",
"description": "Calliope Mini editor for PXT", "description": "Calliope Mini editor for PXT",
"keywords": [ "keywords": [
"JavaScript", "JavaScript",

2
pxtarget.json
View File

@ -170,7 +170,7 @@
"yottaTarget": "calliope-mini-classic-gcc", "yottaTarget": "calliope-mini-classic-gcc",
"yottaCorePackage": "microbit", "yottaCorePackage": "microbit",
"githubCorePackage": "calliope-mini/microbit", "githubCorePackage": "calliope-mini/microbit",
"gittag": "v2.0.0-rc7-calliope-p8_1", "gittag": "v2.0.0-rc7-calliope-p9",
"serviceId": "calliope" "serviceId": "calliope"
}, },
"serial": { "serial": {