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

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

Browse Source
This commit is contained in:
Amerlander 2020-03-19 16:27:13 +01:00
commit 1b7f2c3864
5 changed files with 106 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/core/_locales/core-jsdoc-strings.json
View File

@ -50,13 +50,21 @@
"Array.unshift": "Add one element to the beginning of an array and return the new length of the array.",
"Array@type": "Add, remove, and replace items in lists.",
"Boolean.toString": "Returns a string representation of an object.",
"Buffer.concat": "Return concatenation of current buffer and the given buffer",
"Buffer.concat": "Return concatenation of current buffer and the given buffer\n\nConcatenates all buffers in the list",
"Buffer.create": "Allocate a new buffer.",
"Buffer.create|param|size": "number of bytes in the buffer",
"Buffer.fill": "Fill (a fragment) of the buffer with given value.",
"Buffer.fromArray": "Create a new buffer initalized to bytes from given array.",
"Buffer.fromArray|param|bytes": "data to initalize with",
"Buffer.fromHex": "Create a new buffer, decoding a hex string",
"Buffer.fromUTF8": "Create a new buffer with UTF8-encoded string",
"Buffer.fromUTF8|param|str": "the string to put in the buffer",
"Buffer.getNumber": "Read a number in specified format from the buffer.",
"Buffer.getUint8": "Reads an unsigned byte at a particular location",
"Buffer.indexOf": "Return position of other buffer in current buffer",
"Buffer.isReadOnly": "Returns false when the buffer can be written to.",
"Buffer.length": "Returns the length of a Buffer object.",
"Buffer.packAt": "Writes numbers to the buffer according to the format",
"Buffer.rotate": "Rotate buffer left in place.\n\n\n\nstart. eg: -1",
"Buffer.rotate|param|length": "number of elements in buffer. If negative, length is set as the buffer length minus",
"Buffer.rotate|param|offset": "number of bytes to shift; use negative value to shift right",
@ -67,9 +75,11 @@
"Buffer.shift|param|length": "number of elements in buffer. If negative, length is set as the buffer length minus",
"Buffer.shift|param|offset": "number of bytes to shift; use negative value to shift right",
"Buffer.shift|param|start": "start offset in buffer. Default is 0.",
"Buffer.sizeOfNumberFormat": "Get the size in bytes of specified number format.",
"Buffer.slice": "Return a copy of a fragment of a buffer.",
"Buffer.toHex": "Convert a buffer to its hexadecimal representation.",
"Buffer.toString": "Convert a buffer to string assuming UTF8 encoding",
"Buffer.unpack": "Reads numbers from the buffer according to the format",
"Buffer.write": "Write contents of `src` at `dstOffset` in current buffer.",
"Colors": "Well known colors",
"EventCreationMode": "How to create the event.",
@ -518,8 +528,6 @@
"pins.analogWritePin|param|name": "of pin to write to, eg: AnalogPin.P1",
"pins.analogWritePin|param|value": "value to write to the pin between ``0`` and ``1023``. eg:1023,0",
"pins.createBuffer": "Create a new zero-initialized buffer.",
"pins.createBufferFromArray": "Create a new buffer initalized to bytes from given array.",
"pins.createBufferFromArray|param|bytes": "data to initalize with",
"pins.createBuffer|param|size": "number of bytes in the buffer",
"pins.digitalReadPin": "Read the specified pin or connector as either 0 or 1",
"pins.digitalReadPin|param|name": "pin to read from, eg: DigitalPin.P0",
@ -556,7 +564,6 @@
"pins.setPull": "Configure the pull direction of of a pin.",
"pins.setPull|param|name": "pin to set the pull mode on, eg: DigitalPin.P0",
"pins.setPull|param|pull": "one of the mbed pull configurations, eg: PinPullMode.PullUp",
"pins.sizeOf": "Get the size in bytes of specified number format.",
"pins.spiFormat": "Set the SPI bits and mode",
"pins.spiFormat|param|bits": "the number of bits, eg: 8",
"pins.spiFormat|param|mode": "the mode, eg: 3",

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

@ -43,6 +43,7 @@
"BeatFraction.Quarter|block": "1/4",
"BeatFraction.Sixteenth|block": "1/16",
"BeatFraction.Whole|block": "1",
"Buffer|block": "Buffer",
"Button.AB|block": "A+B",
"ButtonEvent.Click|block": "clicked",
"ButtonEvent.Down|block": "pressed down",

4
libs/core/shims.d.ts vendored
View File

@ -1064,14 +1064,14 @@ declare namespace control {
* Create a new zero-initialized buffer.
* @param size number of bytes in the buffer
*/
//% shim=control::createBuffer
//% deprecated=1 shim=control::createBuffer
function createBuffer(size: int32): Buffer;
/**
* Create a new buffer with UTF8-encoded string
* @param str the string to put in the buffer
*/
//% shim=control::createBufferFromUTF8
//% deprecated=1 shim=control::createBufferFromUTF8
function createBufferFromUTF8(str: string): Buffer;
}

86
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "pxt-calliope",
"version": "2.1.51",
"version": "2.1.53",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -89,9 +89,9 @@
}
},
"acorn": {
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
"integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ=="
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
"integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg=="
},
"acorn-node": {
"version": "1.8.2",
@ -104,9 +104,9 @@
}
},
"acorn-walk": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.0.0.tgz",
"integrity": "sha512-7Bv1We7ZGuU79zZbb6rRqcpxo3OY+zrdtloZWoyD8fmGX+FeXRjE+iuGkZjSXLVovLzrsvMGMy0EkwA0E0umxg=="
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz",
"integrity": "sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ=="
},
"after": {
"version": "0.8.2",
@ -119,9 +119,9 @@
"integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g=="
},
"ajv": {
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz",
"integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==",
"version": "6.12.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
"integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
"requires": {
"fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0",
@ -362,9 +362,9 @@
},
"dependencies": {
"readable-stream": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz",
"integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==",
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
"requires": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
@ -674,9 +674,9 @@
}
},
"caniuse-db": {
"version": "1.0.30001025",
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001025.tgz",
"integrity": "sha512-HtUBOYgagTFMOa8/OSVkXbDS/YiByZZoi4H+ksKgoDfNmMVoodxnH373bXleumM1kg1IXvLspLMKIS7guWEBhg=="
"version": "1.0.30001032",
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001032.tgz",
"integrity": "sha512-thSkUHbrj3Qt4J6kt7j1IUTUFJaMPWAGhPRe9vIO5QIUSyHHPaJRabhfKRWvDs8MveleUERUhwYqK6paWqcyAw=="
},
"caseless": {
"version": "0.12.0",
@ -728,9 +728,9 @@
}
},
"chownr": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
"integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw=="
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
"integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
},
"cipher-base": {
"version": "1.0.4",
@ -1232,9 +1232,9 @@
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
},
"electron-to-chromium": {
"version": "1.3.345",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.345.tgz",
"integrity": "sha512-f8nx53+Z9Y+SPWGg3YdHrbYYfIJAtbUjpFfW4X1RwTZ94iUG7geg9tV8HqzAXX7XTNgyWgAFvce4yce8ZKxKmg=="
"version": "1.3.368",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.368.tgz",
"integrity": "sha512-fqzDipW3p+uDkHUHFPrdW3wINRKcJsbnJwBD7hgaQEQwcuLSvNLw6SeUp5gKDpTbmTl7zri7IZfhsdTUTnygJg=="
},
"elliptic": {
"version": "6.5.2",
@ -2011,9 +2011,9 @@
"integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
},
"js-base64": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
"integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
"version": "2.5.2",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz",
"integrity": "sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ=="
},
"js-tokens": {
"version": "4.0.0",
@ -2355,9 +2355,9 @@
}
},
"mimic-response": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.0.0.tgz",
"integrity": "sha512-8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ=="
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
"integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="
},
"minimalistic-assert": {
"version": "1.0.1",
@ -2494,9 +2494,9 @@
"integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
},
"node-abi": {
"version": "2.14.0",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.14.0.tgz",
"integrity": "sha512-y54KGgEOHnRHlGQi7E5UiryRkH8bmksmQLj/9iLAjoje743YS+KaKB/sDYXgqtT0J16JT3c3AYJZNI98aU/kYg==",
"version": "2.15.0",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.15.0.tgz",
"integrity": "sha512-FeLpTS0F39U7hHZU1srAK4Vx+5AHNVOTP+hxBNQknR/54laTHSFIJkDWDqiquY1LeLUgTfPN7sLPhMubx0PLAg==",
"requires": {
"semver": "^5.4.1"
}
@ -3396,9 +3396,9 @@
}
},
"proxy-from-env": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
"integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4="
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
},
"prr": {
"version": "1.0.1",
@ -3492,18 +3492,18 @@
}
},
"pxt-common-packages": {
"version": "6.20.1",
"resolved": "https://registry.npmjs.org/pxt-common-packages/-/pxt-common-packages-6.20.1.tgz",
"integrity": "sha512-iktjW6JHOMfuDQBFqZgkPQWT3LZxV9477gGCMBbFkLiDvXt2aQKuQvDMMh9WukpJfKAJhiipVvOIyRZyrTy6+Q==",
"version": "6.21.5",
"resolved": "https://registry.npmjs.org/pxt-common-packages/-/pxt-common-packages-6.21.5.tgz",
"integrity": "sha512-W0OjMGiyAVwyesh0BpZaDZvNOW5V8p8KOak2u8yI2mXS+F05mVzbmfS0wvCTnlDAM5jdTTKBlWTTqg+US7UV5w==",
"requires": {
"@jacdac/jacdac-ts": "^0.0.9",
"pxt-core": "^5.34.1"
}
},
"pxt-core": {
"version": "5.34.3",
"resolved": "https://registry.npmjs.org/pxt-core/-/pxt-core-5.34.3.tgz",
"integrity": "sha512-jaWutc18RlnE5nJPvYHcoJKNNZJUTMoBbTreR9oaTk98AfjQ0lV6QQTu+qfh5Ht9XbZVEQzllejIAYeojIAEYA==",
"version": "5.34.18",
"resolved": "https://registry.npmjs.org/pxt-core/-/pxt-core-5.34.18.tgz",
"integrity": "sha512-8Wle0sdS7bt8OWPgrachQXVoM6e7a/OvL7yBylmoSBktYc+7QFoYYAqU5OTAMxHcitrpDH/L7b2AUfxY9ZcwYQ==",
"requires": {
"applicationinsights-js": "^1.0.20",
"bluebird": "3.5.1",
@ -4260,9 +4260,9 @@
},
"dependencies": {
"readable-stream": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz",
"integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==",
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
"requires": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",

98
package.json
View File

@ -1,51 +1,51 @@
{
"name": "pxt-calliope",
"version": "2.1.51",
"description": "micro:bit target for Microsoft MakeCode (PXT)",
"keywords": [
"JavaScript",
"education",
"calliope",
"mini"
],
"repository": {
"type": "git",
"url": "git+https://github.com/Microsoft/pxt-microbit.git"
},
"author": "",
"license": "MIT",
"homepage": "https://github.com/Microsoft/pxt-microbit#readme",
"files": [
"README.md",
"pxtarget.json",
"targetconfig.json",
"built/*.js",
"built/*.json",
"built/*.d.ts",
"built/hexcache",
"built/web",
"sim/public",
"docs/*.md",
"docs/*/*.md",
"docs/*/*/*.md",
"docs/static/*.svg",
"docs/static/*.png",
"docs/static/icons/favicon.ico"
],
"devDependencies": {
"@types/bluebird": "2.0.33",
"@types/marked": "0.3.0",
"@types/node": "8.0.53",
"@types/react": "16.0.25",
"@types/react-dom": "16.0.3",
"@types/web-bluetooth": "0.0.4",
"less": "2.7.3",
"react": "16.8.3",
"semantic-ui-less": "2.2.14",
"typescript": "^3.7.5"
},
"dependencies": {
"pxt-common-packages": "6.21.5",
"pxt-core": "5.34.18"
}
"name": "pxt-calliope",
"version": "2.1.53",
"description": "micro:bit target for Microsoft MakeCode (PXT)",
"keywords": [
"JavaScript",
"education",
"calliope",
"mini"
],
"repository": {
"type": "git",
"url": "git+https://github.com/Microsoft/pxt-microbit.git"
},
"author": "",
"license": "MIT",
"homepage": "https://github.com/Microsoft/pxt-microbit#readme",
"files": [
"README.md",
"pxtarget.json",
"targetconfig.json",
"built/*.js",
"built/*.json",
"built/*.d.ts",
"built/hexcache",
"built/web",
"sim/public",
"docs/*.md",
"docs/*/*.md",
"docs/*/*/*.md",
"docs/static/*.svg",
"docs/static/*.png",
"docs/static/icons/favicon.ico"
],
"devDependencies": {
"@types/bluebird": "2.0.33",
"@types/marked": "0.3.0",
"@types/node": "8.0.53",
"@types/react": "16.0.25",
"@types/react-dom": "16.0.3",
"@types/web-bluetooth": "0.0.4",
"less": "2.7.3",
"react": "16.8.3",
"semantic-ui-less": "2.2.14",
"typescript": "^3.7.5"
},
"dependencies": {
"pxt-common-packages": "6.21.9",
"pxt-core": "5.35.14"
}
}