0.5.6

* use typescript from workspace

* fixed tracking in localhost

* updated ordering of input/radio

.vscode/settings.json

@@ -16,5 +16,6 @@
         "**/pxt_modules/**": true
     },    
     "tslint.enable": true,
-    "tslint.rulesDirectory": "node_modules/tslint-microsoft-contrib"
+    "tslint.rulesDirectory": "node_modules/tslint-microsoft-contrib",
+    "typescript.tsdk": "./node_modules/typescript/lib"
 }

docfiles/apptracking.html

@@ -2,5 +2,5 @@
     (function(e,b){if(!b.__SV){var a,f,i,g;window.mixpanel=b;b._i=[];b.init=function(a,e,d){function f(b,h){var a=h.split(".");2==a.length&&(b=b[a[0]],h=a[1]);b[h]=function(){b.push([h].concat(Array.prototype.slice.call(arguments,0)))}}var c=b;"undefined"!==typeof d?c=b[d]=[]:d="mixpanel";c.people=c.people||[];c.toString=function(b){var a="mixpanel";"mixpanel"!==d&&(a+="."+d);b||(a+=" (stub)");return a};c.people.toString=function(){return c.toString(1)+".people (stub)"};i="disable time_event track track_pageview track_links track_forms register register_once alias unregister identify name_tag set_config reset people.set people.set_once people.increment people.append people.union people.track_charge people.clear_charges people.delete_user".split(" ");
     for(g=0;g<i.length;g++)f(c,i[g]);b._i.push([a,e,d])};b.__SV=1.2;a=e.createElement("script");a.type="text/javascript";a.async=!0;a.src="undefined"!==typeof MIXPANEL_CUSTOM_LIB_URL?MIXPANEL_CUSTOM_LIB_URL:"file:"===e.location.protocol&&"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js".match(/^\/\//)?"https://cdn.mxpnl.com/libs/mixpanel-2-latest.min.js":"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js";f=e.getElementsByTagName("script")[0];f.parentNode.insertBefore(a,f)}})(document,window.mixpanel||[]);
     mixpanel.init("762fef19c053a0ea4cec43d2fecae76e", { disable_persistence: true });
-    if (pxtConfig) mixpanel.register({ target: pxtConfig.targetId, version: pxtConfig.targetVersion });
+    if (typeof pxtConfig !== "undefined") mixpanel.register({ target: pxtConfig.targetId, version: pxtConfig.targetVersion });
 </script>

docfiles/tracking.html

@@ -2,5 +2,5 @@
     (function(e,b){if(!b.__SV){var a,f,i,g;window.mixpanel=b;b._i=[];b.init=function(a,e,d){function f(b,h){var a=h.split(".");2==a.length&&(b=b[a[0]],h=a[1]);b[h]=function(){b.push([h].concat(Array.prototype.slice.call(arguments,0)))}}var c=b;"undefined"!==typeof d?c=b[d]=[]:d="mixpanel";c.people=c.people||[];c.toString=function(b){var a="mixpanel";"mixpanel"!==d&&(a+="."+d);b||(a+=" (stub)");return a};c.people.toString=function(){return c.toString(1)+".people (stub)"};i="disable time_event track track_pageview track_links track_forms register register_once alias unregister identify name_tag set_config reset people.set people.set_once people.increment people.append people.union people.track_charge people.clear_charges people.delete_user".split(" ");
     for(g=0;g<i.length;g++)f(c,i[g]);b._i.push([a,e,d])};b.__SV=1.2;a=e.createElement("script");a.type="text/javascript";a.async=!0;a.src="undefined"!==typeof MIXPANEL_CUSTOM_LIB_URL?MIXPANEL_CUSTOM_LIB_URL:"file:"===e.location.protocol&&"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js".match(/^\/\//)?"https://cdn.mxpnl.com/libs/mixpanel-2-latest.min.js":"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js";f=e.getElementsByTagName("script")[0];f.parentNode.insertBefore(a,f)}})(document,window.mixpanel||[]);
     mixpanel.init("762fef19c053a0ea4cec43d2fecae76e", { disable_persistence: true });
-    if (pxtConfig) mixpanel.register({ target: pxtConfig.targetId, version: pxtConfig.targetVersion });    
+    if (typeof pxtConfig !== "undefined") mixpanel.register({ target: pxtConfig.targetId, version: pxtConfig.targetVersion });    
 </script>

docs/reference.md

@@ -10,6 +10,10 @@ input.onButtonPressed(Button.A, () => {
 music.playTone(0, 0);
 led.plot(0, 0);
 radio.sendNumber(0);
+```
+## Advanced
+
+```namespaces
 game.addScore(1);
 images.createImage(`
 . . . . .
@@ -24,7 +28,8 @@ control.inBackground(() => {
     
 });
 ```
-## Advanced
+
+## Bluetooth
   
 ```namespaces
 devices.tellCameraTo(MesCameraEvent.TakePhoto);

libs/core/basic.cpp

@@ -6,6 +6,26 @@
  */
 //% color=#0078D7 weight=100
 namespace basic {
+    /**
+    * Sets the color on the build-in LED. Set to 0 to turn off.
+    */
+    //% blockId=device_set_led_color block="set led to %color=color_id" icon="\uf00a"
+    //% weight=50
+    void setLedColor(int color) {
+      if (!color) {
+        uBit.rgb.Off();
+        return;
+      }
+
+      int w = (color >> 24) & 0xFF;
+      int r = (color >> 16) & 0xFF;
+      int g = (color >> 8) & 0xFF;
+      int b = (color) & 0xFF;
+      
+      uBit.rgb.Set_Color(r,g,b,w);
+      uBit.rgb.On();
+      uBit.rgb.Send_to_LED();
+    }
 
     /**
      * Scroll a number on the screen. If the number fits on the screen (i.e. is a single digit), do not scroll.

libs/core/basic.ts

@@ -0,0 +1,59 @@
+/**
+  Well known colors
+*/
+enum Colors {
+    //% blockIdentity=basic.color
+    //% block=red
+    Red = 0x00FF0000,
+    //% blockIdentity=basic.color
+    //% block=orange
+    Orange = 0x00FFA500,
+    //% blockIdentity=basic.color
+    //% block=yellow
+    Yellow = 0x00FFFF00,
+    //% blockIdentity=basic.color
+    //% block=green
+    Green = 0x0000FF00,
+    //% blockIdentity=basic.color
+    //% block=blue
+    Blue = 0x000000FF,
+    //% blockIdentity=basic.color
+    //% block=indigo
+    Indigo = 0x004b0082,
+    //% blockIdentity=basic.color
+    //% block=violet
+    Violet = 0x008a2be2,
+    //% blockIdentity=basic.color
+    //% block=purple
+    Purple = 0x00FF00FF,
+    //% blockIdentity=basic.color
+    //% block=white
+    White = 0xFF00000
+}
+
+/**
+ * Provides access to basic micro:bit functionality.
+ */
+//% color=#0078D7 weight=100
+namespace basic {
+    /**
+     * Converts the color name to a number
+     */
+    //% blockId=color_id block="%c" shim=TD_ID
+    export function color(c: Colors): number {
+        return c;
+    }
+
+    /**
+     * Converts red, green, blue channels into a RGB color
+     * @param red value of the red channel between 0 and 255. eg: 255
+     * @param green value of the green channel between 0 and 255. eg: 255
+     * @param blue value of the blue channel between 0 and 255. eg: 255
+     * @param white value of the white channel between 0 and 255. eg: 0
+     */
+    //% weight=1
+    //% blockId="core_rgb" block="red %red|green %green|blue %blue|white %white"
+    export function rgbw(red: number, green: number, blue: number, white:number): number {
+        return ((white & 0xFF) << 24) | ((red & 0xFF) << 16) | ((green & 0xFF) << 8) | (blue & 0xFF);
+    }
+}

libs/core/control.cpp

@@ -110,6 +110,7 @@ enum EventBusValue {
 };
 
 //% weight=1 color="#333333"
+//% advanced=true
 namespace control {
     void fiberDone(void *a)
     {
@@ -131,7 +132,7 @@ namespace control {
      */
     //% weight=30 async help=control/reset blockGap=8
     //% blockId="control_reset" block="reset"
-    void reset() { 
+    void reset() {
       microbit_reset();
     }
 
@@ -153,16 +154,16 @@ namespace control {
      */
     //% weight=21 blockGap=12 blockId="control_raise_event" block="raise event|from source %src=control_event_source_id|with value %value=control_event_value_id" blockExternalInputs=1
     //% mode.defl=CREATE_AND_FIRE
-    void raiseEvent(int src, int value, EventCreationMode mode) { 
-        MicroBitEvent evt(src, value, (MicroBitEventLaunchMode)mode); 
+    void raiseEvent(int src, int value, EventCreationMode mode) {
+        MicroBitEvent evt(src, value, (MicroBitEventLaunchMode)mode);
     }
 
     /**
      * Raises an event in the event bus.
      */
-    //% weight=20 blockGap=8 blockId="control_on_event" block="on event|from %src=control_event_source_id|with value %value=control_event_value_id" 
+    //% weight=20 blockGap=8 blockId="control_on_event" block="on event|from %src=control_event_source_id|with value %value=control_event_value_id"
     //% blockExternalInputs=1
-    void onEvent(int src, int value, Action handler) { 
+    void onEvent(int src, int value, Action handler) {
         registerWithDal(src, value, handler);
     }
 
@@ -174,7 +175,7 @@ namespace control {
     int eventValue() {
         return pxt::lastEvent.value;
     }
-    
+
     /**
     * Gets the timestamp of the last event executed on the bus
     */
@@ -183,15 +184,15 @@ namespace control {
     int eventTimestamp() {
         return pxt::lastEvent.timestamp;
     }
-    
+
     /**
      * Gets a friendly name for the device derived from the its serial number
      */
     //% blockId="control_device_name" block="device name" weight=10 blockGap=8
     StringData* deviceName() {
-        return ManagedString(microbit_friendly_name()).leakData();        
+        return ManagedString(microbit_friendly_name()).leakData();
     }
-    
+
     /**
     * Derive a unique, consistent serial number of this device from internal data.
     */

libs/core/control.ts

@@ -2,6 +2,7 @@
 * Runtime and event utilities.
 */
 //% weight=1 color="#333333"
+//% advanced=true
 namespace control {
 
     /**

libs/core/enums.d.ts

@@ -238,6 +238,8 @@ declare namespace control {
     // TODO DISPLAY_MODE_BLACK_AND_WHITE_LIGHT_SENSE
     }
 declare namespace led {
+}
+declare namespace motors {
 }
 
 

libs/core/game.ts

@@ -1,5 +1,5 @@
 enum Direction {
-    //% block=right    
+    //% block=right
     Right,
     //% block=left
     Left
@@ -22,6 +22,7 @@ enum LedSpriteProperty {
  * A single-LED sprite game engine
  */
 //% color=#008272 weight=32
+//% advanced=true
 namespace game {
     let _score: number = 0;
     let _life: number = 3;

libs/core/images.cpp

@@ -4,6 +4,7 @@
 * Creation, manipulation and display of LED images.
 */
 //% color=#5C2D91 weight=31
+//% advanced=true
 namespace images {
     /**
      * Creates an image that fits on the LED screen.
@@ -29,7 +30,7 @@ namespace images {
 namespace ImageMethods {
     /**
      * Plots the image at a given column to the screen
-     */            
+     */
     //% help=images/plot-image
     //% parts="ledmatrix"
     void plotImage(Image i, int xOffset = 0) {
@@ -46,7 +47,7 @@ namespace ImageMethods {
     void showImage(Image sprite, int xOffset) {
       uBit.display.print(MicroBitImage(sprite), -xOffset, 0, 0);
     }
-    
+
     /**
      * Draws the ``index``-th frame of the image on the screen.
      * @param xOffset column index to start displaying the image
@@ -57,7 +58,7 @@ namespace ImageMethods {
       // TODO showImage() used in original implementation
       plotImage(i, xOffset * 5);
     }
-    
+
     /**
      * Scrolls an image .
      * @param frameOffset x offset moved on each animation step, eg: 5, 1, -1

libs/core/input.cpp

@@ -89,7 +89,7 @@ enum class Gesture {
      * Raised when the screen is pointing right
      */
     //% block="tilt right"
-    TiltRight = MICROBIT_ACCELEROMETER_EVT_TILT_RIGHT,    
+    TiltRight = MICROBIT_ACCELEROMETER_EVT_TILT_RIGHT,
     /**
      * Raised when the board is falling!
      */
@@ -132,7 +132,7 @@ namespace input {
         if ((int)gesture == MICROBIT_ACCELEROMETER_EVT_3G && uBit.accelerometer.getRange() < 3)
             uBit.accelerometer.setRange(4);
         else if ((int)gesture == MICROBIT_ACCELEROMETER_EVT_6G && uBit.accelerometer.getRange() < 6)
-            uBit.accelerometer.setRange(8);            
+            uBit.accelerometer.setRange(8);
         registerWithDal(MICROBIT_ID_GESTURE, (int)gesture, body);
     }
 
@@ -159,6 +159,7 @@ namespace input {
      */
     //% help=input/on-pin-released weight=6 blockGap=8
     //% blockId=device_pin_released block="on pin %NAME|released" icon="\uf094"
+    //% advanced=true
     void onPinReleased(TouchPin name, Action body) {
         auto pin = getPin((int)name);
         if (!pin) return;
@@ -171,7 +172,7 @@ namespace input {
     /**
      * Get the button state (pressed or not) for ``A`` and ``B``.
      */
-    //% help=input/button-is-pressed weight=57
+    //% help=input/button-is-pressed weight=60
     //% block="button|%NAME|is pressed"
     //% blockId=device_get_button2
     //% icon="\uf192" blockGap=8
@@ -190,7 +191,7 @@ namespace input {
      * Get the pin state (pressed or not). Requires to hold the ground to close the circuit.
      * @param name pin used to detect the touch
      */
-    //% help=input/pin-is-pressed weight=56
+    //% help=input/pin-is-pressed weight=58
     //% blockId="device_pin_is_pressed" block="pin %NAME|is pressed" icon="\uf094"
     //% blockGap=8
     bool pinIsPressed(TouchPin name) {
@@ -198,10 +199,44 @@ namespace input {
         return pin && pin->isTouched();
     }
 
+    int getAccelerationStrength() {
+        double x = uBit.accelerometer.getX();
+        double y = uBit.accelerometer.getY();
+        double z = uBit.accelerometer.getZ();
+        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)
+     * @param dimension TODO
+     */
+    //% help=input/acceleration weight=58 icon="\uf135"
+    //% blockId=device_acceleration block="acceleration (mg)|%NAME" blockGap=8
+    //% parts="accelerometer"
+    int acceleration(Dimension dimension) {
+      switch (dimension) {
+      case Dimension::X: return uBit.accelerometer.getX();
+      case Dimension::Y: return uBit.accelerometer.getY();
+      case Dimension::Z: return uBit.accelerometer.getZ();
+      case Dimension::Strength: return getAccelerationStrength();
+      }
+      return 0;
+    }
+
+    /**
+     * Reads the light level applied to the LED screen in a range from ``0`` (dark) to ``255`` bright.
+     */
+    //% help=input/light-level weight=57
+    //% blockId=device_get_light_level block="light level" blockGap=8 icon="\uf185"
+    //% parts="ledmatrix"
+    int lightLevel() {
+        return uBit.display.readLightLevel();
+    }
+
     /**
      * Get the current compass heading in degrees.
      */
-    //% help=input/compass-heading 
+    //% help=input/compass-heading
     //% weight=56 icon="\uf14e"
     //% blockId=device_heading block="compass heading (°)" blockGap=8
     //% parts="compass"
@@ -221,54 +256,19 @@ namespace input {
         return uBit.thermometer.getTemperature();
     }
 
-    int getAccelerationStrength() {
-        double x = uBit.accelerometer.getX();
-        double y = uBit.accelerometer.getY();
-        double z = uBit.accelerometer.getZ();
-        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)
-     * @param dimension TODO
-     */
-    //% help=input/acceleration weight=54 icon="\uf135"
-    //% blockId=device_acceleration block="acceleration (mg)|%NAME" blockGap=8
-    //% parts="accelerometer"
-    int acceleration(Dimension dimension) {
-      switch (dimension) {
-      case Dimension::X: return uBit.accelerometer.getX();
-      case Dimension::Y: return uBit.accelerometer.getY();
-      case Dimension::Z: return uBit.accelerometer.getZ();
-      case Dimension::Strength: return getAccelerationStrength();
-      }
-      return 0;
-    }
-
-
-    /**
-     * Reads the light level applied to the LED screen in a range from ``0`` (dark) to ``255`` bright.
-     */
-    //% help=input/light-level weight=53
-    //% blockId=device_get_light_level block="light level" blockGap=8 icon="\uf185"
-    //% parts="ledmatrix"
-    int lightLevel() {
-        return uBit.display.readLightLevel();
-    }
-
     /**
      * The pitch or roll of the device, rotation along the ``x-axis`` or ``y-axis``, in degrees.
      * @param kind TODO
      */
     //% help=input/rotation weight=52
     //% blockId=device_get_rotation block="rotation (°)|%NAME" blockGap=8 icon="\uf197"
-    //% parts="accelerometer"
+    //% parts="accelerometer" advanced=true
     int rotation(Rotation kind) {
       switch (kind) {
       case Rotation::Pitch: return uBit.accelerometer.getPitch();
       case Rotation::Roll: return uBit.accelerometer.getRoll();
       }
-      return 0;        
+      return 0;
     }
 
     /**
@@ -278,6 +278,7 @@ namespace input {
     //% help=input/magnetic-force weight=51
     //% blockId=device_get_magnetic_force block="magnetic force (µT)|%NAME" blockGap=8 icon="\uf076"
     //% parts="compass"
+    //% advanced=true
     int magneticForce(Dimension dimension) {
       if (!uBit.compass.isCalibrated())
         uBit.compass.calibrate();
@@ -296,6 +297,7 @@ namespace input {
      */
     //% help=input/running-time weight=50
     //% blockId=device_get_running_time block="running time (ms)" icon="\uf017"
+    //% advanced=true
     int runningTime() {
         return system_timer_current_time();
     }
@@ -314,6 +316,7 @@ namespace input {
     //% blockId=device_set_accelerometer_range block="set accelerometer|range %range" icon="\uf135"
     //% weight=5
     //% parts="accelerometer"
+    //% advanced=true
     void setAccelerometerRange(AcceleratorRange range) {
         uBit.accelerometer.setRange((int)range);
     }

libs/core/led.cpp

@@ -19,7 +19,7 @@ namespace led {
     //% help=led/plot weight=78
     //% blockId=device_plot block="plot|x %x|y %y" icon="\uf205" blockGap=8
     //% parts="ledmatrix"
-    void plot(int x, int y) { 
+    void plot(int x, int y) {
       uBit.display.image.setPixelValue(x, y, 1);
     }
 
@@ -31,7 +31,7 @@ namespace led {
     //% help=led/unplot weight=77
     //% blockId=device_unplot block="unplot|x %x|y %y" icon="\uf204" blockGap=8
     //% parts="ledmatrix"
-    void unplot(int x, int y) { 
+    void unplot(int x, int y) {
       uBit.display.image.setPixelValue(x, y, 0);
     }
 
@@ -54,6 +54,7 @@ namespace led {
     //% help=led/brightness weight=60
     //% blockId=device_get_brightness block="brightness" icon="\uf042" blockGap=8
     //% parts="ledmatrix"
+    //% advanced=true
     int brightness() {
       return uBit.display.getBrightness();
     }
@@ -65,7 +66,8 @@ namespace led {
     //% help=led/set-brightness weight=59
     //% blockId=device_set_brightness block="set brightness %value" icon="\uf042"
     //% parts="ledmatrix"
-    void setBrightness(int value) { 
+    //% advanced=true
+    void setBrightness(int value) {
        uBit.display.setBrightness(value);
     }
 
@@ -75,7 +77,8 @@ namespace led {
     //% weight=50 help=led/stop-animation
     //% blockId=device_stop_animation block="stop animation" icon="\uf04d"
     //% parts="ledmatrix"
-    void stopAnimation() { 
+    //% advanced=true
+    void stopAnimation() {
        uBit.display.stopAnimation();
     }
 
@@ -85,7 +88,7 @@ namespace led {
      */
     //% weight=1 help=led/set-display-mode
     //% parts="ledmatrix"
-    void setDisplayMode(DisplayMode_ mode) { 
+    void setDisplayMode(DisplayMode_ mode) {
         uBit.display.setDisplayMode((DisplayMode)mode);
     }
 

libs/core/motors.cpp

@@ -0,0 +1,17 @@
+#include "ksbit.h"
+
+/**
+* Blocks to control the onboard motors
+*/
+//% weight=30
+namespace motors {
+    /**
+    * Controls the power sent to a single motor
+    * @param power %percent of power sent to the motor. Negative power goes backward. eg: 50
+    */
+    //% blockId=motor_on block="motor on at %percent|%"
+    //% parts=dcmotor
+    void motorOn(int power) {
+        uBit.soundmotor.Motor_On(power);
+    }
+}

libs/core/parts/dcmotor.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="488" height="836" viewBox="0 0 488 836">
+  <g transform="translate(0 -216.362)">
+    <rect width="34.286" height="122.532" x="226.365" y="929.711" fill="#ccc" ry="16.162"/>
+    <path fill="gray" d="M23.23 359.456A23.233 23.233 0 0 0 0 382.686v511.428a23.233 23.233 0 0 0 23.23 23.23h38.2v24.117a23.233 23.233 0 0 0 23.23 23.234h317.143a23.233 23.233 0 0 0 23.23-23.23v-24.118h38.197a23.233 23.233 0 0 0 23.23-23.23v-511.43a23.233 23.233 0 0 0-23.23-23.23h-440z"/>
+    <path fill="#333" d="M23.23 357.82C10.4 357.82.002 368.22 0 381.05v511.427c.002 12.83 10.4 23.23 23.23 23.23h38.2v24.118c2.08 25.815 20.27 23.748 33.1 23.75 0 0-11.976-16.96-12.05-40.988-.057-17.923-9.03-12.008-8.176-39.76 2.743-237.84-2.423-390.158.37-522.93z"/>
+    <path fill="#fd5" d="M23.508 286.934A23.51 18.415 0 0 0 0 305.347v69.375a23.51 18.415 0 0 0 23.508 18.413h440a23.51 18.415 0 0 0 23.508-18.413v-69.375a23.51 18.415 0 0 0-23.508-18.413h-440z"/>
+    <path fill="#c87137" d="M77.156 216.362c-5.698 0-10.283 4.588-10.283 10.286v94.03c0 5.7 4.585 10.286 10.283 10.286h24.98c5.697 0 10.284-4.587 10.284-10.285v-94.034c0-5.698-4.587-10.286-10.285-10.286h-24.98zm10.18 10.37h4.018c5.095 0 9.197 4.103 9.197 9.2v28.032c0 5.096-4.1 9.197-9.194 9.197h-4.018c-5.096 0-9.2-4.1-9.2-9.194V235.93c0-5.095 4.104-9.197 9.2-9.197zm288.814-10.37c-5.697 0-10.283 4.588-10.283 10.286v94.03c0 5.7 4.586 10.286 10.283 10.286h24.98c5.697 0 10.284-4.587 10.284-10.285v-94.034c0-5.698-4.587-10.286-10.285-10.286h-24.98zm11.045 11.885h4.02c5.095 0 9.197 4.102 9.197 9.197v28.032c0 5.095-4.102 9.2-9.197 9.2h-4.02c-5.095 0-9.197-4.105-9.197-9.2v-28.032c0-5.095 4.102-9.197 9.197-9.197z"/>
+    <path fill="#fc0" d="M170.587 306.637a17.633 17.633 0 0 0-17.63 17.63v67.587a17.633 17.633 0 0 0 17.63 17.63h34.852v20.57c0 15.162 12.756 27.915 27.913 27.915h24.976c15.157 0 27.916-12.756 27.916-27.917v-20.57h38.612a17.633 17.633 0 0 0 17.63-17.63v-67.587a17.633 17.633 0 0 0-17.63-17.63H170.585z"/>
+    <rect width="126.356" height="29.385" x="272.569" y="914.707" fill="#b3b3b3" ry="14.693"/>
+    <rect width="169.991" height="457.913" x="300.928" y="430.348" fill="#b3b3b3" ry="27.415"/>
+  </g>
+</svg>

libs/core/pins.ts

@@ -2,6 +2,7 @@
  * Control currents in Pins for analog/digital signals, servos, i2c, ...
  */
 //% color=#A80000 weight=30
+//% advanced=true
 namespace pins {
     /**
      * Re-maps a number from one range to another. That is, a value of ``from low`` would get mapped to ``to low``, a value of ``from high`` to ``to high``, values in-between to values in-between, etc.

libs/core/pxt.json

@@ -22,6 +22,7 @@
         "game.ts",
         "led.cpp",
         "led.ts",
+        "motors.cpp",
         "music.ts",
         "pins.cpp",
         "pins.ts",
@@ -31,6 +32,7 @@
         "pxtparts.json",
         "parts/speaker.svg",
         "parts/headphone.svg",
+        "parts/dcmotor.svg",
         "_locales/fr/microbit-jsdoc-strings.json"
     ],
     "public": true,

libs/core/pxtparts.json

@@ -144,5 +144,26 @@
             {"part": true, "pinIndices": [0]},
             {"pinIndices": [1]}
         ]
-    }
+    },
+    "dcmotor": {
+        "numberOfPins": 2,
+        "visual": {
+            "image": "parts/dcmotor.svg",
+            "width": 488,
+            "height": 836,
+            "pinDistance": 65,
+            "pinLocations": [
+                {"x": 89, "y": 48},
+                {"x": 395, "y": 48}            ]
+        },
+        "pinDefinitions": [
+            { "target": "P1", "style": "croc", "orientation": "-Z"},
+            { "target": "ground", "style": "croc", "orientation": "-Z"}
+        ],
+        "instantiation": {"kind": "singleton"},
+        "assembly": [
+            {"part": true, "pinIndices": [0]},
+            {"pinIndices": [1]}
+        ]
+    }    
 }

libs/core/serial.cpp

@@ -20,9 +20,10 @@ enum class BaudRate {
 };
 
 //% weight=2 color=30
+//% advanced=true
 namespace serial {
     // note that at least one // followed by % is needed per declaration!
-    
+
     /**
      * Reads a line of text from the serial port.
      */
@@ -39,10 +40,10 @@ namespace serial {
     //% help=serial/write-string
     //% weight=87
     //% blockId=serial_writestring block="serial write string %text"
-    void writeString(StringData *text) { 
+    void writeString(StringData *text) {
       uBit.serial.send(ManagedString(text));
     }
-    
+
     /**
     * Registers an event to be fired when one of the delimiter is matched
     * @param delimiters the characters to match received characters against. eg:"\n"
@@ -53,7 +54,7 @@ namespace serial {
       uBit.serial.eventOn(ManagedString(delimiters));
       registerWithDal(MICROBIT_ID_SERIAL, MICROBIT_SERIAL_EVT_DELIM_MATCH, body);
     }
-    
+
     /**
     * Dynamically configuring the serial instance to use pins other than USBTX and USBRX.
     * @param tx the new transmission pins

libs/core/serial.ts

@@ -2,6 +2,7 @@
  * Reading and writing data over a serial connection.
  */
 //% weight=2 color=#002050
+//% advanced=true
 namespace serial {
     /**
      * Prints a line of text to the serial

libs/core/shims.d.ts

@@ -5,6 +5,7 @@
      * Creation, manipulation and display of LED images.
      */
     //% color=#5C2D91 weight=31
+    //% advanced=true
 declare namespace images {
 
     /**
@@ -128,6 +129,13 @@ declare interface Image {
     //% color=#0078D7 weight=100
 declare namespace basic {
 
+    /**
+     * Sets the color on the build-in LED. Set to 0 to turn off.
+     */
+    //% blockId=device_set_led_color block="set led to %color=color_id" icon="\uf00a"
+    //% weight=50 shim=basic::setLedColor
+    function setLedColor(color: number): void;
+
     /**
      * Scroll a number on the screen. If the number fits on the screen (i.e. is a single digit), do not scroll.
      * @param interval speed of scroll; eg: 150, 100, 200, -100
@@ -247,13 +255,14 @@ declare namespace input {
      * @param body the code to run when the pin is released
      */
     //% help=input/on-pin-released weight=6 blockGap=8
-    //% blockId=device_pin_released block="on pin %NAME|released" icon="\uf094" shim=input::onPinReleased
+    //% blockId=device_pin_released block="on pin %NAME|released" icon="\uf094"
+    //% advanced=true shim=input::onPinReleased
     function onPinReleased(name: TouchPin, body: () => void): void;
 
     /**
      * Get the button state (pressed or not) for ``A`` and ``B``.
      */
-    //% help=input/button-is-pressed weight=57
+    //% help=input/button-is-pressed weight=60
     //% block="button|%NAME|is pressed"
     //% blockId=device_get_button2
     //% icon="\uf192" blockGap=8
@@ -264,15 +273,32 @@ declare namespace input {
      * Get the pin state (pressed or not). Requires to hold the ground to close the circuit.
      * @param name pin used to detect the touch
      */
-    //% help=input/pin-is-pressed weight=56
+    //% help=input/pin-is-pressed weight=58
     //% blockId="device_pin_is_pressed" block="pin %NAME|is pressed" icon="\uf094"
     //% blockGap=8 shim=input::pinIsPressed
     function pinIsPressed(name: TouchPin): boolean;
 
+    /**
+     * Get the acceleration value in milli-gravitys (when the board is laying flat with the screen up, x=0, y=0 and z=-1024)
+     * @param dimension TODO
+     */
+    //% help=input/acceleration weight=58 icon="\uf135"
+    //% blockId=device_acceleration block="acceleration (mg)|%NAME" blockGap=8
+    //% parts="accelerometer" shim=input::acceleration
+    function acceleration(dimension: Dimension): number;
+
+    /**
+     * Reads the light level applied to the LED screen in a range from ``0`` (dark) to ``255`` bright.
+     */
+    //% help=input/light-level weight=57
+    //% blockId=device_get_light_level block="light level" blockGap=8 icon="\uf185"
+    //% parts="ledmatrix" shim=input::lightLevel
+    function lightLevel(): number;
+
     /**
      * Get the current compass heading in degrees.
      */
-    //% help=input/compass-heading 
+    //% help=input/compass-heading
     //% weight=56 icon="\uf14e"
     //% blockId=device_heading block="compass heading (°)" blockGap=8
     //% parts="compass" shim=input::compassHeading
@@ -287,30 +313,13 @@ declare namespace input {
     //% parts="thermometer" shim=input::temperature
     function temperature(): number;
 
-    /**
-     * Get the acceleration value in milli-gravitys (when the board is laying flat with the screen up, x=0, y=0 and z=-1024)
-     * @param dimension TODO
-     */
-    //% help=input/acceleration weight=54 icon="\uf135"
-    //% blockId=device_acceleration block="acceleration (mg)|%NAME" blockGap=8
-    //% parts="accelerometer" shim=input::acceleration
-    function acceleration(dimension: Dimension): number;
-
-    /**
-     * Reads the light level applied to the LED screen in a range from ``0`` (dark) to ``255`` bright.
-     */
-    //% help=input/light-level weight=53
-    //% blockId=device_get_light_level block="light level" blockGap=8 icon="\uf185"
-    //% parts="ledmatrix" shim=input::lightLevel
-    function lightLevel(): number;
-
     /**
      * The pitch or roll of the device, rotation along the ``x-axis`` or ``y-axis``, in degrees.
      * @param kind TODO
      */
     //% help=input/rotation weight=52
     //% blockId=device_get_rotation block="rotation (°)|%NAME" blockGap=8 icon="\uf197"
-    //% parts="accelerometer" shim=input::rotation
+    //% parts="accelerometer" advanced=true shim=input::rotation
     function rotation(kind: Rotation): number;
 
     /**
@@ -319,14 +328,16 @@ declare namespace input {
      */
     //% help=input/magnetic-force weight=51
     //% blockId=device_get_magnetic_force block="magnetic force (µT)|%NAME" blockGap=8 icon="\uf076"
-    //% parts="compass" shim=input::magneticForce
+    //% parts="compass"
+    //% advanced=true shim=input::magneticForce
     function magneticForce(dimension: Dimension): number;
 
     /**
      * Gets the number of milliseconds elapsed since power on.
      */
     //% help=input/running-time weight=50
-    //% blockId=device_get_running_time block="running time (ms)" icon="\uf017" shim=input::runningTime
+    //% blockId=device_get_running_time block="running time (ms)" icon="\uf017"
+    //% advanced=true shim=input::runningTime
     function runningTime(): number;
 
     /**
@@ -342,13 +353,15 @@ declare namespace input {
     //% help=input/set-accelerometer-range
     //% blockId=device_set_accelerometer_range block="set accelerometer|range %range" icon="\uf135"
     //% weight=5
-    //% parts="accelerometer" shim=input::setAccelerometerRange
+    //% parts="accelerometer"
+    //% advanced=true shim=input::setAccelerometerRange
     function setAccelerometerRange(range: AcceleratorRange): void;
 }
 
 
 
     //% weight=1 color="#333333"
+    //% advanced=true
 declare namespace control {
 
     /**
@@ -386,7 +399,7 @@ declare namespace control {
     /**
      * Raises an event in the event bus.
      */
-    //% weight=20 blockGap=8 blockId="control_on_event" block="on event|from %src=control_event_source_id|with value %value=control_event_value_id" 
+    //% weight=20 blockGap=8 blockId="control_on_event" block="on event|from %src=control_event_source_id|with value %value=control_event_value_id"
     //% blockExternalInputs=1 shim=control::onEvent
     function onEvent(src: number, value: number, handler: () => void): void;
 
@@ -457,7 +470,8 @@ declare namespace led {
      */
     //% help=led/brightness weight=60
     //% blockId=device_get_brightness block="brightness" icon="\uf042" blockGap=8
-    //% parts="ledmatrix" shim=led::brightness
+    //% parts="ledmatrix"
+    //% advanced=true shim=led::brightness
     function brightness(): number;
 
     /**
@@ -466,7 +480,8 @@ declare namespace led {
      */
     //% help=led/set-brightness weight=59
     //% blockId=device_set_brightness block="set brightness %value" icon="\uf042"
-    //% parts="ledmatrix" shim=led::setBrightness
+    //% parts="ledmatrix"
+    //% advanced=true shim=led::setBrightness
     function setBrightness(value: number): void;
 
     /**
@@ -474,7 +489,8 @@ declare namespace led {
      */
     //% weight=50 help=led/stop-animation
     //% blockId=device_stop_animation block="stop animation" icon="\uf04d"
-    //% parts="ledmatrix" shim=led::stopAnimation
+    //% parts="ledmatrix"
+    //% advanced=true shim=led::stopAnimation
     function stopAnimation(): void;
 
     /**
@@ -492,6 +508,22 @@ declare namespace led {
     //% parts="ledmatrix" shim=led::screenshot
     function screenshot(): Image;
 }
+
+
+    /**
+     * Blocks to control the onboard motors
+     */
+    //% weight=30
+declare namespace motors {
+
+    /**
+     * Controls the power sent to a single motor
+     * @param power %percent of power sent to the motor. Negative power goes backward. eg: 50
+     */
+    //% blockId=motor_on block="motor on at %percent|%"
+    //% parts=dcmotor shim=motors::motorOn
+    function motorOn(power: number): void;
+}
 declare namespace pins {
 
     /**
@@ -636,6 +668,7 @@ declare namespace pins {
 
 
     //% weight=2 color=30
+    //% advanced=true
 declare namespace serial {
 
     /**

libs/hello/pxt.json

@@ -6,6 +6,6 @@
     ],
     "public": true,
     "dependencies": {
-        "core": "file:../core",
+        "core": "file:../core"
     }
 }

libs/microbit/basic.ts

@@ -1,56 +0,0 @@
-/**
-  Well known colors
-*/
-enum Colors {
-    //% blockIdentity=basic.color
-    //% block=red
-    Red = 0xFF0000,
-    //% blockIdentity=basic.color
-    //% block=orange
-    Orange = 0xFFA500,
-    //% blockIdentity=basic.color
-    //% block=yellow
-    Yellow = 0xFFFF00,
-    //% blockIdentity=basic.color
-    //% block=green
-    Green = 0x00FF00,
-    //% blockIdentity=basic.color
-    //% block=blue
-    Blue = 0x0000FF,
-    //% blockIdentity=basic.color
-    //% block=indigo
-    Indigo = 0x4b0082,
-    //% blockIdentity=basic.color
-    //% block=violet
-    Violet = 0x8a2be2,
-    //% blockIdentity=basic.color
-    //% block=purple
-    Purple = 0xFF00FF,
-    //% blockIdentity=basic.color
-    //% block=white
-    White = 0xFFFFFF
-}
-
-/**
- * Provides access to basic micro:bit functionality.
- */
-//% color=#0078D7 weight=100
-namespace basic {
-
-    /**
-    * Sets the color on the build-in LED
-    */
-    //% blockId=device_set_led_color block="set led to %color=color_id" icon="\uf00a"
-    //% weight=50
-    export function setLedColor(color: number) {
-        // TODO
-    }
-
-    /**
-     * Converts the color name to a number
-     */
-    //% blockId=color_id block="%c" shim=TD_ID
-    export function color(c: Colors): number {
-        return c;
-    }
-}

libs/radio/radio.cpp

@@ -9,12 +9,12 @@ namespace radio {
 
     // -------------------------------------------------------------------------
     // Radio
-    // -------------------------------------------------------------------------    
+    // -------------------------------------------------------------------------
     bool radioEnabled = false;
     bool transmitSerialNumber = false;
-    
+
     PacketBuffer packet;
-    
+
     int radioEnable() {
         int r = uBit.radio.enable();
         if (r != MICROBIT_OK) {
@@ -32,7 +32,7 @@ namespace radio {
         if (radioEnable() != MICROBIT_OK) return;
         uBit.radio.event.eventReceived(MicroBitEvent(MES_BROADCAST_GENERAL_ID, message, CREATE_ONLY));
     }
-        
+
     void onBroadcastMessageReceived(int message, Action f) {
         if (radioEnable() != MICROBIT_OK) return;
         registerWithDal(MES_BROADCAST_GENERAL_ID, message, f);
@@ -40,18 +40,18 @@ namespace radio {
 
     /**
      * Broadcasts a number over radio to any connected micro:bit in the group.
-     */    
+     */
     //% help=radio/send-number
     //% weight=60
     //% blockId=radio_datagram_send block="radio send number %value" blockGap=8
-    void sendNumber(int value) { 
-        if (radioEnable() != MICROBIT_OK) return;        
+    void sendNumber(int value) {
+        if (radioEnable() != MICROBIT_OK) return;
         uint32_t t = system_timer_current_time();
         uint32_t sn = transmitSerialNumber ? microbit_serial_number() : 0;
-        uint32_t buf[] = { (uint32_t)value, t, sn };        
+        uint32_t buf[] = { (uint32_t)value, t, sn };
         uBit.radio.datagram.send((uint8_t*)buf, 3*sizeof(uint32_t));
     }
-    
+
     /**
     * Broadcasts a name / value pair along with the device serial number
     * and running time to any connected micro:bit in the group.
@@ -64,8 +64,8 @@ namespace radio {
     void sendValue(StringData* name, int value) {
         if (radioEnable() != MICROBIT_OK) return;
 
-        ManagedString n(name);     
-        uint32_t t = system_timer_current_time();           
+        ManagedString n(name);
+        uint32_t t = system_timer_current_time();
         uint32_t sn = transmitSerialNumber ? microbit_serial_number() : 0;
         uint8_t buf[32];
         uint32_t* buf32 = (uint32_t*)buf;
@@ -75,28 +75,28 @@ namespace radio {
         buf32[2] = sn; // 4 bytes: serial number
         uint8_t len = min(MAX_FIELD_NAME_LENGTH, n.length());          // 1 byte: string length
         if (len > 0) {
-            buf[12] = len;                          // 
-            memcpy(buf + 13, n.toCharArray(), len); // 13-25: field name            
+            buf[12] = len;                          //
+            memcpy(buf + 13, n.toCharArray(), len); // 13-25: field name
         }
         uBit.radio.datagram.send(buf, 13 + len);
     }
-    
+
     /**
      * Broadcasts a number over radio to any connected micro:bit in the group.
-     */    
+     */
     //% help=radio/send-string
     //% weight=58
     //% blockId=radio_datagram_send_string block="radio send string %msg"
     void sendString(StringData* msg) {
-        if (radioEnable() != MICROBIT_OK) return;        
-        
+        if (radioEnable() != MICROBIT_OK) return;
+
         ManagedString s(msg);
         if (s.length() > MICROBIT_RADIO_MAX_PACKET_SIZE)
             s = s.substring(0, MICROBIT_RADIO_MAX_PACKET_SIZE);
-        
+
         uBit.radio.datagram.send(s);
     }
-            
+
     /**
     * Reads a value sent with `stream value` and writes it
     * to the serial stream as JSON
@@ -104,29 +104,30 @@ namespace radio {
     //% help=radio/write-value-to-serial
     //% weight=3
     //% blockId=radio_write_value_serial block="radio write value to serial"
+    //% advanced=true
     void writeValueToSerial() {
         if (radioEnable() != MICROBIT_OK) return;
         PacketBuffer p = uBit.radio.datagram.recv();
         int length = p.length();
         uint8_t* bytes = p.getBytes();
         int value;
-        
+
         uBit.serial.send("{");
         if (length >= 4) {
             memcpy(&value, bytes, 4);
             uBit.serial.send("\"v\":"); uBit.serial.send(value);
             if(length >= 8) {
                 memcpy(&value, bytes + 4, 4);
-                uBit.serial.send(",\"t\":"); uBit.serial.send(value);                
+                uBit.serial.send(",\"t\":"); uBit.serial.send(value);
                 if (length >= 12) {
                     memcpy(&value, bytes + 8, 4);
-                    uBit.serial.send(",\"s\":"); uBit.serial.send(value);                                    
+                    uBit.serial.send(",\"s\":"); uBit.serial.send(value);
                     if (length >= 13) {
                         char name[MAX_FIELD_NAME_LENGTH+1];
                         uint8_t len = min(MAX_FIELD_NAME_LENGTH, bytes[12]);
                         memcpy(name, bytes + 13, len);
                         name[len] = 0;
-                        uBit.serial.send(",\"n\":\""); uBit.serial.send(name); uBit.serial.send("\"");                                    
+                        uBit.serial.send(",\"n\":\""); uBit.serial.send(name); uBit.serial.send("\"");
                     }
                 }
             }
@@ -151,7 +152,7 @@ namespace radio {
         }
         return 0;
     }
-    
+
     /**
      * Reads the next packet as a number from the radio queue.
      */
@@ -173,12 +174,12 @@ namespace radio {
     //% blockId=radio_datagram_received_event block="radio on data received" blockGap=8
     void onDataReceived(Action body) {
         if (radioEnable() != MICROBIT_OK) return;
-        registerWithDal(MICROBIT_ID_RADIO, MICROBIT_RADIO_EVT_DATAGRAM, body);    
+        registerWithDal(MICROBIT_ID_RADIO, MICROBIT_RADIO_EVT_DATAGRAM, body);
         // make the the receive buffer has a free spot
         receiveNumber();
     }
 
-    
+
     /**
     * Reads the next packet as a string and returns it.
     */
@@ -188,9 +189,9 @@ namespace radio {
     StringData* receiveString() {
         if (radioEnable() != MICROBIT_OK) return ManagedString().leakData();
         packet = uBit.radio.datagram.recv();
-        return ManagedString(packet).leakData();        
+        return ManagedString(packet).leakData();
     }
-    
+
     /**
      * Gets the received signal strength indicator (RSSI) from the packet received by ``receive number``. Not supported in simulator.
      * namespace=radio
@@ -198,6 +199,7 @@ namespace radio {
     //% help=radio/received-signal-strength
     //% weight=40
     //% blockId=radio_datagram_rssi block="radio received signal strength"
+    //% advanced=true
     int receivedSignalStrength() {
         if (radioEnable() != MICROBIT_OK) return 0;
         return packet.getRSSI();
@@ -208,13 +210,13 @@ namespace radio {
      * @ param id the group id between ``0`` and ``255``, 1 eg
      */
     //% help=radio/set-group
-    //% weight=10 blockGap=8
+    //% weight=10 blockGap=8 advanced=true
     //% blockId=radio_set_group block="radio set group %ID"
     void setGroup(int id) {
         if (radioEnable() != MICROBIT_OK) return;
         uBit.radio.setGroup(id);
     }
-    
+
     /**
      * Change the output power level of the transmitter to the given value.
     * @param power a value in the range 0..7, where 0 is the lowest power and 7 is the highest. eg: 7
@@ -222,17 +224,20 @@ namespace radio {
     //% help=radio/set-transmit-power
     //% weight=9 blockGap=8
     //% blockId=radio_set_transmit_power block="radio set transmit power %power"
+    //% advanced=true
     void setTransmitPower(int power) {
         if (radioEnable() != MICROBIT_OK) return;
         uBit.radio.setTransmitPower(power);
     }
-    
+
     /**
     * Set the radio to transmit the serial number in each message.
+    * @param transmit value indicating if the serial number is transmitted, eg: true
     */
     //% help=radio/set-transmit-serial-number
     //% weight=8 blockGap=8
     //% blockId=radio_set_transmit_serial_number block="radio set transmit serial number %transmit"
+    //% advanced=true
     void setTransmitSerialNumber(bool transmit) {
         if (radioEnable() != MICROBIT_OK) return;
         transmitSerialNumber = transmit;

libs/radio/shims.d.ts

@@ -38,7 +38,8 @@ declare namespace radio {
      */
     //% help=radio/write-value-to-serial
     //% weight=3
-    //% blockId=radio_write_value_serial block="radio write value to serial" shim=radio::writeValueToSerial
+    //% blockId=radio_write_value_serial block="radio write value to serial"
+    //% advanced=true shim=radio::writeValueToSerial
     function writeValueToSerial(): void;
 
     /**
@@ -79,7 +80,8 @@ declare namespace radio {
      */
     //% help=radio/received-signal-strength
     //% weight=40
-    //% blockId=radio_datagram_rssi block="radio received signal strength" shim=radio::receivedSignalStrength
+    //% blockId=radio_datagram_rssi block="radio received signal strength"
+    //% advanced=true shim=radio::receivedSignalStrength
     function receivedSignalStrength(): number;
 
     /**
@@ -87,7 +89,7 @@ declare namespace radio {
      * @ param id the group id between ``0`` and ``255``, 1 eg
      */
     //% help=radio/set-group
-    //% weight=10 blockGap=8
+    //% weight=10 blockGap=8 advanced=true
     //% blockId=radio_set_group block="radio set group %ID" shim=radio::setGroup
     function setGroup(id: number): void;
 
@@ -97,15 +99,18 @@ declare namespace radio {
      */
     //% help=radio/set-transmit-power
     //% weight=9 blockGap=8
-    //% blockId=radio_set_transmit_power block="radio set transmit power %power" shim=radio::setTransmitPower
+    //% blockId=radio_set_transmit_power block="radio set transmit power %power"
+    //% advanced=true shim=radio::setTransmitPower
     function setTransmitPower(power: number): void;
 
     /**
      * Set the radio to transmit the serial number in each message.
+     * @param transmit value indicating if the serial number is transmitted, eg: true
      */
     //% help=radio/set-transmit-serial-number
     //% weight=8 blockGap=8
-    //% blockId=radio_set_transmit_serial_number block="radio set transmit serial number %transmit" shim=radio::setTransmitSerialNumber
+    //% blockId=radio_set_transmit_serial_number block="radio set transmit serial number %transmit"
+    //% advanced=true shim=radio::setTransmitSerialNumber
     function setTransmitSerialNumber(transmit: boolean): void;
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-calliope",
-  "version": "0.5.1",
+  "version": "0.5.6",
   "description": "calliope target for PXT",
   "keywords": [
     "JavaScript",
@@ -29,6 +29,6 @@
     "typescript": "^1.8.7"
   },
   "dependencies": {
-    "pxt-core": "0.4.51"
+    "pxt-core": "0.4.54"
   }
 }

sim/state/rgbled.ts

@@ -1,5 +1,6 @@
 namespace pxsim.basic {
     export function setLedColor(c: number) {
         board().rgbLedState = c;
+        runtime.queueDisplayUpdate()
     }
 }

sim/state/soundmotor.ts

@@ -0,0 +1,5 @@
+namespace pxsim.motors {
+    export function motorOn(power: number) {
+        // TODO
+    }
+}

sim/visuals/microbit.ts

@@ -352,8 +352,16 @@ namespace pxsim.visuals {
             let state = this.board;
             if (state.rgbLedState) {
                 if (!this.rgbLed)
-                    this.rgbLed = svg.child(this.g, "circle", { cx: 170, cy: 200 });
-                svg.fill(this.rgbLed, svg.toHtmlColor(state.rgbLedState));
+                    this.rgbLed = svg.child(this.g, "circle", { cx: 170, cy: 190, r:5 });
+                const c = state.rgbLedState;
+                const b = c & 0xFF;
+                const g = (c >> 8) & 0xFF;
+                const r = (c >> 16) & 0xFF;
+                const w = (c >> 24) & 0xFF;
+                const ch =  `rgba(${r}, ${g}, ${b}, 1)`;
+                svg.fill(this.rgbLed, ch);
+            } else if (this.rgbLed) {
+                svg.fill(this.rgbLed, 'white');
             }
         }