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-microbit

Browse Source
This commit is contained in:
Peli de Halleux 2016-08-17 08:40:45 -07:00
commit 380488528f
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/microbit/core.cpp
View File

@ -171,9 +171,13 @@ namespace pxt {
//% //%
void registerWithDal(int id, int event, Action a); void registerWithDal(int id, int event, Action a);
//% //%
void runAction0(Action a); uint32_t runAction3(Action a, int arg0, int arg1, int arg2);
//% //%
void runAction1(Action a, int arg); uint32_t runAction2(Action a, int arg0, int arg1);
//%
uint32_t runAction1(Action a, int arg0);
//%
uint32_t runAction0(Action a);
//% //%
Action mkAction(int reflen, int totallen, int startptr); Action mkAction(int reflen, int totallen, int startptr);
//% //%

4
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "pxt-microbit", "name": "pxt-microbit",
"version": "0.3.31", "version": "0.3.34",
"description": "micro:bit target for PXT", "description": "micro:bit target for PXT",
"keywords": [ "keywords": [
"JavaScript", "JavaScript",
@ -29,6 +29,6 @@
"typescript": "^1.8.7" "typescript": "^1.8.7"
}, },
"dependencies": { "dependencies": {
"pxt-core": "0.3.34" "pxt-core": "0.3.37"
} }
} }

2
pxtarget.json
View File

@ -74,7 +74,7 @@
"yottaTarget": "bbc-microbit-classic-gcc", "yottaTarget": "bbc-microbit-classic-gcc",
"yottaCorePackage": "pxt-microbit-core", "yottaCorePackage": "pxt-microbit-core",
"githubCorePackage": "microsoft/pxt-microbit-core", "githubCorePackage": "microsoft/pxt-microbit-core",
"gittag": "v0.2.2", "gittag": "v0.3.1",
"serviceId": "ws" "serviceId": "ws"
}, },
"serial": { "serial": {