0.9.14

* delay initializing the global icons, so we don't generate them for each hex file

* Moving the strings to flash

.gitignore

@@ -15,7 +15,7 @@ clients/win10/app/bld
 clients/win10/*.opendb
 clients/**/bin/**
 clients/**/obj/**
-clients/electron/projects
+electron-out
 hexcache
 
 *.user

.vscode/settings.json

@@ -1,6 +1,6 @@
 // Place your settings in this file to overwrite default and user settings.
 {
-    "file.autoSave": "afterDelay",   
+    "files.autoSave": "afterDelay",
     "files.watcherExclude": {
         "**/.git/objects/**": true,
         "**/built/**": true,

THIRD-PARTY-NOTICES.txt

@@ -0,0 +1,43 @@
+/*!----------------- PXT ThirdPartyNotices -------------------------------------------------------
+
+PXT uses third party material from the projects listed below.
+The original copyright notice and the license under which Microsoft
+received such third party material are set forth below. Microsoft
+reserves all other rights not expressly granted, whether by
+implication, estoppel or otherwise.
+
+In the event that we accidentally failed to list a required notice, please
+bring it to our attention. Post an issue or email us:
+
+           abchatra@microsoft.com
+
+---------------------------------------------
+Third Party Code Components
+---------------------------------------------
+
+Some code derived (as noted) from
+
+https://github.com/bbcmicrobit/micropython
+
+The MIT License (MIT)
+
+Copyright (c) 2013-2016 The MicroPython-on-micro:bit Developers, as listed
+in the accompanying AUTHORS file
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

clients/chrome/README.md

@@ -1,5 +1,5 @@
 # microbit-chrome
-Prototype chrome addon that exposes the micro:bit's serial output to webpages. 
+Prototype chrome addon that exposes the @boardname@'s serial output to webpages. 
 * watch the [demo video](https://vimeo.com/146207766)
 
 # Installation

cmds/pxtrequire.ts

@@ -1,4 +1,4 @@
-/// <reference path="../node_modules/pxt-core/typings/node/node.d.ts"/>
+/// <reference path="../node_modules/pxt-core/typings/globals/node/index.d.ts"/>
 /// <reference path="../node_modules/pxt-core/built/pxtlib.d.ts" />
 
 import * as path from "path";

docs/blocks.md

@@ -2,6 +2,10 @@
 
 ### @description Language constructs for the Block editor.
 
+Blocks snap into each other to define the program that your @boardname@ will run.
+Blocks can be event (buttons, shake, ...) or need to be snapped into an event to run. 
+The [on-start](/blocks/on-start) event runs first.
+
 ```namespaces
 for (let i = 0;i<5;++i) {}
 if (true){}
@@ -11,4 +15,4 @@ Math.random(5);
 
 ## See Also
 
-[logic](/blocks/logic), [loops](/blocks/loops), [math](/blocks/math), [variables](/blocks/variables)
+[logic](/blocks/logic), [loops](/blocks/loops), [math](/blocks/math), [variables](/blocks/variables), [on-start](/blocks/on-start)

docs/blocks/logic/boolean.md

@@ -86,12 +86,14 @@ if (led.point(1,1) && led.point(2,2)) {
 When you compare two Numbers, you get a Boolean value, such as the comparison `x < 5` in the code below:
 
 ```blocks
-let x = Math.random(5)
-if(x < 5) {
-   basic.showString("low");
-} else { 
-   basic.showString("high");
-} 
+input.onButtonPressed(Button.A, () => {
+    let x = Math.random(5)
+    if(x < 5) {
+    basic.showString("low");
+    } else { 
+    basic.showString("high");
+    }
+})
 ```
 
 See the documentation on [Numbers](/reference/types/number) for more information on comparing two Numbers. You can also [compare strings](/reference/types/string-functions) using the `equals` function.

docs/blocks/logic/if.md

@@ -14,13 +14,15 @@ Click on the dark blue gear icon (see above) to add an *else* or *if* to the cur
 
 ### Example: adjusting screen brightness
 
-```blocks
-if(input.lightLevel()<100){
-    led.setBrightness(255);
-}
-```
+If the [light level](/reference/input/light-level) is `< 100`, this code sets the brightness to `255` when the button A is pressed:
 
-If the [light level](/reference/input/light-level) is `< 100`, this code sets the brightness to `255`:
+```blocks
+input.onButtonPressed(Button.A, () => {
+    if(input.lightLevel()<100){
+        led.setBrightness(255);
+    }
+})
+```
 
 ### See also
 

docs/blocks/loops/for.md

@@ -4,14 +4,21 @@
  
 Run part of the program the number of times you say.
 
+```block
+for(let i = 0; i <= 4; ++i) {
+}
+```
+
 ### Example: Count to 4
 
 This program will show the numbers 0, 1, 2, 3, and 4 one after another on the LED screen.
 
 ```blocks
-for(let i = 0; i < 5; ++i) {
-basic.showNumber(i)
-}
+input.onButtonPressed(Button.A, () => {
+    for(let i = 0; i < 5; ++i) {
+        basic.showNumber(i)
+    }
+})
 ```
 
 ### See also

docs/blocks/loops/while.md

@@ -2,7 +2,7 @@
 
 Repeat code while a [Boolean](/blocks/logic/boolean) `condition` is true.
 
-```blocks
+```block
 while(true) {
 }
 ```
@@ -16,11 +16,13 @@ The condition is tested before any code runs. Which means that if the condition
 The following example uses a while loop to make a diagonal line on the LED screen (points `0, 0`, `1, 1`, `2, 2`, `3, 3`, `4, 4`).
 
 ```blocks
-let index = 4;
-while(index >= 0) {
-    led.plot(index, index);
-    index--;
-}
+input.onButtonPressed(Button.A, () => {
+    let index = 4;
+    while(index >= 0) {
+        led.plot(index, index);
+        index--;
+    }
+})
 ```
 
 ### See also

docs/blocks/on-start.md

@@ -0,0 +1,28 @@
+# On Start
+
+An event that runs when the program starts.
+
+The ``on start`` is a special event that runs when the program starts, before any other event. 
+Use this event to initialize your program.
+
+## Example
+
+In this example, ``on start`` sets a dimmer brightness on the screen and the button handler shows a string.
+
+```blocks
+input.onButtonPressed(Button.A, () => {
+    basic.showString("Hello!")
+})
+led.setBrightness(50)
+```
+
+## What about JavaScript?
+
+``on-start`` only exists in the block editor. In JavaScript, all code executes sequentially from the first line.
+
+## Hey, my events moved!
+
+When we transform the blocks into JavaScript, we always place all the event registrations (buttons, shake, ...) 
+before launching the ``on start`` code.
+
+If a block from ``on start`` pauses, other registered events will have the opportunity to run as well.

docs/device/servo.md

@@ -0,0 +1,116 @@
+# Equipping a microservo with Crocodile clips
+
+## Materials
+  * Cutting pliers or wire cutter
+  * Tape (masking, duct tape, and/or packing tape)
+  * 3 crocodile clips, yellow, red and black.
+  * 1 micro servo 9g (SG90)
+
+## Using a microservo with the @boardname@
+
+The @boardname@ provides just enough current to operate the SG90 microservo. 
+The servo requires 3 connections: GND, 3V and a logic pin. 
+In this tutorial, we will equip the servo with crocodile clips to make it easier to use. 
+However, you could also use a shield or female to crocodile clips to acheive the same effect.
+
+If you are running a class or activity, you should consider preparing all servos before hand.
+
+### ~ hint
+
+Kitronik wrote an excellent in-depth guide about using servos with the @boardname@. 
+Check it out at https://www.kitronik.co.uk/blog/using-bbc-microbit-control-servo/ .
+
+### ~
+
+## Step 1: cutout the connector
+
+Using the cutting pliers, cut out the dark plastic connector.
+
+![](/static/mb/projects/inchworm/servo1.jpg)
+
+## Step 2: strip out cables
+
+Using the plier or a wire stripper, strip the plastic from the cables.
+
+![](/static/mb/projects/inchworm/servotrim.jpg)
+
+## Step 3: threading the servo cablers
+
+Thread the servo cables.
+
+![](/static/mb/projects/inchworm/servo3.jpg)
+
+## Step 4: crocobile clip claps
+
+Cut a crocodile cable in two and strip out the casing. 
+If possible try to use the same cable colors as the servo!
+
+![](/static/mb/projects/inchworm/servo4.jpg)
+
+## Step 5: thread cables together
+
+Place the cables next to each other
+
+![](/static/mb/projects/inchworm/servo5.jpg)
+
+... and thread them together.
+
+![](/static/mb/projects/inchworm/servo6.jpg)
+
+### ~ hint
+
+It is very **important** to ensure that there is a good connection between the 2 cables.
+If the connection is weak, the microservo will not receive enough current and it will not work.
+**If you have access to a soldering iron, we strongly recommend to solder this connection.**
+
+### ~
+
+## Step 4: protect the connection
+
+Protect the connection with electrical or duct tape.
+
+![](/static/mb/projects/inchworm/servo7.jpg)
+
+## Step 5: repeat for all cables
+
+Repeat the same process until all cables are connected.
+
+![](/static/mb/projects/inchworm/servo8.jpg)
+
+## Step 6: testing!
+
+It's time to test that your connection are all proper and that the servo will function **when the @boardname@ is powered by battery**.
+
+* Connect the microservo to the @boardname@. Black cable on ``GND``, red cable on ``3V`` and remaining cable on ``P0``.
+
+![](/static/mb/projects/inchworm/circuit1.jpg)
+
+### ~ hint
+
+When attaching the crocodile clips to the pins, don't hesitate to grab the side of the board with the jaws.
+
+![](/static/mb/projects/inchworm/circuit2.jpg)
+
+### ~
+
+* Download the following code to your @boardname@
+
+```blocks
+basic.forever(() => {
+    pins.servoWritePin(AnalogPin.P0, pins.map(
+        input.acceleration(Dimension.X),
+        -512,
+        512,
+        0,
+        180
+    ))
+})
+```
+
+* When powered by USB, make sure that the servo moves when you tilt the board.
+* When powered by batteries **only**, make sure that the servo moves when you tilt the board.
+
+## Troubleshooting
+
+If your servo seems to sutter and stay stuck at a particular position, it means that it is not receiving enough power.
+This is probably due to a weak connection or low battery level. Check each connection and check your batteries.

docs/docs.md

@@ -6,6 +6,7 @@
 
 * **[Getting Started](/getting-started)**
 * [Projects](/projects)
+* [Examples](/examples)
 * [Lessons](/lessons)
 
 ### @boardname@ reference

docs/examples.md

@@ -0,0 +1,35 @@
+# Examples
+
+Here are some fun programs for your @boardname@!
+
+## Fun stuff
+
+```codecard
+[{
+  "name": "Blinky",
+  "url":"/examples/blinky"
+},
+{
+  "name": "Name Tag",
+  "url":"/examples/name-tag"
+},
+{
+  "name": "Rando",
+  "url":"/examples/rando"
+}]
+```
+
+## Sensors
+
+```codecard
+[{
+  "name": "Plot Acceleration",
+  "url":"/examples/plot-acceleration"
+}, {
+  "name": "Plot Light Level",
+  "url":"/examples/plot-light-level"
+}, {
+  "name": "Plot Analog Pin",
+  "url":"/examples/plot-analog-pin"
+}]
+```

docs/examples/blinky.md

@@ -0,0 +1,20 @@
+# Blinky
+
+```blocks
+basic.forever(() => {
+    basic.showLeds(`
+        . # . # .
+        # # # # #
+        # # # # #
+        . # # # .
+        . . # . .`
+        );
+    basic.showLeds(`
+        . . . . .
+        . . . . .
+        . . . . .
+        . . . . .
+        . . . . .`
+        );
+})
+```

docs/examples/name-tag.md

@@ -0,0 +1,7 @@
+# Name Tag
+
+```blocks
+basic.forever(() => {
+    basic.showString("JAMES")
+})
+```

docs/examples/plot-acceleration.md

@@ -0,0 +1,10 @@
+# Plot Acceleration
+
+```blocks
+basic.forever(() => {
+    led.plotBarGraph(
+        input.acceleration(Dimension.X),
+        1023
+    )
+})
+```

docs/examples/plot-analog-pin.md

@@ -0,0 +1,10 @@
+# Plot Analog Pin
+
+```blocks
+basic.forever(() => {
+    led.plotBarGraph(
+        pins.analogReadPin(AnalogPin.P0),
+        1023
+    )
+})
+```

docs/examples/plot-light-level.md

@@ -0,0 +1,10 @@
+# Plot Light level
+
+```blocks
+basic.forever(() => {
+    led.plotBarGraph(
+        input.lightLevel(),
+        255
+    )
+})
+```

docs/examples/rando.md

@@ -0,0 +1,7 @@
+# Rando
+
+```blocks
+basic.forever(() => {
+    led.toggle(Math.random(5), Math.random(5))
+})
+```

docs/getting-started.md

@@ -33,7 +33,7 @@ basic.forever(() => {
 
 When this program runs, you will see a smiley face, then a blank
 screen, then a smiley again -- it never stops! (That's because of the
-``forever`` block.)
+`[basic.forever(() => {})]` block.)
 
 Click **Download** to move your program to the @boardname@! 
 Make sure to follow the instructions.

docs/getting-started/buttons.md

@@ -17,7 +17,7 @@ input.onButtonPressed(Button.A, () => {
 
 #### ~hint
 
-The ``showString`` block can show letters, numbers, and punctuation
+The `[basic.showString("HI")]` block can show letters, numbers, and punctuation
 on the @boardname@ screen.
 
 #### ~
@@ -33,7 +33,7 @@ input.onButtonPressed(Button.B, () => {
 #### ~hint
 
 You can find the letter `B` by clicking the letter `A` on the
-``onButtonPressed`` block.
+`[input.onButtonPressed(Button.A, () => {})]` block.
 
 #### ~
 

docs/getting-started/coin-flipper.md

@@ -23,8 +23,8 @@ input.onButtonPressed(Button.B, () => {
 ```
 ### ~hint
 
-The ``pick random true or false`` block randomly tells the ``if``
-block `true` or `false`.  If the ``pick`` block picked `true`, the
+The `[Math.randomBoolean()]` block randomly tells the ``if``
+block `true` or `false`.  If value picked is `true`, the
 ``if`` block shows the letter `H`. Otherwise, it shows the letter `T`.
 
 That's it!

docs/getting-started/screen.md

@@ -9,7 +9,7 @@ There are 25 bright LEDs on the @boardname@ screen. Let's use them to create som
 ### Happy unhappy face
 
 Draw an unhappy face instead of the blank screen.  Click on the dots
-in the second ``show leds`` block until it matches the blocks below.
+in the second `[basic.showLeds("")]` block until it matches the blocks below.
 Now you have an **animation** (cartoon) that shows a happy face,
 then an unhappy one, then a happy one again, forever (or until
 you turn off your @boardname@)!
@@ -36,7 +36,7 @@ Click **Download** to move your program to the @boardname@!
 
 ### Your turn!
 
-Pile up more ``show leds`` blocks to create an animation! Create an
+Pile up more `[basic.showLeds("")]` blocks to create an animation! Create an
 animation with at least 5 pictures.  What does this animation show?
 
 ```blocks
@@ -87,12 +87,6 @@ basic.forever(() => {
 ```
 Click **Download** to move your program to the @boardname@!
 
-#### ~hint
-
-You can find the ``show leds`` block in the **Basic** part of the editor.
-
-#### ~
-
 ### ~button /getting-started/buttons
 NEXT: BUTTONS
 ### ~

docs/index-ref.json

@@ -1,3 +1,3 @@
 {
-    "appref": "v0.6.36"
+    "appref": "v0.9.11"
 }

docs/packages.md

@@ -3,27 +3,48 @@
 You can publish libraries (also known as packages or extensions)
 that users can then add to their scripts. These typically
 provide a driver for a particular hardware device you can connect
-to a microbit.
+to a microbit. 
+
+### ~ hint
+
+All packages need to be approved by the Micro:bit Foundation before being available in the web editor.
+See **Approval** section below.
+
+### ~
 
-* [pxt-max6675](https://github.com/Microsoft/pxt-max6675) -- TypeScript
 * [pxt-neopixel](https://github.com/Microsoft/pxt-neopixel) -- TypeScript + ARM Thumb assembly package
+* [pxt-max6675](https://github.com/Microsoft/pxt-max6675) -- TypeScript
 * [pxt-sonar](https://github.com/microsoft/pxt-sonar) -- TypeScript
 * [pxt-i2c-fram](https://github.com/microsoft/pxt-i2c-fram) -- TypeScript
 
 * [Sample C++ extension](https://github.com/Microsoft/pxt-microbit-cppsample)
-* [Sample TypeScript extension](https://github.com/Microsoft/pxt-microbit/tree/master/libs/i2c-fram)
 
 ## Finding packages
 
-From the editor, the user clicks on **More** then **Add Package** and searches for the package. 
+From the block editor, the user clicks on **Add Package** and searches for the package. 
+Otherwise, the **Add Package** is also available from the gearwheel menu.
 
-To see the list of packages, click on **More** then **Show Files** to see the project file list.
+To see the list of packages, switch to JavaScript and use the **Explorer** view to find them.
 
-To remove a package, click on the garbage button in the file list next to the package.
+To remove a package, click on the garbage button in the **Explorer** view next to the package.
 
-## Publishing packages
+## Publishing and Approving packages
 
-Packages can be published from the pxt command line. Check out [the docs](https://www.pxt.io/packages).
+Once your package is ready, follow these steps to get it approved and listed in the pxt.microbit.org web site:
+
+1. setup a public GitHub repository with your package sources
+2. ensure that the license is **Apache2** or **MIT**
+3. fill ``test.ts`` with a test scenario
+4. ensure that the package builds by running ``pxt`` from the package folder. [Read more...](https://www.pxt.io/packages).
+5. fill up the ``README.md`` file with documentation. See [markdown docs](https://pxt.io/writing-docs) for syntax.
+6. publish a release by running ``pxt bump`` from the package folder.
+7. open a support ticket at https://support.microbit.org, add **package approval** in the subject line.
+
+```
+Package approval request
+
+github repo: .....
+```
 
 ## Localizing packages
 

docs/projects.md

@@ -62,13 +62,13 @@ Fun games to build with your @boardname@.
 }]
 ```
 
-## Science and Engineering
+## Toys
 
 ```codecard
 [{
-  "name": "Timing gates",
-  "url":"/projects/timing-gates",
-  "imageUrl":"/static/mb/projects/timing-gates.jpg"
+  "name": "Inchworm",
+  "url":"/projects/inchworm",
+  "imageUrl":"/static/mb/projects/inchworm.jpg"
 }]
 ```
 
@@ -76,6 +76,10 @@ Fun games to build with your @boardname@.
 
 ```codecard
 [{
+  "name": "Timing gates",
+  "url":"/projects/timing-gates",
+  "imageUrl":"/static/mb/projects/timing-gates.jpg"
+}, {
   "name": "Compass",
   "url":"/projects/compass",
   "imageUrl":"/static/mb/projects/a5-compass.png"
@@ -92,4 +96,4 @@ Fun games to build with your @boardname@.
 
 ### See Also
 
-[Flashing Heart](/projects/flashing-heart), [Smiley Buttons](/projects/smiley-buttons), [Love Meter](/projects/love-meter), [Rock Paper Scissors](/projects/rock-paper-scissors), [Compass](/projects/compass), [Hack your headphones](/projects/hack-your-headphones), [Banana keyboard](/projects/banana-keyboard), [Telegraph](/projects/telegraph), [Radio](/projects/radio), [Guitar](/projects/guitar), [Wallet](/projects/wallet), [Watch](/projects/watch)
+[Flashing Heart](/projects/flashing-heart), [Smiley Buttons](/projects/smiley-buttons), [Love Meter](/projects/love-meter), [Rock Paper Scissors](/projects/rock-paper-scissors), [Compass](/projects/compass), [Hack your headphones](/projects/hack-your-headphones), [Banana keyboard](/projects/banana-keyboard), [Telegraph](/projects/telegraph), [Radio](/projects/radio), [Guitar](/projects/guitar), [Wallet](/projects/wallet), [Watch](/projects/watch)

docs/projects/banana-keyboard.md

@@ -21,8 +21,8 @@ Build your own @boardname@ piano using bananas!
 
 ## Activities
 
-* [Making the keyboard](/projects/banana-keyboard/make)  
-* [Beat box](/projects/banana-keyboard/beat-box)
+* [Make](/projects/banana-keyboard/make)  
+* [Code](/projects/banana-keyboard/code)
 
 ### ~button /projects/banana-keyboard/make
 Let's get started!

docs/projects/banana-keyboard/code.md

@@ -1,4 +1,4 @@
-# banana keyboard - beat box
+# Code
 
 Have you ever tried to making beat box sounds? Let's try making a beatbox with code!
 

docs/projects/banana-keyboard/make.md

@@ -1,4 +1,4 @@
-# banana keyboard - making
+# Make
 
 ## Materials
 
@@ -80,6 +80,6 @@ input.onPinPressed(TouchPin.P1, () => {
 
 Tap your banana instrument to play sound against... the fruit!
 
-### ~button /projects/banana-keyboard/beat-box
+### ~button /projects/banana-keyboard/code
 NEXT: beat box
 ### ~

docs/projects/coffee-cup-monster.md

@@ -0,0 +1,43 @@
+
+# Coffee Cup Monster
+
+### @description A monster made of cardboard that responds to light
+
+### ~avatar avatar
+
+Make a coffee cup monster that responds to light!
+
+### ~
+
+https://youtu.be/BiZLjugXMbM
+
+## Duration
+
+3 Activities, approx 30-45 min each based on familiarity with the coding concepts
+
+## Materials
+
+* 3 Coffee cup holders
+* 2 Coffee cup strirer wood sticks
+* Glue gun
+* Scissors that can cut cardboard
+* 1 @boardname@, battery holder and 2 AAA batteries
+* 3 Crocodile clips
+* 1 micro servo 9g SG90
+* 1 paper clip
+
+## Preparation
+
+* [Equip the microservo with crocodile clips](/device/servo)
+
+## Activities
+
+* [Make](/projects/coffee-cup-monster/make)  
+* [Code](/projects/coffee-cup-monster/code)  
+* [Connect](/projects/coffee-cup-monster/connect)  
+
+### ~button /projects/coffee-cup-monster/make
+
+Let's get started!
+
+### ~

docs/projects/coffee-cup-monster/code.md

@@ -0,0 +1,29 @@
+# Code
+### @description code to make the coffee cup monster alive
+
+### ~avatar avatar
+
+Add code to open the mouth when light is detected.
+
+### ~
+
+## Duration: ~30 minutes
+
+We are going to add code to open the mouth proportionally to the amount of light on the @boardname@.
+In a loop, we will read the light and map it to an angle using the ``pins.map`` function.
+
+```blocks
+basic.forever(() => {
+    pins.servoWritePin(AnalogPin.P0, pins.map(
+        input.lightLevel(),
+        0,
+        255,
+        30,
+        150
+    ))
+})
+```
+
+### ~button /projects/coffee-cup-monster/connect
+NEXT: Connect
+### ~

docs/projects/coffee-cup-monster/connect.md

@@ -0,0 +1,29 @@
+# Connect
+
+### ~avatar avatar
+
+Remote control your monster with another @boardname@
+
+### ~
+
+## Duration: ~30 minutes
+
+You will need 2 @boardname@ for this part. By using the radio, we can make the inchworm controlled by another @boardname@.
+Download the code below to the @boardname@ on the inchworm and another "controller" @boardname@. 
+Whenere A is pressed, the monster will open and close it's mouth will move once.
+
+```blocks
+radio.onDataPacketReceived(({receivedNumber}) => {
+    pins.servoWritePin(AnalogPin.P0, 30)
+    basic.pause(500)
+    pins.servoWritePin(AnalogPin.P0, 150)
+    basic.pause(500)
+})
+input.onButtonPressed(Button.A, () => {
+    radio.sendNumber(0)
+})
+```
+
+```package
+radio
+```

docs/projects/coffee-cup-monster/make.md

@@ -0,0 +1,25 @@
+# Make
+### @description Building the coffee cup monster
+
+### ~avatar avatar
+
+Turn a piece of coffee holders into a monster!
+
+### ~
+
+## Duration: ~60 minutes
+
+## Materials
+  * 3 Coffee cup holders
+  * 2 Coffee cup strirer wood sticks
+  * Scissors
+  * glue gun or tape
+  * 1 paper clip
+
+## Step 1: cardboard
+
+TODO
+
+### ~button /projects/coffee-cup-monster/code
+NEXT: Code
+### ~

docs/projects/guitar/pinpress.md

@@ -21,7 +21,7 @@ Use pin press to switch guitar play on/off
 ## Blocks
 
 ```cards
-var on = false
+let on = false
 on;
 if (on) { } else {}
 input.onPinPressed(TouchPin.P1, () => {})
@@ -106,7 +106,7 @@ input.onPinPressed(TouchPin.P1, () => {
 *Final code*
 TODO: do we want to use `on = !on;` or be more direct in flipping the switch? `on = true; on = false;`
 ```blocks
-var on = false
+let on = false
 basic.forever(() => {
     if (on) {
         music.setTempo(pins.map(Math.abs(input.acceleration(Dimension.Y)),

docs/projects/hack-your-headphones.md

@@ -27,8 +27,8 @@ Build your own music player @boardname@ from headphones.
 
 ## Activities
 
-* [Connect your headphone](/projects/hack-your-headphones/make)
-* [Play sounds!]()
+* [Make](/projects/hack-your-headphones/make)
+* [Code](/projects/hack-your-headphones/code)
 
 ### ~button /projects/hack-your-headphones/make
 

docs/projects/hack-your-headphones/code.md

@@ -1,4 +1,4 @@
-# hack your headphones - music of light
+# Code
 
 ### ~avatar avatar
 
@@ -10,7 +10,9 @@ Let's start by adding a variable where you can store data. Then rename the varia
 
 
 ```blocks
-let light = input.lightLevel();
+input.onButtonPressed(Button.A, () => {
+    let light = input.lightLevel();
+});
 ```
 
 We want to play music on button pressed in order to register an event handler that will execute whenever when you run a script and click on button pressed on the simulator. We must start by opening the Input drawer and adding `on button pressed` A. Then add a block `rest` to plays nothing for a `1/16` beat. Modify your code so that your code looks like this.

docs/projects/hack-your-headphones/make.md

@@ -1,4 +1,4 @@
-# hack your headphones - making
+# Make
 
 ### ~avatar avatar
 
@@ -46,7 +46,7 @@ Using the 2nd crocodile clip, connect the second end of the crocodile clip onto
 
 You hacked your headphones!
 
-### ~button /projects/hack-your-headphones/music-of-light
+### ~button /projects/hack-your-headphones/code
 
 NEXT: music of light
 

docs/projects/inchworm.md

@@ -0,0 +1,44 @@
+
+# Inchworm
+
+### @description A inchworm like robot built with the @boardname@
+
+### ~avatar avatar
+
+Make a funny inchworm robot!
+
+### ~
+
+https://youtu.be/BiZLjugXMbM
+
+## Duration
+
+3 Activities, approx 30-45 min each based on familiarity with the coding concepts
+
+## Materials
+
+* Cardboard pieces (recycle!)
+* Glue gun or Tape (masking, duct tape, and/or packing tape)
+* Scissors that can cut cardboard
+* 1 @boardname@, battery holder and 2 AAA batteries
+* 3 Crocodile clips
+* 1 micro servo 9g SG90
+* 1 paper clip
+
+![Materials](/static/mb/projects/inchworm/materials.jpg)
+
+## Preparation
+
+* [Equip the microservo with crocodile clips](/device/servo)
+
+## Activities
+
+* [Make](/projects/inchworm/make)  
+* [Code](/projects/inchworm/code)  
+* [Connect](/projects/inchworm/connect)  
+
+### ~button /projects/inchworm/make
+
+Let's get started!
+
+### ~

docs/projects/inchworm/code.md

@@ -0,0 +1,35 @@
+# Code
+### @description code to make the inchworm alive
+
+### ~avatar avatar
+
+Add code to make the inchworm move.
+
+### ~
+
+## Duration: ~30 minutes
+
+## Step 1: walk forever
+
+In order for the inchworm to move, the @boardname@ needs to command the servo to go between ``0`` and ``180`` degrees
+at a certain pace. In the code below, the user pressed button ``A`` to launch the inchworm.
+
+```blocks
+input.onButtonPressed(Button.A, () => {
+    pins.servoWritePin(AnalogPin.P0, 0);
+    basic.pause(500);
+    pins.servoWritePin(AnalogPin.P0, 180);
+    basic.pause(500);
+});
+```
+
+### ~ hint
+
+You may have noticed that the inchworm can be rather slow or simply won't move. Try to improve the design of your legs, teeth
+so that the inchworm goes as fast as possible. Trying it on carpet also great helps avoiding skidding.
+
+### ~
+
+### ~button /projects/inchworm/connect
+NEXT: Connect
+### ~

docs/projects/inchworm/connect.md

@@ -0,0 +1,28 @@
+# Connect
+
+### ~avatar avatar
+
+Remote control your inchworm with another @boardname@
+
+### ~
+
+## Duration: ~30 minutes
+
+You will need 2 @boardname@ for this part. By using the radio, we can make the inchworm controlled by another @boardname@.
+Download the code below to the @boardname@ on the inchworm and another "controller" @boardname@. Whenere A is pressed, the inchworm will move once.
+
+```blocks
+radio.onDataPacketReceived(({receivedNumber}) => {
+    pins.servoWritePin(AnalogPin.P0, 0)
+    basic.pause(500)
+    pins.servoWritePin(AnalogPin.P0, 180)
+    basic.pause(500)
+})
+input.onButtonPressed(Button.A, () => {
+    radio.sendNumber(0)
+})
+```
+
+```package
+radio
+```

docs/projects/inchworm/make.md

@@ -0,0 +1,88 @@
+# Make
+### @description Building the cardboard inchworm
+
+### ~avatar avatar
+
+Turn a piece of cardboard into an inchworm!
+
+### ~
+
+## Duration: ~45 minutes
+
+## Materials
+  * Cardboard
+  * Scissors or cutters
+  * glue gun or tape
+  * 1 paper clip
+
+## Step 1: cardboard
+
+Cutout a cardboard rectangle. You can use the @boardname@ as a ruler to figure out the size.
+
+![](/static/mb/projects/inchworm/chassis1.jpg)
+
+## Step 2: center fold
+
+Fold the cardboard in half over the short edge.
+
+![](/static/mb/projects/inchworm/chassis2.jpg)
+
+## Step 3: legs
+
+Fold each end so they rest flat on the ground.
+
+![](/static/mb/projects/inchworm/chassis3.jpg)
+
+## Step 4: front teeth
+
+Fold each corners on one end of the cardbard. This will be the front of the inchworm which is supposed to grip the ground.
+
+![](/static/mb/projects/inchworm/chassis4.jpg)
+
+## Step 5: back teeth
+
+Using a scissor or a cutter (watch the fingers!), cut out various strips in the other edge. Fold one after the other.
+
+![](/static/mb/projects/inchworm/chassis5.jpg)
+
+## Step 6: mounting the board
+
+Using tape or a glue gun, mount the @boardname@ on one side and the microservo on the cardobard.
+
+![](/static/mb/projects/inchworm/chassis6.jpg)
+
+## Step 7: mounting the servo
+
+Attach the servo on the **edge** of the other cardboard side.
+
+![](/static/mb/projects/inchworm/chassis7.jpg)
+
+## Step 8: Cable clean up (optional)
+
+Use tape to route the cables nicely on the inchworm.
+
+![](/static/mb/projects/inchworm/chassis8.jpg)
+
+## Step 9: attaching paper clip to servo
+
+Unfold a paper clip and attach it to the servo arm.
+
+![](/static/mb/projects/inchworm/clip2.jpg)
+
+## Step 10: attaching paper clip to cardboard
+
+Slide the folder paper clip into the cardboard, and use tape to secure it. 
+You might need to toy around with the size of the clip so that the servo rotation opens the inchworm sufficiently.
+
+![](/static/mb/projects/inchworm/clip3.jpg)
+
+
+## Step 11: it's ready!
+
+Your inchworm is ready!
+
+![](/static/mb/projects/inchworm/ready.jpg)
+
+### ~button /projects/inchworm/code
+NEXT: Code
+### ~

docs/projects/magic-button-trick.md

@@ -37,7 +37,7 @@ input.onButtonPressed(Button.B, () => {
 
 We will use the @boardname@'s compass to detect the magnet. Compass's tell us what direction we are pointing by detecting the Earth's magnetic field but they can also detect any other magnet nearby. We will use that to check if our magnet is next to the @boardname@ by using the [magnetic force](/reference/input/magnetic-force) block found in the input menu's 'more' section. As we only want to measure the strength we change the drop down to select 'strength':
 
-```blocks
+```block
 input.magneticForce(Dimension.Strength)
 ```
 
@@ -50,16 +50,19 @@ If you have ever played with magnets you know they have two ends, often called a
 So in the code below we will check if the absolute value of our magnetic field strength reading is more than 100 and save the result of that check in a new variable called 'isSwitched':
 
 ```blocks
-let isSwitched = Math.abs(input.magneticForce(Dimension.Strength)) > 100
+let force = Math.abs(input.magneticForce(Dimension.Strength));
+let isSwitched = force > 100
 ```
 ## Step 4: running our 'magnet nearby' check all the time
 
 At the moment our code to detect the magnet being nearby will only run once so we need to put it into a [forever](/reference/basic/forever) block so that it keeps getting run again and again checking for the magnet to come near to the @boardname@. We should also make sure 'isSwitched' is false when our program starts.
 
 ```blocks
+let force = 0;
 let isSwitched = false;
 basic.forever(() => {
-	let isSwitched = Math.abs(input.magneticForce(Dimension.Strength)) > 100
+    force = Math.abs(input.magneticForce(Dimension.Strength));
+    isSwitched = force > 100
 })
 ```
 
@@ -68,10 +71,11 @@ basic.forever(() => {
 Now we can check the value of our variable 'isSwitched' whenever we want and we will know that the magnet is nearby if it's value is 'true'. Let's use that to change how the buttons work and complete the code for our trick. We will add an 'if, else' block to each button's code and check if we should swap over what each button displays because 'isSwitched' is equal to true:
 
 ```blocks
-
+let force = 0;
 let isSwitched = false;
 basic.forever(() => {
-    isSwitched = Math.abs(input.magneticForce(Dimension.Strength)) > 100
+    force = Math.abs(input.magneticForce(Dimension.Strength));
+    isSwitched = force > 100
 })
 
 input.onButtonPressed(Button.A, () => {

docs/projects/telegraph.md

@@ -17,8 +17,8 @@ Build a telegraph between two @boardname@s to communicate with your friends!
 
 ## Activities
 
-* [Making the circuit](/projects/telegraph/make)  
-* [Manual telegraph](/projects/telegraph/manual-telegraph)
+* [Make](/projects/telegraph/make)  
+* [Code](/projects/telegraph/code)
 
 ### ~button /projects/telegraph/make
 Let's get started!

docs/projects/telegraph/code.md

@@ -1,4 +1,4 @@
-# telegraph - manual telegraph 
+# Code 
 
 Let's build the code that will send a impulse while the user presses ``A``.
 

docs/projects/telegraph/make.md

@@ -1,4 +1,4 @@
-# telegraph - making 
+# Make
 
 ### ~avatar
 
@@ -68,8 +68,8 @@ Using the 4th crocodile clip, connect the unattached end of the crocodile clip o
 ![](/static/mb/lessons/telegraph-0.png)
 
 
-### ~button /projects/telegraph/manual-telegraph
+### ~button /projects/telegraph/code
 
-NEXT: manual telegraph
+NEXT: Code
 
 ### ~

docs/projects/wallet/code.md

@@ -1,4 +1,4 @@
-# Wallet - Code
+# Code
 
 ## Simple animation
 

docs/projects/wallet/make.md

@@ -1,4 +1,4 @@
-# Wallet - Make
+# Make
 
 ### @description Maker Project for Wallet
 

docs/reference/basic/forever.md

@@ -18,15 +18,15 @@ and updates the screen with the direction.
 basic.forever(() => {
     let heading = input.compassHeading()
     if (heading < 45) {
-        basic.showString("N", 100)
+        basic.showString("N")
     } else if (heading < 135) {
-        basic.showString("E", 100)
+        basic.showString("E")
     }
     else if (heading < 225) {
-        basic.showString("S", 100)
+        basic.showString("S")
     }
     else {
-        basic.showString("W", 100)
+        basic.showString("W")
     }
 })
 ```
@@ -40,7 +40,7 @@ You can use a program like this to count things with your @boardname@.
 ```blocks
 let num = 0
 basic.forever(() => {
-    basic.showNumber(num, 150)
+    basic.showNumber(num)
 })
 input.onButtonPressed(Button.A, () => {
     num = num + 1
@@ -56,10 +56,10 @@ Try this on your @boardname@:
 
 ```blocks
 basic.forever(() => {
-    basic.showNumber(6789, 150)
+    basic.showNumber(6789)
 })
 input.onButtonPressed(Button.A, () => {
-    basic.showNumber(2, 150)
+    basic.showNumber(2)
 })
 ```
 

docs/reference/bluetooth.md

@@ -35,7 +35,8 @@ bluetooth.uartWriteValue("", 0);
 ## Eddystone
 
 ```cards
-bluetooth.advertiseUrl("https://pxt.microbit.org/", 7);
+bluetooth.advertiseUid(42, 1, 7, true);
+bluetooth.advertiseUrl("https://pxt.microbit.org/", 7, true);
 bluetooth.stopAdvertising();
 ```
 

docs/reference/bluetooth/advertise-uid-buffer.md

@@ -0,0 +1,37 @@
+# Avertise UID Buffer
+
+Advertises a UID via the Eddystone protocol over Bluetooth.
+
+## ~hint
+
+### Eddystone
+
+Bluetooth beacons are used to indicate proximity to a place or object of interest. 
+Beacons use Bluetooth advertising to broadcast a small amount of data, 
+which can be received and acted upon by anyone in range with a suitable device and software, typically a smartphone and application.
+
+There are various beacon message formats, which define the way Bluetooth advertising packets are used as containers for beacon data. 
+iBeacon is Apple's beacon message format. Eddystone comes from Google.
+
+Read more at https://lancaster-university.github.io/microbit-docs/ble/eddystone/ .
+
+## ~
+
+```sig
+bluetooth.advertiseUidBuffer(pins.createBuffer(16), 7, true);
+```
+
+### Parameters
+
+* ``buffer`` - a 16 bytes buffer containing the namespace (first 10 bytes) and instance (last 6 bytes).
+* ``power`` - a [number](/reference/types/number) representing the power level between 0 (short) and 7 (maximum range).
+* ``connectable`` - a [boolean](/blocks/logic/boolean) indicating whether or not the @boardname@ should accept connections. 
+
+
+## See Also
+
+[stop-advertising](/reference/bluetooth/stop-advertising), [advertise-uid](/reference/bluetooth/advertise-uid)
+
+```package
+bluetooth
+```

docs/reference/bluetooth/advertise-uid.md

@@ -0,0 +1,46 @@
+# Avertise UID
+
+Advertises a UID via the Eddystone protocol over Bluetooth.
+
+## ~hint
+
+### Eddystone
+
+Bluetooth beacons are used to indicate proximity to a place or object of interest. 
+Beacons use Bluetooth advertising to broadcast a small amount of data, 
+which can be received and acted upon by anyone in range with a suitable device and software, typically a smartphone and application.
+
+There are various beacon message formats, which define the way Bluetooth advertising packets are used as containers for beacon data. 
+iBeacon is Apple's beacon message format. Eddystone comes from Google.
+
+Read more at https://lancaster-university.github.io/microbit-docs/ble/eddystone/ .
+
+## ~
+
+```sig
+bluetooth.advertiseUid(42, 1, 7, true);
+```
+
+### Parameters
+
+* ``namespace`` last 4 bytes of the namespace uid (6 to 9)
+* ``instance`` last 4 bytes of the instance (2 to 5)
+* ``power`` - a [number](/reference/types/number) representing the power level between 0 (short) and 7 (maximum range).
+* ``connectable`` - a [boolean](/blocks/logic/boolean) indicating whether or not the @boardname@ should accept connections. 
+
+## Encoding
+
+The bytes of ``namespace`` and ``instance`` are encoded to generate the 10 bytes UID namespace and 6 bytes UID instance.
+
+```
+UID namespace: [0, ..., namespace]
+UID instance: [0, ..., instance]
+```
+
+## See Also
+
+[stop-advertising](/reference/bluetooth/stop-advertising), [advertise-uid-buffer](/reference/bluetooth/advertise-uid-buffer)
+
+```package
+bluetooth
+```

docs/reference/bluetooth/advertise-url.md

@@ -25,6 +25,7 @@ bluetooth.advertiseUrl("https://pxt.microbit.org/", 7, true);
 
 * ``url`` - a [string](/reference/types/string) containing the URL to broadcast, at most 17 characters long, excluding the protocol (eg: ``https://``) which gets encoded as 1 byte.
 * ``power`` - a [number](/reference/types/number) representing the power level between 0 (short) and 7 (maximum range).
+* ``connectable`` - a [boolean](/blocks/logic/boolean) indicating whether or not the @boardname@ should accept connections. 
 
 ### Example: Broadcast a secret code
 
@@ -34,7 +35,7 @@ bluetooth.advertiseUrl("https://pxt.io?secret=42", 7, true);
 
 ## See Also
 
-[stop-advertising](/reference/bluetooth/stop-advertising)
+[stop-advertising](/reference/bluetooth/stop-advertising), [advertise-uid](/reference/bluetooth/advertise-uid)
 
 ```package
 bluetooth

docs/reference/pins/set-events.md

@@ -0,0 +1,30 @@
+# Set Events
+
+Configure the type of events emitted by a given pin.
+
+```sig
+pins.setEvents(DigitalPin.P0, PinEventType.Edge);
+```
+
+### Parameters
+
+* ``name``: The @boardname@ hardware pin to configure (``P0`` through ``P20``)
+* ``type``: The type of events this pin should emit
+
+### Example
+
+The following example configures pin ``P0`` and then
+subscribes to the rise and fall events.
+
+```blocks
+control.onEvent(control.eventSourceId(EventBusSource.MICROBIT_ID_IO_P0),  control.eventValueId(EventBusValue.MICROBIT_PIN_EVT_RISE), () => {
+    basic.showString("Rise")
+})
+control.onEvent(control.eventSourceId(EventBusSource.MICROBIT_ID_IO_P0),  control.eventValueId(EventBusValue.MICROBIT_PIN_EVT_FALL), () => {
+    basic.showString("Fall")
+})
+pins.setEvents(DigitalPin.P0, PinEventType.Edge)
+```
+
+**This is an advanced API.**  For more information, see the
+[@boardname@ runtime messageBus documentation](https://lancaster-university.github.io/microbit-docs/ubit/messageBus/)

docs/reference/radio/on-data-packet-received.md

@@ -21,7 +21,7 @@ To add or remove the parts of the packet from the block, try clicking the blue g
   * `receivedString` - The [string](/reference/types/string) that was sent in this packet or the empty string if this packet did not contain a string. See [send string](/reference/radio/send-string) and [send value](/reference/radio/send-value)
   * `time` - The system time of the @boardname@ that sent this packet at the time the packet was sent.
   * `serial` - The serial number of the @boardname@ that sent this packet or `0` if the @boardname@ did not include its serial number.
-  * `signal` - How strong the radio signal is from `255` (weak) to `0` (strong).
+  * `signal` - How strong the radio signal is from `-128` (weak) to `-42` (strong).
 
 ### Example
 
@@ -39,6 +39,23 @@ radio.onDataPacketReceived(({ receivedNumber }) => {
 })
 ```
 
+### Example
+
+This program uses the signal strength from received packets to graph the
+approximate distance between two @boardname@s.
+
+```blocks
+basic.forever(() => {
+    radio.sendNumber(0)
+})
+radio.onDataPacketReceived(({ signal, receivedNumber }) => {
+    led.plotBarGraph(
+        Math.abs(signal + 42),
+        128 - 42
+    )
+})
+```
+
 ### See also
 
 [send number](/reference/radio/send-number),

docs/reference/radio/received-signal-strength.md

@@ -2,8 +2,8 @@
 
 > Note: This API has been deprecated! Use [on data packet received](/reference/radio/on-data-packet-received) instead.
 
-Find how strong the ``radio`` signal is, from `255` to `0`.
-(`255` means a weak signal and `0` means a strong one.)
+Find how strong the ``radio`` signal is, from `-128` to `-42`.
+(`-128` means a weak signal and `-42` means a strong one.)
 
 The @boardname@ finds the signal strength by checking how strong it was
 the last time it ran the
@@ -16,7 +16,7 @@ radio.receivedSignalStrength();
 
 ### Returns
 
-* a [number](/reference/types/number) between `255` and `0` that means
+* a [number](/reference/types/number) between `-128` and `-42` that means
 how strong the signal is.
 
 ### Simulator

docs/reference/serial.md

@@ -7,8 +7,11 @@ serial.writeLine("");
 serial.writeNumber(0);
 serial.writeValue("x", 0);
 serial.writeString("");
+serial.readUntil(",");
 serial.readLine();
+serial.readString();
 serial.redirect(SerialPin.P0, SerialPin.P0, BaudRate.BaudRate115200);
+serial.onDataReceived(",", () => {})
 ```
 
 ### See Also

docs/reference/serial/on-data-received.md

@@ -0,0 +1,29 @@
+# Serial On Data Received
+
+Registers an event to be fired when one of the delimiter is matched.
+
+
+```sig
+serial.onDataReceived(",", () => {})
+```
+
+### Parameters
+
+* `delimiters` is a [string](/reference/types/string) containing any of the character to match
+
+### Example
+
+Read values separated by `,`:
+
+```blocks
+serial.onDataReceived(serial.delimiters(Delimiters.Comma), () => {
+    basic.showString(serial.readUntil(serial.delimiters(Delimiters.Comma)))
+})
+```
+
+### See also
+
+[serial](/device/serial),
+[serial write line](/reference/serial/write-line),
+[serial write value](/reference/serial/write-value)
+

docs/reference/serial/read-string.md

@@ -0,0 +1,27 @@
+# Serial Read String
+
+Read the buffered serial data as a string
+
+```sig
+serial.readString();
+```
+
+### Returns
+
+* a [string](/reference/types/string) containing input from the serial port. Empty if no data available.
+
+### Example
+
+The following program scrolls text on the screen as it arrives from serial.
+
+```blocks
+basic.forever(() => {
+    basic.showString(serial.readString());
+});
+```
+
+### See also
+
+[serial](/device/serial),
+[serial write line](/reference/serial/write-line),
+[serial write value](/reference/serial/write-value)

docs/static/avatar.svg

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   role="img"
+   aria-labelledby="title  desc"
+   xml:space="preserve"
+   enable-background="new 0 0 280 32.755"
+   height="52.672001"
+   width="52.672001"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="logo.square.black.svg"><sodipodi:namedview
+     pagecolor="#ff00ff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1536"
+     inkscape:window-height="801"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="2.0836233"
+     inkscape:cx="83.390493"
+     inkscape:cy="16.071144"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><rect
+     id="backgroundrect"
+     width="195.47368"
+     height="34.210526"
+     x="0"
+     y="18.461473"
+     class=""
+     style="fill:none;stroke:none" /><title
+     id="title"
+     lang="en-GB">BBC micro:bit</title><desc
+     id="desc"
+     lang="en-GB">BBC micro:bit logo</desc><metadata
+     id="metadata37"><rdf:rdf><cc:work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:work></rdf:rdf><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>BBC micro:bit</dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs35" /><path
+     inkscape:connector-curvature="0"
+     class=""
+     d="m 37.363,29.377 c -1.677,0 -3.035,-1.364 -3.035,-3.042 0,-1.678 1.357,-3.038 3.035,-3.038 1.684,0 3.039,1.36 3.039,3.038 0,1.678 -1.355,3.042 -3.039,3.042 M 15.052,23.3 c -1.677,0 -3.042,1.357 -3.042,3.035 0,1.678 1.363,3.042 3.042,3.042 1.674,0 3.036,-1.364 3.036,-3.042 0,-1.678 -1.363,-3.035 -3.036,-3.035 m -0.003,-5.99 22.576,0 c 4.979,0 9.027,4.047 9.027,9.027 0,4.979 -4.049,9.031 -9.027,9.031 l -22.576,0 c -4.977,0 -9.0299993,-4.053 -9.0299993,-9.031 C 6.0180007,21.357 10.072,17.31 15.049,17.31 m 22.576,24.076 c 8.299,0 15.047,-6.75 15.047,-15.049 0,-8.299 -6.748,-15.051 -15.047,-15.051 l -22.576,0 C 6.7500007,11.286 6.9250488e-7,18.038 6.9250488e-7,26.337 6.9250488e-7,34.636 6.7500007,41.386 15.049,41.386 l 22.576,0"
+     id="path21"
+     style="fill:#000000"
+     sodipodi:nodetypes="csssccsssccsssscccsssssc" /></svg>

docs/static/loader.svg

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   role="img"
+   aria-labelledby="title  desc"
+   xml:space="preserve"
+   enable-background="new 0 0 280 32.755"
+   height="52.672001"
+   width="52.672001"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="logo.square.white.svg"><sodipodi:namedview
+     pagecolor="#ff00ff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1536"
+     inkscape:window-height="801"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="2.0836233"
+     inkscape:cx="83.390493"
+     inkscape:cy="16.071144"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><rect
+     id="backgroundrect"
+     width="195.47368"
+     height="34.210526"
+     x="0"
+     y="18.461473"
+     class=""
+     style="fill:none;stroke:none" /><title
+     id="title"
+     lang="en-GB">BBC micro:bit</title><desc
+     id="desc"
+     lang="en-GB">BBC micro:bit logo</desc><metadata
+     id="metadata37"><rdf:rdf><cc:work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:work></rdf:rdf><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>BBC micro:bit</dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs35" /><path
+     inkscape:connector-curvature="0"
+     class=""
+     d="m 37.363,29.377 c -1.677,0 -3.035,-1.364 -3.035,-3.042 0,-1.678 1.357,-3.038 3.035,-3.038 1.684,0 3.039,1.36 3.039,3.038 0,1.678 -1.355,3.042 -3.039,3.042 M 15.052,23.3 c -1.677,0 -3.042,1.357 -3.042,3.035 0,1.678 1.363,3.042 3.042,3.042 1.674,0 3.036,-1.364 3.036,-3.042 0,-1.678 -1.363,-3.035 -3.036,-3.035 m -0.003,-5.99 22.576,0 c 4.979,0 9.027,4.047 9.027,9.027 0,4.979 -4.049,9.031 -9.027,9.031 l -22.576,0 c -4.977,0 -9.0299993,-4.053 -9.0299993,-9.031 C 6.0180007,21.357 10.072,17.31 15.049,17.31 m 22.576,24.076 c 8.299,0 15.047,-6.75 15.047,-15.049 0,-8.299 -6.748,-15.051 -15.047,-15.051 l -22.576,0 C 6.7500007,11.286 6.9250488e-7,18.038 6.9250488e-7,26.337 6.9250488e-7,34.636 6.7500007,41.386 15.049,41.386 l 22.576,0"
+     id="path21"
+     style="fill:#ffffff"
+     sodipodi:nodetypes="csssccsssccsssscccsssssc" /></svg>

docs/static/logo.square.black.svg

@@ -11,8 +11,7 @@
    aria-labelledby="title  desc"
    xml:space="preserve"
    enable-background="new 0 0 280 32.755"
-   height="52.672001"
-   width="52.672001"
+   viewBox="0 0 52.672001 52.672001"
    version="1.1"
    id="svg2"
    inkscape:version="0.91 r13725"

docs/static/logo.square.white.svg

@@ -11,8 +11,7 @@
    aria-labelledby="title  desc"
    xml:space="preserve"
    enable-background="new 0 0 280 32.755"
-   height="52.672001"
-   width="52.672001"
+   viewBox="0 0 52.672001 52.672001"
    version="1.1"
    id="svg2"
    inkscape:version="0.91 r13725"

docs/tutorials/getting-started.md

@@ -0,0 +1,74 @@
+# Getting started
+
+### Step 1
+
+Place blocks in the workspace to scroll text on the screen.
+
+```blocks
+basic.showString("Hello!")
+```
+
+### Step 2
+
+Click ``|Download|`` to transfer your code in your @boardname@!
+
+### Step 3
+
+Great, the text scrolled! But then it stopped.
+Let's make it scroll when button **A** is pressed.
+
+```block
+input.onButtonPressed(Button.A, () => {
+    basic.showString("Hello!")
+});
+```
+
+### Step 4
+
+Click ``|Download|`` to transfer your code
+and press **A** to scroll your text.
+
+### Step 5
+
+Place more blocks to display a smiley when button **B** is pressed.
+Use the dropdown to find ``B``!
+
+```block
+input.onButtonPressed(Button.B, () => {
+    basic.showLeds(`
+    # # . # #
+    # # . # #
+    . . . . .
+    # . . . #
+    . # # # .
+    `)
+})
+```
+
+### Step 6
+
+Drag more blocks to display a frownie when @boardname@ is shaken.
+
+```block
+input.onGesture(Gesture.Shake, () => {
+    basic.showLeds(`
+    # # . # #
+    # # . # #
+    . . . . .
+    . # # # .
+    # . . . #
+    `)
+})
+```
+
+### Step 7
+
+Drag more blocks to display a random number when pin ``P0`` is touched.
+Hold your right thumb on the ``GND`` metal pin 
+at press the ``0`` pin with your right hand to trigger this event.
+
+```block
+input.onPinPressed(TouchPin.P0, () => {
+    basic.showNumber(Math.random(7))
+})
+```

electron/product.json

@@ -1,14 +1,14 @@
 {
     "applicationName": "pxt-microbit-oss",
     "dataFolderName": ".pxt-microbit-oss",
-    "darwinBundleIdentifier": "com.microsoft.pxtoss",
-    "nameShort": "PXT Microbit - OSS",
-    "nameLong": "PXT Microbit - OSS",
+    "darwinBundleIdentifier": "com.microsoft.pxtmicrobitoss",
+    "nameShort": "PXT microbit - OSS",
+    "nameLong": "PXT micro:bit - OSS",
     "targetId": "pxt-microbit",
     "win32AppId": "{{92db071a-6f58-4938-8c97-13c873f4da13}",
-    "win32AppUserModelId": "Microsoft.PXTMicrobitOss",
-    "win32DirName": "Microsoft PXT-Microbit - OSS",
+    "win32AppUserModelId": "Microsoft.PXTmicrobitOss",
+    "win32DirName": "Microsoft PXT microbit - OSS",
     "win32MutexName": "pxtmicrobitoss",
-    "win32NameVersion": "Microsoft PXT-Microbit-OSS",
-    "win32RegValueName": "PXTMicrobitOss"
+    "win32NameVersion": "Microsoft PXT microbit-OSS",
+    "win32RegValueName": "PXTmicrobitOss"
 }

electron/release.json

@@ -0,0 +1,9 @@
+{
+    "versions": {
+        "0": {
+            "latest": "v0.7.41",
+            "banned": [],
+            "prompt": "v0.7.41"
+        }
+    }
+}

libs/blocksprj/main.blocks

@@ -1,62 +1,4 @@
 <xml xmlns="http://www.w3.org/1999/xhtml">
-<block type="device_forever">
-<statement name="HANDLER">
-<block type="device_show_leds">
-<field name="LED00">FALSE</field>
-<field name="LED10">FALSE</field>
-<field name="LED20">FALSE</field>
-<field name="LED30">FALSE</field>
-<field name="LED40">FALSE</field>
-<field name="LED01">FALSE</field>
-<field name="LED11">TRUE</field>
-<field name="LED21">FALSE</field>
-<field name="LED31">TRUE</field>
-<field name="LED41">FALSE</field>
-<field name="LED02">FALSE</field>
-<field name="LED12">FALSE</field>
-<field name="LED22">FALSE</field>
-<field name="LED32">FALSE</field>
-<field name="LED42">FALSE</field>
-<field name="LED03">TRUE</field>
-<field name="LED13">FALSE</field>
-<field name="LED23">FALSE</field>
-<field name="LED33">FALSE</field>
-<field name="LED43">TRUE</field>
-<field name="LED04">FALSE</field>
-<field name="LED14">TRUE</field>
-<field name="LED24">TRUE</field>
-<field name="LED34">TRUE</field>
-<field name="LED44">FALSE</field>
-<next>
-<block type="device_show_leds">
-<field name="LED00">FALSE</field>
-<field name="LED10">FALSE</field>
-<field name="LED20">FALSE</field>
-<field name="LED30">FALSE</field>
-<field name="LED40">FALSE</field>
-<field name="LED01">FALSE</field>
-<field name="LED11">FALSE</field>
-<field name="LED21">FALSE</field>
-<field name="LED31">FALSE</field>
-<field name="LED41">FALSE</field>
-<field name="LED02">FALSE</field>
-<field name="LED12">FALSE</field>
-<field name="LED22">FALSE</field>
-<field name="LED32">FALSE</field>
-<field name="LED42">FALSE</field>
-<field name="LED03">FALSE</field>
-<field name="LED13">FALSE</field>
-<field name="LED23">FALSE</field>
-<field name="LED33">FALSE</field>
-<field name="LED43">FALSE</field>
-<field name="LED04">FALSE</field>
-<field name="LED14">FALSE</field>
-<field name="LED24">FALSE</field>
-<field name="LED34">FALSE</field>
-<field name="LED44">FALSE</field>
-</block>
-</next>
-</block>
-</statement>
-</block>
+  <block type="pxt-on-start"></block>
+  <block type="device_forever"></block>
 </xml>

libs/blocksprj/main.ts

@@ -1,16 +1 @@
-basic.forever(() => {
-    basic.showLeds(`
-        . # . # .
-        # . # . #
-        # . . . #
-        . # . # .
-        . . # . .
-        `)
-    basic.showLeds(`
-        . . . . .
-        . . . . .
-        . . . . .
-        . . . . .
-        . . . . .
-        `)
-})
+

libs/bluetooth/_locales/bluetooth-jsdoc-strings.json

@@ -1,5 +1,14 @@
 {
-  "bluetooth": "Support for additional Bluetooth services.",
+  "bluetooth": "Support for additional Bluetooth services.\n\nSupport for additional Bluetooth services.",
+  "bluetooth.advertiseUid": "Advertise an Eddystone UID",
+  "bluetooth.advertiseUidBuffer": "Advertise an Eddystone UID",
+  "bluetooth.advertiseUidBuffer|param|connectable": "true to keep bluetooth connectable for other services, false otherwise.",
+  "bluetooth.advertiseUidBuffer|param|nsAndInstance": "16 bytes buffer of namespace (bytes 0-9) and instance (bytes 10-15)",
+  "bluetooth.advertiseUidBuffer|param|power": "power level between 0 and 7, eg: 7",
+  "bluetooth.advertiseUid|param|connectable": "true to keep bluetooth connectable for other services, false otherwise.",
+  "bluetooth.advertiseUid|param|instance": "4 last bytes of the instance uid",
+  "bluetooth.advertiseUid|param|ns": "4 last bytes of the namespace uid",
+  "bluetooth.advertiseUid|param|power": "power level between 0 and 7, eg: 7",
   "bluetooth.advertiseUrl": "Advertise an Eddystone URL",
   "bluetooth.advertiseUrl|param|connectable": "true to keep bluetooth connectable for other services, false otherwise.",
   "bluetooth.advertiseUrl|param|power": "power level between 0 and 7, eg: 7",

libs/bluetooth/_locales/bluetooth-strings.json

@@ -1,4 +1,5 @@
 {
+  "bluetooth.advertiseUid|block": "bluetooth advertise UID|namespace (bytes 6-9)%ns|instance (bytes 2-6)%instance|with power %power|connectable %connectable",
   "bluetooth.advertiseUrl|block": "bluetooth advertise url %url|with power %power|connectable %connectable",
   "bluetooth.onBluetoothConnected|block": "on bluetooth connected",
   "bluetooth.onBluetoothDisconnected|block": "on bluetooth disconnected",

libs/bluetooth/_locales/de/bluetooth-jsdoc-strings.json

@@ -1,4 +1,5 @@
 {
+  "bluetooth.onBluetoothConnected|param|body": "Code, der ausgeführt wird, wenn eine Bluetooth-Verbindung aufgebaut wurde",
   "bluetooth.uartWriteNumber": "Gibt einen numerischen Wert an die serielle",
   "bluetooth.uartWriteValue": "Schreibt ein ``Namen: Wert`` Wertepaar auf die serielle Schnittstelle.",
   "bluetooth.uartWriteValue|param|name": "Name des Wertestreams, z.B.: x",

libs/bluetooth/_locales/no/bluetooth-strings.json

@@ -0,0 +1,21 @@
+{
+  "bluetooth.advertiseUid|block": "bluetooth kringkast UID|namespace (bytes 6-9)%ns|instance (bytes 2-6)%instance|med sendereffekt %power|kan tilkobles %connectable",
+  "bluetooth.advertiseUrl|block": "bluetooth kringkast url %url|med sendereffekt %power|kan tilkobles %connectable",
+  "bluetooth.onBluetoothConnected|block": "når bluetooth tilkobles",
+  "bluetooth.onBluetoothDisconnected|block": "når bluetooth frakobles",
+  "bluetooth.setTransmitPower|block": "bluetooth sett sendereffekt %power",
+  "bluetooth.startAccelerometerService|block": "bluetooth akselerometer-tjeneste",
+  "bluetooth.startButtonService|block": "bluetooth trykknapp-tjeneste",
+  "bluetooth.startIOPinService|block": "bluetooth digital tilkobling-tjeneste",
+  "bluetooth.startLEDService|block": "bluetooth LED-tjeneste",
+  "bluetooth.startMagnetometerService|block": "bluetooth magnetometer-tjeneste",
+  "bluetooth.startTemperatureService|block": "bluetooth temperatur-tjeneste",
+  "bluetooth.startUartService|block": "bluetooth serieport-tjeneste (UART)",
+  "bluetooth.stopAdvertising|block": "bluetooth stopp kringkasting",
+  "bluetooth.uartReadUntil|block": "bluetooth serieport|les frem til %del=serial_delimiter_conv",
+  "bluetooth.uartWriteNumber|block": "bluetooth serieport|skriv tall %value",
+  "bluetooth.uartWriteString|block": "bluetooth serieport|skriv tekst %data",
+  "bluetooth.uartWriteValue|block": "bluetooth serieport|skriv verdi %name|= %value",
+  "bluetooth|block": "bluetooth",
+  "{id:category}Bluetooth": "Bluetooth"
+}

libs/bluetooth/bluetooth.cpp

@@ -7,7 +7,7 @@ using namespace pxt;
 /**
  * Support for additional Bluetooth services.
  */
-//% color=#0082FB weight=20
+//% color=#0082FB weight=96 icon="\uf294"
 namespace bluetooth {
     MicroBitUARTService *uart = NULL;
 
@@ -137,6 +137,24 @@ namespace bluetooth {
         uBit.bleManager.setTransmitPower(power);
     }
 
+    /**
+    * Advertise an Eddystone UID
+	* @param nsAndInstance 16 bytes buffer of namespace (bytes 0-9) and instance (bytes 10-15)
+	* @param power power level between 0 and 7, eg: 7
+    * @param connectable true to keep bluetooth connectable for other services, false otherwise.
+    */
+    //% parts=bluetooth weight=12 advanced=true
+    void advertiseUidBuffer(Buffer nsAndInstance, int power, bool connectable) {
+        ManagedBuffer buf(nsAndInstance);
+        if (buf.length() != 16) return;
+
+        power = min(MICROBIT_BLE_POWER_LEVELS-1, max(0, power));
+        int8_t level = CALIBRATED_POWERS[power];
+        uint8_t uidNs[10]; buf.readBytes(uidNs, 0, 10);
+        uint8_t uidInst[6]; buf.readBytes(uidInst, 10, 6);
+        uBit.bleManager.advertiseEddystoneUid((const char*)uidNs, (const char*)uidInst, level, connectable);
+    }
+
     /**
     * Sets the bluetooth transmit power between 0 (minimal) and 7 (maximum).
     * @param power power level between 0 (minimal) and 7 (maximum), eg: 7.

libs/bluetooth/bluetooth.ts

@@ -1,7 +1,7 @@
 /**
  * Support for additional Bluetooth services.
  */
-//% color=#0082FB weight=20
+//% color=#0082FB weight=96 icon="\uf294"
 namespace bluetooth {
     /**
     *  Writes to the Bluetooth UART service buffer. From there the data is transmitted over Bluetooth to a connected device.
@@ -46,4 +46,21 @@ namespace bluetooth {
         // dummy implementation for simulator
         return "???"
     }
+
+    /**
+    * Advertise an Eddystone UID
+    * @param ns 4 last bytes of the namespace uid
+    * @param instance 4 last bytes of the instance uid
+    * @param power power level between 0 and 7, eg: 7
+    * @param connectable true to keep bluetooth connectable for other services, false otherwise.
+    */
+    //% blockId=eddystone_advertise_uid block="bluetooth advertise UID|namespace (bytes 6-9)%ns|instance (bytes 2-6)%instance|with power %power|connectable %connectable"
+    //% parts=bluetooth weight=12 blockGap=8
+    //% help=bluetooth/advertise-uid blockExternalInputs=1
+    export function advertiseUid(ns: number, instance: number, power: number, connectable: boolean) {
+        const buf = pins.createBuffer(16);
+        buf.setNumber(NumberFormat.Int32BE, 6, ns);
+        buf.setNumber(NumberFormat.Int32BE, 12, instance);
+        bluetooth.advertiseUidBuffer(buf, power, connectable);
+    }
 }