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

Merge pull request #359 from Microsoft/colors

Browse Source 
Fixing colors
This commit is contained in:
Abhijith Chatra
2017-02-27 15:52:14 -08:00
committed by GitHub
parent 5209222438 0d4af4ea12
commit 999a40bb0d
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/core/input.cpp
View File

@@ -112,7 +112,7 @@ enum class Gesture {
EightG = MICROBIT_ACCELEROMETER_EVT_8G EightG = MICROBIT_ACCELEROMETER_EVT_8G
}; };
//% color=300 weight=99 icon="\uf192" //% color=#B4009E weight=99 icon="\uf192"
namespace input { namespace input {
/** /**
* Do something when a button (``A``, ``B`` or both ``A+B``) is pressed * Do something when a button (``A``, ``B`` or both ``A+B``) is pressed
@@ -212,7 +212,7 @@ namespace input {
double y = uBit.accelerometer.getY(); double y = uBit.accelerometer.getY();
double z = uBit.accelerometer.getZ(); double z = uBit.accelerometer.getZ();
return (int)sqrt(x*x+y*y+z*z); return (int)sqrt(x*x+y*y+z*z);
} }
/** /**
* Get the acceleration value in milli-gravitys (when the board is laying flat with the screen up, x=0, y=0 and z=-1024) * Get the acceleration value in milli-gravitys (when the board is laying flat with the screen up, x=0, y=0 and z=-1024)

4
libs/core/led.cpp
View File

@@ -8,7 +8,7 @@ enum class DisplayMode_ {
// TODO DISPLAY_MODE_BLACK_AND_WHITE_LIGHT_SENSE // TODO DISPLAY_MODE_BLACK_AND_WHITE_LIGHT_SENSE
}; };
//% color=3 weight=35 icon="\uf205" //% color=#5C2D91 weight=97 icon="\uf205"
namespace led { namespace led {
/** /**
@@ -93,7 +93,7 @@ namespace led {
} }
/** /**
* Turns on or off the display * Turns on or off the display
*/ */
//% help=led/enable blockId=device_led_enable block="led enable %on" //% help=led/enable blockId=device_led_enable block="led enable %on"
//% advanced=true parts="ledmatrix" //% advanced=true parts="ledmatrix"

2
libs/core/serial.cpp
View File

@@ -34,7 +34,7 @@ enum Delimiters {
Hash = 6, Hash = 6,
}; };
//% weight=2 color=30 icon="\uf287" //% weight=2 color=#002050 icon="\uf287"
//% advanced=true //% advanced=true
namespace serial { namespace serial {
// note that at least one // followed by % is needed per declaration! // note that at least one // followed by % is needed per declaration!

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

@@ -212,7 +212,7 @@ declare namespace basic {
//% color=300 weight=99 icon="\uf192" //% color=#B4009E weight=99 icon="\uf192"
declare namespace input { declare namespace input {
/** /**
@@ -430,7 +430,7 @@ declare namespace control {
//% color=3 weight=35 icon="\uf205" //% color=#5C2D91 weight=97 icon="\uf205"
declare namespace led { declare namespace led {
/** /**
@@ -500,7 +500,7 @@ declare namespace led {
function setDisplayMode(mode: DisplayMode): void; function setDisplayMode(mode: DisplayMode): void;
/** /**
* Turns on or off the display * Turns on or off the display
*/ */
//% help=led/enable blockId=device_led_enable block="led enable %on" //% help=led/enable blockId=device_led_enable block="led enable %on"
//% advanced=true parts="ledmatrix" shim=led::enable //% advanced=true parts="ledmatrix" shim=led::enable
@@ -671,7 +671,7 @@ declare namespace pins {
//% weight=2 color=30 icon="\uf287" //% weight=2 color=#002050 icon="\uf287"
//% advanced=true //% advanced=true
declare namespace serial { declare namespace serial {

2
pxtarget.json
View File

@@ -333,7 +333,7 @@
"coloredToolbox": true, "coloredToolbox": true,
"monacoToolbox": true, "monacoToolbox": true,
"hasAudio": true, "hasAudio": true,
"blocklyOptions": { "blocklyOptions": {
"grid": { "grid": {
"spacing": 45, "spacing": 45,
"length": 7, "length": 7,