diff --git a/docs/static/Microsoft-logo_rgb_c-gray-square.png b/docs/static/Microsoft-logo_rgb_c-gray-square.png new file mode 100644 index 00000000..f5f83b8c Binary files /dev/null and b/docs/static/Microsoft-logo_rgb_c-gray-square.png differ diff --git a/libs/core/_locales/core-strings.json b/libs/core/_locales/core-strings.json index e0ef32da..a43c6577 100644 --- a/libs/core/_locales/core-strings.json +++ b/libs/core/_locales/core-strings.json @@ -8,6 +8,7 @@ "AcceleratorRange.TwoG": "The accelerator measures forces up to 2 gravity", "AcceleratorRange.TwoG|block": "2g", "BaudRate.BaudRate115200|block": "115200", + "BaudRate.BaudRate56700|block": "57600", "BaudRate.BaudRate9600|block": "9600", "BeatFraction.Eighth|block": "1/8", "BeatFraction.Half|block": "1/2", diff --git a/libs/core/_locales/de/core-strings.json b/libs/core/_locales/de/core-strings.json index ee3b8105..37a2c6bd 100644 --- a/libs/core/_locales/de/core-strings.json +++ b/libs/core/_locales/de/core-strings.json @@ -7,7 +7,7 @@ "AcceleratorRange.OneG|block": "1g", "AcceleratorRange.TwoG": "Der Bewegungssensor misst Kräfte bis 2g", "AcceleratorRange.TwoG|block": "2g", - "BaudRate.BaudRate115200|block": "11520", + "BaudRate.BaudRate115200|block": "115200", "BaudRate.BaudRate9600|block": "9600", "BeatFraction.Eighth|block": "1/8", "BeatFraction.Half|block": "1/2", diff --git a/libs/core/dal.d.ts b/libs/core/dal.d.ts index 3d9b5405..28c105e3 100644 --- a/libs/core/dal.d.ts +++ b/libs/core/dal.d.ts @@ -192,6 +192,7 @@ declare const enum DAL { MICROBIT_SERIAL_EVT_TX_EMPTY = 2, MICROBIT_UART_S_EVT_TX_EMPTY = 3, // 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 CALLIOPE_SM_DEFAULT_DUTY_M = 50, CALLIOPE_SM_DEFAULT_DUTY_S = 100, diff --git a/libs/core/enums.d.ts b/libs/core/enums.d.ts index f305d9b3..3823e6b6 100644 --- a/libs/core/enums.d.ts +++ b/libs/core/enums.d.ts @@ -339,6 +339,8 @@ declare namespace motors { declare enum BaudRate { //% block=115200 BaudRate115200 = 115200, + //% block=57600 + BaudRate56700 = 57600, //% block=9600 BaudRate9600 = 9600, } diff --git a/libs/core/serial.cpp b/libs/core/serial.cpp index daeb813b..512f3912 100644 --- a/libs/core/serial.cpp +++ b/libs/core/serial.cpp @@ -12,6 +12,8 @@ enum SerialPin { enum BaudRate { //% block=115200 BaudRate115200 = 115200, + //% block=57600 + BaudRate56700 = 57600, //% block=9600 BaudRate9600 = 9600 }; diff --git a/package.json b/package.json index 168a6759..77e0621d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-calliope", - "version": "0.8.21", + "version": "0.8.23", "description": "Calliope Mini editor for PXT", "keywords": [ "JavaScript", @@ -34,7 +34,7 @@ "semantic-ui-less": "^2.2.4" }, "dependencies": { - "pxt-core": "0.11.31" + "pxt-core": "0.11.32" }, "scripts": { "test": "node node_modules/pxt-core/built/pxt.js travis" diff --git a/pxtarget.json b/pxtarget.json index c168e9e8..56b2f44d 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -171,7 +171,7 @@ "yottaTarget": "calliope-mini-classic-gcc", "yottaCorePackage": "microbit", "githubCorePackage": "calliope-mini/microbit", - "gittag": "v2.0.0-rc7-calliope-p9", + "gittag": "v2.0.0-rc7-calliope-p9-2016-2", "serviceId": "calliope" }, "serial": { @@ -197,7 +197,7 @@ "crowdinProject": "kindscript", "organization": "Microsoft", "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", "browserSupport": [ {