From f04222fecb2456172727e46167532cdfc6a0bec0 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Mon, 13 Feb 2017 15:44:29 -0800 Subject: [PATCH 1/7] Bump pxt-core to 0.11.32 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 168a6759..28e86599 100644 --- a/package.json +++ b/package.json @@ -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" From 7a8f540b27c4cb5a7ecfdb7d06307961d29c0a0c Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Mon, 13 Feb 2017 15:44:32 -0800 Subject: [PATCH 2/7] 0.8.22 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 28e86599..a2b39357 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-calliope", - "version": "0.8.21", + "version": "0.8.22", "description": "Calliope Mini editor for PXT", "keywords": [ "JavaScript", From 00b4e8dc01467aeacb77ae7142d6a38decb62cd4 Mon Sep 17 00:00:00 2001 From: Sam El-Husseini Date: Thu, 16 Feb 2017 20:45:03 -0800 Subject: [PATCH 3/7] Updating small organization logo --- docs/static/Microsoft-logo_rgb_c-gray-square.png | Bin 0 -> 1850 bytes pxtarget.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 docs/static/Microsoft-logo_rgb_c-gray-square.png 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 0000000000000000000000000000000000000000..f5f83b8c33d027642954f4f833432de810768249 GIT binary patch literal 1850 zcmeAS@N?(olHy`uVBq!ia0y~yVAKU+4rZW8mhG`SK#C>Z(btiIVPik{pF~y$24;o; zpAc7|c>OL0h9&RqcYVq~{q<9T(%0&Ud8h5S-N^sHli~j<`~TPTzt3p`DjNl(Au#+x zV5xK!D5Efx1o;L3AK8E*_&d8QForn`JR*x381xiDn2|mD&wrqxWQl7;NpOBzNqJ&X zDnmhHW?qS2UTTSgiJpO;p^-C7_8SHUrum*Ojv*CsZ!c^NWi}LHaBMvIjOXum?Md+m za+f76YpUIC_I>T&+9}UVdaoZ3yrVS=v4_C5I=QF$X1(*T2VP4lY>#fm0gvA5UtHsR z{YR~Q>f7^+ZPG4R#Jd-+E*OQ_Lg4kj*T2}MLgqY?Tb{HLRE&AL`njxgN@xNA3um2* literal 0 HcmV?d00001 diff --git a/pxtarget.json b/pxtarget.json index c168e9e8..9ab99043 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -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": [ { From 978e0fd765ee3a1742b4eb78ee88e2f793186128 Mon Sep 17 00:00:00 2001 From: "Matthias L. Jugel" Date: Sat, 18 Feb 2017 15:25:12 +0100 Subject: [PATCH 4/7] updated for Calliope mini board rev 0.3 (2016) --- libs/core/_locales/core-strings.json | 2 -- libs/core/dal.d.ts | 1 + pxtarget.json | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/core/_locales/core-strings.json b/libs/core/_locales/core-strings.json index 33649d06..e0ef32da 100644 --- a/libs/core/_locales/core-strings.json +++ b/libs/core/_locales/core-strings.json @@ -94,9 +94,7 @@ "Rotation.Roll|block": "roll", "String.charAt|block": "char from %this=text|at %pos", "String.compare|block": "compare %this=text| to %that", - "String.concat|block": "join %this=text|%other", "String.fromCharCode|block": "text from char code %code", - "String.isEmpty|block": "%this=text| is empty", "String.length|block": "length of %VALUE", "String.substr|block": "substring of %this=text|from %start|of length %length", "String|block": "String", 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/pxtarget.json b/pxtarget.json index 9ab99043..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": { From d9b3f2fbef2a44f6212e73510e15375088a5dfd1 Mon Sep 17 00:00:00 2001 From: "Matthias L. Jugel" Date: Sat, 18 Feb 2017 15:32:21 +0100 Subject: [PATCH 5/7] add 57600 as baud selection --- libs/core/_locales/core-strings.json | 1 + libs/core/enums.d.ts | 2 ++ libs/core/serial.cpp | 2 ++ 3 files changed, 5 insertions(+) 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/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 }; From 2a3f2d4b1150adf99770be25caad4e889d39b603 Mon Sep 17 00:00:00 2001 From: "Matthias L. Jugel" Date: Sat, 18 Feb 2017 15:41:52 +0100 Subject: [PATCH 6/7] fix 115200 string --- libs/core/_locales/de/core-strings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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", From 3e46d4c615d5512ac3aa1cf8ee9bca215b33e83d Mon Sep 17 00:00:00 2001 From: "Matthias L. Jugel" Date: Sat, 18 Feb 2017 15:42:01 +0100 Subject: [PATCH 7/7] 0.8.23 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a2b39357..77e0621d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-calliope", - "version": "0.8.22", + "version": "0.8.23", "description": "Calliope Mini editor for PXT", "keywords": [ "JavaScript",