0.6.29

Theming the microbit target

libs/bluetooth/pxt.json

@@ -34,7 +34,7 @@
                     "eddystone_uid": 0,
                     "pairing_mode": 1,
                     "open": 0,
-                    "security_level": "SECURITY_MODE_ENCRYPTION_WITH_MITM"
+                    "security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM"
                 }
             },
             "gatt_table_size": "0x700"
@@ -46,7 +46,21 @@
                     "microbit-dal": {
                         "bluetooth": {
                             "open": 1,
+                            "pairing_mode": 0,                            
+                            "white_list": 0,
+                            "security_level": null
+                        }
+                    }
+                }
+            },
+            {
+                "description": "JustWorks pairing (default): Button press to pair via Bluetooth.",
+                "config": {
+                    "microbit-dal": {
+                        "bluetooth": {
+                            "open": null,
                             "pairing_mode": null,
+                            "white_list": null,
                             "security_level": null
                         }
                     }
@@ -59,6 +73,7 @@
                         "bluetooth": {
                             "open": 0,
                             "pairing_mode": 1,
+                            "white_list": 1,
                             "security_level": "SECURITY_MODE_ENCRYPTION_WITH_MITM"
                         }
                     }

libs/core/_locales/core-strings.json

@@ -9,6 +9,8 @@
   "AcceleratorRange.TwoG|block": "2g",
   "BaudRate.BaudRate115200|block": "115200",
   "BaudRate.BaudRate9600|block": "9600",
+  "BeatFraction.Breve|block": "4",
+  "BeatFraction.Double|block": "2",
   "BeatFraction.Eighth|block": "1/8",
   "BeatFraction.Half|block": "1/2",
   "BeatFraction.Quarter|block": "1/4",
@@ -129,6 +131,7 @@
   "input.temperature|block": "temperature (°C)",
   "input|block": "input",
   "led.brightness|block": "brightness",
+  "led.enable|block": "led enable %on",
   "led.plotBarGraph|block": "plot bar graph of %value |up to %high",
   "led.plot|block": "plot|x %x|y %y",
   "led.point|block": "point|x %x|y %y",

libs/core/led.cpp

@@ -95,7 +95,7 @@ namespace led {
     /**
     * Turns on or off the display    
     */
-    //% help=led/enable blockId=device_led_enable icon="\uf04d"
+    //% help=led/enable blockId=device_led_enable block="led enable %on" icon="\uf04d"
     //% advanced=true parts="ledmatrix"
     void enable(bool on) {
         if (on) uBit.display.enable();

libs/core/music.ts

@@ -119,7 +119,11 @@ enum BeatFraction {
     //% block="1/8"
     Eighth = 8,
     //% block="1/16"
-    Sixteenth = 16
+    Sixteenth = 16,
+    //% block="2"
+    Double = 32,
+    //% block="4",
+    Breve = 64
 }
 
 /**
@@ -188,11 +192,15 @@ namespace music {
         init();
         if (fraction == null) fraction = BeatFraction.Whole;
         let beat = 60000 / beatsPerMinute;
-        if (fraction == BeatFraction.Whole) return beat;
-        else if (fraction == BeatFraction.Half) return beat / 2;
-        else if (fraction == BeatFraction.Quarter) return beat / 4
-        else if (fraction == BeatFraction.Eighth) return beat / 8;
-        else return beat / 16;
+        switch (fraction) {
+            case BeatFraction.Half: return beat / 2;
+            case BeatFraction.Quarter: return beat / 4;
+            case BeatFraction.Eighth: return beat / 8;
+            case BeatFraction.Sixteenth: return beat / 16;
+            case BeatFraction.Double: return beat * 2;
+            case BeatFraction.Breve: return beat * 4;
+            default: return beat;
+        }
     }
 
     /**

libs/core/shims.d.ts

@@ -497,7 +497,7 @@ declare namespace led {
     /**
      * Turns on or off the display    
      */
-    //% help=led/enable blockId=device_led_enable icon="\uf04d"
+    //% help=led/enable blockId=device_led_enable block="led enable %on" icon="\uf04d"
     //% advanced=true parts="ledmatrix" shim=led::enable
     function enable(on: boolean): void;
 

libs/devices/pxt.json

@@ -1,6 +1,6 @@
 {
     "name": "devices",
-    "description": "The BLE specific services",
+    "description": "Camera, remote control and other Bluetooth services",
     "files": [
         "README.md",
         "enums.d.ts",
@@ -9,16 +9,8 @@
     ],
     "public": true,
     "dependencies": {
-        "core": "file:../core"
-    },
-    "yotta": {
-        "config": {
-            "microbit-dal": {
-                "bluetooth": {
-                    "enabled": 1
-                }
-            }
-        }
+        "core": "file:../core",
+        "bluetooth": "file:../bluetooth"
     },
     "installedVersion": "ljipgq"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-microbit",
-  "version": "0.6.23",
+  "version": "0.6.29",
   "description": "micro:bit target for PXT",
   "keywords": [
     "JavaScript",
@@ -34,6 +34,6 @@
     "semantic-ui-less": "^2.2.4"
   },
   "dependencies": {
-    "pxt-core": "0.5.85"
+    "pxt-core": "0.5.90"
   }
 }

pxtarget.json

@@ -173,15 +173,16 @@
     "appTheme": {
         "accentColor": "#5C005C",
         "logoUrl": "http://microbit.org/",
-        "logo": "./static/logo.portrait.black.svg",
+        "logo": "./static/logo.portrait.white.svg",
         "docsLogo": "./static/logo.square.white.svg",
-        "portraitLogo": "./static/logo.square.black.svg",
+        "portraitLogo": "./static/logo.square.white.svg",
         "footerLogo": "./static/logo.portrait.black.svg",
         "cardLogo": "./static/icons/apple-touch-icon.png",
         "appLogo": "./static/icons/apple-touch-icon.png",
         "organization": "Microsoft",
         "organizationUrl": "https://pxt.io/",
         "organizationLogo": "./static/Microsoft-logo_rgb_c-gray.png",
+        "organizationWideLogo": "./static/Microsoft-logo_rgb_c-white.png",
         "homeUrl": "https://pxt.microbit.org/",
         "embedUrl": "https://pxt.microbit.org/",
         "privacyUrl": "https://go.microsoft.com/fwlink/?LinkId=521839",
@@ -311,6 +312,16 @@
                 "browser": "*",
                 "path": "/static/mb/device/usb-windows-sendto.jpg"
             }
-        ]
+        ],
+        "invertedMenu": true,
+        "coloredToolbox": true,
+        "blocklyOptions": { 
+            "grid": {
+                "spacing": 45,
+                "length": 7,
+                "colour": "rgba(189, 195, 199, 0.30)",
+                "snap": false
+            }
+        }
     }
 }

theme/site/collections/menu.variables

@@ -1,3 +1,12 @@
 /*******************************
     User Variable Overrides
 *******************************/
+
+@invertedBackground: #525A67;
+
+/*******************************
+    PXT Theme Overrides
+*******************************/
+
+@mainMenuHeight: 5rem;
+@mainMenuMinHeight: (@itemVerticalPadding * 2) + 2em;

theme/site/globals/site.variables

@@ -1,3 +1,35 @@
 /*******************************
      User Global Variables
-*******************************/
+*******************************/
+
+@importGoogleFonts: true;
+
+@fontName  : 'Roboto';
+
+@emSize      : 14px;
+@fontSize    : 13px;
+
+@primaryColor: @teal;
+
+@teal: #3891A6;
+@blue: #456990;
+@red: #EF767A;
+@pink: #F46197;
+@yellow: #FDE74C;
+
+/* Microbit.org colors */
+@orange: #ff8b27;
+@purple: #6633cc;
+@green: #00ED00;
+
+@pageBackground: #fff;
+
+/*******************************
+         PXT Overrides
+*******************************/
+
+@mainMenuHeight: 5rem;
+@mobileMenuHeight: 5rem;
+
+@simulatorBackground: #FDFDFF;
+@blocklySvgColor: #ecf0f1;

theme/style.less

@@ -13,7 +13,106 @@
 *******************************/
 
 .download-button {
-    &:extend(.ui all);
-    &:extend(.button all);
+    &:extend(.ui.button all);
+    &:extend(.purple all);
+}
+
+.download-button.download-button-full {
+    &:extend(.ui.inverted.button all);
+    &:extend(.purple all);
+}
+
+.download-button:hover {
     &:extend(.green all);
-}
+    color: black !important;
+}
+
+.play-button.play-button-full {
+    &:extend(.ui.inverted.button all);
+}
+
+.getting-started-btn {
+    &:extend(.ui.button all);
+    &:extend(.orange all);
+}
+
+#filelist {
+    background: #fff url(https://az742082.vo.msecnd.net/pub/psopafpj) 0 0 repeat !important;
+}
+
+/*******************************
+             Blockly
+*******************************/
+
+.blocklyTreeRow {
+    border-bottom: 1px solid #ecf0f1;
+    margin-bottom: 0px;
+}
+
+/* Blockly toolbox font size same as the page font */
+.blocklyTreeLabel {
+    font-family: @pageFont !important;
+    font-weight: 200;
+}
+
+.blocklyToolboxDiv {
+    background-color: white !important;
+}
+
+.blocklyFlyoutBackground {
+    fill: #525A67;
+}
+
+/* Remove shadow around blockly blocks */
+.blocklyPathDark, .blocklyPathLight {
+    display: none;
+}
+
+.organization {
+    top: 1.6em;
+}
+
+/*******************************
+             Monaco
+*******************************/
+
+.monaco-editor, .monaco-editor .inputarea {
+    background: #ecf0f1;
+}
+
+.monaco-editor-background {
+    background: #ecf0f1;
+}
+
+
+/* Mobile */
+@media only screen and (max-width: @largestMobileScreen) {
+    #filelist {
+        background: transparent !important;
+    }
+    .organization {
+        top: auto;
+    }
+}
+
+/* Tablet */
+@media only screen and (min-width: @tabletBreakpoint) and (max-width: @largestTabletScreen) {
+    .organization {
+        top: auto;
+    }
+}
+
+/* Small Monitor */
+@media only screen and (min-width: @computerBreakpoint) and (max-width: @largestSmallMonitor) {
+    .organization {
+        top: auto;
+    }
+}
+
+/* Large Monitor */
+@media only screen and (min-width: @largeMonitorBreakpoint) {
+    .blocklyTreeRow {
+        width: 230px;
+        padding-left: 1rem;
+    }
+}

theme/theme.config

@@ -32,7 +32,7 @@
 @input      : 'pxt';
 @label      : 'pxt';
 @list       : 'pxt';
-@loader     : 'pxt';
+@loader     : 'pulsar';
 @rail       : 'pxt';
 @reveal     : 'pxt';
 @segment    : 'pxt';
@@ -41,7 +41,7 @@
 /* Collections */
 @breadcrumb : 'default';
 @form       : 'default';
-@grid       : 'default';
+@grid       : 'pxt';
 @menu       : 'pxt';
 @message    : 'default';
 @table      : 'default';
@@ -91,7 +91,9 @@
 
 @fontPath  : 'fonts';
 
+/*
 @headerFont        : 'Segoe UI', 'Helvetica Neue', Arial, Helvetica, sans-serif;
 @pageFont          : 'Segoe UI', 'Helvetica Neue', Arial, Helvetica, sans-serif;
+*/
 
 /* End Config */