0.7.41

Bump pxt-core to 0.10.11
Add openocd script (for pxt gdb)
2017-01-19 16:09:32 -08:00 · 2017-01-19 16:09:29 -08:00 · 2017-01-19 17:24:03 +00:00 · 2017-01-19 17:23:51 +00:00 · 2017-01-19 00:19:15 -08:00 · 2017-01-19 00:19:14 -08:00
135 changed files with 2333 additions and 940 deletions
--- a/.gitignore
+++ b/.gitignore
@ -15,7 +15,7 @@ clients/win10/app/bld
 clients/win10/*.opendb
 clients/**/bin/**
 clients/**/obj/**
-clients/electron/projects
+electron-out
 hexcache

 *.user
--- a/README.md
+++ b/README.md
@ -7,6 +7,10 @@ PXT ([Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt

 [![Build Status](https://travis-ci.org/Microsoft/pxt-microbit.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-microbit)

+## Issue tracking
+
+All issue tracking for this repo happens at https://github.com/Microsoft/pxt, see you there!
+
 ## Local server

 The local server allows to run the editor and the documentation from your computer.
--- a/clients/electron/.gitignore
+++ b/clients/electron/.gitignore
@ -1,2 +0,0 @@
-node_modules
-projects
--- a/clients/electron/README.md
+++ b/clients/electron/README.md
@ -1,5 +0,0 @@
-# PXT micro:bit Electron app
-
-A very basic wrapper around the web app. To install, copy the contents of this
-directory to somewhere outside the main `pxt-microbit` repository. Then run `npm
-install && npm start`.
--- a/clients/electron/index.html
+++ b/clients/electron/index.html
@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <title>code the micro:bit</title>
-  </head>
-  <body>
-    <webview id="webview" style="position:absolute; left:0; top:0; right:0; bottom:0"/>
-    <script>
-      const webview = document.getElementById("webview")
-      const url = `http://localhost:3232/${window.location.hash}`
-      webview.src = url
-    </script>
-  </body>
-</html>
--- a/clients/electron/main.js
+++ b/clients/electron/main.js
@ -1,39 +0,0 @@
-const {app, BrowserWindow, Menu} = require('electron')
-const pxt = require('pxt-core')
-const path = require('path')
-
-let win
-
-const cliPath = path.join(process.cwd(), "node_modules/pxt-microbit") 
-
-function startServerAndCreateWindow() {
-  pxt.mainCli(cliPath, ["serve", "-no-browser"])
-  createWindow()
-}
-
-function createWindow () {
-  win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    title: "code the micro:bit"
-  })
-  Menu.setApplicationMenu(null)
-  win.loadURL(`file://${__dirname}/index.html#local_token=${pxt.globalConfig.localToken}`)
-  win.on('closed', () => {
-    win = null
-  })
-}
-
-app.on('ready', startServerAndCreateWindow)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (win === null) {
-    createWindow()
-  }
-})
--- a/clients/electron/package.json
+++ b/clients/electron/package.json
@ -1,14 +0,0 @@
-{
-  "name"    : "code-the-microbit",
-  "version" : "1.0.0",
-  "description": "Blocks / Javascript editor",
-  "author": "Microsoft",
-  "main"    : "main.js",
-  "scripts": {
-      "start": "node_modules/.bin/electron ."
-  },
-  "devDependencies": {
-      "electron": "*",
-      "pxt-microbit": "*"
-  }
-}
--- a/cmds/cmds.ts
+++ b/cmds/cmds.ts
@ -1,60 +0,0 @@
-/// <reference path="../node_modules/pxt-core/typings/node/node.d.ts"/>
-/// <reference path="../node_modules/pxt-core/built/pxtlib.d.ts" />
-
-import * as fs from "fs";
-import * as path from "path";
-import * as child_process from "child_process";
-
-let writeFileAsync: any = Promise.promisify(fs.writeFile)
-let execAsync: (cmd: string, options?: { cwd?: string }) => Promise<Buffer> = Promise.promisify(child_process.exec)
-let readDirAsync = Promise.promisify(fs.readdir)
-
-
-export function deployCoreAsync(res: ts.pxtc.CompileResult) {
-    return getBitDrivesAsync()
-        .then(drives => {
-            if (drives.length == 0) {
-                console.log("cannot find any drives to deploy to");
-                return Promise.resolve(0);
-            }
-
-            console.log(`copy ${ts.pxtc.BINARY_HEX} to ` + drives.join(", "));
-
-            let writeHexFile = (filename: string) => {
-                return writeFileAsync(filename + ts.pxtc.BINARY_HEX, res.outfiles[ts.pxtc.BINARY_HEX])
-                    .then(() => console.log("wrote hex file to " + filename));
-            };
-
-            return Promise.map(drives, d => writeHexFile(d))
-                .then(() => drives.length);
-        });
-}
-
-function getBitDrivesAsync(): Promise<string[]> {
-    if (process.platform == "win32") {
-        const rx = new RegExp("^([A-Z]:).* " + pxt.appTarget.compile.deployDrives)
-        return execAsync("wmic PATH Win32_LogicalDisk get DeviceID, VolumeName, FileSystem")
-            .then(buf => {
-                let res: string[] = []
-                buf.toString("utf8").split(/\n/).forEach(ln => {
-                    let m = rx.exec(ln)
-                    if (m) {
-                        res.push(m[1] + "/")
-                    }
-                })
-                return res
-            })
-    }
-    else if (process.platform == "darwin") {
-        const rx = new RegExp(pxt.appTarget.compile.deployDrives)
-        return readDirAsync("/Volumes")
-            .then(lst => lst.filter(s => rx.test(s)).map(s => "/Volumes/" + s + "/"))
-    } else if (process.platform == "linux") {
-        const rx = new RegExp(pxt.appTarget.compile.deployDrives)
-        const user = process.env["USER"]
-        return readDirAsync(`/media/${user}`)
-            .then(lst => lst.filter(s => rx.test(s)).map(s => `/media/${user}/${s}/`))
-    } else {
-        return Promise.resolve([])
-    }
-}
--- a/cmds/pxtrequire.ts
+++ b/cmds/pxtrequire.ts
@ -1,3 +1,6 @@
+/// <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";
 export let pxtCore = require("pxt-core");
 // require.resolve() gives path to [pxt dir]/built/pxt.js, so move up twice to get pxt root dir
--- a/docs/blocks.md
+++ b/docs/blocks.md
@ -11,4 +11,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)
--- a/docs/blocks/logic/boolean.md
+++ b/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.
--- a/docs/blocks/logic/if.md
+++ b/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

--- a/docs/blocks/loops/for.md
+++ b/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
--- a/docs/blocks/loops/while.md
+++ b/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
--- a/docs/blocks/on-start.md
+++ b/docs/blocks/on-start.md
@ -0,0 +1,22 @@
+# 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.
--- a/docs/getting-started.md
+++ b/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.
--- a/docs/getting-started/buttons.md
+++ b/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.

 #### ~

--- a/docs/getting-started/coin-flipper.md
+++ b/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!
--- a/docs/getting-started/screen.md
+++ b/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
 ### ~
--- a/docs/index-ref.json
+++ b/docs/index-ref.json
@ -1,3 +1,3 @@
 {
-    "appref": "v0.6.13"
+    "appref": "v0.6.36"
 }
--- a/docs/projects.md
+++ b/docs/projects.md
@ -66,6 +66,10 @@ Fun games to build with your @boardname@.

 ```codecard
 [{
+  "name": "Inchworm",
+  "url":"/projects/inchworm",
+  "imageUrl":"/static/mb/projects/inchworm.jpg"
+}, {
  "name": "Timing gates",
  "url":"/projects/timing-gates",
  "imageUrl":"/static/mb/projects/timing-gates.jpg"
--- a/docs/projects/compass.md
+++ b/docs/projects/compass.md
@ -10,12 +10,10 @@ Welcome! This guided tutorial will show you how to program a script that display

 ### ~

-
 ## Step 1

 Create a loop that will continuously update the reading of the compass.

-
 ```blocks
 basic.forever(() => {
    
--- a/docs/projects/flashing-heart.md
+++ b/docs/projects/flashing-heart.md
@ -2,8 +2,7 @@

 ### ~avatar avatar

-Use the LEDs to display a flashing heart, and then create
-an animation of a broken heart. :(
+Use the LEDs to display a flashing heart!

 ### ~

@ -38,19 +37,19 @@ basic.clearScreen();

 ## Step 3

-Put a [forever loop](/reference/basic/forever) around it.
+Put a [forever loop](/reference/basic/forever) around it to repeat the animation.

 ```blocks
 basic.forever(() => {
-basic.showLeds(`
-    . # . # .
-    # # # # #
-    # # # # #
-    . # # # .
-    . . # . .`
-    );
-basic.pause(500);
-basic.clearScreen();
+    basic.showLeds(`
+        . # . # .
+        # # # # #
+        # # # # #
+        . # # # .
+        . . # . .`
+        );
+    basic.pause(500);
+    basic.clearScreen();
 })
 ```

@ -60,45 +59,50 @@ Add a [pause](/reference/basic/pause) to wait after clearing the screen.

 ```blocks
 basic.forever(() => {
-basic.showLeds(`
-    . # . # .
-    # # # # #
-    # # # # #
-    . # # # .
-    . . # . .`
-    );
-basic.pause(500);
-basic.clearScreen();
-basic.pause(500);
+    basic.showLeds(`
+        . # . # .
+        # # # # #
+        # # # # #
+        . # # # .
+        . . # . .`
+        );
+    basic.pause(500);
+    basic.clearScreen();
+    basic.pause(500);
 })
 ```

-## Step 5
+## Send your heartbeats over radio!

-Add a second image of a broken heart. 
+Do you have a second @boardname@ at hand? You could use radio and send your heartbeats to other
+@boardname@ and show a heart when you receive one.

+* move the code in the **forever** inside 
+a [on data packet received](/reference/radio/on-data-packet-received) handler. 
+The handler will run whenever a message is received from another @boardname@.
+* use [send number](/reference/radio/send-number) and [pause](/reference/basic/pause) 
+to broadcast a packet of data every second.

 ```blocks
 basic.forever(() => {
-basic.showLeds(`
-    . # . # .
-    # # # # #
-    # # # # #
-    . # # # .
-    . . # . .`
-    );
-basic.pause(500);
-basic.clearScreen();
-basic.pause(500);
-basic.showLeds(`
-    . # . # .
-    # . # # #
-    # . . . #
-    . # # # .
-    . . # . .`
-    );
-basic.pause(500);
-basic.clearScreen();
-basic.pause(500);
+    radio.sendNumber(0)
+    basic.pause(1000)
+})
+radio.onDataPacketReceived(({receivedNumber}) => {
+    basic.showLeds(`
+        . # . # .
+        # # # # #
+        # # # # #
+        . # # # .
+        . . # . .`);
+    basic.pause(500)
+    basic.clearScreen()
+    basic.pause(500)
 })
 ```
+
+Download the .hex file onto both @boardname@ and try it out!
+
+```package
+radio
+```
--- a/docs/projects/hack-your-headphones/music-of-light.md
+++ b/docs/projects/hack-your-headphones/music-of-light.md
@ -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.
--- a/docs/projects/inchworm.md
+++ b/docs/projects/inchworm.md
@ -0,0 +1,40 @@
+
+# Inchworm
+
+### @description A inchworm like robot built with the micro:bit
+
+### ~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)
+
+## Activities
+
+* [Servo](/projects/inchworm/servo)  
+* [Chassis](/projects/inchworm/chassis)  
+* [Code](/projects/inchworm/code)  
+
+### ~button /projects/inchworm/servo
+
+Let's get started!
+
+### ~
--- a/docs/projects/inchworm/chassis.md
+++ b/docs/projects/inchworm/chassis.md
@ -0,0 +1,88 @@
+# Chassis
+### @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
+### ~
--- a/docs/projects/inchworm/code.md
+++ b/docs/projects/inchworm/code.md
@ -0,0 +1,52 @@
+# 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.
+
+### ~
+
+## Step 2: radio controlled inchworm
+
+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
+```
--- a/docs/projects/inchworm/servo.md
+++ b/docs/projects/inchworm/servo.md
@ -0,0 +1,130 @@
+# Preparing the servo
+### @description Connecting the servo to crocodile clips
+
+### ~avatar avatar
+
+Equip the microservo with crocodile clips.
+
+### ~
+
+## Duration: ~30 minutes
+
+## 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 solver 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
+let a = 0
+basic.forever(() => {
+    a = input.acceleration(Dimension.X)
+    pins.servoWritePin(AnalogPin.P0, pins.map(
+        a,
+        -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.
+
+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.
+
+
+### ~button /projects/inchworm/chassis
+NEXT: Chassis
+### ~
--- a/docs/projects/magic-button-trick.md
+++ b/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, () => {
--- a/docs/projects/smiley-buttons.md
+++ b/docs/projects/smiley-buttons.md
@ -12,8 +12,8 @@ Use [show leds](/reference/basic/show-leds) to make a smiley face:

 ```blocks
 basic.showLeds(`
-    . # . # .
-    . # . # .
+    # # . # #
+    # # . # #
    . . . . .
    # . . . #
    . # # # .`
@ -22,56 +22,93 @@ basic.showLeds(`

 ## Step 2

-Add an input block for when [button A is pressed](/reference/input/button-is-pressed), and put a
-frowny face inside it:
+Add an input block for when [button A is pressed](/reference/input/button-is-pressed), 
+and **move** the smiley face inside it:

 ```blocks
-basic.showLeds(`
-    . # . # .
-    . # . # .
-    . . . . .
-    # . . . #
-    . # # # .`
-    );
 input.onButtonPressed(Button.A, () => { 
    basic.showLeds(`
-        . # . # .
-        . # . # .
-        . . . . .
-        . # # # .
-        # . . . #`
-        );
-});
-```
-
-## Step 3
-
-Now add blocks so that when [button B is pressed](/reference/input/button-is-pressed), a smiley appears:
-
-```blocks
-basic.showLeds(`
-    . # . # .
-    . # . # .
-    . . . . .
-    # . . . #
-    . # # # .`
-    );
-input.onButtonPressed(Button.A, () => { 
-    basic.showLeds(`
-        . # . # .
-        . # . # .
-        . . . . .
-        . # # # .
-        # . . . #`
-        );
-});
-input.onButtonPressed(Button.B, () => { 
-    basic.showLeds(`
-        . # . # .
-        . # . # .
+        # # . # #
+        # # . # #
        . . . . .
        # . . . #
        . # # # .`
        );
 });
 ```
+
+Try pressing button A!
+
+## Step 3
+
+Now add blocks so that when [button B is pressed](/reference/input/on-button-pressed), 
+a frowney appears:
+
+```blocks
+input.onButtonPressed(Button.A, () => { 
+    basic.showLeds(`
+        # # . # #
+        # # . # #
+        . . . . .
+        # . . . #
+        . # # # .`
+        );
+});
+input.onButtonPressed(Button.B, () => { 
+    basic.showLeds(`
+        # # . # #
+        # # . # #
+        . . . . .
+        . # # # .
+        # . . . #`
+        );
+});
+```
+
+Try pressing ``A`` or ``B``!
+
+## Send your smileys over radio
+
+Do you have a second @boardname@ at hand? You could use radio and send your smileys or frownies to other
+@boardname@.
+
+Since radio can send numbers, we decide that ``0`` is the code for displaying a smiley 
+and ``1`` is the code for a frowney.
+
+Change your code as follows: 
+* [radio send number](/reference/radio/send-number) sends a number
+to any other @boardname@ in range
+* [radio on data packet received](/reference/radio/on-data-packet-received) runs code
+when data is received over radio
+
+```blocks
+input.onButtonPressed(Button.A, () => {
+    radio.sendNumber(0)
+})
+input.onButtonPressed(Button.B, () => {
+    radio.sendNumber(1)
+})
+radio.onDataPacketReceived(({receivedNumber}) => {
+    if (receivedNumber == 0) {
+        basic.showLeds(`
+            # # . # #
+            # # . # #
+            . . . . .
+            # . . . #
+            . # # # .
+            `)
+    } else {
+        basic.showLeds(`
+            # # . # #
+            # # . # #
+            . . . . .
+            . # # # .
+            # . . . #
+            `)
+    }
+})
+```
+
+```package
+radio
+```
--- a/docs/reference/basic/forever.md
+++ b/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)
 })
 ```

--- a/docs/reference/bluetooth.md
+++ b/docs/reference/bluetooth.md
@ -19,6 +19,7 @@ bluetooth.startMagnetometerService();
 bluetooth.startTemperatureService();
 bluetooth.onBluetoothConnected(() => {});
 bluetooth.onBluetoothDisconnected(() => {});
+bluetooth.setTransmitPower(7);
 ```

 ## UART 
@ -34,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();
 ```

--- a/docs/reference/bluetooth/advertise-uid-buffer.md
+++ b/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 micro:bit should accept connections. 
+
+
+## See Also
+
+[stop-advertising](/reference/bluetooth/stop-advertising), [advertise-uid](/reference/bluetooth/advertise-uid)
+
+```package
+bluetooth
+```
--- a/docs/reference/bluetooth/advertise-uid.md
+++ b/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 micro:bit 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
+```
--- a/docs/reference/bluetooth/advertise-url.md
+++ b/docs/reference/bluetooth/advertise-url.md
@ -18,24 +18,25 @@ Read more at https://lancaster-university.github.io/microbit-docs/ble/eddystone/
 ## ~

 ```sig
-bluetooth.advertiseUrl("https://pxt.microbit.org/", 7);
+bluetooth.advertiseUrl("https://pxt.microbit.org/", 7, true);
 ```

 ### Parameters

-* ``url`` - a [string](/reference/types/string) containing the URL to broadcast, at most 18 characters long
+* ``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 micro:bit should accept connections. 

 ### Example: Broadcast a secret code

 ```blocks
-bluetooth.advertiseUrl("https://pxt.io?secret=42", 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
-```
+```
--- a/docs/reference/bluetooth/set-transmit-power.md
+++ b/docs/reference/bluetooth/set-transmit-power.md
@ -0,0 +1,26 @@
+# Bluetooth Set Transmit Power
+
+### ~hint
+![](/static/bluetooth/Bluetooth_SIG.png)
+
+For another device like a smartphone to use any of the Bluetooth "services" which the @boardname@ has, it must first be [paired with the @boardname@](/reference/bluetooth/bluetooth-pairing). Once paired, the other device may connect to the @boardname@ and exchange data relating to many of the @boardname@'s features.
+
+### ~
+
+Change the output power level of the transmitter to the given value.
+
+```sig
+bluetooth.setTransmitPower(7);
+```
+
+### Parameters
+
+* `power`: a [number](/reference/types/number) in the range ``0..7``, where ``0`` is the lowest power and ``7`` is the highest.
+
+### See also
+
+[About Bluetooth](/reference/bluetooth/about-bluetooth), [@boardname@ Bluetooth profile overview ](http://lancaster-university.github.io/microbit-docs/ble/profile/), [@boardname@ Bluetooth profile reference](http://lancaster-university.github.io/microbit-docs/resources/bluetooth/microbit-profile-V1.9-Level-2.pdf),  [Bluetooth on @boardname@ resources](http://bluetooth-mdw.blogspot.co.uk/p/bbc-microbit.html), [Bluetooth SIG](https://www.bluetooth.com)
+
+```package
+bluetooth
+```
--- a/docs/reference/serial.md
+++ b/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
--- a/docs/reference/serial/on-data-received.md
+++ b/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)
+
--- a/docs/reference/serial/read-string.md
+++ b/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)
--- a/docs/reference/serial/read-until.md
+++ b/docs/reference/serial/read-until.md
@ -0,0 +1,28 @@
+# Serial Read Until
+
+Read a text from the serial port until a delimiter is found.
+
+```sig
+serial.readUntil(",");
+```
+
+### Returns
+
+* a [string](/reference/types/string) containing input from the serial port, such as a response typed by a user
+
+### Example
+
+The following example reads strings separated by commands (``,``).
+
+```blocks
+basic.forever(() => {
+    let answer = serial.readUntil(",");
+    serial.writeLine(answer);
+});
+```
+
+### See also
+
+[serial](/device/serial),
+[serial write line](/reference/serial/write-line),
+[serial write value](/reference/serial/write-value)
--- a/docs/static/Microsoft-logo_rgb_c-white.png
+++ b/docs/static/Microsoft-logo_rgb_c-white.png
--- a/docs/static/avatar.svg
+++ b/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>
--- a/docs/static/loader.svg
+++ b/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>
--- a/docs/static/mb/projects/inchworm.jpg
+++ b/docs/static/mb/projects/inchworm.jpg
--- a/docs/static/mb/projects/inchworm/chassis1.jpg
+++ b/docs/static/mb/projects/inchworm/chassis1.jpg
--- a/docs/static/mb/projects/inchworm/chassis2.jpg
+++ b/docs/static/mb/projects/inchworm/chassis2.jpg
--- a/docs/static/mb/projects/inchworm/chassis3.jpg
+++ b/docs/static/mb/projects/inchworm/chassis3.jpg
--- a/docs/static/mb/projects/inchworm/chassis4.jpg
+++ b/docs/static/mb/projects/inchworm/chassis4.jpg
--- a/docs/static/mb/projects/inchworm/chassis5.jpg
+++ b/docs/static/mb/projects/inchworm/chassis5.jpg
--- a/docs/static/mb/projects/inchworm/chassis6.jpg
+++ b/docs/static/mb/projects/inchworm/chassis6.jpg
--- a/docs/static/mb/projects/inchworm/chassis7.jpg
+++ b/docs/static/mb/projects/inchworm/chassis7.jpg
--- a/docs/static/mb/projects/inchworm/chassis8.jpg
+++ b/docs/static/mb/projects/inchworm/chassis8.jpg
--- a/docs/static/mb/projects/inchworm/circuit1.jpg
+++ b/docs/static/mb/projects/inchworm/circuit1.jpg
--- a/docs/static/mb/projects/inchworm/circuit2.jpg
+++ b/docs/static/mb/projects/inchworm/circuit2.jpg
--- a/docs/static/mb/projects/inchworm/clip1.jpg
+++ b/docs/static/mb/projects/inchworm/clip1.jpg
--- a/docs/static/mb/projects/inchworm/clip2.jpg
+++ b/docs/static/mb/projects/inchworm/clip2.jpg
--- a/docs/static/mb/projects/inchworm/clip3.jpg
+++ b/docs/static/mb/projects/inchworm/clip3.jpg
--- a/docs/static/mb/projects/inchworm/materials.jpg
+++ b/docs/static/mb/projects/inchworm/materials.jpg
--- a/docs/static/mb/projects/inchworm/ready.jpg
+++ b/docs/static/mb/projects/inchworm/ready.jpg
--- a/docs/static/mb/projects/inchworm/servo1.jpg
+++ b/docs/static/mb/projects/inchworm/servo1.jpg
--- a/docs/static/mb/projects/inchworm/servo3.jpg
+++ b/docs/static/mb/projects/inchworm/servo3.jpg
--- a/docs/static/mb/projects/inchworm/servo4.jpg
+++ b/docs/static/mb/projects/inchworm/servo4.jpg
--- a/docs/static/mb/projects/inchworm/servo5.jpg
+++ b/docs/static/mb/projects/inchworm/servo5.jpg
--- a/docs/static/mb/projects/inchworm/servo6.jpg
+++ b/docs/static/mb/projects/inchworm/servo6.jpg
--- a/docs/static/mb/projects/inchworm/servo7.jpg
+++ b/docs/static/mb/projects/inchworm/servo7.jpg
--- a/docs/static/mb/projects/inchworm/servo8.jpg
+++ b/docs/static/mb/projects/inchworm/servo8.jpg
--- a/docs/static/mb/projects/inchworm/servotrim.jpg
+++ b/docs/static/mb/projects/inchworm/servotrim.jpg
--- a/docs/tutorials/getting-started.md
+++ b/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))
+})
+```
--- a/docs/uploader.md
+++ b/docs/uploader.md
@ -38,7 +38,7 @@ That's it!

 ### Installation Instructions

-* Download the [Microsoft.Uploader.Microbit.zip](https://pxt.microbit.org/microbit-uploader.zip) file to your local computer.
+* Download the [Microsoft.Uploader.Microbit.zip](https://www.touchdevelop.com/microbituploader.zip) file to your local computer.
 * Unzip the .zip file to your desktop.
 * Launch the Microsoft.Uploader.exe file before working on your @boardname@.

--- a/electron/product.json
+++ b/electron/product.json
@ -0,0 +1,14 @@
+{
+    "applicationName": "pxt-microbit-oss",
+    "dataFolderName": ".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",
+    "win32MutexName": "pxtmicrobitoss",
+    "win32NameVersion": "Microsoft PXT microbit-OSS",
+    "win32RegValueName": "PXTmicrobitOss"
+}
--- a/electron/release.json
+++ b/electron/release.json
@ -0,0 +1,9 @@
+{
+    "versions": {
+        "0": {
+            "latest": "v0.7.29",
+            "banned": [],
+            "prompt": "v0.7.29"
+        }
+    }
+}
--- a/libs/blocksprj/main.blocks
+++ b/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>
--- a/libs/blocksprj/main.ts
+++ b/libs/blocksprj/main.ts
@ -1,16 +1 @@
-basic.forever(() => {
-    basic.showLeds(`
-        . # . # .
-        # . # . #
-        # . . . #
-        . # . # .
-        . . # . .
-        `)
-    basic.showLeds(`
-        . . . . .
-        . . . . .
-        . . . . .
-        . . . . .
-        . . . . .
-        `)
-})
+
--- a/libs/bluetooth/_locales/bluetooth-jsdoc-strings.json
+++ b/libs/bluetooth/_locales/bluetooth-jsdoc-strings.json
@ -1,12 +1,24 @@
 {
-  "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|power": "power level between 0 and 7, e.g.: 7",
-  "bluetooth.advertiseUrl|param|url": "the url to transmit. Must be no longer than the supported eddystone url length",
+  "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",
+  "bluetooth.advertiseUrl|param|url": "the url to transmit. Must be no longer than the supported eddystone url length, eg: \"https://pxt.io/\"",
  "bluetooth.onBluetoothConnected": "Register code to run when the micro:bit is connected to over Bluetooth",
  "bluetooth.onBluetoothConnected|param|body": "Code to run when a Bluetooth connection is established",
  "bluetooth.onBluetoothDisconnected": "Register code to run when a bluetooth connection to the micro:bit is lost",
  "bluetooth.onBluetoothDisconnected|param|body": "Code to run when a Bluetooth connection is lost",
+  "bluetooth.setTransmitPower": "Sets the bluetooth transmit power between 0 (minimal) and 7 (maximum).",
+  "bluetooth.setTransmitPower|param|power": "power level between 0 (minimal) and 7 (maximum), eg: 7.",
  "bluetooth.startAccelerometerService": "Starts the Bluetooth accelerometer service",
  "bluetooth.startButtonService": "Starts the Bluetooth button service",
  "bluetooth.startIOPinService": "Starts the Bluetooth IO pin service.",
--- a/libs/bluetooth/_locales/bluetooth-strings.json
+++ b/libs/bluetooth/_locales/bluetooth-strings.json
@ -1,7 +1,9 @@
 {
-  "bluetooth.advertiseUrl|block": "bluetooth advertise url %url|with power %power",
+  "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",
+  "bluetooth.setTransmitPower|block": "bluetooth set transmit power %power",
  "bluetooth.startAccelerometerService|block": "bluetooth accelerometer service",
  "bluetooth.startButtonService|block": "bluetooth button service",
  "bluetooth.startIOPinService|block": "bluetooth io pin service",
--- a/libs/bluetooth/bluetooth.cpp
+++ b/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;

@ -121,18 +121,48 @@ namespace bluetooth {
    } 

    const int8_t CALIBRATED_POWERS[] = {-49, -37, -33, -28, -25, -20, -15, -10};
-
    /**
    * Advertise an Eddystone URL
-	* @param url the url to transmit. Must be no longer than the supported eddystone url length
-	* @param power power level between 0 and 7, e.g.: 7
+	* @param url the url to transmit. Must be no longer than the supported eddystone url length, eg: "https://pxt.io/"
+	* @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_url block="bluetooth advertise url %url|with power %power"
+    //% blockId=eddystone_advertise_url block="bluetooth advertise url %url|with power %power|connectable %connectable"
    //% parts=bluetooth weight=11 blockGap=8
-    //% help=bluetooth/advertise-url
-    void advertiseUrl(StringData* url, int power) {
-        int8_t level = CALIBRATED_POWERS[min(7, max(0, power))];
-        uBit.bleManager.advertiseEddystoneUrl(ManagedString(url), level);
+    //% help=bluetooth/advertise-url blockExternalInputs=1
+    void advertiseUrl(StringData* url, int power, bool connectable) {
+        power = min(MICROBIT_BLE_POWER_LEVELS-1, max(0, power));
+        int8_t level = CALIBRATED_POWERS[power];
+        uBit.bleManager.advertiseEddystoneUrl(ManagedString(url), level, connectable);
+        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.
+    */
+    //% parts=bluetooth weight=5 help=bluetooth/set-transmit-power advanced=true
+    //% blockId=bluetooth_settransmitpower block="bluetooth set transmit power %power"
+    void setTransmitPower(int power) {
+        uBit.bleManager.setTransmitPower(min(MICROBIT_BLE_POWER_LEVELS-1, max(0, power)));
    }

    /**
@ -140,7 +170,7 @@ namespace bluetooth {
    */
    //% blockId=eddystone_stop_advertising block="bluetooth stop advertising"
    //% parts=bluetooth weight=10
-    //% help=bluetooth/stop-advertising
+    //% help=bluetooth/stop-advertising advanced=true
    void stopAdvertising() {
        uBit.bleManager.stopAdvertising();
    } 
--- a/libs/bluetooth/bluetooth.ts
+++ b/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);
+    }
 }
--- a/libs/bluetooth/pxt.json
+++ b/libs/bluetooth/pxt.json
@ -6,7 +6,8 @@
        "enums.d.ts",
        "shims.d.ts",
        "bluetooth.ts",
-        "bluetooth.cpp"
+        "bluetooth.cpp",
+        "_locales/de/bluetooth-jsdoc-strings.json"
    ],
    "public": true,
    "dependencies": {
@ -24,53 +25,56 @@
            "microbit-dal": {
                "bluetooth": {
                    "private_addressing": 0,
-                    "whitelist": 1,
                    "advertising_timeout": 0,
                    "tx_power": 6,
                    "dfu_service": 1,
                    "event_service": 1,
                    "device_info_service": 1,
                    "eddystone_url": 1,
-                    "eddystone_uid": 0,
-                    "pairing_mode": 1,
+                    "eddystone_uid": 1,
                    "open": 0,
+                    "pairing_mode": 1,
+                    "whitelist": 1,
                    "security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM"
-                }
-            },
-            "gatt_table_size": "0x700"
+                },
+                "gatt_table_size": "0x700"
+            }
        },
        "userConfigs": [
            {
-                "description": "No pairing: Anyone can connect via Bluetooth.",
+                "description": "Unsecure: Anyone can connect via Bluetooth.",
                "config": {
                    "microbit-dal": {
                        "bluetooth": {
                            "open": 1,
-                            "pairing_mode": null,
+                            "pairing_mode": 0,
+                            "whitelist": 0,
                            "security_level": null
                        }
                    }
                }
            },
            {
-                "description": "JustWorks pairing (default): Button press to pair via Bluetooth.",
+                "description": "JustWorks pairing (default): Button press to pair.",
                "config": {
                    "microbit-dal": {
                        "bluetooth": {
-                            "open": 0,
-                            "pairing_mode": 1,
-                            "security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM"
+                            "open": null,
+                            "pairing_mode": null,
+                            "whitelist": null,
+                            "security_level": null
                        }
                    }
                }
            },
            {
-                "description": "Passkey pairing: Button press and 6 digit key to pair via Bluetooth.",
+                "description": "Passkey pairing: Button press and 6 digit key to pair.",
                "config": {
                    "microbit-dal": {
                        "bluetooth": {
                            "open": 0,
                            "pairing_mode": 1,
+                            "whitelist": 1,
                            "security_level": "SECURITY_MODE_ENCRYPTION_WITH_MITM"
                        }
                    }
--- a/libs/bluetooth/shims.d.ts
+++ b/libs/bluetooth/shims.d.ts
@ -4,7 +4,7 @@
    /**
     * Support for additional Bluetooth services.
     */
-    //% color=#0082FB weight=20
+    //% color=#0082FB weight=96 icon="\uf294"
 declare namespace bluetooth {

    /**
@ -83,20 +83,38 @@ declare namespace bluetooth {

    /**
     * Advertise an Eddystone URL
-     * @param url the url to transmit. Must be no longer than the supported eddystone url length
-     * @param power power level between 0 and 7, e.g.: 7
+     * @param url the url to transmit. Must be no longer than the supported eddystone url length, eg: "https://pxt.io/"
+     * @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_url block="bluetooth advertise url %url|with power %power"
+    //% blockId=eddystone_advertise_url block="bluetooth advertise url %url|with power %power|connectable %connectable"
    //% parts=bluetooth weight=11 blockGap=8
-    //% help=bluetooth/advertise-url shim=bluetooth::advertiseUrl
-    function advertiseUrl(url: string, power: number): void;
+    //% help=bluetooth/advertise-url blockExternalInputs=1 shim=bluetooth::advertiseUrl
+    function advertiseUrl(url: string, power: number, connectable: boolean): void;
+
+    /**
+     * 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 shim=bluetooth::advertiseUidBuffer
+    function advertiseUidBuffer(nsAndInstance: Buffer, power: number, connectable: boolean): void;
+
+    /**
+     * Sets the bluetooth transmit power between 0 (minimal) and 7 (maximum).
+     * @param power power level between 0 (minimal) and 7 (maximum), eg: 7.
+     */
+    //% parts=bluetooth weight=5 help=bluetooth/set-transmit-power advanced=true
+    //% blockId=bluetooth_settransmitpower block="bluetooth set transmit power %power" shim=bluetooth::setTransmitPower
+    function setTransmitPower(power: number): void;

    /**
     * Stops advertising Eddystone end points
     */
    //% blockId=eddystone_stop_advertising block="bluetooth stop advertising"
    //% parts=bluetooth weight=10
-    //% help=bluetooth/stop-advertising shim=bluetooth::stopAdvertising
+    //% help=bluetooth/stop-advertising advanced=true shim=bluetooth::stopAdvertising
    function stopAdvertising(): void;
 }

--- a/libs/bluetoothprj/main.blocks
+++ b/libs/bluetoothprj/main.blocks
@ -1,62 +1,3 @@
 <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>
 </xml>
--- a/libs/bluetoothprj/main.ts
+++ b/libs/bluetoothprj/main.ts
@ -1,16 +1 @@
-basic.forever(() => {
-    basic.showLeds(`
-        . # . # .
-        # . # . #
-        # . . . #
-        . # . # .
-        . . # . .
-        `)
-    basic.showLeds(`
-        . . . . .
-        . . . . .
-        . . . . .
-        . . . . .
-        . . . . .
-        `)
-})
+
--- a/libs/core/_locales/core-jsdoc-strings.json
+++ b/libs/core/_locales/core-jsdoc-strings.json
@ -85,7 +85,7 @@
  "game.setLife": "Sets the current life value",
  "game.setLife|param|value": "TODO",
  "game.setScore": "Sets the current score value",
-  "game.setScore|param|value": "TODO",
+  "game.setScore|param|value": "new score value.",
  "game.showScore": "Displays the score on the screen.",
  "game.startCountdown": "Starts a game countdown timer",
  "game.startCountdown|param|ms": "countdown duration in milliseconds, eg: 10000",
@ -97,26 +97,28 @@
  "input.acceleration": "Get the acceleration value in milli-gravitys (when the board is laying flat with the screen up, x=0, y=0 and z=-1024)",
  "input.acceleration|param|dimension": "TODO",
  "input.buttonIsPressed": "Get the button state (pressed or not) for ``A`` and ``B``.",
+  "input.buttonIsPressed|param|button": "the button to query the request, eg: Button.A",
  "input.calibrate": "Obsolete, compass calibration is automatic.",
  "input.compassHeading": "Get the current compass heading in degrees.",
  "input.lightLevel": "Reads the light level applied to the LED screen in a range from ``0`` (dark) to ``255`` bright.",
  "input.magneticForce": "Get the magnetic force value in ``micro-Teslas`` (``µT``). This function is not supported in the simulator.",
  "input.magneticForce|param|dimension": "TODO",
  "input.onButtonPressed": "Do something when a button (``A``, ``B`` or both ``A+B``) is pressed",
-  "input.onButtonPressed|param|body": "TODO",
-  "input.onButtonPressed|param|button": "TODO",
+  "input.onButtonPressed|param|body": "code to run when event is raised",
+  "input.onButtonPressed|param|button": "the button that needs to be pressed",
  "input.onGesture": "Do something when when a gesture is done (like shaking the micro:bit).",
-  "input.onGesture|param|body": "TODO",
+  "input.onGesture|param|body": "code to run when gesture is raised",
+  "input.onGesture|param|gesture": "the type of gesture to track, eg: Gesture.Shake",
  "input.onLogoDown": "Attaches code to run when the logo is oriented downwards and the board is vertical.",
  "input.onLogoDown|param|body": "TODO",
  "input.onLogoUp": "Attaches code to run when the logo is oriented upwards and the board is vertical.",
  "input.onLogoUp|param|body": "TODO",
  "input.onPinPressed": "Do something when a pin is pressed.",
  "input.onPinPressed|param|body": "the code to run when the pin is pressed",
-  "input.onPinPressed|param|name": "the pin that needs to be pressed",
+  "input.onPinPressed|param|name": "the pin that needs to be pressed, eg: TouchPin.P0",
  "input.onPinReleased": "Do something when a pin is released.",
  "input.onPinReleased|param|body": "the code to run when the pin is released",
-  "input.onPinReleased|param|name": "the pin that needs to be released",
+  "input.onPinReleased|param|name": "the pin that needs to be released, eg: TouchPin.P0",
  "input.onScreenDown": "Attaches code to run when the screen is facing down.",
  "input.onScreenDown|param|body": "TODO",
  "input.onScreenUp": "Attaches code to run when the screen is facing up.",
@ -124,7 +126,7 @@
  "input.onShake": "Attaches code to run when the device is shaken.",
  "input.onShake|param|body": "TODO",
  "input.pinIsPressed": "Get the pin state (pressed or not). Requires to hold the ground to close the circuit.",
-  "input.pinIsPressed|param|name": "pin used to detect the touch",
+  "input.pinIsPressed|param|name": "pin used to detect the touch, eg: TouchPin.P0",
  "input.rotation": "The pitch or roll of the device, rotation along the ``x-axis`` or ``y-axis``, in degrees.",
  "input.rotation|param|kind": "TODO",
  "input.runningTime": "Gets the number of milliseconds elapsed since power on.",
@ -166,7 +168,7 @@
  "music.changeTempoBy": "Change the tempo by the specified amount",
  "music.changeTempoBy|param|bpm": "The change in beats per minute to the tempo, eg: 20",
  "music.noteFrequency": "Gets the frequency of a note.",
-  "music.noteFrequency|param|name": "the note name",
+  "music.noteFrequency|param|name": "the note name, eg: Note.C",
  "music.playTone": "Plays a tone through pin ``P0`` for the given duration.",
  "music.playTone|param|frequency": "pitch of the tone to play in Hertz (Hz)",
  "music.playTone|param|ms": "tone duration in milliseconds (ms)",
@ -182,21 +184,21 @@
  "pins.analogPitch|param|frequency": "frequency to modulate in Hz.",
  "pins.analogPitch|param|ms": "duration of the pitch in milli seconds.",
  "pins.analogReadPin": "Read the connector value as analog, that is, as a value comprised between 0 and 1023.",
-  "pins.analogReadPin|param|name": "pin to write to",
+  "pins.analogReadPin|param|name": "pin to write to, eg: AnalogPin.P0",
  "pins.analogSetPeriod": "Configures the Pulse-width modulation (PWM) of the analog output to the given value in **microseconds** or `1/1000` milliseconds.\nIf this pin is not configured as an analog output (using `analog write pin`), the operation has no effect.",
  "pins.analogSetPeriod|param|micros": "period in micro seconds. eg:20000",
-  "pins.analogSetPeriod|param|name": "analog pin to set period to",
+  "pins.analogSetPeriod|param|name": "analog pin to set period to, eg: AnalogPin.P0",
  "pins.analogSetPitchPin": "Sets the pin used when using `analog pitch` or music.",
  "pins.analogSetPitchPin|param|name": "pin to modulate pitch from",
  "pins.analogWritePin": "Set the connector value as analog. Value must be comprised between 0 and 1023.",
-  "pins.analogWritePin|param|name": "pin name to write to",
+  "pins.analogWritePin|param|name": "pin name to write to, eg: AnalogPin.P0",
  "pins.analogWritePin|param|value": "value to write to the pin between ``0`` and ``1023``. eg:1023,0",
  "pins.createBuffer": "Create a new zero-initialized buffer.",
  "pins.createBuffer|param|size": "number of bytes in the buffer",
  "pins.digitalReadPin": "Read the specified pin or connector as either 0 or 1",
-  "pins.digitalReadPin|param|name": "pin to read from",
+  "pins.digitalReadPin|param|name": "pin to read from, eg: DigitalPin.P0",
  "pins.digitalWritePin": "Set a pin or connector value to either 0 or 1.",
-  "pins.digitalWritePin|param|name": "pin to write to",
+  "pins.digitalWritePin|param|name": "pin to write to, eg: DigitalPin.P0",
  "pins.digitalWritePin|param|value": "value to set on the pin, 1 eg,0",
  "pins.i2cReadBuffer": "Read `size` bytes from a 7-bit I2C `address`.",
  "pins.i2cReadNumber": "Read one number from 7-bit I2C address.",
@ -209,31 +211,36 @@
  "pins.map|param|toLow": "the lower bound of the value's target range",
  "pins.map|param|value": "value to map in ranges",
  "pins.onPulsed": "Configures this pin to a digital input, and generates events where the timestamp is the duration that this pin was either ``high`` or ``low``.",
+  "pins.onPulsed|param|name": "digital pin to register to, eg: DigitalPin.P0",
+  "pins.onPulsed|param|pulse": "the value of the pulse, eg: PulseValue.High",
  "pins.pulseDuration": "Gets the duration of the last pulse in micro-seconds. This function should be called from a ``onPulsed`` handler.",
  "pins.pulseIn": "Returns the duration of a pulse in microseconds",
-  "pins.pulseIn|param|name": "the pin which measures the pulse",
-  "pins.pulseIn|param|value": "the value of the pulse (default high)",
+  "pins.pulseIn|param|name": "the pin which measures the pulse, eg: DigitalPin.P0",
+  "pins.pulseIn|param|value": "the value of the pulse, eg: PulseValue.High",
  "pins.servoSetPulse": "Configures this IO pin as an analog/pwm output, configures the period to be 20 ms, and sets the pulse width, based on the value it is given **microseconds** or `1/1000` milliseconds.",
  "pins.servoSetPulse|param|micros": "pulse duration in micro seconds, eg:1500",
  "pins.servoSetPulse|param|name": "pin name",
  "pins.servoWritePin": "Writes a value to the servo, controlling the shaft accordingly. On a standard servo, this will set the angle of the shaft (in degrees), moving the shaft to that orientation. On a continuous rotation servo, this will set the speed of the servo (with ``0`` being full-speed in one direction, ``180`` being full speed in the other, and a value near ``90`` being no movement).",
-  "pins.servoWritePin|param|name": "pin to write to",
+  "pins.servoWritePin|param|name": "pin to write to, eg: AnalogPin.P0",
  "pins.servoWritePin|param|value": "angle or rotation speed, eg:180,90,0",
  "pins.setPull": "Configures the pull of this pin.",
-  "pins.setPull|param|name": "pin to set the pull mode on",
-  "pins.setPull|param|pull": "one of the mbed pull configurations: PullUp, PullDown, PullNone ",
+  "pins.setPull|param|name": "pin to set the pull mode on, eg: DigitalPin.P0",
+  "pins.setPull|param|pull": "one of the mbed pull configurations, eg: PinPullMode.PullUp",
  "pins.sizeOf": "Get the size in bytes of specified number format.",
  "pins.spiWrite": "Write to the SPI slave and return the response",
  "pins.spiWrite|param|value": "Data to be sent to the SPI slave",
  "serial": "Reading and writing data over a serial connection.",
  "serial.delimiters": "Returns the delimiter corresponding string",
-  "serial.onLineReceived": "Registers an event to be fired when a line has been received",
+  "serial.onDataReceived": "Registers an event to be fired when one of the delimiter is matched.",
+  "serial.onDataReceived|param|delimiters": "the characters to match received characters against.",
  "serial.readLine": "Reads a line of text from the serial port.",
+  "serial.readString": "Reads the buffered received data as a string",
  "serial.readUntil": "Reads a line of text from the serial port and returns the buffer when the delimiter is met.",
  "serial.readUntil|param|delimiter": "text delimiter that separates each text chunk",
  "serial.redirect": "Dynamically configuring the serial instance to use pins other than USBTX and USBRX.",
-  "serial.redirect|param|rx": "the new reception pin",
-  "serial.redirect|param|tx": "the new transmission pins",
+  "serial.redirect|param|rate": "the new baud rate. eg: 115200",
+  "serial.redirect|param|rx": "the new reception pin, eg: SerialPin.P1",
+  "serial.redirect|param|tx": "the new transmission pins, eg: SerialPin.P0",
  "serial.writeLine": "Prints a line of text to the serial",
  "serial.writeNumber": "Prints a numeric value to the serial",
  "serial.writeString": "Sends a piece of text through Serial connection.",
--- a/libs/core/_locales/core-strings.json
+++ b/libs/core/_locales/core-strings.json
@ -33,6 +33,8 @@
  "DisplayMode.Greyscale|block": "greyscale",
  "EventCreationMode.CreateAndFire": "MicroBitEvent is initialised, and its event handlers are immediately fired (not suitable for use in interrupts!).",
  "EventCreationMode.CreateOnly": "MicroBitEvent is initialised, and no further processing takes place.",
+  "Gesture.EightG": "Raised when a 8G shock is detected",
+  "Gesture.EightG|block": "8g",
  "Gesture.FreeFall": "Raised when the board is falling!",
  "Gesture.FreeFall|block": "free fall",
  "Gesture.LogoDown": "Raised when the logo is downward and the screen is vertical",
@ -110,6 +112,7 @@
  "game.createSprite|block": "create sprite at|x: %x|y: %y",
  "game.gameOver|block": "game over",
  "game.score|block": "score",
+  "game.setScore|block": "set score %points",
  "game.startCountdown|block": "start countdown|(ms) %duration",
  "game|block": "game",
  "images.createBigImage|block": "create big image",
@ -122,7 +125,7 @@
  "input.magneticForce|block": "magnetic force (µT)|%NAME",
  "input.onButtonPressed|block": "on button|%NAME|pressed",
  "input.onGesture|block": "on |%NAME",
-  "input.onPinPressed|block": "on pin %NAME|pressed",
+  "input.onPinPressed|block": "on pin %name|pressed",
  "input.onPinReleased|block": "on pin %NAME|released",
  "input.pinIsPressed|block": "pin %NAME|is pressed",
  "input.rotation|block": "rotation (°)|%NAME",
@ -131,6 +134,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",
@ -167,7 +171,9 @@
  "pins.spiWrite|block": "spi write %value",
  "pins|block": "pins",
  "serial.delimiters|block": "%del",
+  "serial.onDataReceived|block": "serial|on data received %delimiters=serial_delimiter_conv",
  "serial.readLine|block": "serial|read line",
+  "serial.readString|block": "serial|read string",
  "serial.readUntil|block": "serial|read until %delimiter=serial_delimiter_conv",
  "serial.redirect|block": "serial|redirect to|TX %tx|RX %rx|at baud rate %rate",
  "serial.writeLine|block": "serial|write line %text",
--- a/libs/core/_locales/de/core-jsdoc-strings.json
+++ b/libs/core/_locales/de/core-jsdoc-strings.json
@ -64,7 +64,6 @@
  "control.waitMicros|param|micros": "Anzahl der Mikrosekunden, die gewartet werden soll, z.B.: 4",
  "game": "Eine Einzel-LED-Sprite-Spielumgebung",
  "game.addLife": "Fügt Leben zum aktuellen Spielstand hinzu",
-  "game.addLife|param|lives": "TODO",
  "game.addScore": "Fügt zum aktuellen Spielstand Punkte hinzu",
  "game.addScore|param|points": "Anzahl von zu verändernden Punkten, z.B.: 1",
  "game.createSprite": "Erzeugt einen neuen LED-Sprite, der nach rechts zeigt.",
@ -79,12 +78,9 @@
  "game.levelUp": "Erhöht das Level und zeigt eine Nachricht an.",
  "game.life": "Ruft das aktuelle Leben ab",
  "game.removeLife": "Entfernt ein Leben",
-  "game.removeLife|param|life": "TODO",
  "game.score": "Ruft den aktuellen Punktestand ab",
  "game.setLife": "Setzt den aktuellen Wert der Leben",
-  "game.setLife|param|value": "TODO",
  "game.setScore": "Setzt den aktuellen Wert des Spielstands",
-  "game.setScore|param|value": "TODO",
  "game.showScore": "Zeigt den Spielstand auf dem Display.",
  "game.startCountdown": "Startet einen Spiel-Countdown",
  "game.startCountdown|param|ms": "Countdown-Dauer in Millisekunden, z.B.: 10000",
@ -94,38 +90,24 @@
  "images.createImage": "Erstellt ein Bild, das auf den LED-Bildschirm passt.",
  "input": "Ereignisse und Daten der Sensoren",
  "input.acceleration": "Holt den Beschleunigungswert in Milli-Erdanziehung (wenn das Board flach mit dem Display nach oben liegt, X = 0, y = 0 und Z =-1024)",
-  "input.acceleration|param|dimension": "TODO",
  "input.buttonIsPressed": "Erhalte den Sie den Tastenstatus (gepresst oder nicht) für ``A`` und ``B``.",
  "input.calibrate": "Veraltet, Kompasskalibrierung erfolgt automatisch.",
  "input.compassHeading": "Holt die aktuelle Kompassrichtung in Grad.",
  "input.lightLevel": "Liest die Lichtintensität auf dem LED-Bildschirm im Bereich von ``0`` (dunkel) und `` 255`` (hell).",
  "input.magneticForce": "Ruft den Wert der Magnetkraft in ``Mikro-Tesla`` (``µT``) ab. Diese Funktion wird im Simulator nicht unterstützt.",
-  "input.magneticForce|param|dimension": "TODO",
  "input.onButtonPressed": "Tue etwas, wenn eine Taste (``A``, ``B`` oder ``A + B``) gedrückt wird",
-  "input.onButtonPressed|param|body": "TODO",
-  "input.onButtonPressed|param|button": "TODO",
  "input.onGesture": "Mache etwas, wenn eine Geste gemacht wird (wie den mini zu schütteln).",
-  "input.onGesture|param|body": "TODO",
  "input.onLogoDown": "Fügt Code hinzu, der ausgeführt wird, wenn das Logo nach unten zeigt und das Board vertikal ausgerichtet ist.",
-  "input.onLogoDown|param|body": "TODO",
  "input.onLogoUp": "Fügt Code hinzu, der ausgeführt wird, wenn das Logo nach oben zeigt und das Board vertikal ausgerichtet ist.",
-  "input.onLogoUp|param|body": "TODO",
  "input.onPinPressed": "Mache etwas, wenn eine Pin gehalten wird.",
  "input.onPinPressed|param|body": "Code, der ausführt wird, wenn ein Pin gehalten wird",
-  "input.onPinPressed|param|name": "Der Pin, der gehalten werden muss",
  "input.onPinReleased": "Mache etwas, wenn der Pin losgelassen wird.",
  "input.onPinReleased|param|body": "Code, der ausgeführt werden soll, wenn der Pin losgelassen wird",
-  "input.onPinReleased|param|name": "Der Pin, der losgelassen werden muss",
  "input.onScreenDown": "Hängt Code an, der ausgeführt wird, wenn der Bildschirm nach unten zeigt.",
-  "input.onScreenDown|param|body": "TODO",
  "input.onScreenUp": "Hängt Code an, der ausgeführt wird, wenn der Bildschirm nach oben zeigt.",
-  "input.onScreenUp|param|body": "TODO",
  "input.onShake": "Hängt Code an, der ausgeführt wird, wenn der mini geschüttelt wird.",
-  "input.onShake|param|body": "TODO",
  "input.pinIsPressed": "Ruft den Pin-Zustand (gehalten oder nicht) ab. Die Erdung muss gehalten werden, um den Stromkreis zu schließen.",
-  "input.pinIsPressed|param|name": "Pin, der verwendet wird, um eine Berührung zu erkennen",
  "input.rotation": "Die Neigung und Drehung des mini Drehung auf ``X-Achse``oder ``Y-Achse``, in Grad.",
-  "input.rotation|param|kind": "TODO",
  "input.runningTime": "Ruft die Anzahl der Millisekunden auf, die seit dem Einschalten vergangen sind.",
  "input.setAccelerometerRange": "Legt die Stichprobenbereich des Beschleunigungssensors in Schwerkraft fest.",
  "input.setAccelerometerRange|param|range": "Ein Wert, der die maximale Stärke der gemessenen Beschleunigung beschreibt",
@ -134,19 +116,13 @@
  "led.brightness": "Ruft die Helligkeit des Bildschirms ab, von 0 (aus) bis 255 (volle Helligkeit).",
  "led.enable": "Schaltet das Display an und aus",
  "led.fadeIn": "Blendet die Bildschirmanzeige ein.",
-  "led.fadeIn|param|ms": "TODO",
  "led.fadeOut": "Blendet die Bildschirmhelligkeit aus.",
-  "led.fadeOut|param|ms": "TODO",
  "led.plot": "Schalte die angegebene LED mit Hilfe von X- und Y-Koordinaten ein (X ist horizontal, Y ist vertikal). (0,0) ist die obere linke Ecke.",
  "led.plotAll": "Schaltet alle LEDs an",
  "led.plotBarGraph": "Zeigt ein vertikales Balkendiagramm an, basierend auf dem `Wert`und dem `Hoch`-Wert. Wenn `Hoch`0 ist, wird das Diagramm automatisch angepasst.",
  "led.plotBarGraph|param|high": "maximalen Wert. Wenn dieser 0 ist, wird der Maximalwert automatisch angepasst, z.B.: 0",
  "led.plotBarGraph|param|value": "aktueller Wert zum Darstellen",
-  "led.plot|param|x": "TODO",
-  "led.plot|param|y": "TODO",
  "led.point": "Ruft den An/Aus-Status einer vorgegebenen LED mittels X-/Y-Koordinaten ab. (0,0) ist oben links.",
-  "led.point|param|x": "TODO",
-  "led.point|param|y": "TODO",
  "led.screenshot": "Macht einen Screenshot vom LED-Bildschirm und gibt ein Bild aus.",
  "led.setBrightness": "Lege die Helligkeit des Bildschirms fest, von 0 (aus) bis 255 (volle Helligkeit).",
  "led.setBrightness|param|value": "Helligkeitswert, z.B.: 255, 127, 0",
@ -155,17 +131,12 @@
  "led.stopAnimation": "Bricht die aktuelle Animation ab und löscht andere ausstehende Animationen.",
  "led.toggle": "Schaltet ein bestimmtes Pixel ein",
  "led.toggleAll": "Invertiert die aktuelle LED-Anzeige",
-  "led.toggle|param|x": "TODO",
-  "led.toggle|param|y": "TODO",
  "led.unplot": "Schalte die angegebene LED mit x-und y-Koordinaten ab (X ist horizontal, y ist vertikal). (0,0) ist oben links.",
-  "led.unplot|param|x": "TODO",
-  "led.unplot|param|y": "TODO",
  "music": "Generierung von von Musik durch Pin ``P0``.",
  "music.beat": "Gibt die Dauer eines Taktes in Milli-Sekunden aus",
  "music.changeTempoBy": "Ändere die Geschwindigkeit um den angegebenen Betrag",
  "music.changeTempoBy|param|bpm": "Die Änderung in Schlägen pro Minute auf das Tempo, z.B.: 20",
  "music.noteFrequency": "Ruft die Frequenz einer Note ab.",
-  "music.noteFrequency|param|name": "der Name der Notiz",
  "music.playTone": "Spielt einen Ton für den angegebenen Zeitraum über Pin ``P0`` ab.",
  "music.playTone|param|frequency": "Tonhöhe des abzuspielenden Tones in Hertz (Hz)",
  "music.playTone|param|ms": "Tondauer in Millisekunden (ms)",
@ -181,21 +152,15 @@
  "pins.analogPitch|param|frequency": "TODO",
  "pins.analogPitch|param|ms": "TODO",
  "pins.analogReadPin": "Lese den Anschlusswert als Analog aus, d. h. als einen Wert zwischen 0 und 1023.",
-  "pins.analogReadPin|param|name": "Pin, auf den geschrieben werden soll",
  "pins.analogSetPeriod": "Stellt die Pulsweite Modulation (PWM) des Analogausganges auf den angegebenen Wert in ** Mikrosekunden ** oder `1/1000` Millisekunden ein.\nWenn dieser Pin nicht als einen Analogausgang (mit `analog write pin`) konfiguriert ist, hat der Vorgang keine Auswirkungen.",
  "pins.analogSetPeriod|param|micros": "Zeit in Mikrosekunden. z.B.: 20000",
-  "pins.analogSetPeriod|param|name": "analoger Pin, der zeitlich festgelegt werden soll",
-  "pins.analogSetPitchPin": "Setzt den genutzten Pin, wenn `pins->analog pitch`angewendet wird.",
  "pins.analogSetPitchPin|param|name": "TODO",
  "pins.analogWritePin": "Legt den Wert des Verbinders auf analog fest. Der Wert muss zwischen 0 und 1023 liegen.",
-  "pins.analogWritePin|param|name": "PIN-Name, auf den geschrieben werden soll",
  "pins.analogWritePin|param|value": "Wert, der auf den Pin geschrieben werden soll, zwischen ``0`` und ``1023`` z.B.: 1023,0",
  "pins.createBuffer": "Erstellt einen Null-initialisierten Zwischenspeicher.",
  "pins.createBuffer|param|size": "Anzahl der Bytes im Zwischenspeicher",
  "pins.digitalReadPin": "Lese den angegebene Pin oder Verbinder als 0 oder 1",
-  "pins.digitalReadPin|param|name": "Pin, aus dem gelesen werden soll",
  "pins.digitalWritePin": "Setzt einen Pin- oder Verbinder-Wert auf 0 oder 1.",
-  "pins.digitalWritePin|param|name": "Pin, auf den geschrieben werden soll",
  "pins.digitalWritePin|param|value": "Wert, der auf dem Pin 1 gesetzt werden soll, z.B. 0",
  "pins.i2cReadBuffer": "Lese `Größe`bytes aus einer 7-bit I2C-Adresse.",
  "pins.i2cReadNumber": "Lese eine Nummer aus einer 7-bit I2C-Adresse.",
@ -210,17 +175,12 @@
  "pins.onPulsed": "Stellt diesen Pin als einen Digitaleingang ein und generiert Ereignisse, deren Zeitstempel die Dauer darstellt, in der der Pin entweder ``hoch``oder ``niedrig``war.",
  "pins.pulseDuration": "Ruft die Dauer des letzten Impulses in Mikrosendungen ab. Diese Funktion soll von einem `onPulsed`-Handler aufgerufen werden.",
  "pins.pulseIn": "Gibt die Dauer eines Pulses in Mikrosekunden an",
-  "pins.pulseIn|param|name": "der Pin, der den Puls misst",
-  "pins.pulseIn|param|value": "der Wert des Pulses (Standard hoch)",
  "pins.servoSetPulse": "Konfiguriert diesen IO-Pin als einen analogen/PWM-Ausgang, stellt den Zeitraum auf 20 ms ein und setzt die Pulsweite fest, basieren auf dem angegeben Wert **Mikrosekunden** oder `1/1000`Millisekunden.",
  "pins.servoSetPulse|param|micros": "Impulsdauer in Mikrosekunden, z.B.: 1500",
  "pins.servoSetPulse|param|name": "PIN-Name",
  "pins.servoWritePin": "Schreibt einen Wert in den Servo, der die Welle entsprechend kontroliert. Auf einem Standard-Servo wird so der Winkel der Welle (in Grad) eingestellt, sodass sich die Welle entsprechend anpasst. Auf einem kontinuierlich drehenden Servo wird dadurch die Geschwindigkeit des Servos festgelegt, wobei ``0``die volle Geschwindigkeit in eine Richtung darstellt, ``180``die volle Geschwindigkeit in die andere, und ein Wert von ``90`` einen Stillstand erzeugt.",
-  "pins.servoWritePin|param|name": "Pin, auf den geschrieben werden soll",
  "pins.servoWritePin|param|value": "Winkel oder Rotationsbeschleunigung, z.B.: 180,90,0",
  "pins.setPull": "Stellt die Anziehungskraft des Pins ein.",
-  "pins.setPull|param|name": "Pin, auf dem der Pull-Modus aktiviert wird",
-  "pins.setPull|param|pull": "eine der mbed-Pull-Konfigurationen: PullUp, PullDown, PullNone",
  "pins.sizeOf": "Ruft die Bytegröße im spezifierten Nummernformat ab.",
  "pins.spiWrite": "Schreibe in den SPI-Slave und gebe die Antwort aus",
  "pins.spiWrite|param|value": "Daten, die an den SPI-Slave geschickt werden sollen",
@ -231,8 +191,6 @@
  "serial.readUntil": "Liest aus eine Textzeile aus dem seriellen Anschluss und gibt den Puffer aus, wenn die Begrenzung erreicht wurde.",
  "serial.readUntil|param|delimiter": "Text-Begrenzung, die die Textblöcke voneinander trennt",
  "serial.redirect": "Konfiguriert dynamisch die serielle Instanz, damit sie andere Pins als USBTX und USBRX benutzt.",
-  "serial.redirect|param|rx": "der neue Empfangs-Pin",
-  "serial.redirect|param|tx": "Der neue Übertragungs-Pin",
  "serial.writeLine": "Gibt eine Zeile des Textes an die serielle",
  "serial.writeNumber": "Gibt einen numerischen Wert an die serielle",
  "serial.writeString": "Sendet ein Stück Text über serielle Verbindung.",
--- a/libs/core/_locales/de/core-strings.json
+++ b/libs/core/_locales/de/core-strings.json
@ -7,12 +7,71 @@
  "AcceleratorRange.OneG|block": "1g",
  "AcceleratorRange.TwoG": "Der Bewegungssensor misst Kräfte bis 2g",
  "AcceleratorRange.TwoG|block": "2g",
+  "BaudRate.BaudRate115200|block": "11520",
+  "BaudRate.BaudRate9600|block": "9600",
+  "BeatFraction.Eighth|block": "1/8",
+  "BeatFraction.Half|block": "1/2",
+  "BeatFraction.Quarter|block": "1/4",
+  "BeatFraction.Sixteenth|block": "1/16",
+  "BeatFraction.Whole|block": "1",
+  "Button.AB|block": "A+B",
+  "Delimiters.Dollar|block": "$",
+  "Delimiters.Hash|block": "#",
+  "Delimiters.NewLine|block": "Neue Zeile",
+  "Dimension.Strength|block": "Stärke",
+  "Dimension.X|block": "x",
+  "Dimension.Y|block": "y",
+  "Dimension.Z|block": "z",
+  "Direction.Left|block": "links",
+  "Direction.Right|block": "rechts",
+  "DisplayMode.BackAndWhite|block": "Schwarz-Weiß",
+  "DisplayMode.Greyscale|block": "Graustufen",
+  "EventCreationMode.CreateAndFire": "Calliope mini-Event wurde initialisiert, seine Event-Handler werden unverzüglich ausgeführt (nicht geeignet für die Nutzung bei Unterbrechungen!).",
+  "EventCreationMode.CreateOnly": "Calliope mini-Event wurde initialisiert, es wird keine weitere Verarbeitung vorgenommen.",
+  "Gesture.EightG|block": "8g",
+  "Gesture.FreeFall": "Wird ausgeführt, wenn das Board fällt!",
+  "Gesture.FreeFall|block": "freier Fall",
+  "Gesture.LogoDown": "Wird ausgeführt, wenn das Logo nach unten zeigt und das Display vertikal ist.",
+  "Gesture.LogoDown|block": "Logo nach unten",
+  "Gesture.LogoUp": "Wird ausgeführt, wenn das Logo nach oben zeigt und das Display vertikal ist.",
+  "Gesture.LogoUp|block": "Logo oben",
+  "Gesture.ScreenDown": "Wird ausgeführt, wenn das Display nach oben zeigt und das Board horizontal ist.",
+  "Gesture.ScreenDown|block": "Display nach unten",
+  "Gesture.ScreenUp": "Wird ausgeführt, wenn das Display nach unten zeigt und das Board horizontal ist.",
+  "Gesture.ScreenUp|block": "Display nach oben",
  "Gesture.Shake": "Wird erhöht, wenn geschüttelt",
  "Gesture.Shake|block": "geschüttelt",
+  "Gesture.SixG": "Wird ausgeführt, ein 6g starker Stoß erkannt wird",
+  "Gesture.SixG|block": "6g",
+  "Gesture.ThreeG": "Wird ausgeführt, ein 3g starker Stoß erkannt wird",
+  "Gesture.ThreeG|block": "3g",
+  "Gesture.TiltLeft": "Wird ausgeführt, wenn das Display nach links zeigt",
+  "Gesture.TiltLeft|block": "nach links neigen",
+  "Gesture.TiltRight": "Wird ausgeführt, wenn das Display nach rechts zeigt",
+  "Gesture.TiltRight|block": "nach rechts neigen",
+  "LedSpriteProperty.Blink|block": "blinken",
  "LedSpriteProperty.Brightness|block": "Helligkeit",
+  "LedSpriteProperty.Direction|block": "Richtung",
+  "LedSpriteProperty.X|block": "x",
+  "LedSpriteProperty.Y|block": "y",
  "Math.randomBoolean|block": "wähle zufälligen Wahr- oder Falsch-Wert",
  "Math|block": "Mathematik",
+  "Note.CSharp3|block": "C#3",
+  "Note.CSharp4|block": "C#4",
+  "Note.CSharp5|block": "C#5",
+  "Note.CSharp|block": "C#",
+  "Note.FSharp3|block": "F#3",
+  "Note.FSharp4|block": "F#4",
+  "Note.FSharp5|block": "F#5",
+  "Note.FSharp|block": "F#",
+  "Note.GSharp3|block": "G#3",
+  "Note.GSharp4|block": "G#4",
+  "Note.GSharp5|block": "G#5",
+  "Note.GSharp|block": "G#",
+  "PinPullMode.PullDown|block": "nach unten",
+  "PinPullMode.PullUp|block": "nach oben",
  "Rotation.Pitch|block": "Winkel",
+  "Rotation.Roll|block": "rollen",
  "String.charAt|block": "Zeichen an Position %pos aus|%this",
  "String.compare|block": "vergleiche %this| mit %that",
  "String.concat|block": "hänge %this| mit %other aneinander",
@ -23,10 +82,10 @@
  "String|block": "Zeichenfolge",
  "basic.clearScreen|block": "Bildschirminhalt löschen",
  "basic.forever|block": "dauerhaft",
-  "basic.pause|block": "Pausiere (ms) %pause",
+  "basic.pause|block": "pausiere (ms) %pause",
  "basic.showLeds|block": "zeige LEDs",
  "basic.showNumber|block": "zeige|Nummer %number",
-  "basic.showString|block": "Zeige|Zeichenfolge %text",
+  "basic.showString|block": "zeige|Zeichenfolge %text",
  "basic|block": "Grundlagen",
  "control.deviceName|block": "Gerätename",
  "control.deviceSerialNumber|block": "Seriennnummer",
@ -56,7 +115,6 @@
  "input.magneticForce|block": "Magnetkraft (µT) |%NAME",
  "input.onButtonPressed|block": "wenn Knopf|%NAME|gedrückt",
  "input.onGesture|block": "wenn |%NAME",
-  "input.onPinPressed|block": "wenn Pin %NAME|gedrückt",
  "input.onPinReleased|block": "wenn Pin %NAME|losgelassen",
  "input.pinIsPressed|block": "Pin %NAME|ist gedrückt",
  "input.rotation|block": "Rotation (°)|%NAME",
@ -71,7 +129,7 @@
  "led.setBrightness|block": "Setze Helligkeit auf %value",
  "led.stopAnimation|block": "Halte Animation an",
  "led.toggle|block": "Schalte zwischen|x %x|y %y",
-  "led.unplot|block": "Unplot|x %x|y %y",
+  "led.unplot|block": "schalte Pixel|x %x|y %y aus",
  "led|block": "LED",
  "music.beat|block": "%fraction|Takt",
  "music.changeTempoBy|block": "ändere die Geschwindigkeit (bpm)|%value",
--- a/libs/core/_locales/fr/core-jsdoc-strings.json
+++ b/libs/core/_locales/fr/core-jsdoc-strings.json
@ -21,59 +21,40 @@
  "basic.showString|param|text": "le texte à faire défiler sur l’écran, par exemple : « Bonjour ! »",
  "control.inBackground": "Planifie le code qui s’exécute en arrière-plan.",
  "control.reset": "Réinitialise le micro:bit de BBC.",
+  "control.waitMicros": "Bloque la fibre courante pour le nombre de microsecondes donné",
  "control.waitMicros|param|micros": "nombre de microsecondes à attendre. par ex. : 4",
  "game": "Un moteur de jeu avec une unique LED",
-  "game.addLife|param|lives": "TODO",
  "game.addScore": "Ajoute des points au score actuel",
  "game.addScore|param|points": "nombre de points à changer, par ex. : 1",
  "game.gameOver": "Affiche un animation de fin de jeu.",
-  "game.removeLife|param|life": "TODO",
  "game.score": "Obtient le score actuel",
-  "game.setLife|param|value": "TODO",
  "game.setScore": "Définit la valeur du score actuel",
-  "game.setScore|param|value": "TODO",
  "game.startCountdown": "Démarre un compte à rebours de jeu",
  "game.startCountdown|param|ms": "durée du compte à rebours en millisecondes, par ex. : 10000",
  "images": "Création, manipulation et affichage d’images LED.",
  "images.createBigImage": "Crée une image à partir de 2 images.",
  "images.createImage": "Crée une image qui s’adapte aux dimensions de l’écran LED.",
  "input": "Événements et des données provenant de capteurs",
-  "input.acceleration|param|dimension": "TODO",
+  "input.acceleration": "Donne la valeur de l'accélération en milli-g (quand la carte est à plat avec l'écran vers le haut, x=0, y=0 et z=-1024)",
+  "input.buttonIsPressed": "Donne l'état du bouton (appuyé ou non) pour ``A`` et ``B``.",
  "input.calibrate": "Obsolète, le calibrage de la boussole est automatique.",
  "input.compassHeading": "Obtient la direction actuelle du compas en degrés.",
-  "input.magneticForce|param|dimension": "TODO",
-  "input.onButtonPressed|param|body": "TODO",
-  "input.onButtonPressed|param|button": "TODO",
-  "input.onGesture|param|body": "TODO",
-  "input.onLogoDown|param|body": "TODO",
-  "input.onLogoUp|param|body": "TODO",
+  "input.lightLevel": "Lit le niveau de lumière appliqué à l'écran LED de ``0`` (sombre) à ``255`` lumineux.",
+  "input.magneticForce": "Obtenir la valeur de la force magnétique en ``micro-Teslas`` (``µT``). Cette fonction n’est pas supportée par le simulateur.",
+  "input.onButtonPressed": "Faire quelque chose quand un bouton (``A``, ``B`` ou les deux ``A+B``) est appuyé",
+  "input.onGesture": "Faire quelque chose lorsque lorsqu’un geste est fait (par exemple secouer le micro:bit).",
  "input.onPinPressed": "Faire quelque chose lorsque vous appuyez sur une broche.",
  "input.onPinPressed|param|body": "code à exécuter lorsque la broche est enfoncée",
-  "input.onPinPressed|param|name": "la broche qui doit être pressée",
  "input.onPinReleased": "Faire quelque chose quand une broche est relâchée.",
  "input.onPinReleased|param|body": "le code à exécuter lorsque la broche est relâchée",
-  "input.onPinReleased|param|name": "la broche qui doit être relâchée",
-  "input.onScreenDown|param|body": "TODO",
-  "input.onScreenUp|param|body": "TODO",
-  "input.onShake|param|body": "TODO",
-  "input.pinIsPressed|param|name": "broche utilisée pour détecter le contact",
-  "input.rotation|param|kind": "TODO",
+  "input.pinIsPressed": "Donne l’état de la broche (pressée ou non). Nécessite de tenir la masse pour fermer le circuit.",
+  "input.runningTime": "Donne le nombre de millisecondes écoulées depuis la mise en route.",
  "input.temperature": "Obtient la température en degrés Celsius (°C).",
  "led": "Contrôle de l’écran LED.",
  "led.enable": "Active ou désactive l’affichage",
-  "led.fadeIn|param|ms": "TODO",
-  "led.fadeOut|param|ms": "TODO",
  "led.plotAll": "Allume toutes les LEDS",
  "led.plotBarGraph|param|value": "valeur actuelle à tracer",
-  "led.plot|param|x": "TODO",
-  "led.plot|param|y": "TODO",
-  "led.point|param|x": "TODO",
-  "led.point|param|y": "TODO",
  "led.setBrightness|param|value": "valeur de la luminosité, par ex. : 255, 127, 0",
-  "led.toggle|param|x": "TODO",
-  "led.toggle|param|y": "TODO",
-  "led.unplot|param|x": "TODO",
-  "led.unplot|param|y": "TODO",
  "music.rest": "Repose (joue rien) pendant une durée spécifiée via broche '' P0''.",
  "pins.analogPitch|param|frequency": "TODO",
  "pins.analogPitch|param|ms": "TODO",
--- a/libs/core/_locales/fr/core-strings.json
+++ b/libs/core/_locales/fr/core-strings.json
@ -30,7 +30,6 @@
  "input.magneticForce|block": "force magnétique (µT) |%NAME",
  "input.onButtonPressed|block": "lorsque le button|%NAME|est pressé",
  "input.onGesture|block": "lorsque|%NAME",
-  "input.onPinPressed|block": "lorsque le pin %NAME|est pressé",
  "input.onPinReleased|block": "lorsque la broche %NAME|est lachée",
  "input.pinIsPressed|block": "broche %NAME| est pressée",
  "input.rotation|block": "rotation (°)|%NAME",
--- a/libs/core/_locales/ja/core-strings.json
+++ b/libs/core/_locales/ja/core-strings.json
@ -0,0 +1,82 @@
+{
+  "AcceleratorRange.EightG": "8Gまでの加速度を測ります。",
+  "AcceleratorRange.EightG|block": "8G",
+  "AcceleratorRange.FourG": "4Gまでの加速度を測ります。",
+  "AcceleratorRange.FourG|block": "4G",
+  "AcceleratorRange.OneG": "1Gまでの加速度を測ります。",
+  "AcceleratorRange.OneG|block": "1G",
+  "AcceleratorRange.TwoG": "2Gまでの加速度を測ります。",
+  "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",
+  "BeatFraction.Sixteenth|block": "1/16",
+  "BeatFraction.Whole|block": "1",
+  "Button.AB|block": "A+B",
+  "Delimiters.Dollar|block": "$",
+  "Delimiters.Hash|block": "#",
+  "Delimiters.NewLine|block": "改行",
+  "Gesture.EightG": "8Gの衝撃があったときに発生します。",
+  "Gesture.EightG|block": "8G",
+  "Gesture.FreeFall": "ボードを落としたときに発生します。",
+  "Gesture.FreeFall|block": "落とした",
+  "Gesture.LogoDown": "画面が垂直で、ロゴの位置が下になったときに発生します。",
+  "Gesture.LogoDown|block": "ロゴが下になった",
+  "Gesture.LogoUp": "画面が垂直で、ロゴの位置が上になったときに発生します。",
+  "Gesture.LogoUp|block": "ロゴが上になった",
+  "Gesture.ScreenDown": "ボードが水平で、画面が下向きになったときに発生します。",
+  "Gesture.ScreenDown|block": "画面が下になった",
+  "Gesture.ScreenUp": "ボードが水平で、画面が上向きになったときに発生します。",
+  "Gesture.ScreenUp|block": "画面が上になった",
+  "Gesture.Shake": "ボードがゆさぶられたときに発生します。",
+  "Gesture.Shake|block": "ゆさぶられた",
+  "Gesture.SixG": "6Gの衝撃があったときに発生します。",
+  "Gesture.SixG|block": "6G",
+  "Gesture.ThreeG": "3Gの衝撃があったときに発生します。",
+  "Gesture.ThreeG|block": "3G",
+  "Gesture.TiltLeft": "画面を左に傾けたときに発生します。",
+  "Gesture.TiltLeft|block": "左に傾けた",
+  "Gesture.TiltRight": "画面を右に傾けたときに発生します。",
+  "Gesture.TiltRight|block": "右に傾けた",
+  "LedSpriteProperty.Brightness|block": "明るさ",
+  "Math.randomBoolean|block": "真または偽をランダムに選ぶ",
+  "Math|block": "計算",
+  "String.fromCharCode|block": "文字コード %code|の文字",
+  "basic.clearScreen|block": "表示を消す",
+  "basic.forever|block": "ずっと",
+  "basic.pause|block": "ひと休み（ミリ秒） %pause",
+  "basic.showLeds|block": "LEDに表示",
+  "basic.showNumber|block": "数を表示|%number",
+  "basic.showString|block": "文字列を表示|%text",
+  "basic|block": "基本",
+  "control.inBackground|block": "バックグラウンドで実行する",
+  "control.reset|block": "リセット",
+  "control|block": "制御",
+  "game.gameOver|block": "ゲームオーバー",
+  "game|block": "ゲーム",
+  "images.createBigImage|block": "大きな画像を作成",
+  "images.createImage|block": "画像を作成",
+  "images|block": "画像",
+  "input.acceleration|block": "加速度（ミリG）|%NAME",
+  "input.onPinPressed|block": "端子 %name|がタッチされたとき",
+  "input.onPinReleased|block": "端子 %NAME|がタッチされなくなったとき",
+  "input.pinIsPressed|block": "端子 %NAME|がタッチされている",
+  "input.rotation|block": "傾斜（°）|%NAME",
+  "input.runningTime|block": "稼働時間（ミリ秒）",
+  "input.setAccelerometerRange|block": "加速度センサの計測範囲を設定する %range",
+  "input.temperature|block": "温度（℃）",
+  "led.brightness|block": "明るさ",
+  "led.enable|block": "表示をオンまたはオフにする %on",
+  "led.plot|block": "点灯|x %x|y %y",
+  "led|block": "LED",
+  "music.setTempo|block": "テンポを設定する（bpm）|%value",
+  "music.tempo|block": "テンポ（bpm）",
+  "music|block": "音楽",
+  "{id:category}Basic": "基本",
+  "{id:category}Led": "LED",
+  "{id:category}Math": "計算"
+}
--- a/libs/core/_locales/no/core-jsdoc-strings.json
+++ b/libs/core/_locales/no/core-jsdoc-strings.json
@ -0,0 +1,9 @@
+{
+  "Math.abs": "Gir absoluttverdien av et tall (størrelsen av tallet, uavhengig av om det er positivt eller negativt).\nFor eksempel er absoluttverdien av -5 og absoluttverdien av 5 begge lik 5.",
+  "Math.abs|param|x": "Et tall eller matematisk uttrykk som vi ønsker absoluttverdien av.",
+  "Math.max": "Gir verdien til det største av to tall eller matematiske uttrykk.",
+  "Math.randomBoolean": "Gir en tilfeldig logisk verdi, \"sann\" eller \"usann\".",
+  "String.fromCharCode": "Lag en tekst som består av tegnet med den angitte ASCII-koden.",
+  "basic": "Blokker for grunnleggende mikro:bit-funksjonalitet.",
+  "basic.clearScreen": "Slå av alle lysene på skjermen"
+}
--- a/libs/core/_locales/no/core-strings.json
+++ b/libs/core/_locales/no/core-strings.json
@ -0,0 +1,3 @@
+{
+  "serial|block": "føljetong"
+}
--- a/libs/core/_locales/sv-SE/core-jsdoc-strings.json
+++ b/libs/core/_locales/sv-SE/core-jsdoc-strings.json
@ -0,0 +1,5 @@
+{
+  "Math.abs": "Returnerar absolutbeloppet av ett tal (värdet utan hänsyn till huruvida det är positivt eller negativt). \nTill exempel är absolutbeloppet av -5 detsamma som absolutbeloppet av 5.",
+  "Math.max": "Returnerar det större av två givna numeriska uttryck.",
+  "Math.min": "Returnerar det mindre av två givna numeriska uttryck."
+}
--- a/libs/core/basic.cpp
+++ b/libs/core/basic.cpp
@ -4,7 +4,7 @@
 /**
 * Provides access to basic micro:bit functionality.
 */
-//% color=#0078D7 weight=100
+//% color=#0078D7 weight=100 icon="\uf00a"
 namespace basic {

    /**
@ -13,7 +13,7 @@ namespace basic {
     */
    //% help=basic/show-number
    //% weight=96
-    //% blockId=device_show_number block="show|number %number" blockGap=8 icon="\uf1ec"
+    //% blockId=device_show_number block="show|number %number" blockGap=8
    //% async
    //% parts="ledmatrix"
    void showNumber(int value, int interval = 150) { 
@ -50,7 +50,7 @@ namespace basic {
     */
    //% help=basic/show-string 
    //% weight=87 blockGap=8
-    //% block="show|string %text" icon="\uf031" 
+    //% block="show|string %text" 
    //% async
    //% blockId=device_print_message
    //% parts="ledmatrix"
@ -73,7 +73,7 @@ namespace basic {
     * Turn off all LEDs
     */
    //% help=basic/clear-screen weight=79
-    //% blockId=device_clear_display block="clear screen" icon="\uf12d"
+    //% blockId=device_clear_display block="clear screen"
    //% parts="ledmatrix"
    void clearScreen() {
      uBit.display.image.clear();
@ -112,7 +112,7 @@ namespace basic {
     * Repeats the code forever in the background. On each iteration, allows other codes to run.
     * @param body code to execute
     */
-    //% help=basic/forever weight=55 blockGap=8
+    //% help=basic/forever weight=55 blockGap=8 blockAllowMultiple=1
    //% blockId=device_forever block="forever" icon="\uf01e"
    void forever(Action a) {
      if (a != 0) {
--- a/libs/core/control.cpp
+++ b/libs/core/control.cpp
@ -121,7 +121,7 @@ namespace control {
    /**
     * Schedules code that run in the background.
     */
-    //% help=control/in-background
+    //% help=control/in-background blockAllowMultiple=1
    //% blockId="control_in_background" block="run in background" blockGap=8
    void inBackground(Action a) {
      runInBackground(a);
--- a/libs/core/control.ts
+++ b/libs/core/control.ts
@ -1,7 +1,7 @@
 /**
 * Runtime and event utilities.
 */
-//% weight=1 color="#333333"
+//% weight=1 color="#333333" icon="\uf233"
 //% advanced=true
 namespace control {

@ -31,7 +31,7 @@ namespace control {
    /**
     * If the condition is false, display msg on serial console, and panic with code 098.
     */
-    export function assert(condition: boolean, msg ?: string) {
+    export function assert(condition: boolean, msg?: string) {
        if (!condition) {
            console.log("ASSERTION FAILED")
            if (msg != null) {
--- a/libs/core/core.cpp
+++ b/libs/core/core.cpp
@ -21,7 +21,12 @@ namespace String_ {

    //%
    int compare(StringData *s, StringData *that) {
-        return strcmp(s->data, that->data);
+      int compareResult = strcmp(s->data, that->data);
+      if (compareResult < 0)
+        return -1;
+      else if (compareResult > 0)
+        return 1;
+      return 0;
    }

    //%
@ -76,7 +81,7 @@ namespace Boolean_ {
    }

    //%
-    bool bang(bool v) { return !v; }
+    bool bang(int v) { return v == 0; }
 }

 namespace Number_ {
@ -153,13 +158,19 @@ namespace Array_ {
    //%
    int length(RefCollection *c) { return c->length(); }
    //%
+    void setLength(RefCollection *c, int newLength) { c->setLength(newLength); }    
+    //%
    void push(RefCollection *c, uint32_t x) { c->push(x); }
    //%
+    uint32_t pop(RefCollection *c) { return c->pop(); }    
+    //%
    uint32_t getAt(RefCollection *c, int x) { return c->getAt(x); }
    //%
-    void removeAt(RefCollection *c, int x) { c->removeAt(x); }
+    void setAt(RefCollection *c, int x, uint32_t y) { c->setAt(x, y); }    
    //%
-    void setAt(RefCollection *c, int x, uint32_t y) { c->setAt(x, y); }
+    uint32_t removeAt(RefCollection *c, int x) { return c->removeAt(x); }
+    //%
+    void insertAt(RefCollection *c, int x, uint32_t value) { c->insertAt(x, value); }    
    //%
    int indexOf(RefCollection *c, uint32_t x, int start) { return c->indexOf(x, start); }
    //%
--- a/libs/core/enums.d.ts
+++ b/libs/core/enums.d.ts
@ -115,6 +115,11 @@ declare namespace basic {
     */
    //% block="6g"
    SixG = 9,  // MICROBIT_ACCELEROMETER_EVT_6G
+    /**
+     * Raised when a 8G shock is detected
+     */
+    //% block="8g"
+    EightG = 10,  // MICROBIT_ACCELEROMETER_EVT_8G
    }
 declare namespace input {
 }
--- a/libs/core/game.ts
+++ b/libs/core/game.ts
@ -21,7 +21,7 @@ enum LedSpriteProperty {
 /**
 * A single-LED sprite game engine
 */
-//% color=#008272 weight=32
+//% color=#008272 weight=32 icon="\uf11b"
 //% advanced=true
 namespace game {
    let _score: number = 0;
@ -40,7 +40,7 @@ namespace game {
     * @param x sprite horizontal coordinate, eg: 2
     * @param y sprite vertical coordinate, eg: 2
     */
-    //% weight=60
+    //% weight=60 blockGap=8
    //% blockId=game_create_sprite block="create sprite at|x: %x|y: %y"
    //% parts="ledmatrix"
    export function createSprite(x: number, y: number): LedSprite {
@ -146,8 +146,9 @@ namespace game {

    /**
     * Sets the current score value
-     * @param value TODO
+     * @param value new score value.
     */
+    //% blockId=game_set_score block="set score %points" blockGap=8
    //% weight=10 help=game/set-score
    export function setScore(value: number): void {
        _score = Math.max(0, value);
@ -589,7 +590,7 @@ namespace game {

        /**
         * Turns on the sprite (on by default)
-         * @param this TODO
+         * @param this the sprite
         */
        public on(): void {
            this.setBrightness(255);
@ -597,7 +598,7 @@ namespace game {

        /**
         * Turns off the sprite (on by default)
-         * @param this TODO
+         * @param this the sprite
         */
        public off(): void {
            this.setBrightness(0);
@ -605,8 +606,8 @@ namespace game {

        /**
         * Set the ``brightness`` of a sprite
-         * @param this TODO
-         * @param brightness TODO
+         * @param this the sprite
+         * @param brightness the brightness from 0 (off) to 255 (on), eg: 255.
         */
        //% parts="ledmatrix"
        public setBrightness(brightness: number): void {
@ -616,8 +617,9 @@ namespace game {

        /**
         * Reports the ``brightness` of a sprite on the LED screen
-         * @param this TODO
+         * @param this the sprite
         */
+        //% parts="ledmatrix"
        public brightness(): number {
            let r: number;
            return this._brightness;
@ -625,8 +627,8 @@ namespace game {

        /**
         * Changes the ``y`` position by the given amount
-         * @param this TODO
-         * @param value TODO
+         * @param this the sprite
+         * @param value the value to change brightness
         */
        public changeBrightnessBy(value: number): void {
            this.setBrightness(this._brightness + value);
@ -643,10 +645,12 @@ namespace game {

        /**
         * Deletes the sprite from the game engine. All further operation of the sprite will not have any effect.
-         * @param sprite TODO
+         * @param this sprite to delete
         */
-        public delete(sprite: LedSprite): void {
-            sprites.removeElement(sprite);
+        //% weight=59
+        //% blockId="game_delete_sprite" block="delete %this"        
+        public delete(): void {
+            sprites.removeElement(this);
        }

        /**
--- a/libs/core/images.cpp
+++ b/libs/core/images.cpp
@ -3,7 +3,7 @@
 /**
 * Creation, manipulation and display of LED images.
 */
-//% color=#5C2D91 weight=31
+//% color=#5C2D91 weight=31 icon="\uf03e"
 //% advanced=true
 namespace images {
    /**
--- a/libs/core/input.cpp
+++ b/libs/core/input.cpp
@ -104,18 +104,23 @@ enum class Gesture {
    * Raised when a 6G shock is detected
    */
    //% block="6g"
-    SixG = MICROBIT_ACCELEROMETER_EVT_6G
+    SixG = MICROBIT_ACCELEROMETER_EVT_6G,
+    /**
+    * Raised when a 8G shock is detected
+    */
+    //% block="8g"
+    EightG = MICROBIT_ACCELEROMETER_EVT_8G
 };

-//% color=300 weight=99
+//% color=300 weight=99 icon="\uf192"
 namespace input {
    /**
     * Do something when a button (``A``, ``B`` or both ``A+B``) is pressed
-     * @param button TODO
-     * @param body TODO
+     * @param button the button that needs to be pressed
+     * @param body code to run when event is raised
     */
    //% help=input/on-button-pressed weight=85 blockGap=8
-    //% blockId=device_button_event block="on button|%NAME|pressed" icon="\uf192"
+    //% blockId=device_button_event block="on button|%NAME|pressed"
    //% parts="buttonpair"
    void onButtonPressed(Button button, Action body) {
        registerWithDal((int)button, MICROBIT_BUTTON_EVT_CLICK, body);
@ -123,26 +128,28 @@ namespace input {

    /**
     * Do something when when a gesture is done (like shaking the micro:bit).
-     * @param body TODO
+     * @param gesture the type of gesture to track, eg: Gesture.Shake
+     * @param body code to run when gesture is raised
     */
    //% help=input/on-gesture weight=84 blockGap=8
-    //% blockId=device_gesture_event block="on |%NAME" icon="\uf135"
+    //% blockId=device_gesture_event block="on |%NAME"
    //% parts="accelerometer"
    void onGesture(Gesture gesture, Action body) {
-        if ((int)gesture == MICROBIT_ACCELEROMETER_EVT_3G && uBit.accelerometer.getRange() < 3)
+        int gi = (int)gesture;
+        if (gi == MICROBIT_ACCELEROMETER_EVT_3G && uBit.accelerometer.getRange() < 3)
            uBit.accelerometer.setRange(4);
-        else if ((int)gesture == MICROBIT_ACCELEROMETER_EVT_6G && uBit.accelerometer.getRange() < 6)
+        else if ((gi == MICROBIT_ACCELEROMETER_EVT_6G || gi == MICROBIT_ACCELEROMETER_EVT_8G) && uBit.accelerometer.getRange() < 6)
            uBit.accelerometer.setRange(8);
-        registerWithDal(MICROBIT_ID_GESTURE, (int)gesture, body);
+        registerWithDal(MICROBIT_ID_GESTURE, gi, body);
    }

     /**
     * Do something when a pin is pressed.
-     * @param name the pin that needs to be pressed
+     * @param name the pin that needs to be pressed, eg: TouchPin.P0
     * @param body the code to run when the pin is pressed
     */
    //% help=input/on-pin-pressed weight=83
-    //% blockId=device_pin_event block="on pin %NAME|pressed" icon="\uf094"
+    //% blockId=device_pin_event block="on pin %name|pressed"
    void onPinPressed(TouchPin name, Action body) {
        auto pin = getPin((int)name);
        if (!pin) return;
@ -154,11 +161,11 @@ namespace input {

    /**
     * Do something when a pin is released.
-     * @param name the pin that needs to be released
+     * @param name the pin that needs to be released, eg: TouchPin.P0
     * @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"
+    //% blockId=device_pin_released block="on pin %NAME|released"
    //% advanced=true
    void onPinReleased(TouchPin name, Action body) {
        auto pin = getPin((int)name);
@ -171,6 +178,7 @@ namespace input {

    /**
     * Get the button state (pressed or not) for ``A`` and ``B``.
+     * @param button the button to query the request, eg: Button.A
     */
    //% help=input/button-is-pressed weight=60
    //% block="button|%NAME|is pressed"
@ -189,10 +197,10 @@ 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
+     * @param name pin used to detect the touch, eg: TouchPin.P0
     */
    //% help=input/pin-is-pressed weight=58
-    //% blockId="device_pin_is_pressed" block="pin %NAME|is pressed" icon="\uf094"
+    //% blockId="device_pin_is_pressed" block="pin %NAME|is pressed"
    //% blockGap=8
    bool pinIsPressed(TouchPin name) {
        auto pin = getPin((int)name);
@ -210,7 +218,7 @@ namespace input {
     * 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"
+    //% help=input/acceleration weight=58
    //% blockId=device_acceleration block="acceleration (mg)|%NAME" blockGap=8
    //% parts="accelerometer"
    int acceleration(Dimension dimension) {
@ -227,7 +235,7 @@ namespace input {
     * 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"
+    //% blockId=device_get_light_level block="light level" blockGap=8
    //% parts="ledmatrix"
    int lightLevel() {
        return uBit.display.readLightLevel();
@ -237,7 +245,7 @@ namespace input {
     * Get the current compass heading in degrees.
     */
    //% help=input/compass-heading
-    //% weight=56 icon="\uf14e"
+    //% weight=56
    //% blockId=device_heading block="compass heading (°)" blockGap=8
    //% parts="compass"
    int compassHeading() {
@ -248,7 +256,7 @@ namespace input {
    /**
     * Gets the temperature in Celsius degrees (°C).
     */
-    //% weight=55 icon="\uf06d"
+    //% weight=55
    //% help=input/temperature
    //% blockId=device_temperature block="temperature (°C)" blockGap=8
    //% parts="thermometer"
@ -261,7 +269,7 @@ namespace input {
     * @param kind TODO
     */
    //% help=input/rotation weight=52
-    //% blockId=device_get_rotation block="rotation (°)|%NAME" blockGap=8 icon="\uf197"
+    //% blockId=device_get_rotation block="rotation (°)|%NAME" blockGap=8
    //% parts="accelerometer" advanced=true
    int rotation(Rotation kind) {
      switch (kind) {
@ -276,7 +284,7 @@ namespace input {
     * @param dimension TODO
     */
    //% help=input/magnetic-force weight=51
-    //% blockId=device_get_magnetic_force block="magnetic force (µT)|%NAME" blockGap=8 icon="\uf076"
+    //% blockId=device_get_magnetic_force block="magnetic force (µT)|%NAME" blockGap=8
    //% parts="compass"
    //% advanced=true
    int magneticForce(Dimension dimension) {
@ -296,7 +304,7 @@ namespace input {
     * 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"
+    //% blockId=device_get_running_time block="running time (ms)"
    //% advanced=true
    int runningTime() {
        return system_timer_current_time();
@ -313,7 +321,7 @@ namespace input {
     * @param range a value describe the maximum strengh of acceleration measured
     */
    //% help=input/set-accelerometer-range
-    //% blockId=device_set_accelerometer_range block="set accelerometer|range %range" icon="\uf135"
+    //% blockId=device_set_accelerometer_range block="set accelerometer|range %range"
    //% weight=5
    //% parts="accelerometer"
    //% advanced=true
--- a/libs/core/input.ts
+++ b/libs/core/input.ts
@ -1,7 +1,7 @@
 /**
 * Events and data from sensors
 */
-//% color=#B4009E weight=99
+//% color=#B4009E weight=99 icon="\uf192"
 namespace input {
    /**
     * Attaches code to run when the screen is facing up.
--- a/Show More
+++ b/Show More