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

Merge branch 'calliope-mini-2016' of github.com:microsoft/pxt-calliope into calliope-mini-2016

Browse Source
This commit is contained in:
thinkberg 2017-02-19 11:22:49 +01:00
commit 97ba83f660
8 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/static/Microsoft-logo_rgb_c-gray-square.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

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

@ -8,6 +8,7 @@
"AcceleratorRange.TwoG": "The accelerator measures forces up to 2 gravity", "AcceleratorRange.TwoG": "The accelerator measures forces up to 2 gravity",
"AcceleratorRange.TwoG|block": "2g", "AcceleratorRange.TwoG|block": "2g",
"BaudRate.BaudRate115200|block": "115200", "BaudRate.BaudRate115200|block": "115200",
"BaudRate.BaudRate56700|block": "57600",
"BaudRate.BaudRate9600|block": "9600", "BaudRate.BaudRate9600|block": "9600",
"BeatFraction.Eighth|block": "1/8", "BeatFraction.Eighth|block": "1/8",
"BeatFraction.Half|block": "1/2", "BeatFraction.Half|block": "1/2",

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

@ -7,7 +7,7 @@
"AcceleratorRange.OneG|block": "1g", "AcceleratorRange.OneG|block": "1g",
"AcceleratorRange.TwoG": "Der Bewegungssensor misst Kräfte bis 2g", "AcceleratorRange.TwoG": "Der Bewegungssensor misst Kräfte bis 2g",
"AcceleratorRange.TwoG|block": "2g", "AcceleratorRange.TwoG|block": "2g",
"BaudRate.BaudRate115200|block": "11520", "BaudRate.BaudRate115200|block": "115200",
"BaudRate.BaudRate9600|block": "9600", "BaudRate.BaudRate9600|block": "9600",
"BeatFraction.Eighth|block": "1/8", "BeatFraction.Eighth|block": "1/8",
"BeatFraction.Half|block": "1/2", "BeatFraction.Half|block": "1/2",

1
libs/core/dal.d.ts vendored
View File

@ -192,6 +192,7 @@ declare const enum DAL {
MICROBIT_SERIAL_EVT_TX_EMPTY = 2, MICROBIT_SERIAL_EVT_TX_EMPTY = 2,
MICROBIT_UART_S_EVT_TX_EMPTY = 3, MICROBIT_UART_S_EVT_TX_EMPTY = 3,
// built/yt/yotta_modules/microbit-dal/inc/drivers/CalliopeRGB.h // built/yt/yotta_modules/microbit-dal/inc/drivers/CalliopeRGB.h
RGB_LED_MAX_INTENSITY = 40,
// built/yt/yotta_modules/microbit-dal/inc/drivers/CalliopeSoundMotor.h // built/yt/yotta_modules/microbit-dal/inc/drivers/CalliopeSoundMotor.h
CALLIOPE_SM_DEFAULT_DUTY_M = 50, CALLIOPE_SM_DEFAULT_DUTY_M = 50,
CALLIOPE_SM_DEFAULT_DUTY_S = 100, CALLIOPE_SM_DEFAULT_DUTY_S = 100,

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

@ -339,6 +339,8 @@ declare namespace motors {
declare enum BaudRate { declare enum BaudRate {
//% block=115200 //% block=115200
BaudRate115200 = 115200, BaudRate115200 = 115200,
//% block=57600
BaudRate56700 = 57600,
//% block=9600 //% block=9600
BaudRate9600 = 9600, BaudRate9600 = 9600,
} }

2
libs/core/serial.cpp
View File

@ -12,6 +12,8 @@ enum SerialPin {
enum BaudRate { enum BaudRate {
//% block=115200 //% block=115200
BaudRate115200 = 115200, BaudRate115200 = 115200,
//% block=57600
BaudRate56700 = 57600,
//% block=9600 //% block=9600
BaudRate9600 = 9600 BaudRate9600 = 9600
}; };

4
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "pxt-calliope", "name": "pxt-calliope",
"version": "0.8.21", "version": "0.8.23",
"description": "Calliope Mini editor for PXT", "description": "Calliope Mini editor for PXT",
"keywords": [ "keywords": [
"JavaScript", "JavaScript",
@ -34,7 +34,7 @@
"semantic-ui-less": "^2.2.4" "semantic-ui-less": "^2.2.4"
}, },
"dependencies": { "dependencies": {
"pxt-core": "0.11.31" "pxt-core": "0.11.32"
}, },
"scripts": { "scripts": {
"test": "node node_modules/pxt-core/built/pxt.js travis" "test": "node node_modules/pxt-core/built/pxt.js travis"

4
pxtarget.json
View File

@ -171,7 +171,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-p9", "gittag": "v2.0.0-rc7-calliope-p9-2016-2",
"serviceId": "calliope" "serviceId": "calliope"
}, },
"serial": { "serial": {
@ -197,7 +197,7 @@
"crowdinProject": "kindscript", "crowdinProject": "kindscript",
"organization": "Microsoft", "organization": "Microsoft",
"organizationUrl": "https://pxt.io/", "organizationUrl": "https://pxt.io/",
"organizationLogo": "./static/Microsoft-logo_rgb_c-gray.png", "organizationLogo": "./static/Microsoft-logo_rgb_c-gray-square.png",
"organizationWideLogo": "./static/Microsoft-logo_rgb_c-white.png", "organizationWideLogo": "./static/Microsoft-logo_rgb_c-white.png",
"browserSupport": [ "browserSupport": [
{ {