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-09-01 05:08:35 -07:00
parent bfc2641637 a8b427fd89
commit 8a4556e70c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/microbit/core.cpp
View File

@@ -183,6 +183,8 @@ namespace pxt {
//% //%
RefRecord* mkRecord(int reflen, int totallen); RefRecord* mkRecord(int reflen, int totallen);
//% //%
RefRecord* mkClassInstance(int offset);
//%
void debugMemLeaks(); void debugMemLeaks();
//% //%
int incr(uint32_t e); int incr(uint32_t e);

2
pxtarget.json
View File

@@ -91,7 +91,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.4.1", "gittag": "v0.4.2",
"serviceId": "ws" "serviceId": "ws"
}, },
"serial": { "serial": {