0.0.60

Add lego avatar

README.md

@@ -4,7 +4,8 @@
 
 This repo contains the editor target hosted at https://d541eec2-1e96-4b7b-a223-da9d01d0337a.pxt.io/
 
-Issue tracker: https://src.education.lego.com/groups/ev3-makecode
+LEGO Auth: https://src.education.lego.com/groups/ev3-makecode (use Google Authenticator)
+LEGO Chat: https://chat.internal.education.lego.com/make-code/channels/town-square 
 
 ## Local Dev setup
 

cmds/cmds.ts

@@ -2,14 +2,10 @@
 
 import * as fs from 'fs';
 
-require("./editor/deploy")
-
-declare namespace pxt.editor {
-    function deployCoreAsync(resp: pxtc.CompileResult, disconnect?: boolean): Promise<void>;
-}
+const deploy = require("./editor/deploy")
 
 export function deployCoreAsync(resp: pxtc.CompileResult) {
-    return pxt.editor.deployCoreAsync(resp, process.env["PXT_SERIAL"] ? false : true)
+    return deploy.deployCoreAsync(resp, process.env["PXT_SERIAL"] ? false : true)
         .then(() => {
             fs.writeFileSync("built/full-" + pxtc.BINARY_UF2, resp.outfiles[pxtc.BINARY_UF2], {
                 encoding: "base64"

docs/coding.md

@@ -0,0 +1,171 @@
+# Coding Activites
+
+12 computer science activities, with cross-curricular opportunities in design and technology, science, and math.
+
+* [Download Curriculum Materials](https://education.lego.com/en-us/downloads/mindstorms-ev3)
+
+## Three Point Turn
+
+```codecard
+[
+{
+  "name": "Three Point Turn 1",
+  "description": "Activity 1",
+  "url":"/coding/three-point-turn-1",
+  "cardType": "example"
+}, {
+  "name": "Three Point Turn 2",
+  "description": "Activity 2",
+  "url":"/coding/three-point-turn-2",
+  "cardType": "example"
+}, {
+  "name": "Three Point Turn 3",
+  "description": "Activity 3",
+  "url":"/coding/three-point-turn-3",
+  "cardType": "example"
+}]
+```
+
+## Reversing the robot
+
+```codecard
+[{
+  "name": "Reversing the robot 1",
+  "description": "Activity 1",
+  "url":"/coding/reversing-the-robot-1",
+  "cardType": "example"
+}, {
+  "name": "Reversing the robot 2",
+  "description": "Activity 2",
+  "url":"/coding/reversing-the-robot-2",
+  "cardType": "example"
+}, {
+  "name": "Reversing the robot 3",
+  "description": "Activity 3",
+  "url":"/coding/reversing-the-robot-3",
+  "cardType": "example"
+}]
+```
+
+## Light the way
+
+```codecard
+[{
+  "name": "Light the way 1",
+  "description": "Activity 1",
+  "url":"/coding/light-the-way-1",
+  "cardType": "example"
+}, {
+  "name": "Light the way 2",
+  "description": "Activity 2",
+  "url":"/coding/light-the-way-2",
+  "cardType": "example"
+}, {
+  "name": "Light the way 3",
+  "description": "Activity 3",
+  "url":"/coding/light-the-way-3",
+  "cardType": "example"
+}    
+]
+```
+
+## Traffic Lights
+
+```codecard
+[{
+  "name": "Traffic Lights 1",
+  "description": "Activity 1",
+  "url":"/coding/traffic-lights-1",
+  "cardType": "example"
+}, {
+  "name": "Traffic Lights 2",
+  "description": "Activity 2",
+  "url":"/coding/traffic-lights-2",
+  "cardType": "example"
+}, {
+  "name": "Traffic Lights 3",
+  "description": "Activity 3",
+  "url":"/coding/traffic-lights-3",
+  "cardType": "example"
+}
+]
+```
+
+## Reverse Bepper
+
+```codecard
+[{
+  "name": "Reverse Beeper 1",
+  "description": "Activity 1",
+  "url":"/coding/reverse-beeper-1",
+  "cardType": "example"
+}, {
+  "name": "Reverse Beeper 2",
+  "description": "Activity 2",
+  "url":"/coding/reverse-beeper-2",
+  "cardType": "example"
+}, {
+  "name": "Reverse Beeper 3",
+  "description": "Activity 3",
+  "url":"/coding/reverse-beeper-3",
+  "cardType": "example"
+}]
+```
+
+## Ignition
+
+```codecard
+[{
+  "name": "Ignition 1",
+  "description": "Activity 1",
+  "url":"/coding/ingition-1",
+  "cardType": "example"
+}, {
+  "name": "Ignition 2",
+  "description": "Activity 2",
+  "url":"/coding/ignition-2",
+  "cardType": "example"
+}, {
+  "name": "Ignition 3",
+  "description": "Activity 3",
+  "url":"/coding/ignition-3",
+  "cardType": "example"
+}]
+```
+
+## Cruise Control
+
+```codecard
+[{
+  "name": "Cruise Control 1",
+  "description": "Activity 1",
+  "url":"/coding/cruise-control-1",
+  "cardType": "example"
+}, {
+  "name": "Cruise Control 2",
+  "description": "Activity 2",
+  "url":"/coding/cruise-control-2",
+  "cardType": "example"
+}, {
+  "name": "Cruise Control 3",
+  "description": "Activity 3",
+  "url":"/coding/cruise-control-3",
+  "cardType": "example"
+}]
+```
+
+## Roaming
+
+```codecard
+[{
+  "name": "Roaming 1",
+  "description": "Activity 1",
+  "url":"/coding/roaming-1",
+  "cardType": "example"
+}, {
+  "name": "Roaming 2",
+  "description": "Activity 2",
+  "url":"/coding/roaming-2",
+  "cardType": "example"
+}]
+```

docs/coding/cruise-control-1.md

@@ -0,0 +1,10 @@
+# Cruise Control Activity 1
+
+```blocks
+let speed = 0;
+sensors.touch1.onEvent(TouchSensorEvent.Pressed, function () {
+    if (speed < 100)
+        speed = speed + 10;
+    motors.largeBC.setSpeed(speed);
+}) 
+```

docs/coding/cruise-control-2.md

@@ -0,0 +1,15 @@
+# Cruise Control Activity 2
+
+```blocks
+let speed = 0;
+sensors.touch1.onEvent(TouchSensorEvent.Pressed, function () {
+    if (speed < 100)
+        speed = speed + 10;
+    motors.largeBC.setSpeed(speed);
+}) 
+sensors.touch2.onEvent(TouchSensorEvent.Pressed, function () {
+    if (speed > -100)
+        speed = speed - 10;
+    motors.largeBC.setSpeed(speed);
+}) 
+```

docs/coding/cruise-control-3.md

@@ -0,0 +1,28 @@
+# Cruise Control Activity 3
+
+```blocks
+let speed = 0
+function decelerate() {
+    if (speed > -100) {
+        speed = speed - 10
+    }
+}
+function accelerate() {
+    if (speed < 100) {
+        speed = speed + 10
+    }
+}
+function update() {
+    brick.clearScreen()
+    brick.showString("speed: " + speed, 1)
+    motors.largeBC.setSpeed(speed)
+}
+sensors.touch2.onEvent(TouchSensorEvent.Pressed, function () {
+    accelerate()
+    update()
+})
+sensors.touch1.onEvent(TouchSensorEvent.Pressed, function () {
+    decelerate()
+    update()
+})
+```

docs/coding/ignition-1.md

@@ -0,0 +1,11 @@
+# Ignition Activity 1
+
+```blocks
+sensors.touch1.onEvent(TouchSensorEvent.Pressed, function () {
+    brick.showImage(images.eyesDizzy)
+})
+sensors.ultrasonic4.onEvent(UltrasonicSensorEvent.ObjectDetected, function () {
+    brick.showImage(images.eyesTiredMiddle)
+})
+brick.showImage(images.eyesSleeping)
+```

docs/coding/ignition-2.md

@@ -0,0 +1,12 @@
+# Ignition Activity 2
+
+```blocks
+while (true) {
+    if (sensors.touch1.wasPressed() &&
+        sensors.ultrasonic4.distance() < 10) {
+        music.playSoundEffectUntilDone(sounds.mechanicalMotorStart)
+        music.playSoundEffectUntilDone(sounds.mechanicalMotorIdle);
+    }
+    loops.pause(1);
+}
+```

docs/coding/ignition-3.md

@@ -0,0 +1,13 @@
+# Ignition Activity 3
+
+```blocks
+while (true) {
+    if (sensors.ultrasonic4.distance() < 10 &&
+        sensors.touch1.wasPressed() &&
+        brick.buttonEnter.wasPressed()) {
+        music.playSoundEffectUntilDone(sounds.mechanicalMotorStart)
+        music.playSoundEffectUntilDone(sounds.mechanicalMotorIdle);
+    }
+    loops.pause(1);
+}
+```

docs/coding/light-the-way-1.md

@@ -0,0 +1,9 @@
+# Light the way Activity 1
+
+```blocks
+sensors.color3.onLightChanged(LightIntensityMode.Ambient, LightCondition.Dark, function () {
+    brick.showImage(images.objectsLightOn)
+    loops.pause(5000)
+    brick.clearScreen()
+})
+```

docs/coding/light-the-way-2.md

@@ -0,0 +1,10 @@
+# Light the way Activity 2
+
+```blocks
+sensors.color3.onLightChanged(LightIntensityMode.Ambient, LightCondition.Bright, function () {
+    brick.clearScreen()
+})
+sensors.color3.onLightChanged(LightIntensityMode.Ambient, LightCondition.Dark, function () {
+    brick.showImage(images.objectsLightOn)
+})
+```

docs/coding/light-the-way-3.md

@@ -0,0 +1,13 @@
+# Light the way Activity 3
+
+```blocks
+sensors.color3.onLightChanged(LightIntensityMode.Ambient, LightCondition.Bright, function () {
+    brick.clearScreen()
+})
+sensors.color3.onLightChanged(LightIntensityMode.Ambient, LightCondition.Dark, function () {
+    brick.showImage(images.objectsLightOn)
+})
+sensors.touch1.onEvent(TouchSensorEvent.Pressed, function () {
+    brick.showImage(images.objectsLightOn);
+})
+```

docs/coding/reverse-beeper-1.md

@@ -0,0 +1,11 @@
+# Reverse Beeper Activity 1
+
+```blocks
+loops.forever(function () {
+    music.playTone(440, sensors.ultrasonic4.distance());
+    loops.pause(50)
+})
+motors.largeBC.setSpeed(-20);
+sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectNear);
+motors.largeBC.stop();
+```

docs/coding/reverse-beeper-2.md

@@ -0,0 +1,13 @@
+# Reverse Beeper Activity 2
+
+```blocks
+loops.forever(function () {
+    if (motors.largeB.speed() != 0 && sensors.ultrasonic4.distance() < 20) {
+        music.playTone(440, sensors.ultrasonic4.distance());
+        loops.pause(50)
+    }
+})
+motors.largeBC.setSpeed(-20);
+sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectNear);
+motors.largeBC.stop();
+```

docs/coding/reverse-beeper-3.md

@@ -0,0 +1,20 @@
+# Reverse Beeper Activity 2
+
+```blocks
+let beep = false
+beep = true
+control.runInBackground(function () {
+    motors.largeBC.setSpeed(-20)
+    sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectNear)
+    motors.largeBC.stop()
+    beep = false
+})
+control.runInBackground(function () {
+    while (beep) {
+        if (sensors.ultrasonic4.distance() < 20) {
+            music.playTone(440, sensors.ultrasonic4.distance())
+            loops.pause(50)
+        }
+    }
+})
+```

docs/coding/reversing-the-robot-1.md

@@ -0,0 +1,14 @@
+# Reversing the robot Activity 1
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Click, function () {
+    motors.largeBC.setSpeed(50)
+    sensors.touchSensor1.pauseUntil(TouchSensorEvent.Pressed)
+    motors.largeBC.setSpeed(0)
+    loops.pause(1000)
+    brick.setLight(LightsPattern.OrangeFlash)
+    motors.largeBC.setSpeed(-50)
+    loops.pause(2000)
+    motors.largeBC.setSpeed(0)
+})
+```

docs/coding/reversing-the-robot-2.md

@@ -0,0 +1,15 @@
+# Reversing the robot Activity 2
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Click, function () {
+    sensors.touchSensor1.pauseUntil(TouchSensorEvent.Pressed)
+    motors.largeBC.setSpeed(50)
+    sensors.touchSensor2.pauseUntil(TouchSensorEvent.Pressed)
+    motors.largeBC.setSpeed(0)
+    loops.pause(1000)
+    brick.setLight(LightsPattern.OrangeFlash)
+    motors.largeBC.setSpeed(-50)
+    loops.pause(2000)
+    motors.largeBC.setSpeed(0)
+})
+```

docs/coding/reversing-the-robot-3.md

@@ -0,0 +1,19 @@
+# Reversing the robot Activity 3
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Click, function () {
+    brick.showImage(images.eyesSleeping)
+    sensors.touchSensor1.pauseUntil(TouchSensorEvent.Pressed)
+    brick.showImage(images.eyesNeutral)
+    motors.largeBC.setSpeed(50)
+    sensors.touchSensor2.pauseUntil(TouchSensorEvent.Pressed)
+    brick.showImage(images.eyesTiredMiddle)
+    motors.largeBC.setSpeed(0)
+    loops.pause(1000)
+    brick.setLight(LightsPattern.OrangeFlash)
+    brick.showImage(images.eyesDizzy)
+    motors.largeBC.setSpeed(-50)
+    loops.pause(2000)
+    motors.largeBC.setSpeed(0)
+})
+```

docs/coding/roaming-1.md

@@ -0,0 +1,36 @@
+# Roaming Activity 1
+
+```blocks
+let drive: number[] = []
+brick.buttonLeft.onEvent(ButtonEvent.Click, function () {
+    drive.push(1)
+})
+brick.buttonRight.onEvent(ButtonEvent.Click, function () {
+    drive.push(3)
+})
+brick.buttonUp.onEvent(ButtonEvent.Click, function () {
+    drive.push(4)
+})
+brick.buttonDown.onEvent(ButtonEvent.Click, function () {
+    drive.push(5)
+})
+pauseUntil(() => drive.length >= 5)
+loops.pause(1000)
+music.playSoundEffectUntilDone(sounds.communicationGo)
+for (let d of drive) {
+    if (d == 1) {
+        motors.largeC.setSpeedFor(50, 360, MoveUnit.Degrees)
+        motors.largeC.pauseUntilReady()
+    } else if (d == 3) {
+        motors.largeB.setSpeedFor(50, 360, MoveUnit.Degrees)
+        motors.largeB.pauseUntilReady()
+    } else if (d == 4) {
+        motors.largeBC.setSpeedFor(50, 360, MoveUnit.Degrees)
+        motors.largeBC.pauseUntilReady()
+    } else {
+        motors.largeBC.setSpeedFor(-50, 360, MoveUnit.Degrees)
+        motors.largeBC.pauseUntilReady()
+    }
+}
+music.playSoundEffectUntilDone(sounds.communicationGameOver)
+```

docs/coding/roaming-2.md

@@ -0,0 +1,40 @@
+# Roaming Activity 2
+
+```blocks
+let drive: number[] = []
+brick.buttonLeft.onEvent(ButtonEvent.Click, function () {
+    drive.push(1)
+    music.playSoundEffectUntilDone(sounds.systemClick)
+})
+brick.buttonRight.onEvent(ButtonEvent.Click, function () {
+    drive.push(3)
+    music.playSoundEffectUntilDone(sounds.systemClick)
+})
+brick.buttonUp.onEvent(ButtonEvent.Click, function () {
+    drive.push(4)
+    music.playSoundEffectUntilDone(sounds.systemClick)
+})
+brick.buttonDown.onEvent(ButtonEvent.Click, function () {
+    drive.push(5)
+    music.playSoundEffectUntilDone(sounds.systemClick)
+})
+brick.buttonEnter.pauseUntil(ButtonEvent.Click);
+loops.pause(1000)
+music.playSoundEffectUntilDone(sounds.communicationGo)
+for (let d of drive) {
+    if (d == 1) {
+        motors.largeC.setSpeedFor(50, 360, MoveUnit.Degrees)
+        motors.largeC.pauseUntilReady()
+    } else if (d == 3) {
+        motors.largeB.setSpeedFor(50, 360, MoveUnit.Degrees)
+        motors.largeB.pauseUntilReady()
+    } else if (d == 4) {
+        motors.largeBC.setSpeedFor(50, 360, MoveUnit.Degrees)
+        motors.largeBC.pauseUntilReady()
+    } else {
+        motors.largeBC.setSpeedFor(-50, 360, MoveUnit.Degrees)
+        motors.largeBC.pauseUntilReady()
+    }
+}
+music.playSoundEffectUntilDone(sounds.communicationGameOver)
+```

docs/coding/three-point-turn-1.md

@@ -0,0 +1,12 @@
+# Three Point Turn Activity 1
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Click, function () {
+    motors.largeBC.tank(75, 30)
+    loops.pause(1500)
+    motors.largeBC.tank(-30, -75)
+    loops.pause(1000)
+    motors.largeBC.tank(50, 50)
+    loops.pause(3000)
+})
+```

docs/coding/three-point-turn-2.md

@@ -0,0 +1,14 @@
+# Three Point Turn Activity 2
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Click, function () {
+    motors.largeBC.tank(75, 30)
+    loops.pause(1500)
+    motors.largeBC.tank(-30, -75)
+    sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectNear);
+    motors.largeBC.tank(0, 0)
+    loops.pause(1000)
+    motors.largeBC.tank(50, 50)
+    loops.pause(3000)
+})
+```

docs/coding/three-point-turn-3.md

@@ -0,0 +1,15 @@
+# Three Point Turn Activity 3
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Click, function () {
+    motors.largeBC.tank(75, 30)
+    loops.pause(1500)
+    motors.largeBC.tank(-30, -75)
+    sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectNear);
+    motors.largeBC.tank(0, 0)
+    music.playSoundEffect(sounds.animalsDogBark1)
+    loops.pause(1000)
+    motors.largeBC.tank(50, 50)
+    loops.pause(3000)
+})
+```

docs/coding/traffic-lights-1.md

@@ -0,0 +1,9 @@
+# Traffic Lights Activity 1
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Click, function () {
+    motors.largeBC.tank(20, 20)
+    sensors.color3.pauseForColor(ColorSensorColor.Red)
+    motors.largeBC.tank(0, 0)
+})
+```

docs/coding/traffic-lights-2.md

@@ -0,0 +1,10 @@
+# Traffic Lights Activity 2
+
+```blocks
+sensors.color3.onColorDetected(ColorSensorColor.Red, function () {
+    motors.largeBC.tank(0, 0)  
+})
+sensors.color3.onColorDetected(ColorSensorColor.Green, function () {
+    motors.largeBC.tank(20, 20)
+})
+```

docs/coding/traffic-lights-3.md

@@ -0,0 +1,11 @@
+# Traffic Lights Activity 3
+
+```blocks
+loops.forever(function () {
+    if (sensors.color3.light(LightIntensityMode.Reflected) < 15) {
+        motors.largeBC.tank(30, 12)
+    } else {
+        motors.largeBC.tank(12, 30)
+    }
+})
+```

docs/examples/line-follower-pid.md

@@ -0,0 +1,50 @@
+# Gradien follower PID + calibration
+
+```blocks
+let lasterror = 0
+let D = 0
+let I = 0
+let P = 0
+let error = 0
+let setpoint = 0
+let max = 0
+let min = 0
+let v = 0
+v = sensors.color3.light(LightIntensityMode.Reflected)
+min = v
+max = v
+setpoint = v
+while (!(brick.buttonEnter.wasPressed())) {
+    brick.clearScreen()
+    brick.showString("Move robot on terrain", 1)
+    brick.showString("Press ENTER when done", 2)
+    v = sensors.color3.light(LightIntensityMode.Reflected)
+    min = Math.min(min, v)
+    max = Math.max(max, v)
+    setpoint = (max + min) / 2
+    brick.showValue("v", v, 3)
+    brick.showValue("min", min, 4)
+    brick.showValue("max", v, 5)
+    brick.showValue("setpoint", setpoint, 6)
+    loops.pause(100)
+}
+loops.forever(function () {
+    brick.clearScreen()
+    v = sensors.color3.light(LightIntensityMode.Reflected)
+    brick.showValue("light", v, 1)
+    error = v - setpoint
+    brick.showValue("error", error, 2)
+    P = error * 5
+    brick.showValue("P", P, 3)
+    I = I + error * 0.01
+    brick.showValue("I", I, 4)
+    D = (error - lasterror) * 0.2
+    brick.showValue("D", D, 5)
+    motors.largeBC.steer(P + (I + D), 100)
+    lasterror = error
+    if (brick.buttonEnter.wasPressed()) {
+        motors.largeBC.setSpeed(0)
+        brick.buttonDown.pauseUntil(ButtonEvent.Click)
+    }
+})
+```

docs/static/avatar.svg

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="svg2" inkscape:version="0.91 r13725" sodipodi:docname="avatar.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 32 32"
+	 style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#303030;}
+</style>
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" id="namedview15" inkscape:current-layer="svg2" inkscape:cx="16" inkscape:cy="16" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="661" inkscape:window-maximized="0" inkscape:window-width="997" inkscape:window-x="0" inkscape:window-y="0" inkscape:zoom="5.2149125" objecttolerance="10" pagecolor="#ffffff" showgrid="false">
+	</sodipodi:namedview>
+<g id="avatar_mf" transform="translate(-5304.979 8145.745)">
+	<path id="Path_180" class="st0" d="M5317.1-8125.6c0.2,0,0.3-0.1,0.5-0.1l2.9-0.6c1.3-0.3,2.5-0.5,3.8-0.8c0.5-0.1,1-0.2,1.5-0.3
+		c0.1,0,0.1,0,0.1-0.1c0-0.5,0-1-0.1-1.5c-0.1-0.6-0.2-1.1-0.3-1.7c-0.1-0.4-0.1-0.8-0.2-1.2c-0.1-0.7-0.2-1.4-0.3-2
+		c-0.1-0.6-0.2-1.1-0.3-1.7c0-0.2-0.2-0.4-0.4-0.4c0,0,0,0-0.1,0c-0.2,0-0.5,0.1-0.7,0.1c-0.5,0.1-1,0.1-1.5,0.2
+		c-0.5,0.1-1,0.1-1.6,0.2c-0.5,0.1-1,0.1-1.4,0.2c-0.2,0-0.3,0-0.5,0.1c-0.2,0-0.4,0.2-0.5,0.4c0,0.2-0.1,0.4-0.1,0.5
+		c0,0.4-0.1,0.8-0.1,1.2c-0.1,0.5-0.1,1-0.2,1.5c0,0.4-0.1,0.9-0.1,1.3l-0.1,1.3l-0.1,1.3c-0.1,0.5-0.1,1-0.2,1.5
+		C5317.1-8126,5317.1-8125.8,5317.1-8125.6z"/>
+	<path id="Path_181" class="st0" d="M5316.1-8140c0,0.6,0.1,1.2,0.1,1.8c0,0.4,0.2,0.8,0.6,1c0.3,0.2,0.7,0.3,1.1,0.3
+		c0.7,0.1,1.4,0.1,2.1,0c0.6,0,1.2-0.1,1.8-0.2c0.4,0,0.9-0.2,1.2-0.5c0.3-0.3,0.5-0.7,0.5-1.1c0-1.2,0-2.3-0.1-3.5
+		c0-0.3-0.1-0.6-0.3-0.8c-0.3-0.4-0.8-0.6-1.4-0.6c0,0,0,0-0.1,0c-0.2,0.1-0.4,0.1-0.6,0.1c-0.9,0-1.8,0.1-2.7,0.1
+		c-0.1,0-0.3,0-0.4,0c-0.4-0.1-0.8,0-1.2,0.2c-0.4,0.2-0.6,0.6-0.7,1c0,0.1,0,0.2,0,0.3C5316-8141.2,5316.1-8140.6,5316.1-8140
+		L5316.1-8140z"/>
+	<path id="Path_182" class="st0" d="M5312-8129.2c0,0.6,0,1.2,0,1.8c0,0.1,0,0.1,0.1,0.1c0.3,0,0.6,0.1,0.9,0.1c0.3,0,0.7,0,1,0
+		c0.1,0,0.2,0,0.3,0c0.1,0,0.1,0,0.1-0.1c0.1-0.4,0.2-0.8,0.2-1.2c0.1-0.5,0.2-1,0.3-1.4c0-0.1,0.1-0.1,0.1-0.1
+		c0.4-0.2,0.8-0.5,1.2-0.8c0.4-0.4,0.7-0.9,0.8-1.5c0.1-0.6,0-1.2-0.4-1.7c-0.2-0.3-0.6-0.4-0.9-0.3c-0.3,0.1-0.6,0.3-0.9,0.5
+		c-0.7,0.6-1.5,1.2-2.2,1.8c-0.3,0.2-0.5,0.5-0.6,0.8c0,0.2-0.1,0.4-0.1,0.6C5311.9-8130.2,5311.9-8129.7,5312-8129.2
+		C5311.9-8129.2,5312-8129.2,5312-8129.2z"/>
+	<path id="Path_183" class="st0" d="M5315.5-8124.7c0,0.2-0.1,0.5-0.1,0.7c-0.1,0.5-0.4,0.9-0.8,1.1c0,0,0,0,0,0
+		c-0.1,0-0.2,0.2-0.2,0.3c-0.4,1.4-0.9,2.7-1.3,4.1c0,0,0,0.1,0,0.1c0.8,1.1,1.6,2.2,2.4,3.3c0,0,0,0,0.1,0.1
+		c0.1-0.2,0.1-0.3,0.2-0.5c0.1-0.3,0.2-0.5,0.3-0.8c0,0,0-0.1,0-0.1c-0.2-0.3-0.5-0.7-0.7-1c0,0,0-0.1,0-0.2
+		c0.3-0.9,0.6-1.7,0.9-2.6c0,0,0-0.1,0.1-0.1c0.5-0.2,0.9-0.6,1.1-1.1c0.1-0.3,0.1-0.7,0.1-1.1c0-0.4-0.1-0.8-0.3-1.2
+		c-0.2-0.4-0.5-0.8-1-1C5315.9-8124.7,5315.7-8124.7,5315.5-8124.7z"/>
+	<path id="Path_184" class="st0" d="M5314.7-8134.2c0.1-0.1,0.2-0.1,0.3-0.2c0.3-0.2,0.7-0.3,1-0.3c0.4,0,0.7,0.2,0.8,0.6
+		c0.6,1.1,0.5,2.4-0.4,3.3c-0.4,0.4-0.8,0.7-1.3,1c0,0-0.1,0.1-0.1,0.1c-0.2,0.8-0.3,1.6-0.5,2.5c0,0,0,0.1,0,0.1
+		c0,0.2,0,0.2-0.2,0.2c-0.1,0-0.1,0-0.2,0c0,0.1,0,0.2,0,0.3c0,0,0,0,0.1,0.1l1.9,0.7c0.2,0.1,0.4,0.2,0.7,0.2c0-0.1,0-0.2,0-0.2
+		c0-0.3,0-0.6,0-0.8l0.2-1.5l0.2-1.5c0.1-0.5,0.1-1,0.2-1.5c0.1-0.5,0.1-1.1,0.2-1.6c0.1-0.5,0.1-1,0.2-1.5c0-0.2,0-0.4,0-0.6
+		c0-0.2-0.1-0.4-0.3-0.4c0,0,0,0,0,0c-0.1,0-0.1,0-0.2,0c-0.6-0.1-1.2-0.2-1.9-0.3c-0.1,0-0.2,0-0.3,0c-0.1,0-0.2,0.1-0.3,0.3
+		C5314.8-8135,5314.7-8134.6,5314.7-8134.2z"/>
+	<path id="Path_185" class="st0" d="M5324.5-8117.2c-0.2-0.7-0.5-1.3-0.7-2l-0.7,0.3c0,0-0.1,0-0.1,0c-0.1,0.1-0.2,0-0.2-0.1
+		c-0.1-0.3-0.2-0.5-0.3-0.8c-0.2-0.7-0.5-1.4-0.7-2.1c0,0,0-0.1,0-0.1c0,0,0,0.1-0.1,0.1c-0.1,0.2-0.3,0.3-0.5,0.5c0,0-0.1,0-0.1,0
+		c-0.3,0.1-0.6,0.1-0.8,0.2c0,0-0.1,0-0.1,0c0,0.2-0.1,0.3-0.1,0.5c0.6,1.5,1.1,3.1,1.7,4.6c0,0,0,0,0,0.1
+		C5322.7-8116.3,5323.6-8116.7,5324.5-8117.2z"/>
+	<path id="Path_186" class="st0" d="M5325.4-8123.1c-0.7,0.2-1.3,0.3-2,0.5c-0.5,0.1-0.9,0.2-1.4,0.3c-0.1,0-0.2,0.1-0.1,0.2
+		c0,0,0,0,0,0.1c0.2,0.5,0.3,0.9,0.5,1.4c0.2,0.5,0.4,1.1,0.6,1.6c0,0,0,0,0,0c0.1-0.1,0.2-0.1,0.3-0.2c0.2-0.1,0.3-0.2,0.5-0.2
+		c0.2-0.1,0.4-0.1,0.6-0.2c0.7-0.2,1.5-0.4,2.2-0.6c0,0,0,0,0.1,0C5326.3-8121.1,5325.9-8122.1,5325.4-8123.1z"/>
+	<path id="Path_187" class="st0" d="M5320.7-8124.4c-0.4,0.1-0.8,0.2-1.2,0.3c-0.6,0.1-1.3,0.3-1.9,0.4c0,0-0.1,0-0.1,0
+		c-0.1,0-0.2-0.1-0.3-0.1c0,0,0,0.1,0,0.1c0.3,0.7,0.4,1.5,0.3,2.2c-0.1,0.4-0.3,0.8-0.5,1.1c0,0,0,0-0.1,0.1
+		c0.2-0.1,0.4-0.1,0.6-0.1l2.5-0.6c0.5-0.1,0.9-0.6,1-1.1c0.1-0.5,0-1-0.1-1.5C5320.8-8124,5320.8-8124.2,5320.7-8124.4z"/>
+	<path id="Path_188" class="st0" d="M5325.5-8127c-2.7,0.5-5.3,1.1-7.9,1.6c0,0.5,0,0.9,0.1,1.4c0.1,0,0.2,0,0.3-0.1
+		c1.2-0.3,2.3-0.5,3.5-0.8c1.2-0.3,2.4-0.5,3.6-0.8c0.1,0,0.3-0.1,0.4-0.1c0,0,0.1,0,0.1-0.1
+		C5325.6-8126.2,5325.5-8126.6,5325.5-8127z"/>
+	<path id="Path_189" class="st0" d="M5328.6-8118.4c-0.2-0.4-0.3-0.7-0.5-1.1c-0.1-0.2-0.2-0.5-0.3-0.7c0-0.1,0-0.1-0.1,0
+		c-1.2,0.3-2.4,0.6-3.6,1c0,0,0,0-0.1,0c0.2,0.7,0.5,1.3,0.7,2C5326-8117.6,5327.3-8118,5328.6-8118.4z"/>
+	<path id="Path_190" class="st0" d="M5319.9-8120.9l-0.6,0.1c-1,0.2-2,0.5-3,0.7c-0.1,0-0.1,0.1-0.1,0.1c-0.3,0.7-0.5,1.5-0.8,2.2
+		c0,0,0,0,0,0.1c0.2,0,0.4-0.1,0.5-0.1c1-0.3,2-0.5,3.1-0.8c0.1,0,0.2-0.1,0.3-0.2C5319.5-8119.5,5319.7-8120.2,5319.9-8120.9z"/>
+	<path id="Path_191" class="st0" d="M5325.1-8125.4c-1.1,0.2-2.2,0.5-3.3,0.7c0.3,0.7,0.4,1.4,0.3,2.2c0.2,0,0.4-0.1,0.5-0.1
+		c0.9-0.2,1.8-0.4,2.7-0.6c0.1,0,0.1,0,0.1-0.1c0.1-0.4,0-0.9-0.1-1.3C5325.3-8124.9,5325.2-8125.1,5325.1-8125.4
+		C5325.1-8125.3,5325.1-8125.4,5325.1-8125.4z"/>
+	<path id="Path_192" class="st0" d="M5325.6-8132c0.2,0,0.4,0,0.5,0c0.2,0,0.4,0,0.6,0c0.3,0,0.6-0.2,0.8-0.4c0.3-0.4,0.7-0.8,1-1.2
+		c-0.1-0.1-0.1-0.1-0.1-0.2c0,0,0,0-0.1,0c-0.7-0.1-1.3-0.5-1.4-1.2c-0.1-0.2-0.1-0.4-0.1-0.6c-0.2,0.1-0.3,0.3-0.5,0.4
+		c-0.1,0.1-0.2,0.1-0.3,0.2c0,0-0.1,0.1-0.2,0c-0.2,0-0.5-0.1-0.7-0.1c0,0,0,0-0.1,0C5325.3-8134.1,5325.4-8133.1,5325.6-8132z"/>
+	<path id="Path_193" class="st0" d="M5328.4-8134.2c0.2-0.3,0.5-0.5,0.8-0.7c0.4-0.4,0.6-0.8,0.7-1.4c0-0.1,0-0.2-0.1-0.3
+		c-0.3-0.5-0.7-1.1-1-1.6c0-0.1-0.1-0.1-0.1,0c-0.4,0.2-0.8,0.5-1.1,0.8c-0.2,0.2-0.4,0.4-0.6,0.6c-0.1,0.1-0.1,0.3,0,0.4
+		c0.5,0.7,1,1.5,1.4,2.2C5328.4-8134.2,5328.4-8134.2,5328.4-8134.2z"/>
+	<path id="Path_194" class="st0" d="M5314.3-8126.1c-0.1-0.1-0.1-0.1-0.2-0.2c-0.1,0-0.1-0.1-0.1-0.2c0-0.1,0-0.3,0-0.4h-0.1
+		c-0.6,0-1.2-0.1-1.7-0.2c0,0-0.1,0-0.1,0c-0.4,0.2-0.7,0.4-1,0.8c-0.4,0.6-0.4,1.4,0.1,1.9c0.2,0.2,0.4,0.4,0.6,0.6
+		c0.1,0.1,0.2,0.2,0.3,0.2c-0.2-0.6,0-1.3,0.5-1.8C5313-8125.9,5313.6-8126.2,5314.3-8126.1z"/>
+	<path id="Path_195" class="st0" d="M5315.7-8114.9c0.5-0.1,0.9-0.3,1.4-0.4c0.8-0.2,1.6-0.4,2.4-0.7c0.1,0,0.1,0,0.1-0.1
+		c0.1-0.4,0.2-0.7,0.4-1.1c0,0,0,0,0-0.1c-0.1,0-0.2,0-0.3,0.1c-1.2,0.3-2.3,0.6-3.5,1c-0.1,0-0.1,0.1-0.1,0.1
+		c-0.1,0.4-0.3,0.7-0.4,1.1C5315.7-8115,5315.7-8115,5315.7-8114.9z"/>
+	<path id="Path_196" class="st0" d="M5315.4-8117.4c0.2,0.3,0.4,0.6,0.6,0.9c0,0,0.1,0,0.1,0c1-0.3,1.9-0.5,2.9-0.8
+		c0.3-0.1,0.6-0.2,0.9-0.2c-0.1-0.1-0.1-0.2-0.2-0.2c-0.2-0.2-0.3-0.4-0.5-0.6c0,0-0.1-0.1-0.1,0c-0.9,0.3-1.9,0.5-2.8,0.8
+		C5316-8117.5,5315.7-8117.5,5315.4-8117.4z"/>
+	<path id="Path_197" class="st0" d="M5321.3-8143.6c0-0.3,0-0.7,0-1c0,0-0.1,0-0.1,0c-0.7,0-1.5,0-2.2,0.1c-0.4,0-0.7,0-1.1,0.1
+		c-0.1,0-0.1,0-0.1,0.1c0,0.3,0,0.6,0,0.8c0,0,0,0.1,0.1,0.1c0.4,0,0.8,0,1.1,0c0.5,0,1.1,0,1.6-0.1
+		C5320.9-8143.5,5321.1-8143.6,5321.3-8143.6z"/>
+	<path id="Path_198" class="st0" d="M5329.2-8134.3c0.1,0,0.2,0,0.2-0.1c0.4-0.2,0.8-0.4,1.1-0.7c0.3-0.2,0.4-0.5,0.6-0.8
+		c0.1-0.3,0.1-0.6-0.1-0.9c-0.4-0.5-0.7-1-1.1-1.6c0,0,0,0-0.1-0.1c-0.2,0.2-0.4,0.4-0.6,0.6c0,0,0,0,0,0c0,0,0,0.1,0,0.1
+		c0.2,0.4,0.5,0.7,0.7,1c0.1,0.2,0.2,0.4,0.1,0.6c0,0.5-0.1,0.9-0.4,1.3c-0.1,0.1-0.2,0.2-0.3,0.3
+		C5329.4-8134.5,5329.3-8134.4,5329.2-8134.3C5329.2-8134.3,5329.2-8134.3,5329.2-8134.3z"/>
+	<path id="Path_199" class="st0" d="M5317.5-8136.7c0,0.2,0,0.3,0,0.5c0,0,0,0.1,0.1,0.1c0.2,0,0.3,0.1,0.5,0.1c0.7,0.1,1.4,0.1,2,0
+		c0.4,0,0.8-0.1,1.2-0.1c0.2,0,0.5-0.1,0.7-0.1c0.1,0,0.1,0,0.1-0.1c0-0.2,0-0.3,0-0.5C5320.5-8136.6,5319-8136.5,5317.5-8136.7z"/>
+	<path id="Path_200" class="st0" d="M5312.5-8123.2c0.1-0.4,0.1-0.8,0.2-1.2c0.1-0.6,0.6-1,1.2-1c0.3,0,0.5,0.1,0.7,0.3
+		c0.2,0.2,0.2,0.4,0.2,0.7c-0.1,0.3-0.2,0.6-0.2,0.9c0,0.1-0.1,0.2-0.1,0.4c0,0,0,0,0,0c0.1-0.1,0.2-0.2,0.3-0.3
+		c0.3-0.4,0.4-0.9,0.4-1.4c0-0.6-0.4-1-0.9-1.1c-0.1,0-0.1,0-0.2,0c-0.5,0-1,0.3-1.4,0.7c-0.3,0.3-0.4,0.6-0.5,1
+		c-0.1,0.3,0,0.7,0.2,1C5312.5-8123.2,5312.5-8123.2,5312.5-8123.2z"/>
+	<path id="Path_201" class="st0" d="M5314.3-8123.2c0.1-0.5,0.3-0.9,0.4-1.4c0.1-0.2,0-0.4-0.2-0.5c-0.4-0.2-0.9-0.1-1.2,0.2
+		c0,0,0,0,0,0.1c0,0.2,0,0.4,0.1,0.6c0,0.1,0.1,0.2,0.2,0.3C5313.7-8123.6,5314-8123.4,5314.3-8123.2
+		C5314.2-8123.2,5314.3-8123.2,5314.3-8123.2z"/>
+	<path id="Path_202" class="st0" d="M5317.4-8124.1c0-0.4,0-0.9-0.1-1.3c-0.1,0-0.1,0-0.2,0c-0.1,0-0.2,0-0.3,0
+		c-0.7-0.3-1.4-0.5-2.1-0.8c0,0,0,0,0,0c0.1,0.1,0.1,0.1,0.2,0.2c0.3,0.2,0.5,0.6,0.6,0.9c0,0,0,0,0,0c0.1,0,0.3,0,0.4,0.1
+		c0.3,0.1,0.6,0.3,0.9,0.5c0,0,0.1,0.1,0.1,0.1C5317.1-8124.2,5317.2-8124.1,5317.4-8124.1z"/>
+	<path id="Path_203" class="st0" d="M5321.6-8124.6c-0.2,0-0.4,0.1-0.6,0.1c0.1,0.2,0.1,0.4,0.2,0.6c0.1,0.4,0.2,0.8,0.1,1.2
+		c0,0.5-0.1,0.9-0.4,1.3c0,0,0,0,0,0c0.3,0,0.6-0.2,0.7-0.5c0.2-0.3,0.3-0.6,0.3-0.9C5321.9-8123.4,5321.8-8124,5321.6-8124.6z"/>
+	<path id="Path_204" class="st0" d="M5315.7-8135.8c0.2,0,0.3,0.1,0.5,0.1c0.5,0.1,1,0.2,1.5,0.2c0.2,0,0.5,0,0.7,0
+		c0.7-0.1,1.4-0.2,2.1-0.2c0.6-0.1,1.2-0.2,1.8-0.2c0.5-0.1,1.1-0.1,1.6-0.2l-1.5-0.2c0,0,0,0,0,0c0,0.2-0.1,0.3-0.2,0.3
+		c0,0,0,0,0,0c-0.3,0.1-0.5,0.1-0.8,0.2c-0.8,0.1-1.6,0.1-2.3,0.1c-0.4,0-0.9,0-1.3-0.1c-0.1,0-0.2-0.1-0.3-0.2c0,0-0.1,0-0.1,0
+		c-0.3,0-0.6,0.1-0.9,0.1L5315.7-8135.8L5315.7-8135.8z"/>
+	<path id="Path_205" class="st0" d="M5327.3-8117.7c-0.3,0.1-0.5,0.2-0.8,0.2c-0.6,0.2-1.1,0.3-1.7,0.5c0,0-0.1,0-0.1,0.1
+		c-0.5,0.2-1,0.5-1.5,0.7c0,0,0,0,0,0c0.3-0.1,0.5-0.1,0.8-0.2c0.5-0.2,1.1-0.3,1.6-0.5c0.1,0,0.2-0.1,0.2-0.1
+		C5326.2-8117.2,5326.8-8117.5,5327.3-8117.7C5327.3-8117.7,5327.3-8117.7,5327.3-8117.7C5327.3-8117.7,5327.3-8117.7,5327.3-8117.7
+		z"/>
+	<path id="Path_206" class="st0" d="M5327-8135.8c0,0.1,0,0.2,0,0.4c0.1,0.5,0.3,0.9,0.7,1.1c0.1,0.1,0.3,0.1,0.4,0.2l0,0
+		C5327.8-8134.7,5327.4-8135.2,5327-8135.8L5327-8135.8z"/>
+	<path id="Path_207" class="st0" d="M5329-8134.4c-0.1,0.1-0.2,0.2-0.3,0.4c0,0,0,0,0,0.1c0,0.1,0,0.1,0.1,0.1c0.1,0,0.2,0,0.3-0.1
+		c0.1,0,0.2-0.1,0.3-0.1c-0.1,0-0.1-0.1-0.2-0.1C5329-8134.2,5329-8134.3,5329-8134.4z"/>
+</g>
+</svg>

docs/static/fonts/icons/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
 	font-family: "iconfont";
-	src: url("iconfont.eot?73552ec404b3a3d3769a3f04fa58c2c4?#iefix") format("embedded-opentype"),
-url("iconfont.woff2?73552ec404b3a3d3769a3f04fa58c2c4") format("woff2"),
-url("iconfont.woff?73552ec404b3a3d3769a3f04fa58c2c4") format("woff");
+	src: url("iconfont.eot?8b7e57577c2d1f1ae9e810b9e010bc84?#iefix") format("embedded-opentype"),
+url("iconfont.woff2?8b7e57577c2d1f1ae9e810b9e010bc84") format("woff2"),
+url("iconfont.woff?8b7e57577c2d1f1ae9e810b9e010bc84") format("woff");
 }
 
 .icon {
@@ -67,24 +67,27 @@ url("iconfont.woff?73552ec404b3a3d3769a3f04fa58c2c4") format("woff");
 .icon-variables:before {
 	content: "\f111";
 }
-.icon-advancedcollapsed:before {
+.icon-console:before {
 	content: "\f112";
 }
-.icon-advancedexpanded:before {
+.icon-advancedcollapsed:before {
 	content: "\f113";
 }
-.icon-cancel:before {
+.icon-advancedexpanded:before {
 	content: "\f114";
 }
-.icon-check:before {
+.icon-cancel:before {
 	content: "\f115";
 }
-.icon-download:before {
+.icon-check:before {
 	content: "\f116";
 }
-.icon-save:before {
+.icon-download:before {
 	content: "\f117";
 }
-.icon-blocks:before {
+.icon-save:before {
 	content: "\f118";
 }
+.icon-blocks:before {
+	content: "\f119";
+}

docs/static/fonts/icons/iconfont.svg

@@ -58,26 +58,29 @@
     <glyph glyph-name="variables"
       unicode="&#xF111;"
       horiz-adv-x="40" d=" M36.8 12V7.8H3.4V12H36.8z M36.8 22.1V17.9H3.4V22.1H36.8z M36.7 32.2V28H3.3V32.2H36.7z" />
-    <glyph glyph-name="advancedcollapsed"
+    <glyph glyph-name="console"
       unicode="&#xF112;"
+      horiz-adv-x="40" d=" M15.6 21.3L2.3 15L2.3 19.8L11.1 23.6L2.3 27.4L2.3 32.2L15.6 25.9L15.6 21.3z M36 9.1L16.6 9.1L16.6 12.2L36 12.2L36 9.1z" />
+    <glyph glyph-name="advancedcollapsed"
+      unicode="&#xF113;"
       horiz-adv-x="40" d=" M39.7 28.2L36.2 31.5L20 15.3L3.8 31.5L0.3 28.2L18.3 10.3L18.3 10.3L20 8.5L20.5 9L20.5 9z" />
     <glyph glyph-name="advancedexpanded"
-      unicode="&#xF113;"
+      unicode="&#xF114;"
       horiz-adv-x="40" d=" M39.3 12L21.7 29.6L21.7 29.6L20 31.3L19.5 30.8L19.5 30.8L0.7 12L4 8.7L20 24.7L36 8.7z" />
     <glyph glyph-name="cancel"
-      unicode="&#xF114;"
+      unicode="&#xF115;"
       horiz-adv-x="40" d=" M33 29.6L29.4 33.2L20.2 24L11 33.2L7.3 29.6L16.5 20.3L7.3 11.1L11 7.3L20.2 16.5L29.4 7.3L33 11.1L23.8 20.3z" />
     <glyph glyph-name="check"
-      unicode="&#xF115;"
+      unicode="&#xF116;"
       horiz-adv-x="40" d=" M33.7 32.9L15.3 14.4L7.5 22.3L3.8 18.4L11.7 10.8L11.7 10.8L15.3 7.1L37.4 29.2z" />
     <glyph glyph-name="download"
-      unicode="&#xF116;"
+      unicode="&#xF117;"
       horiz-adv-x="40" d=" M5.2 15.7H36.5V1.7H5.2V15.7z M28.5 24.2L26.1 26.6L22.6 23.1L22.6 36.5L19.1 36.5L19.1 23.5L16 26.6L13.6 24.2L20.9 16.7L21 16.9L21.2 16.7z" />
     <glyph glyph-name="save"
-      unicode="&#xF117;"
+      unicode="&#xF118;"
       horiz-adv-x="40" d=" M25 34.5C25 33.6 25 32.8 25 31.9C25 31 24.7 30.9 24 30.9C23.5 30.9 22.8 30.9 22.4 30.9C22.1 30.9 21.4 31 21.4 31.7V31.9V36.9C21.4 37.3 21.6 37.8 22.3 38C22.3 38 22.3 38 22.4 38C23 38 23.7 38 24.2 38C24.7 38 25.2 37.6 25.2 37.1C25.2 37.1 25.2 37.1 25.2 36.9C25 36.3 25 35.2 25 34.5z M37.6 31.2C35.8 32.9 34.3 34.5 32.5 36.3C31 37.8 31 37.8 28.5 37.8C27.5 37.8 27.3 37.6 27.3 36.6V28.4C27.3 27.4 27.1 27.2 26.1 27.2H14.3C13.2 27.2 13 27.4 13 28.4V36.4C13 37.6 12.9 37.8 11.7 37.8H3.8C2.6 37.8 2.4 37.6 2.4 36.4V19.9C2.4 14.3 2.4 8.9 2.4 3.2C2.4 2 2.6 1.8 3.7 1.8H36.9C37.9 1.8 38.1 2.2 38.1 3.2V29.6C38.3 30.5 37.9 30.9 37.6 31.2zM33.7 6.7H7.1V23H33.7V6.7z" />
     <glyph glyph-name="blocks"
-      unicode="&#xF118;"
+      unicode="&#xF119;"
       horiz-adv-x="40" d=" M10.9 23H39V16.9H10.9V23z M39.2 27.1L39.2 33L0.9 33L0.9 31.1L0.9 27.1L0.9 12.9L0.9 7L39.2 7L39.2 12.9L6.9 12.9L6.9 27.1z" />
   </font>
 </defs>

docs/static/loader_back.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="301.499" height="179.742" viewBox="0 0 282.655 168.508"><g transform="translate(-41.005 -446.364)"><rect ry="30" rx="30" y="458.77" x="53.41" height="143.698" width="105.312" stroke="#000" stroke-width="17.724" stroke-linecap="round" stroke-linejoin="round"/><rect width="105.668" height="144.183" x="53.232" y="458.527" rx="30.101" ry="30.101" fill="#fff"/></g><g transform="translate(111.528 -446.364)"><rect width="105.312" height="143.698" x="53.41" y="458.77" rx="30" ry="30" stroke="#000" stroke-width="17.724" stroke-linecap="round" stroke-linejoin="round"/><rect ry="30.101" rx="30.101" y="458.527" x="53.232" height="144.183" width="105.668" fill="#fff"/></g></svg>

docs/static/loader_front.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="301.499" height="179.742" viewBox="0 0 282.655 168.508"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round"><g transform="translate(124.66 -243.829)"><circle r="25.968" cy="356.872" cx="-38.891" fill="none"/><circle cx="-38.891" cy="356.872" r="21.013" stroke-width=".809"/><path d="M-30.581 341.741a13.835 13.835 0 0 1 5.76 4.504l-11.099 8.26z" fill="#fff" stroke-width=".533"/></g><g transform="translate(277.193 -243.829)"><circle cx="-38.891" cy="356.872" r="25.968" fill="none"/><circle r="21.013" cy="356.872" cx="-38.891" stroke-width=".809"/><path d="M-30.581 341.741a13.835 13.835 0 0 1 5.76 4.504l-11.099 8.26z" fill="#fff" stroke-width=".533"/></g></g></svg>

docs/static/loader_full.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="301.499" height="179.742" viewBox="0 0 282.655 168.508"><g transform="translate(-41.005 -446.364)"><rect ry="30" rx="30" y="458.77" x="53.41" height="143.698" width="105.312" stroke="#000" stroke-width="17.724" stroke-linecap="round" stroke-linejoin="round"/><rect width="105.668" height="144.183" x="53.232" y="458.527" rx="30.101" ry="30.101" fill="#fff"/></g><g transform="translate(124.66 -243.829)" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><circle r="25.968" cy="356.872" cx="-38.891" fill="none"/><circle cx="-38.891" cy="356.872" r="21.013" stroke-width=".809"/><path d="M-30.581 341.741a13.835 13.835 0 0 1 5.76 4.504l-11.099 8.26z" fill="#fff" stroke-width=".533"/></g><g transform="translate(111.528 -446.364)"><rect width="105.312" height="143.698" x="53.41" y="458.77" rx="30" ry="30" stroke="#000" stroke-width="17.724" stroke-linecap="round" stroke-linejoin="round"/><rect ry="30.101" rx="30.101" y="458.527" x="53.232" height="144.183" width="105.668" fill="#fff"/></g><g transform="translate(277.193 -243.829)" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><circle cx="-38.891" cy="356.872" r="25.968" fill="none"/><circle r="21.013" cy="356.872" cx="-38.891" stroke-width=".809"/><path d="M-30.581 341.741a13.835 13.835 0 0 1 5.76 4.504l-11.099 8.26z" fill="#fff" stroke-width=".533"/></g></svg>

editor/deploy.ts

@@ -29,7 +29,8 @@ export function initAsync() {
 
     let canHID = false
     if (pxt.U.isNodeJS) {
-        canHID = true
+        // doesn't seem to work ATM
+        canHID = false
     } else {
         const forceHexDownload = /forceHexDownload/i.test(window.location.href);
         if (pxt.Cloud.isLocalHost() && pxt.Cloud.localToken && !forceHexDownload)

editor/extension.ts

@@ -4,6 +4,9 @@
 import { deployCoreAsync, initAsync } from "./deploy";
 import { FieldPorts } from "./field_ports";
 import { FieldImages } from "./field_images";
+import { FieldSpeed } from "./field_speed";
+import { FieldBrickButtons } from "./field_brickbuttons";
+import { FieldTurnRatio } from "./field_turnratio";
 
 pxt.editor.initExtensionsAsync = function(opts: pxt.editor.ExtensionOptions): Promise<pxt.editor.ExtensionResult> {
     pxt.debug('loading pxt-ev3 target extensions...')
@@ -15,6 +18,15 @@ pxt.editor.initExtensionsAsync = function(opts: pxt.editor.ExtensionOptions): Pr
         }, {
             selector: "images",
             editor: FieldImages
+        }, {
+            selector: "speed",
+            editor: FieldSpeed
+        }, {
+            selector: "brickbuttons",
+            editor: FieldBrickButtons
+        }, {
+            selector: "turnratio",
+            editor: FieldTurnRatio
         }],
         deployCoreAsync
     };
@@ -111,6 +123,20 @@ function updateBlocklyShape() {
         'l ' + 0 + ',' + (Blockly.BlockSvg as any).CORNER_RADIUS * 2 +
         'l ' + (Blockly.BlockSvg as any).CORNER_RADIUS + ',' + 0;
 
+    /**
+     * Corner radius of the flyout background.
+     * @type {number}
+     * @const
+     */
+    (Blockly as any).Flyout.prototype.CORNER_RADIUS = 0;
+
+    /**
+     * Margin around the edges of the blocks in the flyout.
+     * @type {number}
+     * @const
+     */
+    (Blockly as any).Flyout.prototype.MARGIN = 8;
+
 }
 
 // When require()d from node, bind the global pxt namespace

editor/field_brickbuttons.ts

@@ -0,0 +1,159 @@
+/// <reference path="../node_modules/pxt-core/localtypings/blockly.d.ts"/>
+/// <reference path="../node_modules/pxt-core/built/pxtsim.d.ts"/>
+
+export interface FieldPortsOptions extends Blockly.FieldCustomDropdownOptions {
+    columns?: string;
+    width?: string;
+}
+
+export class FieldBrickButtons extends Blockly.FieldDropdown implements Blockly.FieldCustom {
+    public isFieldCustom_ = true;
+
+    // Width in pixels
+    private width_: number;
+
+    // Columns in grid
+    private columns_: number;
+
+    private savedPrimary_: string;
+
+    constructor(text: string, options: FieldPortsOptions, validator?: Function) {
+        super(options.data);
+
+        this.columns_ = parseInt(options.columns) || 4;
+        this.width_ = parseInt(options.width) || 150;
+    }
+
+    /**
+     * Create a dropdown menu under the text.
+     * @private
+     */
+    public showEditor_() {
+        // If there is an existing drop-down we own, this is a request to hide the drop-down.
+        if (Blockly.DropDownDiv.hideIfOwner(this)) {
+            return;
+        }
+        // If there is an existing drop-down someone else owns, hide it immediately and clear it.
+        Blockly.DropDownDiv.hideWithoutAnimation();
+        Blockly.DropDownDiv.clearContent();
+        // Populate the drop-down with the icons for this field.
+        let dropdownDiv = Blockly.DropDownDiv.getContentDiv();
+        let contentDiv = document.createElement('div');
+        // Accessibility properties
+        contentDiv.setAttribute('role', 'menu');
+        contentDiv.setAttribute('aria-haspopup', 'true');
+
+        const buttonsSVG = document.createElementNS("http://www.w3.org/2000/svg", "svg") as SVGGElement;
+        pxsim.svg.hydrate(buttonsSVG, {
+            viewBox: "0 0 256.68237 256.68237",
+            width: this.width_,
+            height: this.width_
+        });
+        contentDiv.appendChild(buttonsSVG);
+
+        const gWrapper = pxsim.svg.child(buttonsSVG, 'g', { 'transform': 'translate(-4.695057,58.29823)' });
+        const gInnerWrapper = pxsim.svg.child(gWrapper, 'g', { 'transform': 'translate(3.9780427e-6,-32.677281)' });
+
+        const back = pxsim.svg.child(gInnerWrapper, 'path', {
+            style: 'fill:#6a6a6a;stroke-width:3.91719985',
+            d: 'M 106.30882,198.38022 C 84.431262,177.26258 50.453467,142.52878 50.453467,142.52878 v -7.12931 H 37.087971 a 32.381533,32.381533 0 1 1 0,-64.763062 H 50.457376 V 63.503186 L 105.71731,7.0563355 h 55.25604 c 25.02699,25.5048885 55.25994,55.2599395 55.25994,55.2599395 v 8.320133 h 12.77398 a 32.381533,32.381533 0 0 1 0,64.763062 h -12.77398 v 7.13323 c -29.43384,30.27603 -54.66454,55.85144 -54.66454,55.85144 z'
+        })
+
+        const buttonLeft = pxsim.svg.child(gInnerWrapper, 'path', {
+            style: 'fill:#a8a9a8;stroke-width:3.91719985',
+            d: 'm 36.492567,78.357208 h 40.69971 V 126.48393 H 36.492567 A 24.063359,24.063359 0 0 1 12.429199,102.42057 v 0 A 24.063359,24.063359 0 0 1 36.492567,78.357208 Z'
+        })
+
+        const buttonRight = pxsim.svg.child(gInnerWrapper, 'path', {
+            style: 'fill:#a8a9a8;stroke-width:3.91719985',
+            d: 'M 229.00727,126.48784 H 188.30756 V 78.361126 h 40.69971 a 24.063359,24.063359 0 0 1 24.06335,24.063354 v 0 a 24.063359,24.063359 0 0 1 -24.06335,24.06336 z'
+        })
+
+        const buttonEnter = pxsim.svg.child(gInnerWrapper, 'path', {
+            style: 'fill:#3c3c3c;stroke-width:3.91719985',
+            d: 'm 109.27806,78.357208 h 46.9398 a 1.782326,1.782326 0 0 1 1.78233,1.782326 V 124.7016 a 1.782326,1.782326 0 0 1 -1.78233,1.78233 h -46.9398 a 1.782326,1.782326 0 0 1 -1.78233,-1.78233 V 80.139534 a 1.782326,1.782326 0 0 1 1.78233,-1.782326 z'
+        })
+
+        const buttonTop = pxsim.svg.child(gInnerWrapper, 'path', {
+            style: 'fill:#a8a9a8;stroke-width:3.91719985',
+            d: 'm 108.09114,15.967966 49.90905,-0.59542 37.43276,38.619675 -15.44943,15.449437 V 97.367379 H 165.7249 V 81.306861 A 11.978797,11.978797 0 0 0 153.84012,69.422075 c -11.59883,-0.184102 -43.37516,0 -43.37516,0 A 9.6676495,9.6676495 0 0 0 100.36251,79.520618 V 97.347793 H 86.103905 V 69.422075 L 70.654464,53.97264 Z'
+        })
+
+        const buttonBottom = pxsim.svg.child(gInnerWrapper, 'path', {
+            style: 'fill:#a8a9a8;stroke-width:3.91719985',
+            d: 'M 157.78865,189.01028 108.18908,189.38233 70.654464,150.794 86.323259,135.4895 v -28.08625 h 14.101921 v 16.11144 a 12.006218,12.006218 0 0 0 11.85346,11.9788 c 11.59882,0.1841 43.13227,0 43.13227,0 a 10.18472,10.18472 0 0 0 10.38059,-10.38058 v -17.70966 h 14.39179 v 28.08632 l 15.3045,15.3045 z'
+        })
+
+        const buttons = [buttonEnter, buttonLeft, buttonRight, buttonTop, buttonBottom];
+        const options = this.getOptions();
+        for (let i = 0, option: any; option = options[i]; i++) {
+            let content = (options[i] as any)[0]; // Human-readable text or image.
+            const value = (options[i] as any)[1]; // Language-neutral value.
+            const button = buttons[i];
+            button.setAttribute('id', ':' + i); // For aria-activedescendant
+            button.setAttribute('role', 'menuitem');
+            button.setAttribute('cursor', 'pointer');
+            const title = pxsim.svg.child(button, 'title');
+            title.textContent = content;
+
+            Blockly.bindEvent_(button, 'click', this, this.buttonClick_);
+            Blockly.bindEvent_(button, 'mouseup', this, this.buttonClick_);
+            // These are applied manually instead of using the :hover pseudoclass
+            // because Android has a bad long press "helper" menu and green highlight
+            // that we must prevent with ontouchstart preventDefault
+            Blockly.bindEvent_(button, 'mousedown', button, function (e) {
+                this.setAttribute('stroke', '#ffffff');
+                e.preventDefault();
+            });
+            Blockly.bindEvent_(button, 'mouseover', button, function () {
+                this.setAttribute('stroke', '#ffffff');
+            });
+            Blockly.bindEvent_(button, 'mouseout', button, function () {
+                this.setAttribute('stroke', 'transparent');
+            });
+
+            button.setAttribute('data-value', value);
+        }
+
+        contentDiv.style.width = this.width_ + 'px';
+        dropdownDiv.appendChild(contentDiv);
+
+        Blockly.DropDownDiv.setColour('#ffffff', '#dddddd');
+
+        // Calculate positioning based on the field position.
+        var scale = this.sourceBlock_.workspace.scale;
+        var bBox = { width: this.size_.width, height: this.size_.height };
+        bBox.width *= scale;
+        bBox.height *= scale;
+        var position = this.fieldGroup_.getBoundingClientRect();
+        var primaryX = position.left + bBox.width / 2;
+        var primaryY = position.top + bBox.height;
+        var secondaryX = primaryX;
+        var secondaryY = position.top;
+        // Set bounds to workspace; show the drop-down.
+        (Blockly.DropDownDiv as any).setBoundsElement(this.sourceBlock_.workspace.getParentSvg().parentNode);
+        (Blockly.DropDownDiv as any).show(this, primaryX, primaryY, secondaryX, secondaryY,
+            this.onHide_.bind(this));
+    }
+
+    /**
+     * Callback for when a button is clicked inside the drop-down.
+     * Should be bound to the FieldIconMenu.
+     * @param {Event} e DOM event for the click/touch
+     * @private
+     */
+    private buttonClick_ = function (e: any) {
+        let value = e.target.getAttribute('data-value');
+        this.setValue(value);
+        Blockly.DropDownDiv.hide();
+    };
+
+    /**
+     * Callback for when the drop-down is hidden.
+     */
+    private onHide_ = function () {
+        Blockly.DropDownDiv.content_.removeAttribute('role');
+        Blockly.DropDownDiv.content_.removeAttribute('aria-haspopup');
+        Blockly.DropDownDiv.content_.removeAttribute('aria-activedescendant');
+    };
+}

editor/field_ports.ts

@@ -24,6 +24,9 @@ export class FieldPorts extends Blockly.FieldDropdown implements Blockly.FieldCu
         this.width_ = parseInt(options.width) || 300;
     }
 
+    trimOptions_() {
+    }
+
     /**
      * Create a dropdown menu under the text.
      * @private
@@ -42,7 +45,8 @@ export class FieldPorts extends Blockly.FieldDropdown implements Blockly.FieldCu
         // Accessibility properties
         contentDiv.setAttribute('role', 'menu');
         contentDiv.setAttribute('aria-haspopup', 'true');
-        const options = this.getOptions();
+        let options = this.getOptions();
+        options = options.sort();
         for (let i = 0, option: any; option = options[i]; i++) {
             let content = (options[i] as any)[0]; // Human-readable text or image.
             const value = (options[i] as any)[1]; // Language-neutral value.

editor/field_speed.ts

@@ -0,0 +1,96 @@
+/// <reference path="../node_modules/pxt-core/localtypings/blockly.d.ts"/>
+/// <reference path="../node_modules/pxt-core/built/pxtsim.d.ts"/>
+
+export interface FieldSpeedOptions extends Blockly.FieldCustomOptions {
+    min?: string;
+    max?: string;
+    label?: string;
+}
+
+export class FieldSpeed extends Blockly.FieldSlider implements Blockly.FieldCustom {
+    public isFieldCustom_ = true;
+
+    private params: any;
+
+    private speedSVG: SVGElement;
+    private circleBar: SVGCircleElement;
+    private reporter: SVGTextElement;
+
+    /**
+     * Class for a color wheel field.
+     * @param {number|string} value The initial content of the field.
+     * @param {Function=} opt_validator An optional function that is called
+     *     to validate any constraints on what the user entered.  Takes the new
+     *     text as an argument and returns either the accepted text, a replacement
+     *     text, or null to abort the change.
+     * @extends {Blockly.FieldNumber}
+     * @constructor
+     */
+    constructor(value_: any, params: FieldSpeedOptions, opt_validator?: Function) {
+        super(String(value_), '-100', '100', null, '10', 'Speed', opt_validator);
+        this.params = params;
+        if (this.params['min']) this.min_ = parseFloat(this.params.min);
+        if (this.params['max']) this.max_ = parseFloat(this.params.max);
+        if (this.params['label']) this.labelText_ = this.params.label;
+
+        (this as any).sliderColor_ = '#a8aaa8';
+    }
+
+    createLabelDom_(labelText: string) {
+        var labelContainer = document.createElement('div');
+        this.speedSVG = document.createElementNS("http://www.w3.org/2000/svg", "svg") as SVGGElement;
+        pxsim.svg.hydrate(this.speedSVG, {
+            viewBox: "0 0 200 100"
+        });
+
+        labelContainer.appendChild(this.speedSVG);
+
+        const outerCircle = pxsim.svg.child(this.speedSVG, "circle", {
+            'stroke-dasharray': '565.48', 'stroke-dashoffset': '0',
+            'cx': 100, 'cy': 100, 'r': '90', 'style': `fill:transparent; transition: stroke-dashoffset 0.1s linear;`,
+            'stroke': '#a8aaa8', 'stroke-width': '1rem'
+        }) as SVGCircleElement;
+        this.circleBar = pxsim.svg.child(this.speedSVG, "circle", {
+            'stroke-dasharray': '565.48', 'stroke-dashoffset': '0',
+            'cx': 100, 'cy': 100, 'r': '90', 'style': `fill:transparent; transition: stroke-dashoffset 0.1s linear;`,
+            'stroke': '#f12a21', 'stroke-width': '1rem'
+        }) as SVGCircleElement;
+
+        this.reporter = pxsim.svg.child(this.speedSVG, "text", {
+            'x': 100, 'y': 80,
+            'text-anchor': 'middle', 'alignment-baseline': 'middle',
+            'style': 'font-size: 50px',
+            'class': 'sim-text inverted number'
+        }) as SVGTextElement;
+
+        // labelContainer.setAttribute('class', 'blocklyFieldSliderLabel');
+        var readout = document.createElement('span');
+        readout.setAttribute('class', 'blocklyFieldSliderReadout');
+        // var label = document.createElement('span');
+        // label.setAttribute('class', 'blocklyFieldSliderLabelText');
+        // label.innerHTML = labelText;
+        // labelContainer.appendChild(label);
+        // labelContainer.appendChild(readout);
+        return [labelContainer, readout];
+    };
+
+    setReadout_(readout: Element, value: string) {
+        this.updateSpeed(parseFloat(value));
+        // Update reporter
+        this.reporter.textContent = `${value}%`;
+    }
+
+    private updateSpeed(speed: number) {
+        let sign = this.sign(speed);
+        speed = (Math.abs(speed) / 100 * 50) + 50;
+        if (sign == -1) speed = 50 - speed;
+        let c = Math.PI * (90 * 2);
+        let pct = ((100 - speed) / 100) * c;
+        this.circleBar.setAttribute('stroke-dashoffset', `${pct}`);
+    }
+
+    // A re-implementation of Math.sign (since IE11 doesn't support it)
+    private sign(num: number) {
+        return num ? num < 0 ? -1 : 1 : 0;
+    }
+}

editor/field_turnratio.ts

@@ -0,0 +1,108 @@
+/// <reference path="../node_modules/pxt-core/localtypings/blockly.d.ts"/>
+/// <reference path="../node_modules/pxt-core/built/pxtsim.d.ts"/>
+
+export interface FieldTurnRatioOptions extends Blockly.FieldCustomOptions {
+}
+
+export class FieldTurnRatio extends Blockly.FieldSlider implements Blockly.FieldCustom {
+    public isFieldCustom_ = true;
+
+    private params: any;
+
+    private path_: SVGPathElement;
+    private reporter_: SVGTextElement;
+
+    /**
+     * Class for a color wheel field.
+     * @param {number|string} value The initial content of the field.
+     * @param {Function=} opt_validator An optional function that is called
+     *     to validate any constraints on what the user entered.  Takes the new
+     *     text as an argument and returns either the accepted text, a replacement
+     *     text, or null to abort the change.
+     * @extends {Blockly.FieldNumber}
+     * @constructor
+     */
+    constructor(value_: any, params: FieldTurnRatioOptions, opt_validator?: Function) {
+        super(String(value_), '-100', '100', null, '10', 'TurnRatio', opt_validator);
+        this.params = params;
+        (this as any).sliderColor_ = '#a8aaa8';
+    }
+
+    static HALF = 80;
+    static HANDLE_RADIUS = 30;
+    static RADIUS = FieldTurnRatio.HALF - FieldTurnRatio.HANDLE_RADIUS - 1;
+
+    createLabelDom_(labelText: string) {
+        let labelContainer = document.createElement('div');
+        let svg = Blockly.utils.createSvgElement('svg', {
+            'xmlns': 'http://www.w3.org/2000/svg',
+            'xmlns:html': 'http://www.w3.org/1999/xhtml',
+            'xmlns:xlink': 'http://www.w3.org/1999/xlink',
+            'version': '1.1',
+            'height': (FieldTurnRatio.HALF + FieldTurnRatio.HANDLE_RADIUS + 10) + 'px',
+            'width': (FieldTurnRatio.HALF * 2) + 'px'
+        }, labelContainer);
+        let defs = Blockly.utils.createSvgElement('defs', {}, svg);
+        let marker = Blockly.utils.createSvgElement('marker', {
+            'id': 'head',
+            'orient': "auto",
+            'markerWidth': '2',
+            'markerHeight': '4',
+            'refX': '0.1', 'refY': '1.5'
+        }, defs);
+        let markerPath = Blockly.utils.createSvgElement('path', {
+            'd': 'M0,0 V3 L1.5,1.5 Z',
+            'fill': '#f12a21'
+        }, marker);
+        this.reporter_ = pxsim.svg.child(svg, "text", {
+            'x': FieldTurnRatio.HALF, 'y': 96,
+            'text-anchor': 'middle', 'alignment-baseline': 'middle',
+            'style': 'font-size: 50px',
+            'class': 'sim-text inverted number'
+        }) as SVGTextElement;
+        this.path_ = Blockly.utils.createSvgElement('path', {
+            'x1': FieldTurnRatio.HALF,
+            'y1': FieldTurnRatio.HALF,
+            'marker-end': 'url(#head)',
+            'style': 'fill: none; stroke: #f12a21; stroke-width: 10'
+        }, svg);
+        this.updateGraph_();
+        let readout = document.createElement('span');
+        readout.setAttribute('class', 'blocklyFieldSliderReadout');
+        return [labelContainer, readout];
+    };
+
+    updateGraph_() {
+        if (!this.path_) {
+            return;
+        }
+        let v = goog.math.clamp(parseFloat(this.getText()), -100, 100);
+        if (isNaN(v)) {
+            v = 0;
+        }
+
+        const x = goog.math.clamp(parseFloat(this.getText()), -100, 100) / 100;
+        const theta = x * Math.PI / 2;
+        const cx = FieldTurnRatio.HALF;
+        const cy = FieldTurnRatio.HALF - 14;
+        const gamma = Math.PI - 2 * theta;
+        const r = FieldTurnRatio.RADIUS;
+        const alpha = 0.2 + Math.abs(x) * 0.5;
+        const x1 = 0;
+        const y1 = r * alpha;
+        const y2 = r * Math.sin(Math.PI / 2 - theta);
+        const x2 = r * Math.cos(Math.PI / 2 - theta);
+        const y3 = y2 - r * alpha * Math.cos(2 * theta);
+        const x3 = x2 - r * alpha * Math.sin(2 * theta);
+
+
+        const d = `M ${cx} ${cy} C ${cx} ${cy - y1} ${cx + x3} ${cy - y3} ${cx + x2} ${cy - y2}`;
+        this.path_.setAttribute('d', d);
+
+        this.reporter_.textContent = `${v}`;
+    }
+
+    setReadout_(readout: Element, value: string) {
+        this.updateGraph_();
+    }
+}

libs/behaviors/_locales/behaviors-strings.json

@@ -1,7 +1,7 @@
 {
   "behaviors.addBehavior|block": "add behavior %behavior",
   "behaviors.avoidCrash|block": "avoid crash using %ultrasonic",
-  "behaviors.driveForward|block": "drive %motors|forward at %speed|%",
+  "behaviors.driveForward|block": "drive %motors|forward at %speed=motorSpeedPicker|%",
   "behaviors|block": "behaviors",
   "{id:category}Behaviors": "Behaviors"
 }

libs/behaviors/targetoverrides.ts

@@ -49,7 +49,7 @@ namespace behaviors {
      * @param motors 
      * @param speed the desired speed, eg: 50
      */
-    //% blockId=behaviorsDriveForward block="drive %motors|forward at %speed|%"
+    //% blockId=behaviorsDriveForward block="drive %motors|forward at %speed=motorSpeedPicker|%"
     export function driveForward(motors: motors.MotorBase, speed: number): behaviors.Behavior {
         return new DriveForwardBehavior(motors, speed);
     }

libs/chassis/README.md

@@ -0,0 +1,3 @@
+# Chassis
+
+A library to control a chassis.

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

@@ -0,0 +1,11 @@
+{
+  "chassis.Chassis": "A differential drive robot",
+  "chassis.Chassis.drive": "Makes a differential drive robot move with a given speed (cm/s) and rotation rate (deg/s)\nusing a unicycle model.",
+  "chassis.Chassis.drive|param|rotationSpeed": "rotation of the robot around the center point, eg: 30",
+  "chassis.Chassis.drive|param|speed": "speed of the center point between motors, eg: 10",
+  "chassis.Chassis.drive|param|value": "the amount of movement, eg: 2",
+  "chassis.Chassis.setMotors": "Sets the motors used by the chassis, default is B+C",
+  "chassis.Chassis.setProperty": "Sets a property of the robot",
+  "chassis.Chassis.setProperty|param|property": "the property to set",
+  "chassis.Chassis.setProperty|param|value": "the value to set"
+}

libs/chassis/_locales/chassis-strings.json

@@ -0,0 +1,9 @@
+{
+  "ChassisProperty.BaseLength|block": "base length (cm)",
+  "ChassisProperty.WheelRadius|block": "wheel radius (cm)",
+  "chassis.Chassis.drive|block": "drive %chassis|at %speed|cm/s|turning %rotationSpeed|deg/s",
+  "chassis.Chassis.setMotors|block": "set %chassis|motors to %motors",
+  "chassis.Chassis.setProperty|block": "set %chassis|%property|to %value",
+  "chassis|block": "chassis",
+  "{id:category}Chassis": "Chassis"
+}

libs/chassis/chassis.ts

@@ -0,0 +1,88 @@
+enum ChassisProperty {
+    //% block="wheel radius (cm)"
+    WheelRadius,
+    //% block="base length (cm)"
+    BaseLength
+}
+
+namespace chassis {
+    /**
+     * A differential drive robot
+     */
+    //% fixedInstances
+    export class Chassis {
+        // the motor pair
+        public motors: motors.SynchedMotorPair;
+        // the radius of the wheel (cm)
+        public wheelRadius: number;
+        // the distance between the wheels (cm)
+        public baseLength: number;
+
+        constructor() {
+            this.motors = motors.largeBC;
+            this.wheelRadius = 3;
+            this.baseLength = 12;
+        }
+
+        /**
+         * Makes a differential drive robot move with a given speed (cm/s) and rotation rate (deg/s)
+         * using a unicycle model.
+         * @param speed speed of the center point between motors, eg: 10
+         * @param rotationSpeed rotation of the robot around the center point, eg: 30
+         * @param value the amount of movement, eg: 2
+         * @param unit 
+         */
+        //% blockId=motorDrive block="drive %chassis|at %speed|cm/s|turning %rotationSpeed|deg/s"
+        //% inlineInputMode=inline
+        //% weight=95 blockGap=8
+        drive(speed: number, rotationSpeed: number, value: number = 0, unit: MoveUnit = MoveUnit.MilliSeconds) {
+            // speed is expressed in %
+            const R = this.wheelRadius; // cm
+            const L = this.baseLength; // cm
+            const PI = 3.14;
+            const maxw = 170 / 60 * 2 * PI; // rad / s
+            const maxv = maxw * R; // cm / s
+            // speed is cm / s
+            const v = speed; // cm / s
+            const w = rotationSpeed / 360 * 2 * PI; // rad / s
+
+            const vr = (2 * v + w * L) / (2 * R); // rad / s
+            const vl = (2 * v - w * L) / (2 * R); // rad / s
+
+            const sr = vr / maxw * 100; // % 
+            const sl = vl / maxw * 100; // %
+
+            this.motors.tank(sr, sl, value, unit)
+        }
+
+        /**
+         * Sets a property of the robot
+         * @param property the property to set
+         * @param value  the value to set
+         */
+        //% blockId=chassisSetProperty block="set %chassis|%property|to %value"
+        //% blockGap=8
+        //% weight=10
+        setProperty(property: ChassisProperty, value: number) {
+            switch (property) {
+                case ChassisProperty.WheelRadius:
+                    this.wheelRadius = Math.max(0.1, value); break;
+                case ChassisProperty.BaseLength:
+                    this.baseLength = Math.max(0.1, value); break;
+            }
+        }
+
+        /**
+         * Sets the motors used by the chassis, default is B+C
+         * @param motors 
+         */
+        //% blockId=chassisSetMotors block="set %chassis|motors to %motors"
+        //% weight=10
+        setMotors(motors: motors.SynchedMotorPair) {
+            this.motors = motors;
+        }
+    }
+
+    //% fixedInstance whenUsed
+    export const chassis = new Chassis();
+}

libs/chassis/pxt.json

@@ -0,0 +1,15 @@
+{
+    "name": "chassis",
+    "description": "Chassis robot support",
+    "files": [
+        "README.md",
+        "chassis.ts"
+    ],
+    "testFiles": [
+        "test.ts"
+    ],
+    "public": true,
+    "dependencies": {
+            "core": "file:../core"
+    }
+}

libs/chassis/test.ts

@@ -0,0 +1 @@
+

libs/color-sensor/_locales/color-sensor-jsdoc-strings.json

@@ -11,5 +11,8 @@
   "sensors.ColorSensor.onLightChanged|param|handler": "the code to run when detected",
   "sensors.ColorSensor.pauseForColor": "Waits for the given color to be detected",
   "sensors.ColorSensor.pauseForColor|param|color": "the color to detect",
-  "sensors.ColorSensor.pauseForLight": "Waits for the given color to be detected"
+  "sensors.ColorSensor.pauseForLight": "Waits for the given color to be detected",
+  "sensors.ColorSensor.setThreshold": "Sets a threshold value",
+  "sensors.ColorSensor.setThreshold|param|condition": "the dark or bright light condition",
+  "sensors.ColorSensor.setThreshold|param|value": "the value threshold"
 }

libs/color-sensor/_locales/color-sensor-strings.json

@@ -18,12 +18,14 @@
   "sensors.ColorSensor.onColorDetected|block": "on %sensor|detected color %color",
   "sensors.ColorSensor.onLightChanged|block": "on %sensor|%mode|%condition",
   "sensors.ColorSensor.pauseForColor|block": "pause %sensor|for color %color",
-  "sensors.ColorSensor.pauseForLight|block": "pause %sensor|for %mode|light %condition",
+  "sensors.ColorSensor.pauseForLight|block": "pause %sensor|for %mode|%condition",
+  "sensors.ColorSensor.setThreshold|block": "set %sensor|%condition|to %value",
   "sensors.color1|block": "color 1",
   "sensors.color2|block": "color 2",
   "sensors.color3|block": "color 3",
   "sensors.color4|block": "color 4",
   "sensors|block": "sensors",
   "{id:category}Sensors": "Sensors",
-  "{id:group}Color Sensor": "Color Sensor"
+  "{id:group}Color Sensor": "Color Sensor",
+  "{id:group}Threshold": "Threshold"
 }

libs/color-sensor/color.ts

@@ -152,7 +152,7 @@ namespace sensors {
         //% parts="colorsensor"
         //% blockNamespace=sensors
         //% sensor.fieldEditor="ports"
-        //% weight=99
+        //% weight=98
         //% group="Color Sensor"
         color(): ColorSensorColor {
             this.setMode(ColorSensorMode.Color)
@@ -182,7 +182,7 @@ namespace sensors {
          * @param color the color to detect
          */
         //% help=sensors/color-sensor/pause-for-light
-        //% block="pause %sensor|for %mode|light %condition"
+        //% block="pause %sensor|for %mode|%condition"
         //% blockId=colorPauseForLight
         //% parts="colorsensor"
         //% blockNamespace=sensors
@@ -221,17 +221,32 @@ namespace sensors {
         reflectedLight() {
             return this.light(LightIntensityMode.Reflected);
         }
+
+        /**
+         * Sets a threshold value
+         * @param condition the dark or bright light condition
+         * @param value the value threshold
+         */
+        //% blockId=colorSetThreshold block="set %sensor|%condition|to %value"
+        //% group="Threshold" blockGap=8 weight=90
+        //% value.min=0 value.max=100
+        setThreshold(condition: LightCondition, value: number) {
+            if (condition == LightCondition.Dark)
+                this.thresholdDetector.setLowThreshold(value)
+            else
+                this.thresholdDetector.setHighThreshold(value);
+        }
     }
 
+    //% whenUsed block="color 3" weight=90 fixedInstance jres=icons.port3
+    export const color3: ColorSensor = new ColorSensor(3)
+    
     //% whenUsed block="color 1" weight=95 fixedInstance jres=icons.port1
     export const color1: ColorSensor = new ColorSensor(1)
 
     //% whenUsed block="color 2" weight=90 fixedInstance jres=icons.port2
     export const color2: ColorSensor = new ColorSensor(2)
 
-    //% whenUsed block="color 3" weight=90 fixedInstance jres=icons.port3
-    export const color3: ColorSensor = new ColorSensor(3)
-
     //% whenUsed block="color 4" weight=90 fixedInstance jres=icons.port4
     export const color4: ColorSensor = new ColorSensor(4)
 }

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

@@ -1,4 +1,5 @@
 {
+  "BrickLight": "Patterns for lights under the buttons.",
   "ButtonEvent": "User interaction on buttons",
   "Draw": "Drawing modes",
   "Image.buffer": "Returns the underlaying Buffer object.",
@@ -6,7 +7,6 @@
   "Image.draw": "Draw an image on the screen.",
   "Image.height": "Returns the height of an image.",
   "Image.width": "Returns the width of an image.",
-  "LightsPattern": "Patterns for lights under the buttons.",
   "MMap.getNumber": "Read a number in specified format from the buffer.",
   "MMap.ioctl": "Perform ioctl(2) on the underlaying file",
   "MMap.length": "Returns the length of a Buffer object.",
@@ -21,22 +21,27 @@
   "brick.Button.pauseUntil": "Waits until the event is raised",
   "brick.Button.pauseUntil|param|ev": "the event to wait for",
   "brick.Button.wasPressed": "See if the button was pressed again since the last time you checked.",
+  "brick.batteryLevel": "Returns the current battery level",
   "brick.buttonDown": "Down button on the EV3 Brick.",
   "brick.buttonEnter": "Enter button on the EV3 Brick.",
   "brick.buttonLeft": "Left button on the EV3 Brick.",
   "brick.buttonRight": "Right button on the EV3 Brick.",
   "brick.buttonUp": "Up button on the EV3 Brick.",
   "brick.clearScreen": "Clears the screen",
-  "brick.lightPattern": "Pattern block.",
-  "brick.lightPattern|param|pattern": "the lights pattern to use. eg: LightsPattern.Green",
-  "brick.printLine": "Show text on the screen at a specific line.",
-  "brick.printLine|param|line": "the line number to print the text at, eg: 0",
-  "brick.printLine|param|text": "the text to print on the screen, eg: \"Hello world\"",
   "brick.printPorts": "Prints the port states on the screen",
   "brick.setLight": "Set lights.",
-  "brick.setLight|param|pattern": "the lights pattern to use.",
+  "brick.setLight|param|pattern": "the lights pattern to use. eg: BrickLight.Orange",
   "brick.showImage": "Shows an image on screen",
   "brick.showImage|param|image": "image to draw",
+  "brick.showNumber": "Shows a number on the screen",
+  "brick.showNumber|param|line": "the line number to print the text at, eg: 1",
+  "brick.showNumber|param|value": "the numeric value",
+  "brick.showString": "Show text on the screen at a specific line.",
+  "brick.showString|param|line": "the line number to print the text at, eg: 1",
+  "brick.showString|param|text": "the text to print on the screen, eg: \"Hello world\"",
+  "brick.showValue": "Shows a name, value pair on the screen",
+  "brick.showValue|param|line": "the line number to print the text at, eg: 1",
+  "brick.showValue|param|value": "the numeric value",
   "console": "Reading and writing data to the console output.\n\nReading and writing data to the console output.",
   "console.addListener": "Adds a listener for the log messages",
   "console.log": "Write a line of text to the console output.",
@@ -54,38 +59,33 @@
   "control.raiseEvent|param|value": "Component specific code indicating the cause of the event.",
   "motors.Motor.angle": "Gets motor angle.",
   "motors.Motor.clearCounts": "Clears the motor count",
+  "motors.Motor.setRegulated": "Indicates if the motor speed should be regulated. Default is true.",
+  "motors.Motor.setRegulated|param|value": "true for regulated motor",
   "motors.Motor.speed": "Gets motor actual speed.",
   "motors.Motor.tacho": "Gets motor tachometer count.",
   "motors.Motor.toString": "Returns the status of the motor",
   "motors.MotorBase.isReady": "Returns a value indicating if the motor is still running a previous command.",
-  "motors.MotorBase.move": "Moves the motor by a number of rotations, degress or seconds",
-  "motors.MotorBase.move|param|speed": "the speed from ``100`` full forward to ``-100`` full backward, eg: 50",
-  "motors.MotorBase.move|param|unit": "the meaning of the value",
-  "motors.MotorBase.move|param|value": "the move quantity, eg: 2",
   "motors.MotorBase.pauseUntilReady": "Pauses the execution until the previous command finished.",
   "motors.MotorBase.pauseUntilReady|param|timeOut": "optional maximum pausing time in milliseconds",
   "motors.MotorBase.reset": "Resets the motor(s).",
   "motors.MotorBase.setBrake": "Sets the automatic brake on or off when the motor is off",
   "motors.MotorBase.setBrake|param|brake": "a value indicating if the motor should break when off",
   "motors.MotorBase.setReversed": "Reverses the motor polarity",
-  "motors.MotorBase.setSpeed": "Sets the speed of the motor.",
+  "motors.MotorBase.setSpeed": "Sets the motor speed for limited time or distance.",
   "motors.MotorBase.setSpeed|param|speed": "the speed from ``100`` full forward to ``-100`` full backward, eg: 50",
+  "motors.MotorBase.setSpeed|param|unit": "(optional) unit of the value",
+  "motors.MotorBase.setSpeed|param|value": "(optional) measured distance or rotation",
   "motors.MotorBase.stop": "Stops the motor(s).",
-  "motors.SynchedMotorPair.drive": "Makes a differential drive robot move with a given speed (%) and rotation rate (deg/s)\nusing a unicycle model.",
-  "motors.SynchedMotorPair.drive|param|rotationSpeed": "rotation of the robot around the center point, eg: 30",
-  "motors.SynchedMotorPair.drive|param|speed": "speed of the center point between motors, eg: 10",
-  "motors.SynchedMotorPair.drive|param|value": "the amount of movement, eg: 2",
-  "motors.SynchedMotorPair.setDimensions": "Sets the wheels radius and base length of a directional drive robot",
-  "motors.SynchedMotorPair.setDimensions|param|wheelRadius": "@param baseLength ",
   "motors.SynchedMotorPair.steer": "Turns the motor and the follower motor by a number of rotations",
   "motors.SynchedMotorPair.steer|param|speed": "the speed from ``100`` full forward to ``-100`` full backward, eg: 50",
   "motors.SynchedMotorPair.steer|param|turnRatio": "the ratio of power sent to the follower motor, from ``-200`` to ``200``, eg: 0",
-  "motors.SynchedMotorPair.steer|param|unit": "the meaning of the value",
-  "motors.SynchedMotorPair.steer|param|value": "the move quantity, eg: 2",
+  "motors.SynchedMotorPair.steer|param|unit": "(optional) unit of the value",
+  "motors.SynchedMotorPair.steer|param|value": "(optional) move duration or rotation",
   "motors.SynchedMotorPair.tank": "The Move Tank block can make a robot drive forward, backward, turn, or stop. \nUse the Move Tank block for robot vehicles that have two Large Motors, \nwith one motor driving the left side of the vehicle and the other the right side. \nYou can make the two motors go at different speeds or in different directions \nto make your robot turn.",
+  "motors.SynchedMotorPair.tank|param|speedLeft": "the speed on the left motor, eg: 50",
   "motors.SynchedMotorPair.tank|param|speedRight": "the speed on the right motor, eg: 50",
-  "motors.SynchedMotorPair.tank|param|unit": "@param speedLeft the speed on the left motor, eg: 50",
-  "motors.SynchedMotorPair.tank|param|value": "the amount of movement, eg: 2",
+  "motors.SynchedMotorPair.tank|param|unit": "(optional) unit of the value",
+  "motors.SynchedMotorPair.tank|param|value": "(optional) move duration or rotation",
   "motors.SynchedMotorPair.toString": "Returns the name(s) of the motor",
   "motors.mkCmd": "Allocates a message buffer",
   "motors.mkCmd|param|addSize": "required additional bytes",

libs/core/_locales/core-strings.json

@@ -1,20 +1,21 @@
 {
+  "BrickLight.GreenFlash|block": "green flash",
+  "BrickLight.GreenPulse|block": "green pulse",
+  "BrickLight.Green|block": "green",
+  "BrickLight.Off|block": "off",
+  "BrickLight.OrangeFlash|block": "orange flash",
+  "BrickLight.OrangePulse|block": "orange pulse",
+  "BrickLight.Orange|block": "orange",
+  "BrickLight.RedFlash|block": "red flash",
+  "BrickLight.RedPulse|block": "red pulse",
+  "BrickLight.Red|block": "red",
   "ButtonEvent.Click|block": "click",
   "ButtonEvent.Down|block": "down",
   "ButtonEvent.Up|block": "up",
-  "LightsPattern.GreenFlash|block": "Flashing Green",
-  "LightsPattern.GreenPulse|block": "Pulsing Green",
-  "LightsPattern.Green|block": "Green",
-  "LightsPattern.Off|block": "Off",
-  "LightsPattern.OrangeFlash|block": "Flashing Orange",
-  "LightsPattern.OrangePulse|block": "Pulsing Orange",
-  "LightsPattern.Orange|block": "Orange",
-  "LightsPattern.RedFlash|block": "Flashing Red",
-  "LightsPattern.RedPulse|block": "Pulsing Red",
-  "LightsPattern.Red|block": "Red",
   "MoveUnit.Degrees|block": "degrees",
   "MoveUnit.MilliSeconds|block": "milliseconds",
   "MoveUnit.Rotations|block": "rotations",
+  "MoveUnit.Seconds|block": "seconds",
   "Output.AB|block": "A+B",
   "Output.AD|block": "A+D",
   "Output.ALL|block": "All",
@@ -28,17 +29,19 @@
   "brick.Button.onEvent|block": "on %button|%event",
   "brick.Button.pauseUntil|block": "pause until %button|%event",
   "brick.Button.wasPressed|block": "%button|was pressed",
-  "brick.buttonDown|block": "down",
-  "brick.buttonEnter|block": "enter",
-  "brick.buttonLeft|block": "left",
-  "brick.buttonRight|block": "right",
-  "brick.buttonUp|block": "up",
+  "brick.batteryLevel|block": "battery level",
+  "brick.buttonDown|block": "button down",
+  "brick.buttonEnter|block": "button enter",
+  "brick.buttonLeft|block": "button left",
+  "brick.buttonRight|block": "button right",
+  "brick.buttonUp|block": "button up",
   "brick.clearScreen|block": "clear screen",
-  "brick.lightPattern|block": "%pattern",
-  "brick.printLine|block": "print %text| at line %line",
   "brick.printPorts|block": "print ports",
-  "brick.setLight|block": "set light to %pattern=led_pattern",
+  "brick.setLight|block": "set light to %pattern",
   "brick.showImage|block": "show image %image=screen_image_picker",
+  "brick.showNumber|block": "show number %name|at line %line",
+  "brick.showString|block": "show string %text|at line %line",
+  "brick.showValue|block": "show value %name|= %text|at line %line",
   "brick|block": "brick",
   "console.logValue|block": "console|log value %name|= %value",
   "console.log|block": "console|log %text",
@@ -48,16 +51,17 @@
   "control|block": "control",
   "motors.Motor.angle|block": "%motor|angle",
   "motors.Motor.clearCounts|block": "%motor|clear counts",
+  "motors.Motor.setRegulated|block": "set %motor|regulated %value",
   "motors.Motor.speed|block": "%motor|speed",
   "motors.Motor.tacho|block": "%motor|tacho",
-  "motors.MotorBase.move|block": "move %motor|for %value|%unit|at %speed|%",
   "motors.MotorBase.pauseUntilReady|block": "%motor|pause until ready",
+  "motors.MotorBase.reset|block": "%motors|reset",
   "motors.MotorBase.setBrake|block": "set %motor|brake %brake",
   "motors.MotorBase.setReversed|block": "set %motor|reversed %reversed",
-  "motors.MotorBase.setSpeed|block": "set speed of %motor|to %speed|%",
-  "motors.SynchedMotorPair.drive|block": "drive %chassis|at %speed|cm/s|turning %rotationSpeed|deg/s|for %value|%unit",
-  "motors.SynchedMotorPair.steer|block": "steer %chassis turn by|%turnRatio|at speed %speed|%|for %value|%unit",
-  "motors.SynchedMotorPair.tank|block": "tank %chassis|left %speedLeft|%|right %speedRight|%|for %value|%unit",
+  "motors.MotorBase.setSpeed|block": "set %motor|speed to %speed=motorSpeedPicker|%",
+  "motors.MotorBase.stop|block": "%motors|stop",
+  "motors.SynchedMotorPair.steer|block": "steer %chassis|turn ratio %turnRatio=motorTurnRatioPicker|speed %speed=motorSpeedPicker|%",
+  "motors.SynchedMotorPair.tank|block": "tank %motors|%speedLeft=motorSpeedPicker|%|%speedRight=motorSpeedPicker|%",
   "motors.largeAB|block": "large A+B",
   "motors.largeAD|block": "large A+D",
   "motors.largeA|block": "large A",
@@ -87,9 +91,9 @@
   "{id:category}Screen": "Screen",
   "{id:category}Serial": "Serial",
   "{id:group}Buttons": "Buttons",
-  "{id:group}Chassis": "Chassis",
-  "{id:group}Light": "Light",
-  "{id:group}Motion": "Motion",
+  "{id:group}Counters": "Counters",
+  "{id:group}More": "More",
+  "{id:group}Move": "Move",
   "{id:group}Screen": "Screen",
   "{id:group}Sensors": "Sensors"
 }

libs/core/battery.ts

@@ -0,0 +1,12 @@
+
+namespace brick {
+    /**
+     * Returns the current battery level
+     */
+    //% blockId=brickBatteryLevel block="battery level"
+    //% group="More"
+    export function batteryLevel(): number {
+        const info = sensors.internal.getBatteryInfo();
+        return info.current;
+    }
+}

libs/core/buttons.ts

@@ -2,35 +2,35 @@
 /**
  * Patterns for lights under the buttons.
  */
-const enum LightsPattern {
-    //% block=Off enumval=0
+const enum BrickLight {
+    //% block=off enumval=0
     //% blockIdentity=brick.lightPattern
     Off = 0,
-    //% block=Green enumval=1
+    //% block=green enumval=1
     //% blockIdentity=brick.lightPattern
     Green = 1,
-    //% block=Red enumval=2
+    //% block=red enumval=2
     //% blockIdentity=brick.lightPattern
     Red = 2,
-    //% block=Orange enumval=3
+    //% block=orange enumval=3
     //% blockIdentity=brick.lightPattern
     Orange = 3,
-    //% block="Flashing Green" enumval=4
+    //% block="green flash" enumval=4
     //% blockIdentity=brick.lightPattern
     GreenFlash = 4,
-    //% block="Flashing Red" enumval=5
+    //% block="red flash" enumval=5
     //% blockIdentity=brick.lightPattern
     RedFlash = 5,
-    //% block="Flashing Orange" enumval=6
+    //% block="orange flash" enumval=6
     //% blockIdentity=brick.lightPattern
     OrangeFlash = 6,
-    //% block="Pulsing Green" enumval=7
+    //% block="green pulse" enumval=7
     //% blockIdentity=brick.lightPattern
     GreenPulse = 7,
-    //% block="Pulsing Red" enumval=8
+    //% block="red pulse" enumval=8
     //% blockIdentity=brick.lightPattern
     RedPulse = 8,
-    //% block="Pulsing Orange" enumval=9
+    //% block="orange pulse" enumval=9
     //% blockIdentity=brick.lightPattern
     OrangePulse = 9,
 }
@@ -92,6 +92,7 @@ namespace brick {
         //% blockNamespace=brick
         //% weight=81 blockGap=8
         //% group="Buttons"
+        //% button.fieldEditor="brickbuttons"
         isPressed() {
             return this._isPressed
         }
@@ -107,6 +108,7 @@ namespace brick {
         //% blockNamespace=brick
         //% weight=80
         //% group="Buttons"
+        //% button.fieldEditor="brickbuttons"
         wasPressed() {
             const r = this._wasPressed
             this._wasPressed = false
@@ -125,6 +127,7 @@ namespace brick {
         //% blockNamespace=brick
         //% weight=99 blockGap=8
         //% group="Buttons"
+        //% button.fieldEditor="brickbuttons"
         onEvent(ev: ButtonEvent, body: () => void) {
             control.onEvent(this._id, ev, body)
         }
@@ -139,6 +142,7 @@ namespace brick {
         //% blockNamespace=brick
         //% weight=98 blockGap=8
         //% group="Buttons"
+        //% button.fieldEditor="brickbuttons"
         pauseUntil(ev: ButtonEvent) {
             control.waitForEvent(this._id, ev);
         }
@@ -163,6 +167,12 @@ namespace brick {
             if (sl[i])
                 ret |= 1 << i
         }
+        // this needs to be done in query(), which is run without the main JS execution mutex
+        // otherwise, while(true){} will lock the device
+        if (ret & DAL.BUTTON_ID_ESCAPE) {
+            motors.stopAllMotors(); // ensuring that all motors are off
+            control.reset()
+        }
         return ret
     }
 
@@ -172,8 +182,6 @@ namespace brick {
         if (!btnsMM) control.fail("no buttons?")
         buttons = []
         sensors.internal.unsafePollForChanges(50, readButtons, (prev, curr) => {
-            if (curr & DAL.BUTTON_ID_ESCAPE)
-                control.reset()
             for (let b of buttons)
                 b._update(!!(curr & b.mask))
         })
@@ -188,7 +196,7 @@ namespace brick {
             initBtns()
             buttons.push(this)
         }
-    }
+    }    
 
     initBtns() // always ON as it handles ESCAPE button
 
@@ -196,31 +204,31 @@ namespace brick {
     /**
      * Enter button on the EV3 Brick.
      */
-    //% whenUsed block="enter" weight=95 fixedInstance
+    //% whenUsed block="button enter" weight=95 fixedInstance
     export const buttonEnter: Button = new DevButton(DAL.BUTTON_ID_ENTER)
 
     /**
      * Left button on the EV3 Brick.
      */
-    //% whenUsed block="left" weight=95 fixedInstance
+    //% whenUsed block="button left" weight=95 fixedInstance
     export const buttonLeft: Button = new DevButton(DAL.BUTTON_ID_LEFT)
 
     /**
      * Right button on the EV3 Brick.
      */
-    //% whenUsed block="right" weight=94 fixedInstance
+    //% whenUsed block="button right" weight=94 fixedInstance
     export const buttonRight: Button = new DevButton(DAL.BUTTON_ID_RIGHT)
 
     /**
      * Up button on the EV3 Brick.
      */
-    //% whenUsed block="up" weight=95 fixedInstance
+    //% whenUsed block="button up" weight=95 fixedInstance
     export const buttonUp: Button = new DevButton(DAL.BUTTON_ID_UP)
 
     /**
      * Down button on the EV3 Brick.
      */
-    //% whenUsed block="down" weight=95 fixedInstance
+    //% whenUsed block="button down" weight=95 fixedInstance
     export const buttonDown: Button = new DevButton(DAL.BUTTON_ID_DOWN)
 }
 
@@ -229,6 +237,7 @@ namespace control {
     /**
      * Determine the version of system software currently running.
      */
+    //%
     export function deviceFirmwareVersion(): string {
         let buf = output.createBuffer(6)
         brick.internal.getBtnsMM().read(buf)
@@ -243,32 +252,21 @@ namespace control {
 }
 
 namespace brick {
-    let currPattern: LightsPattern
+    // the brick starts with the red color
+    let currPattern: BrickLight = BrickLight.Red;
 
     /**
      * Set lights.
-     * @param pattern the lights pattern to use.
+     * @param pattern the lights pattern to use. eg: BrickLight.Orange
      */
-    //% blockId=setLights block="set light to %pattern=led_pattern"
+    //% blockId=setLights block="set light to %pattern"
     //% weight=100 group="Buttons"
-    export function setLight(pattern: number): void {
+    export function setLight(pattern: BrickLight): void {
         if (currPattern === pattern)
             return
-        currPattern = pattern
-        let cmd = output.createBuffer(2)
+        currPattern = pattern;
+        const cmd = output.createBuffer(2)
         cmd[0] = pattern + 48
         brick.internal.getBtnsMM().write(cmd)
     }
-
-
-    /**
-     * Pattern block.
-     * @param pattern the lights pattern to use. eg: LightsPattern.Green
-     */
-    //% blockId=led_pattern block="%pattern"
-    //% shim=TD_ID colorSecondary="#6e9a36" group="Light"
-    //% blockHidden=true useEnumVal=1 pattern.fieldOptions.decompileLiterals=1
-    export function lightPattern(pattern: LightsPattern): number {
-        return pattern;
-    }
 }

libs/core/console.ts

@@ -3,7 +3,7 @@
 /**
  * Reading and writing data to the console output.
  */
-//% weight=12 color=#002050 icon="\uf120"
+//% weight=12 color=#00451A icon="\uf112"
 //% advanced=true
 namespace console {
     type Listener = (text: string) => void;

libs/core/images.jres

@@ -114,23 +114,7 @@
     "progressWaterLevel3": "iVBORw0KGgoAAAANSUhEUgAAALIAAACAAQAAAACHQw5jAAABP0lEQVR42u2VMWrEMBBFRxGsGrNqXYT4CltuFV9lj5EqVlhImyPkKoKFbJcrrHKCKJ2XKFb+BGxsGBdbBRJ/mGHm+VtjJGNT/srQO6cG8cnFKXvKLVdHRFcjfXD3xDyybY9IFVJgbpgHtilEa5E8XJ1m/gJbVwJFXuwRrqSYa9hSCZt/A1/B1VLjqdMG1mu0bgeD4W5Te2r1A6YVJne0qfNP57fWU9AY5dYKd29tDgodldoTqagjGaoc3VAiiibQmlg1ApeIQIjuufDUq+C0Q1z1xaJFi/60iluZ28aJ3Jy9yPU5iFxlmesZvsry+kUz8/z/5qTuZKyizM2F3IYZfnDyuR7kc61fL+P4qYmq0mCZ+tuhfHZjPvhV8iKnMVejuZNXrjnK3O77aeo03hEzNGqyUcbNnJdfPjqLFv2+vgH+JtBJ4nz/SAAAAABJRU5ErkJggg==",
     "systemAccept1": "iVBORw0KGgoAAAANSUhEUgAAABgAAAAQAQAAAAAkX4I4AAAAQElEQVR42mM4wMDMsP//X4b6//+AWI6h/p8dQ/2fOob6H/8YKj/+Y6h4/I+hxvkfQx07UJ4fiOf/A6sF6QHqBQDsYh9jNdETHwAAAABJRU5ErkJggg==",
     "systemAccept2": "iVBORw0KGgoAAAANSUhEUgAAABgAAAAQAQAAAAAkX4I4AAAAQUlEQVR42mM4wMDMsP//X4YEBjYGB4ZHDA6MhxgcmJsYHNiZGNz4mBjcZZgYnPcwMTj+YGJw+ADECUxgtSA9QL0A+IIPxwiZFtwAAAAASUVORK5CYII=",
-    "systemAlert": "iVBORw0KGgoAAAANSUhEUgAAABgAAAAVAQAAAAB0khOLAAAARUlEQVR42iXD0QmAIAAE0IvWCtqmMbLG8MtVhAZwjBvALyE85XzwoE/QO8f5WPsd0K+An6c3Jq8sThIUUVg9qfmDDRn7AD/WMAQEJ+pCAAAAAElFTkSuQmCC",
     "systemBox": "iVBORw0KGgoAAAANSUhEUgAAABgAAAAQAQAAAAAkX4I4AAAAGklEQVR42mM4wMDMsP//X4b6//9IwiA9QL0AlQYkzY8nCoAAAAAASUVORK5CYII=",
-    "systemBusy0": "iVBORw0KGgoAAAANSUhEUgAAABMAAAAPAQAAAAAuP8mBAAAAMElEQVR42mPY/38Bg/x/BgbnHw4Msd8dGKLeA+k4IL0XSGdB6TioOFAepA6kHqgPAJCPFdTsOCPGAAAAAElFTkSuQmCC",
-    "systemBusy1": "iVBORw0KGgoAAAANSUhEUgAAAA8AAAATAQAAAABnuWoHAAAAOUlEQVR42mNoYGKw/8EAJO9/A6GrYQyv1jF8jWP4tY/hbx3D730M3+4xvH/HcO8bw90yhlvbGGDqAdjhGYsKgwC5AAAAAElFTkSuQmCC",
     "systemDecline1": "iVBORw0KGgoAAAANSUhEUgAAABgAAAAQAQAAAAAkX4I4AAAANUlEQVR42mM4wMDMsP//X4b6//8Y6urtGOrt6hjq5/xjqD8JxI+hGMQGiQHlwGqAakF6gHoBybUeX0RcSJEAAAAASUVORK5CYII=",
-    "systemDecline2": "iVBORw0KGgoAAAANSUhEUgAAABgAAAAQAQAAAAAkX4I4AAAANUlEQVR42mM4wMDMsP//X4YEBjYGx4ZDDA4HmxgckpkYHMyAWAaKQWyQGFAOpAakFqQHqBcAGz4QyzSHE/gAAAAASUVORK5CYII=",
-    "systemDotEmpty": "iVBORw0KGgoAAAANSUhEUgAAAB8AAAAfAQAAAAA31SuUAAAAYklEQVR42oWOMQ5AQBRE5yZ7FEfSKTmC25CQuILehkahkc12IvgjRqHUTPX/ew+MzsByNlhxGq7ochz90mFL9gmBFjCSGTxZoSUb1OTwTkquP/Md61cU8USWQzZ5VaCWp+oGeLZn9EklJaAAAAAASUVORK5CYII=",
-    "systemDotFull": "iVBORw0KGgoAAAANSUhEUgAAAB8AAAAfAQAAAAA31SuUAAAAX0lEQVR42mP4/0H+H8P//sf/GP7V//nH8PeDfB3D7wPs+xi+MzDeY3jHAER3GBjKGG4wMJgx7GBgsGLYwMAgBSESGBh4CBAIxWC9YFPA5oFNBtsBtg1sL9gFYLeAXAUAPIwyHWLMTS8AAAAASUVORK5CYII=",
-    "systemEv3small": "iVBORw0KGgoAAAANSUhEUgAAACsAAAANAQAAAAAY06pGAAAAPUlEQVR42mNg4LFvYwACFEr+n32fPYiS5/8P5PLLyz8AUXwQqs8eSMn/b7H/D6IO1NmDBA/UgbTzP/gHpwBcwBWO2QYBDwAAAABJRU5ErkJggg==",
-    "systemPlay": "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQAAAAA3iMLMAAAAMElEQVR42mP4Y8/wsZ/h+XOG858Z5v5k2POXwcaGoUYOhIAMIBcoCJQCKgAq+2MPAAFKFVmziLfGAAAAAElFTkSuQmCC",
-    "systemSlider0": "iVBORw0KGgoAAAANSUhEUgAAAAwAAAAbAQAAAABg3VNpAAAAEklEQVR42mM4YMBwfwPV0AEDAHmKKNims3dJAAAAAElFTkSuQmCC",
-    "systemSlider1": "iVBORw0KGgoAAAANSUhEUgAAAAwAAAAbAQAAAABg3VNpAAAAGklEQVR42mM4YMBwfwNFCAKuGjCc2sBwwAAAT7olG9TpXdAAAAAASUVORK5CYII=",
-    "systemSlider2": "iVBORw0KGgoAAAANSUhEUgAAAAwAAAAbAQAAAABg3VNpAAAAG0lEQVR42mM4YMBwfwM5CAJObWC4aoAgDxgAACpUJGftPg+WAAAAAElFTkSuQmCC",
-    "systemSlider3": "iVBORw0KGgoAAAANSUhEUgAAAAwAAAAbAQAAAABg3VNpAAAAG0lEQVR42mM4YMBwfwMJCAKuGjCc2oCFPGAAAPSIIz417p4OAAAAAElFTkSuQmCC",
-    "systemSlider4": "iVBORw0KGgoAAAANSUhEUgAAAAwAAAAbAQAAAABg3VNpAAAAG0lEQVR42mM4YMBwfwNhBAGnNjBcNcBHHjAAAMJ6IooqNLP/AAAAAElFTkSuQmCC",
-    "systemSlider5": "iVBORw0KGgoAAAANSUhEUgAAAAwAAAAbAQAAAABg3VNpAAAAG0lEQVR42mM4YMBwfwNOBAFXDRhObSCKPGAAAHfbIWHuFKlNAAAAAElFTkSuQmCC",
-    "systemSlider6": "iVBORw0KGgoAAAANSUhEUgAAAAwAAAAbAQAAAABg3VNpAAAAG0lEQVR42mM4YMBwfwM6goBTGxiuGpBGHjAAADklIK1PooVQAAAAAElFTkSuQmCC",
-    "systemSlider7": "iVBORw0KGgoAAAANSUhEUgAAAAwAAAAbAQAAAABg3VNpAAAAG0lEQVR42mM4YMBwfwMUQcBVA4ZTG8gkDxgAANmVH4SOiUHMAAAAAElFTkSuQmCC",
-    "systemSlider8": "iVBORw0KGgoAAAANSUhEUgAAAAwAAAAbAQAAAABg3VNpAAAAFElEQVR42mM4YMBwagPDVSqRBwwASoohT92wVBIAAAAASUVORK5CYII="
+    "systemDecline2": "iVBORw0KGgoAAAANSUhEUgAAABgAAAAQAQAAAAAkX4I4AAAANUlEQVR42mM4wMDMsP//X4YEBjYGx4ZDDA4HmxgckpkYHMyAWAaKQWyQGFAOpAakFqQHqBcAGz4QyzSHE/gAAAAASUVORK5CYII="
 }

libs/core/images.ts

@@ -220,41 +220,10 @@ namespace images {
     //% fixedInstance jres blockIdentity=brick.__imagePicker
     export const systemAccept2 = screen.unpackPNG(hex``);
     //% fixedInstance jres blockIdentity=brick.__imagePicker
-    export const systemAlert = screen.unpackPNG(hex``);
-    //% fixedInstance jres blockIdentity=brick.__imagePicker
     export const systemBox = screen.unpackPNG(hex``);
     //% fixedInstance jres blockIdentity=brick.__imagePicker
-    export const systemBusy0 = screen.unpackPNG(hex``);
-    //% fixedInstance jres blockIdentity=brick.__imagePicker
-    export const systemBusy1 = screen.unpackPNG(hex``);
-    //% fixedInstance jres blockIdentity=brick.__imagePicker
     export const systemDecline1 = screen.unpackPNG(hex``);
     //% fixedInstance jres blockIdentity=brick.__imagePicker
     export const systemDecline2 = screen.unpackPNG(hex``);
     //% fixedInstance jres blockIdentity=brick.__imagePicker
-    export const systemDotEmpty = screen.unpackPNG(hex``);
-    //% fixedInstance jres blockIdentity=brick.__imagePicker
-    export const systemDotFull = screen.unpackPNG(hex``);
-    //% fixedInstance jres blockIdentity=brick.__imagePicker
-    export const systemEv3small = screen.unpackPNG(hex``);
-    //% fixedInstance jres blockIdentity=brick.__imagePicker
-    export const systemPlay = screen.unpackPNG(hex``);
-    //% fixedInstance jres blockIdentity=brick.__imagePicker
-    export const systemSlider0 = screen.unpackPNG(hex``);
-    //% fixedInstance jres blockIdentity=brick.__imagePicker
-    export const systemSlider1 = screen.unpackPNG(hex``);
-    //% fixedInstance jres blockIdentity=brick.__imagePicker
-    export const systemSlider2 = screen.unpackPNG(hex``);
-    //% fixedInstance jres blockIdentity=brick.__imagePicker
-    export const systemSlider3 = screen.unpackPNG(hex``);
-    //% fixedInstance jres blockIdentity=brick.__imagePicker
-    export const systemSlider4 = screen.unpackPNG(hex``);
-    //% fixedInstance jres blockIdentity=brick.__imagePicker
-    export const systemSlider5 = screen.unpackPNG(hex``);
-    //% fixedInstance jres blockIdentity=brick.__imagePicker
-    export const systemSlider6 = screen.unpackPNG(hex``);
-    //% fixedInstance jres blockIdentity=brick.__imagePicker
-    export const systemSlider7 = screen.unpackPNG(hex``);
-    //% fixedInstance jres blockIdentity=brick.__imagePicker
-    export const systemSlider8 = screen.unpackPNG(hex``);
 }

libs/core/input.ts

@@ -89,6 +89,14 @@ namespace sensors.internal {
         //serial.writeLine("UART " + port + " / " + mode + " - " + info)
     }
 
+    export function getBatteryInfo(): { temp: number; current: number } {
+        init();
+        return {
+            temp: analogMM.getNumber(NumberFormat.Int16LE, AnalogOff.BatteryTemp),
+            current: Math.round(analogMM.getNumber(NumberFormat.Int16LE, AnalogOff.BatteryCurrent) / 10)
+        }
+    }
+
     function detectDevices() {
         let conns = analogMM.slice(AnalogOff.InConn, DAL.NUM_INPUTS)
         let numChanged = 0
@@ -301,6 +309,10 @@ namespace sensors.internal {
                 return 0
             return getUartNumber(fmt, off, this._port)
         }
+
+        reset() {
+            if (this.isActive()) uartReset(this._port);
+        }
     }
 
     function uartReset(port: number) {

libs/core/linux.cpp

@@ -483,7 +483,15 @@ void runLMS() {
     */
 }
 
+void stopMotors() {
+    uint8_t cmd[2] = { 0xA3, 0x0F };
+    int fd = open("/dev/lms_pwm", O_RDWR);
+    write(fd, cmd, 2);
+    close(fd);
+}
+
 extern "C" void target_reset() {
+    stopMotors();
     if (lmsPid)
         runLMS();
     else

libs/core/ns.ts

@@ -1 +1,25 @@
 
+namespace motors {
+
+    /**
+     * A speed picker
+     * @param speed the speed, eg: 50
+     */
+    //% blockId=motorSpeedPicker block="%speed" shim=TD_ID
+    //% speed.fieldEditor="speed" colorSecondary="#FFFFFF"
+    //% weight=0 blockHidden=1 speed.fieldOptions.decompileLiterals=1
+    export function __speedPicker(speed: number): number {
+        return speed;
+    }
+
+    /**
+     * A turn ratio picker
+     * @param turnratio the turn ratio, eg: 0
+     */
+    //% blockId=motorTurnRatioPicker block="%turnratio" shim=TD_ID
+    //% turnratio.fieldEditor="turnratio" colorSecondary="#FFFFFF"
+    //% weight=0 blockHidden=1 turnRatio.fieldOptions.decompileLiterals=1
+    export function __turnRatioPicker(turnratio: number): number {
+        return turnratio;
+    }
+}

libs/core/output.ts

@@ -30,6 +30,8 @@ enum MoveUnit {
     Rotations,
     //% block="degrees"
     Degrees,
+    //% block="seconds"
+    Seconds,
     //% block="milliseconds"
     MilliSeconds
 }
@@ -94,7 +96,7 @@ namespace motors {
         return b
     }
 
-    function outputToName(out: Output): string {
+    export function outputToName(out: Output): string {
         let r = "";
         for (let i = 0; i < DAL.NUM_OUTPUTS; ++i) {
             if (out & (1 << i)) {
@@ -109,8 +111,8 @@ namespace motors {
      * Stops all motors
      */
     //% blockId=motorStopAll block="stop all motors"
-    //% weight=5
-    //% group="Motion"
+    //% weight=1
+    //% group="Move"
     export function stopAllMotors() {
         const b = mkCmd(Output.ALL, DAL.opOutputStop, 0)
         writePWM(b)
@@ -119,7 +121,7 @@ namespace motors {
     /**
      * Resets all motors
      */
-    //% group="Motion"
+    //% group="Move"
     export function resetAllMotors() {
         reset(Output.ALL)
     }
@@ -162,7 +164,7 @@ namespace motors {
         //% blockId=outputMotorSetBrakeMode block="set %motor|brake %brake"
         //% brake.fieldEditor=toggleonoff
         //% weight=60 blockGap=8
-        //% group="Motion"
+        //% group="Move"
         setBrake(brake: boolean) {
             this.init();
             this._brake = brake;
@@ -173,8 +175,8 @@ namespace motors {
         */
         //% blockId=motorSetReversed block="set %motor|reversed %reversed"
         //% reversed.fieldEditor=toggleonoff
-        //% weight=59
-        //% group="Motion"
+        //% weight=59 blockGap=8
+        //% group="Move"
         setReversed(reversed: boolean) {
             this.init();
             const b = mkCmd(this._port, DAL.opOutputPolarity, 1)
@@ -185,7 +187,9 @@ namespace motors {
         /**
          * Stops the motor(s).
          */
-        //%
+        //% weight=6 blockGap=8
+        //% group="Move"
+        //% blockId=motorStop block="%motors|stop"
         stop() {
             this.init();
             stop(this._port, this._brake);
@@ -194,47 +198,37 @@ namespace motors {
         /**
          * Resets the motor(s).
          */
-        //%
+        //% weight=5
+        //% group="Move"
+        //% blockId=motorReset block="%motors|reset"
         reset() {
             this.init();
             reset(this._port);
         }
 
         /**
-         * Sets the speed of the motor.
+         * Sets the motor speed for limited time or distance.
          * @param speed the speed from ``100`` full forward to ``-100`` full backward, eg: 50
+         * @param value (optional) measured distance or rotation
+         * @param unit (optional) unit of the value
          */
-        //% blockId=motorSetSpeed block="set speed of %motor|to %speed|%"
-        //% on.fieldEditor=toggleonoff
-        //% weight=99 blockGap=8
-        //% speed.min=-100 speed.max=100
-        //% group="Motion"
-        setSpeed(speed: number) {
-            this.init();
-            speed = Math.clamp(-100, 100, speed >> 0);
-            if (!speed) // always stop
-                this.stop();
-            else
-                this._setSpeed(speed);
-        }
-
-        /**
-         * Moves the motor by a number of rotations, degress or seconds
-         * @param value the move quantity, eg: 2
-         * @param unit the meaning of the value
-         * @param speed the speed from ``100`` full forward to ``-100`` full backward, eg: 50
-         */
-        //% blockId=motorMove block="move %motor|for %value|%unit|at %speed|%"
-        //% weight=98 blockGap=8
-        //% speed.min=-100 speed.max=100    
-        //% group="Motion"
-        move(value: number, unit: MoveUnit, speed: number) {
+        //% blockId=motorSetSpeed block="set %motor|speed to %speed=motorSpeedPicker|%"
+        //% weight=100 blockGap=8
+        //% group="Move"
+        setSpeed(speed: number, value: number = 0, unit: MoveUnit = MoveUnit.MilliSeconds) {
             this.init();
             speed = Math.clamp(-100, 100, speed >> 0);
+            // stop if speed is 0
             if (!speed) {
                 this.stop();
                 return;
             }
+            // special: 0 is infinity
+            if (value == 0) {
+                this._setSpeed(speed);
+                return;
+            }
+            // timed motor moves
             let useSteps: boolean;
             let stepsOrTime: number;
             switch (unit) {
@@ -246,6 +240,10 @@ namespace motors {
                     stepsOrTime = value >> 0;
                     useSteps = true;
                     break;
+                case MoveUnit.Seconds:
+                    stepsOrTime = (value * 1000) >> 0;
+                    useSteps = false;
+                    break;
                 default:
                     stepsOrTime = value;
                     useSteps = false;
@@ -253,6 +251,8 @@ namespace motors {
             }
 
             this._move(useSteps, stepsOrTime, speed);
+            // wait till motor is done with this work
+            this.pauseUntilReady();
         }
 
         /**
@@ -264,13 +264,7 @@ namespace motors {
             const buf = mkCmd(this._port, DAL.opOutputTest, 2);
             readPWM(buf)
             const flags = buf.getNumber(NumberFormat.UInt8LE, 2);
-            // TODO: FIX with ~ support
-            for(let i = 0; i < DAL.NUM_OUTPUTS; ++i) {
-                const flag = 1 << i;
-                if ((this._port & flag) && (flags & flag))
-                    return false;
-            }
-            return true;
+            return (~flags & this._port) == this._port;
         }
 
         /**
@@ -278,8 +272,8 @@ namespace motors {
          * @param timeOut optional maximum pausing time in milliseconds
          */
         //% blockId=motorPauseUntilRead block="%motor|pause until ready"
-        //% weight=97
-        //% group="Motion"
+        //% weight=90
+        //% group="Move"
         pauseUntilReady(timeOut?: number) {
             pauseUntil(() => this.isReady(), timeOut);
         }
@@ -288,10 +282,12 @@ namespace motors {
     //% fixedInstances
     export class Motor extends MotorBase {
         private _large: boolean;
+        private _regulated: boolean;
 
         constructor(port: Output, large: boolean) {
             super(port, () => this.__init(), (speed) => this.__setSpeed(speed), (steps, stepsOrTime, speed) => this.__move(steps, stepsOrTime, speed));
             this._large = large;
+            this._regulated = true;
             this.markUsed();
         }
 
@@ -307,7 +303,7 @@ namespace motors {
         }
 
         private __setSpeed(speed: number) {
-            const b = mkCmd(this._port, DAL.opOutputSpeed, 1)
+            const b = mkCmd(this._port, this._regulated ? DAL.opOutputPower : DAL.opOutputSpeed, 1)
             b.setNumber(NumberFormat.Int8LE, 2, speed)
             writePWM(b)
             if (speed) {
@@ -321,11 +317,24 @@ namespace motors {
                 step1: 0,
                 step2: stepsOrTime,
                 step3: 0,
-                speed: speed,
+                speed: this._regulated ? speed : undefined,
+                power: this._regulated ? undefined : speed,
                 useBrake: this._brake
             })
         }
 
+        /**
+         * Indicates if the motor speed should be regulated. Default is true.
+         * @param value true for regulated motor
+         */
+        //% blockId=outputMotorSetRegulated block="set %motor|regulated %value"
+        //% value.fieldEditor=toggleonoff
+        //% weight=58
+        //% group="Move"
+        setRegulated(value: boolean) {
+            this._regulated = value;
+        }
+
         /**
          * Gets motor actual speed.
          * @param motor the port which connects to the motor
@@ -333,7 +342,7 @@ namespace motors {
         //% blockId=motorSpeed block="%motor|speed"
         //% weight=72 
         //% blockGap=8
-        //% group="Sensors"
+        //% group="Counters"
         speed(): number {
             this.init();
             return getMotorData(this._port).actualSpeed;
@@ -345,7 +354,8 @@ namespace motors {
          */
         //% blockId=motorAngle block="%motor|angle"
         //% weight=70
-        //% group="Sensors"
+        //% blockGap=8
+        //% group="Counters"
         angle(): number {
             this.init();
             return getMotorData(this._port).count;
@@ -359,7 +369,7 @@ namespace motors {
         //% blockId=motorTachoCount block="%motor|tacho"
         //% weight=69
         //% blockGap=8
-        //% group="Sensors"
+        //% group="Counters"
         tacho(): number {
             this.init();
             return getMotorData(this._port).tachoCount;
@@ -371,7 +381,7 @@ namespace motors {
         //% blockId=motorClearCount block="%motor|clear counts"
         //% weight=68
         //% blockGap=8
-        //% group="Sensors"
+        //% group="Counters"
         clearCounts() {
             this.init();
             const b = mkCmd(this._port, DAL.opOutputClearCount, 0)
@@ -418,13 +428,9 @@ namespace motors {
 
     //% fixedInstances
     export class SynchedMotorPair extends MotorBase {
-        private wheelRadius: number;
-        private baseLength: number;
 
         constructor(ports: Output) {
             super(ports, () => this.__init(), (speed) => this.__setSpeed(speed), (steps, stepsOrTime, speed) => this.__move(steps, stepsOrTime, speed));
-            this.wheelRadius = 3;
-            this.baseLength = 12;
             this.markUsed();
         }
 
@@ -445,7 +451,7 @@ namespace motors {
         private __setSpeed(speed: number) {
             syncMotors(this._port, {
                 speed: speed,
-                turnRatio: 100, // same speed
+                turnRatio: 0, // same speed
                 useBrake: !!this._brake
             })
         }
@@ -454,7 +460,7 @@ namespace motors {
             syncMotors(this._port, {
                 useSteps: steps,
                 speed: speed,
-                turnRatio: 100, // same speed
+                turnRatio: 0, // same speed
                 stepsOrTime: stepsOrTime,
                 useBrake: this._brake
             });
@@ -466,18 +472,16 @@ namespace motors {
          * with one motor driving the left side of the vehicle and the other the right side. 
          * You can make the two motors go at different speeds or in different directions 
          * to make your robot turn.
-         * @param value the amount of movement, eg: 2
-         * @param unit 
          * @param speedLeft the speed on the left motor, eg: 50
          * @param speedRight the speed on the right motor, eg: 50
+         * @param value (optional) move duration or rotation
+         * @param unit (optional) unit of the value
          */
-        //% blockId=motorPairTank block="tank %chassis|left %speedLeft|%|right %speedRight|%|for %value|%unit"
-        //% weight=9 blockGap=8
-        //% speedLeft.min=-100 speedLeft=100
-        //% speedRight.min=-100 speedRight=100
+        //% blockId=motorPairTank block="tank %motors|%speedLeft=motorSpeedPicker|%|%speedRight=motorSpeedPicker|%"
+        //% weight=96 blockGap=8
         //% inlineInputMode=inline
-        //% group="Chassis"
-        tank(speedLeft: number, speedRight: number, value: number, unit: MoveUnit) {
+        //% group="Move"
+        tank(speedLeft: number, speedRight: number, value: number = 0, unit: MoveUnit = MoveUnit.MilliSeconds) {
             this.init();
 
             speedLeft = Math.clamp(-100, 100, speedLeft >> 0);
@@ -487,56 +491,23 @@ namespace motors {
             const turnRatio = speedLeft == speed
                 ? (100 - speedRight / speedLeft * 100)
                 : (speedLeft / speedRight * 100 - 100);
+
             this.steer(turnRatio, speed, value, unit);
         }
 
-        /**
-         * Makes a differential drive robot move with a given speed (%) and rotation rate (deg/s)
-         * using a unicycle model.
-         * @param speed speed of the center point between motors, eg: 10
-         * @param rotationSpeed rotation of the robot around the center point, eg: 30
-         * @param value the amount of movement, eg: 2
-         * @param unit 
-         */
-        //% blockId=motorDrive block="drive %chassis|at %speed|cm/s|turning %rotationSpeed|deg/s|for %value|%unit"
-        //% inlineInputMode=inline
-        //% group="Chassis"
-        //% weight=8 blockGap=8
-        drive(speed: number, rotationSpeed: number, value: number, unit: MoveUnit) {
-            this.init();
-
-            // speed is expressed in %
-            const R = this.wheelRadius; // cm
-            const L = this.baseLength; // cm
-            const PI = 3.14;
-            const maxw = 170 / 60 * 2 * PI; // rad / s
-            const maxv = maxw * R; // cm / s
-            // speed is cm / s
-            const v = speed; // cm / s
-            const w = rotationSpeed / 360 * 2 * PI; // rad / s
-
-            const vr = (2 * v + w * L) / (2 * R); // rad / s
-            const vl = (2 * v - w * L) / (2 * R); // rad / s
-
-            const sr = vr / maxw * 100; // % 
-            const sl = vl / maxw * 100; // %
-
-            this.tank(sr, sl, value, unit)
-        }    
-        
         /**
          * Turns the motor and the follower motor by a number of rotations
          * @param turnRatio the ratio of power sent to the follower motor, from ``-200`` to ``200``, eg: 0
          * @param speed the speed from ``100`` full forward to ``-100`` full backward, eg: 50
-         * @param value the move quantity, eg: 2
-         * @param unit the meaning of the value
+         * @param value (optional) move duration or rotation
+         * @param unit (optional) unit of the value
          */
-        //% blockId=motorPairTurn block="steer %chassis turn by|%turnRatio|at speed %speed|%|for %value|%unit"
-        //% weight=6 blockGap=8
+        //% blockId=motorPairSteer block="steer %chassis|turn ratio %turnRatio=motorTurnRatioPicker|speed %speed=motorSpeedPicker|%"
+        //% weight=95
         //% turnRatio.min=-200 turnRatio=200
         //% inlineInputMode=inline
-        //% group="Chassis"
-        steer(turnRatio: number, speed: number, value: number, unit: MoveUnit) {
+        //% group="Move"
+        steer(turnRatio: number, speed: number, value: number = 0, unit: MoveUnit = MoveUnit.MilliSeconds) {
             this.init();
             speed = Math.clamp(-100, 100, speed >> 0);
             if (!speed) {
@@ -556,6 +527,10 @@ namespace motors {
                     stepsOrTime = value >> 0;
                     useSteps = true;
                     break;
+                case MoveUnit.Seconds:
+                    stepsOrTime = (value * 1000) >> 0;
+                    useSteps = false;
+                    break;
                 default:
                     stepsOrTime = value >> 0;
                     useSteps = false;
@@ -569,17 +544,6 @@ namespace motors {
                 stepsOrTime: stepsOrTime,
                 useBrake: this._brake
             });
-        }        
-
-        /**
-         * Sets the wheels radius and base length of a directional drive robot
-         * @param wheelRadius 
-         * @param baseLength 
-         */
-        //% group="Chassis"
-        setDimensions(wheelRadius: number, baseLength: number): void {
-            this.wheelRadius = wheelRadius;
-            this.baseLength = baseLength;
         }
 
         /**

libs/core/pxt.json

@@ -16,6 +16,7 @@
         "png.cpp",
         "screen.cpp",
         "screen.ts",
+        "battery.ts",
         "output.cpp",
         "output.ts",
         "core.ts",

libs/core/screen.ts

@@ -58,29 +58,7 @@ namespace brick {
         }
     }
 
-    export function microbitFont() {
-        return {
-            charWidth: 6,
-            charHeight: 5,
-            firstChar: 32,
-            // source https://github.com/lancaster-university/microbit-dal/blob/master/source/core/MicroBitFont.cpp
-            data: hex`
-0000000000 0202020002 0a0a000000 0a1f0a1f0a 0e130e190e 1309041219 0609060916 0202000000 0402020204
-0204040402 000a040a00 00040e0400 0000000402 00000e0000 0000000200 1008040201 0609090906 040604040e
-070806010f 0f08040906 0c0a091f08 1f010f100f 08040e110e 1f08040201 0e110e110e 0e110e0402 0002000200
-0004000402 0804020408 000e000e00 0204080402 0e110c0004 0e11151906 06090f0909 0709070907 0e0101010e
-0709090907 0f0107010f 0f01070101 0e0119110e 09090f0909 0702020207 1f08080906 0905030509 010101010f
-111b151111 1113151911 0609090906 0709070101 060909060c 0709070911 0e01060807 1f04040404 0909090906
-1111110a04 1111151b11 0909060909 110a040404 0f0402010f 0e0202020e 0102040810 0e0808080e 040a000000
-000000001f 0204000000 000e09091e 0101070907 000e01010e 08080e090e 060907010e 0c02070202 0e090e0806
-0101070909 0200020202 0800080806 0105030509 020202020c 001b151111 0007090909 0006090906 0007090701
-000e090e08 000e010101 000c020403 02020e021c 000909091e 0011110a04 001111151b 0009060609 00110a0403
-000f04020f 0c0406040c 0202020202 0302060203 0000061800
-`
-        }
-    }
-
-    export function setPixel(on: boolean, x: number, y: number) {
+    function setPixel(on: boolean, x: number, y: number) {
         x |= 0
         y |= 0
         if (0 <= x && x < DAL.LCD_WIDTH && 0 <= y && y < DAL.LCD_HEIGHT)
@@ -90,18 +68,43 @@ namespace brick {
     /**
      * Show text on the screen at a specific line.
      * @param text the text to print on the screen, eg: "Hello world"
-     * @param line the line number to print the text at, eg: 0
+     * @param line the line number to print the text at, eg: 1
      */
-    //% blockId=screen_print block="print %text| at line %line"
+    //% blockId=screen_print block="show string %text|at line %line"
     //% weight=98 group="Screen" inlineInputMode="inline" blockGap=8
-    //% line.min=0 line.max=9
-    export function printLine(text: string, line: number) {
+    //% line.min=1 line.max=10
+    export function showString(text: string, line: number) {
         const NUM_LINES = 9;
         const offset = 5;
-        const y = offset + (Math.clamp(0, NUM_LINES, line) / (NUM_LINES + 2)) * DAL.LCD_HEIGHT;
+        const y = offset + (Math.clamp(0, NUM_LINES, line - 1) / (NUM_LINES + 2)) * DAL.LCD_HEIGHT;
         brick.print(text, offset, y);
     }
 
+    /**
+     * Shows a number on the screen
+     * @param value the numeric value
+     * @param line the line number to print the text at, eg: 1
+     */
+    //% blockId=screenShowNumber block="show number %name|at line %line"
+    //% weight=96 group="Screen" inlineInputMode="inline" blockGap=8
+    //% line.min=1 line.max=10
+    export function showNumber(value: number, line: number) {
+        showString("" + value, line);
+    }
+
+    /**
+     * Shows a name, value pair on the screen
+     * @param value the numeric value
+     * @param line the line number to print the text at, eg: 1
+     */
+    //% blockId=screenShowValue block="show value %name|= %text|at line %line"
+    //% weight=96 group="Screen" inlineInputMode="inline" blockGap=8
+    //% line.min=1 line.max=10
+    export function showValue(name: string, value: number, line: number) {
+        value = Math.round(value * 1000) / 1000;
+        showString((name ? name + ": " : "") + value, line);        
+    }
+
     export function print(text: string, x: number, y: number, mode = Draw.Normal) {
         x |= 0
         y |= 0
@@ -138,12 +141,9 @@ namespace brick {
      */
     //% blockId=screen_show_image block="show image %image=screen_image_picker"
     //% weight=100 group="Screen" blockGap=8
-    export function showImage(image: Image, delay: number = 400) {
+    export function showImage(image: Image) {
         if (!image) return;
         image.draw(0, 0, Draw.Normal);
-        delay = Math.max(0, delay);
-        if (delay > 0)
-            loops.pause(delay);
     }
 
     /**
@@ -168,7 +168,7 @@ namespace brick {
         screen.clear();
     }
 
-    export function drawRect(x: number, y: number, w: number, h: number, mode = Draw.Normal) {
+    function drawRect(x: number, y: number, w: number, h: number, mode = Draw.Normal) {
         x |= 0;
         y |= 0;
         w |= 0;
@@ -213,30 +213,32 @@ namespace brick {
     //% blockId=brickPrintPorts block="print ports"
     //% weight=1 group="Screen"
     export function printPorts() {
+        const col = 44;
         clearScreen();
 
+        function scale(x: number) {
+            if (Math.abs(x) > 1000) return Math.round(x / 100) / 10 + "k";
+            return ("" + (x >> 0));
+        }
+
         // motors
         const datas = motors.getAllMotorData();
         for(let i = 0; i < datas.length; ++i) {
             const data = datas[i];
             if (!data.actualSpeed && !data.count) continue;
-            const x = i * 52;
-            print(`${data.actualSpeed}%`, x, brick.LINE_HEIGHT)
-            print(`${data.count}>`, x, 2 * brick.LINE_HEIGHT)
-
-            console.logValue(`speed.` + "ABCD"[i], data.actualSpeed);
-            console.logValue(`angle.` + "ABCD"[i], data.count);
+            const x = i * col;
+            print(`${scale(data.actualSpeed)}%`, x, brick.LINE_HEIGHT)
+            print(`${scale(data.count)}>`, x, 2 * brick.LINE_HEIGHT)
+            print(`${scale(data.tachoCount)}|`, x, 3 * brick.LINE_HEIGHT)
         }
 
         // sensors
         const sis = sensors.internal.getActiveSensors();
         for(let i =0; i < sis.length; ++i) {
             const si = sis[i];
-            const x = (si.port() - 1) * 52;
+            const x = (si.port() - 1) * col;
             const v = si._query();
-            print(`${v}`, x, 9 * brick.LINE_HEIGHT)
-
-            console.logValue(`sensor.` + si.port(), v);
+            print(`${scale(v)}`, x, 9 * brick.LINE_HEIGHT)
         }
     }
 }

libs/core/test.ts

@@ -2,7 +2,7 @@ screen.clear()
 brick.print("PXT!", 10, 30, Draw.Quad)
 
 brick.drawRect(40, 40, 20, 10, Draw.Fill)
-brick.setLight(LightsPattern.Orange)
+brick.setLight(BrickLight.Orange)
 
 brick.heart.doubled().draw(100, 50, Draw.Double | Draw.Transparent)
 
@@ -12,7 +12,7 @@ brick.buttonEnter.onEvent(ButtonEvent.Click, () => {
 
 brick.buttonLeft.onEvent(ButtonEvent.Click, () => {
     brick.drawRect(10, 70, 20, 10, Draw.Fill)
-    brick.setLight(LightsPattern.Red)
+    brick.setLight(BrickLight.Red)
     brick.setFont(brick.microbitFont())
 })
 

libs/ev3/ns.ts

@@ -8,17 +8,22 @@ namespace brick {
 
 //% color="#C8509B" weight=95 icon="\uf10f"
 //% labelLineWidth=0
-//% groups='["Ultrasonic Sensor", "Touch Sensor", "Color Sensor", "Infrared Sensor", "Remote Infrared Beacon", "Gyro Sensor"]'
+//% groups='["Touch Sensor", "Color Sensor", "Ultrasonic Sensor", "Gyro Sensor", "Infrared Sensor", "Remote Infrared Beacon", "Threshold"]'
 //% groupIcons='["\uf101","\uf103","\uf102","","","\uf104"]'
 namespace sensors {
 }
 
 //% color="#A5CA18" weight=90 icon="\uf10d"
-//% groups='["Motion", "Sensors", "Chassis"]'
+//% groups='["Move", "Counters"]'
 //% labelLineWidth=0
 namespace motors {
 }
 
+//% labelLineWidth=0
+namespace chassis {
+
+}
+
 //% labelLineWidth=0
 namespace behaviors {
 }

libs/gyro-sensor/_locales/gyro-sensor-jsdoc-strings.json

@@ -1,4 +1,5 @@
 {
   "sensors.GyroSensor.angle": "Get the current angle from the gyroscope.",
-  "sensors.GyroSensor.rate": "Get the current rotation rate from the gyroscope."
+  "sensors.GyroSensor.rate": "Get the current rotation rate from the gyroscope.",
+  "sensors.GyroSensor.reset": "Forces a calibration of the gyro. Must be called when the sensor is completely still."
 }

libs/gyro-sensor/_locales/gyro-sensor-strings.json

@@ -1,6 +1,7 @@
 {
   "sensors.GyroSensor.angle|block": "%sensor|angle",
-  "sensors.GyroSensor.rate|block": "%sensor|rotation rate",
+  "sensors.GyroSensor.rate|block": "%sensor|rate",
+  "sensors.GyroSensor.reset|block": "%sensor|reset",
   "sensors.gyro1|block": "gyro 1",
   "sensors.gyro2|block": "gyro 2",
   "sensors.gyro3|block": "gyro 3",

libs/gyro-sensor/gyro.ts

@@ -7,8 +7,10 @@ const enum GyroSensorMode {
 namespace sensors {
     //% fixedInstances
     export class GyroSensor extends internal.UartSensor {
+        private calibrating: boolean;
         constructor(port: number) {
             super(port)
+            this.calibrating = false;
         }
 
         _deviceType() {
@@ -29,9 +31,12 @@ namespace sensors {
         //% parts="gyroscope"
         //% blockNamespace=sensors
         //% sensor.fieldEditor="ports"
-        //% weight=65 blockGap=8
+        //% weight=64 blockGap=8
         //% group="Gyro Sensor"
         angle(): number {
+            if (this.calibrating)
+                pauseUntil(() => !this.calibrating, 2000);
+
             this.setMode(GyroSensorMode.Angle)
             return this.getNumber(NumberFormat.Int16LE, 0)
         }
@@ -41,7 +46,7 @@ namespace sensors {
          * @param sensor the gyroscope to query the request
          */
         //% help=input/gyro/rate
-        //% block="%sensor|rotation rate"
+        //% block="%sensor|rate"
         //% blockId=gyroGetRate
         //% parts="gyroscope"
         //% blockNamespace=sensors
@@ -49,17 +54,54 @@ namespace sensors {
         //% weight=65 blockGap=8        
         //% group="Gyro Sensor"
         rate(): number {
+            if (this.calibrating)
+                pauseUntil(() => !this.calibrating, 2000);
+
             this.setMode(GyroSensorMode.Rate)
             return this.getNumber(NumberFormat.Int16LE, 0)
         }
-    }
 
-    //% fixedInstance whenUsed block="gyro 1" jres=icons.port1
-    export const gyro1: GyroSensor = new GyroSensor(1)
+        /**
+         * Forces a calibration of the gyro. Must be called when the sensor is completely still.
+         */
+        //% help=input/gyro/calibrate
+        //% block="%sensor|reset"
+        //% blockId=gyroReset  
+        //% parts="gyroscope"
+        //% blockNamespace=sensors
+        //% sensor.fieldEditor="ports"
+        //% weight=50 blockGap=8        
+        //% group="Gyro Sensor"
+        reset(): void {
+            if (this.calibrating) return; // already in calibration mode
+
+            this.calibrating = true;
+            // may be triggered by a button click, give time to settle
+            loops.pause(500);
+            // send a reset command
+            super.reset();
+            // we need to switch mode twice to perform a calibration
+            if (this.mode == GyroSensorMode.Rate)
+                this.setMode(GyroSensorMode.Angle);
+            else
+                this.setMode(GyroSensorMode.Rate);
+            // switch back and wait
+            if (this.mode == GyroSensorMode.Rate)
+                this.setMode(GyroSensorMode.Angle);
+            else
+                this.setMode(GyroSensorMode.Rate);
+            // give it more time to settle
+            loops.pause(500);
+            this.calibrating = false;            
+        }
+    }
 
     //% fixedInstance whenUsed block="gyro 2" weight=95 jres=icons.port2
     export const gyro2: GyroSensor = new GyroSensor(2)
 
+    //% fixedInstance whenUsed block="gyro 1" jres=icons.port1
+    export const gyro1: GyroSensor = new GyroSensor(1)
+
     //% fixedInstance whenUsed block="gyro 3" jres=icons.port3
     export const gyro3: GyroSensor = new GyroSensor(3)
 

libs/infrared-sensor/_locales/infrared-sensor-jsdoc-strings.json

@@ -4,6 +4,9 @@
   "sensors.InfraredSensor.pauseUntil": "Waits for the event to occur",
   "sensors.InfraredSensor.proximity": "Get the promixity measured by the infrared sensor, from ``0`` (close) to ``100`` (far)",
   "sensors.InfraredSensor.remoteCommand": "Get the remote commandreceived the infrared sensor.",
+  "sensors.InfraredSensor.setThreshold": "Sets a threshold value",
+  "sensors.InfraredSensor.setThreshold|param|condition": "the dark or bright light condition",
+  "sensors.InfraredSensor.setThreshold|param|value": "the value threshold",
   "sensors.RemoteInfraredBeaconButton.isPressed": "Check if a remote button is currently pressed or not.",
   "sensors.RemoteInfraredBeaconButton.onEvent": "Do something when a button or sensor is clicked, up or down",
   "sensors.RemoteInfraredBeaconButton.onEvent|param|body": "code to run when the event is raised",

libs/infrared-sensor/_locales/infrared-sensor-strings.json

@@ -5,6 +5,7 @@
   "sensors.InfraredSensor.pauseUntil|block": "pause until %sensor| %event",
   "sensors.InfraredSensor.proximity|block": "%sensor|proximity",
   "sensors.InfraredSensor.remoteCommand|block": "%sensor|remote command",
+  "sensors.InfraredSensor.setThreshold|block": "set %sensor|%condition|to %value",
   "sensors.RemoteInfraredBeaconButton.isPressed|block": "%button|is pressed",
   "sensors.RemoteInfraredBeaconButton.onEvent|block": "on %button|%event",
   "sensors.RemoteInfraredBeaconButton.wasPressed|block": "%button|was pressed",
@@ -20,5 +21,6 @@
   "sensors|block": "sensors",
   "{id:category}Sensors": "Sensors",
   "{id:group}Infrared Sensor": "Infrared Sensor",
-  "{id:group}Remote Infrared Beacon": "Remote Infrared Beacon"
+  "{id:group}Remote Infrared Beacon": "Remote Infrared Beacon",
+  "{id:group}Threshold": "Threshold"
 }

libs/infrared-sensor/ir.ts

@@ -250,6 +250,22 @@ namespace sensors {
             this._setMode(IrSensorMode.Seek)
             return this.getNumber(NumberFormat.UInt16LE, this.channel * 2)
         }
+
+
+        /**
+         * Sets a threshold value
+         * @param condition the dark or bright light condition
+         * @param value the value threshold
+         */
+        //% blockId=irSetThreshold block="set %sensor|%condition|to %value"
+        //% group="Threshold" blockGap=8
+        //% value.min=0 value.max=100
+        setThreshold(condition: InfraredSensorEvent, value: number) {
+            if (condition == InfraredSensorEvent.ObjectNear)
+                this.proximityThreshold.setLowThreshold(value)
+            else
+                this.proximityThreshold.setHighThreshold(value);
+        }
     }
 
     //% fixedInstance whenUsed block="infrared 1" jres=icons.port1

libs/music/_locales/music-strings.json

@@ -33,34 +33,34 @@
   "music.stopAllSounds|block": "stop all sounds",
   "music.tempo|block": "tempo (bpm)",
   "music|block": "music",
-  "sounds.animalsCatPurr|block": "Animals cat purr",
-  "sounds.animalsDogBark1|block": "Animals dog bark 1",
-  "sounds.animalsDogBark2|block": "Animals dog bark 2",
-  "sounds.animalsDogGrowl|block": "Animals dog growl",
-  "sounds.animalsDogSniff|block": "Animals dog sniff",
-  "sounds.animalsDogWhine|block": "Animals dog whine",
-  "sounds.animalsElephantCall|block": "Animals elephant call",
-  "sounds.animalsInsectBuzz1|block": "Animals insect buzz1",
-  "sounds.animalsInsectBuzz2|block": "Animals insect buzz2",
-  "sounds.animalsInsectChirp|block": "Animals insect chirp",
-  "sounds.animalsSnakeHiss|block": "Animals snake hiss",
-  "sounds.animalsSnakeRattle|block": "Animals snake rattle",
-  "sounds.animalsTRexRoar|block": "Animals trex roar",
-  "sounds.colorsBlack|block": "Colors black",
-  "sounds.colorsBlue|block": "Colors blue",
-  "sounds.colorsBrown|block": "Colors brown",
-  "sounds.colorsGreen|block": "Colors green",
-  "sounds.colorsRed|block": "Colors red",
-  "sounds.colorsWhite|block": "Colors white",
-  "sounds.colorsYellow|block": "Colors yellow",
-  "sounds.communicationBravo|block": "Communication bravo",
-  "sounds.communicationEv3|block": "Communication ev3",
-  "sounds.communicationFantastic|block": "Communication fantastic",
-  "sounds.communicationGameOver|block": "Communication game over",
+  "sounds.animalsCatPurr|block": "animals cat purr",
+  "sounds.animalsDogBark1|block": "animals dog bark 1",
+  "sounds.animalsDogBark2|block": "animals dog bark 2",
+  "sounds.animalsDogGrowl|block": "animals dog growl",
+  "sounds.animalsDogSniff|block": "animals dog sniff",
+  "sounds.animalsDogWhine|block": "animals dog whine",
+  "sounds.animalsElephantCall|block": "animals elephant call",
+  "sounds.animalsInsectBuzz1|block": "animals insect buzz1",
+  "sounds.animalsInsectBuzz2|block": "animals insect buzz2",
+  "sounds.animalsInsectChirp|block": "animals insect chirp",
+  "sounds.animalsSnakeHiss|block": "animals snake hiss",
+  "sounds.animalsSnakeRattle|block": "animals snake rattle",
+  "sounds.animalsTRexRoar|block": "animals trex roar",
+  "sounds.colorsBlack|block": "colors black",
+  "sounds.colorsBlue|block": "colors blue",
+  "sounds.colorsBrown|block": "colors brown",
+  "sounds.colorsGreen|block": "colors green",
+  "sounds.colorsRed|block": "colors red",
+  "sounds.colorsWhite|block": "colors white",
+  "sounds.colorsYellow|block": "colors yellow",
+  "sounds.communicationBravo|block": "communication bravo",
+  "sounds.communicationEv3|block": "communication ev3",
+  "sounds.communicationFantastic|block": "communication fantastic",
+  "sounds.communicationGameOver|block": "communication game over",
   "sounds.communicationGoodJob|block": "communicationGoodJob",
   "sounds.communicationGoodbye|block": "communication goodbye",
   "sounds.communicationGood|block": "communication good",
-  "sounds.communicationGo|block": "Communication go",
+  "sounds.communicationGo|block": "communication go",
   "sounds.communicationHello|block": "communication hello",
   "sounds.communicationHi|block": "communication hi",
   "sounds.communicationLego|block": "communication lego",
@@ -159,7 +159,7 @@
   "sounds.systemOverpower|block": "system overpower",
   "sounds.systemPowerDown|block": "system power down",
   "sounds.systemReady|block": "system ready",
-  "sounds.systemStartUp|block": "S",
+  "sounds.systemStartUp|block": "system start up",
   "{id:category}Music": "Music",
   "{id:category}Sound": "Sound",
   "{id:category}Sounds": "Sounds"

libs/music/sounds.ts

@@ -1,53 +1,53 @@
 namespace sounds {
-    //% fixedInstance jres block="Animals cat purr"
+    //% fixedInstance jres block="animals cat purr"
     export const animalsCatPurr = music.fromWAV(hex``);
-    //% fixedInstance jres block="Animals dog bark 1"
+    //% fixedInstance jres block="animals dog bark 1"
     export const animalsDogBark1 = music.fromWAV(hex``);
-    //% fixedInstance jres block="Animals dog bark 2"
+    //% fixedInstance jres block="animals dog bark 2"
     export const animalsDogBark2 = music.fromWAV(hex``);
-    //% fixedInstance jres block="Animals dog growl"
+    //% fixedInstance jres block="animals dog growl"
     export const animalsDogGrowl = music.fromWAV(hex``);
-    //% fixedInstance jres block="Animals dog sniff"
+    //% fixedInstance jres block="animals dog sniff"
     export const animalsDogSniff = music.fromWAV(hex``);
-    //% fixedInstance jres block="Animals dog whine"
+    //% fixedInstance jres block="animals dog whine"
     export const animalsDogWhine = music.fromWAV(hex``);
-    //% fixedInstance jres block="Animals elephant call"
+    //% fixedInstance jres block="animals elephant call"
     export const animalsElephantCall = music.fromWAV(hex``);
-    //% fixedInstance jres block="Animals insect buzz1"
+    //% fixedInstance jres block="animals insect buzz1"
     export const animalsInsectBuzz1 = music.fromWAV(hex``);
-    //% fixedInstance jres block="Animals insect buzz2"
+    //% fixedInstance jres block="animals insect buzz2"
     export const animalsInsectBuzz2 = music.fromWAV(hex``);
-    //% fixedInstance jres block="Animals insect chirp"
+    //% fixedInstance jres block="animals insect chirp"
     export const animalsInsectChirp = music.fromWAV(hex``);
-    //% fixedInstance jres block="Animals snake hiss"
+    //% fixedInstance jres block="animals snake hiss"
     export const animalsSnakeHiss = music.fromWAV(hex``);
-    //% fixedInstance jres block="Animals snake rattle"
+    //% fixedInstance jres block="animals snake rattle"
     export const animalsSnakeRattle = music.fromWAV(hex``);
-    //% fixedInstance jres block="Animals trex roar"
+    //% fixedInstance jres block="animals trex roar"
     export const animalsTRexRoar = music.fromWAV(hex``);
-    //% fixedInstance jres block="Colors black"
+    //% fixedInstance jres block="colors black"
     export const colorsBlack = music.fromWAV(hex``);
-    //% fixedInstance jres block="Colors blue"
+    //% fixedInstance jres block="colors blue"
     export const colorsBlue = music.fromWAV(hex``);
-    //% fixedInstance jres block="Colors brown"
+    //% fixedInstance jres block="colors brown"
     export const colorsBrown = music.fromWAV(hex``);
-    //% fixedInstance jres block="Colors green"
+    //% fixedInstance jres block="colors green"
     export const colorsGreen = music.fromWAV(hex``);
-    //% fixedInstance jres block="Colors red"
+    //% fixedInstance jres block="colors red"
     export const colorsRed = music.fromWAV(hex``);
-    //% fixedInstance jres block="Colors white"
+    //% fixedInstance jres block="colors white"
     export const colorsWhite = music.fromWAV(hex``);
-    //% fixedInstance jres block="Colors yellow"
+    //% fixedInstance jres block="colors yellow"
     export const colorsYellow = music.fromWAV(hex``);
-    //% fixedInstance jres block="Communication bravo"
+    //% fixedInstance jres block="communication bravo"
     export const communicationBravo = music.fromWAV(hex``);
-    //% fixedInstance jres block="Communication ev3"
+    //% fixedInstance jres block="communication ev3"
     export const communicationEv3 = music.fromWAV(hex``);
-    //% fixedInstance jres block="Communication fantastic"
+    //% fixedInstance jres block="communication fantastic"
     export const communicationFantastic = music.fromWAV(hex``);
-    //% fixedInstance jres block="Communication game over"
+    //% fixedInstance jres block="communication game over"
     export const communicationGameOver = music.fromWAV(hex``);
-    //% fixedInstance jres block="Communication go"
+    //% fixedInstance jres block="communication go"
     export const communicationGo = music.fromWAV(hex``);
     //% fixedInstance jres block="communicationGoodJob"
     export const communicationGoodJob = music.fromWAV(hex``);
@@ -251,7 +251,7 @@ namespace sounds {
     export const systemPowerDown = music.fromWAV(hex``);
     //% fixedInstance jres block="system ready"
     export const systemReady = music.fromWAV(hex``);
-    //% fixedInstance jres block=S
+    //% fixedInstance jres block="system start up"
     export const systemStartUp = music.fromWAV(hex``);
 }
 

libs/touch-sensor/_locales/touch-sensor-strings.json

@@ -6,10 +6,10 @@
   "sensors.TouchSensor.onEvent|block": "on %sensor|%event",
   "sensors.TouchSensor.pauseUntil|block": "pause until %sensor|%event",
   "sensors.TouchSensor.wasPressed|block": "%sensor|was pressed",
-  "sensors.touchSensor1|block": "touch 1",
-  "sensors.touchSensor2|block": "touch 2",
-  "sensors.touchSensor3|block": "touch 3",
-  "sensors.touchSensor4|block": "touch 4",
+  "sensors.touch1|block": "touch 1",
+  "sensors.touch2|block": "touch 2",
+  "sensors.touch3|block": "touch 3",
+  "sensors.touch4|block": "touch 4",
   "{id:category}Sensors": "Sensors",
   "{id:group}Touch Sensor": "Touch Sensor"
 }

libs/touch-sensor/test.ts

@@ -1,8 +1,8 @@
-sensors.touchSensor1.onEvent(TouchSensorEvent.Pressed, function () {
+sensors.touch1.onEvent(TouchSensorEvent.Pressed, function () {
 })
-sensors.touchSensor2.onEvent(TouchSensorEvent.Bumped, function () {
+sensors.touch2.onEvent(TouchSensorEvent.Bumped, function () {
 })
-sensors.touchSensor3.onEvent(TouchSensorEvent.Released, function () {
+sensors.touch3.onEvent(TouchSensorEvent.Released, function () {
 })
-sensors.touchSensor4.isPressed();
-sensors.touchSensor4.wasPressed();
+sensors.touch4.isPressed();
+sensors.touch4.wasPressed();

libs/touch-sensor/touch.ts

@@ -102,11 +102,11 @@ namespace sensors {
     }
 
     //% whenUsed block="touch 1" weight=95 fixedInstance jres=icons.port1
-    export const touchSensor1: TouchSensor = new TouchSensor(1)
+    export const touch1: TouchSensor = new TouchSensor(1)
     //% whenUsed block="touch 2" weight=95 fixedInstance jres=icons.port2
-    export const touchSensor2: TouchSensor = new TouchSensor(2)
+    export const touch2: TouchSensor = new TouchSensor(2)
     //% whenUsed block="touch 3" weight=95 fixedInstance jres=icons.port3
-    export const touchSensor3: TouchSensor = new TouchSensor(3)
+    export const touch3: TouchSensor = new TouchSensor(3)
     //% whenUsed block="touch 4" weight=95 fixedInstance jres=icons.port4
-    export const touchSensor4: TouchSensor = new TouchSensor(4)
+    export const touch4: TouchSensor = new TouchSensor(4)
 }

libs/ultrasonic-sensor/_locales/ultrasonic-sensor-jsdoc-strings.json

@@ -2,5 +2,8 @@
   "sensors.UltraSonicSensor.distance": "Gets the distance from the sonar in centimeters",
   "sensors.UltraSonicSensor.onEvent": "Registers code to run when the given color is close",
   "sensors.UltraSonicSensor.onEvent|param|handler": "the code to run when detected",
-  "sensors.UltraSonicSensor.pauseUntil": "Waits for the event to occur"
+  "sensors.UltraSonicSensor.pauseUntil": "Waits for the event to occur",
+  "sensors.UltraSonicSensor.setThreshold": "Sets a threshold value",
+  "sensors.UltraSonicSensor.setThreshold|param|condition": "the dark or bright light condition",
+  "sensors.UltraSonicSensor.setThreshold|param|value": "the value threshold"
 }

libs/ultrasonic-sensor/_locales/ultrasonic-sensor-strings.json

@@ -5,10 +5,12 @@
   "sensors.UltraSonicSensor.distance|block": "%sensor|distance",
   "sensors.UltraSonicSensor.onEvent|block": "on %sensor|%event",
   "sensors.UltraSonicSensor.pauseUntil|block": "pause until %sensor| %event",
+  "sensors.UltraSonicSensor.setThreshold|block": "set %sensor|%condition|to %value",
   "sensors.ultrasonic1|block": "ultrasonic 1",
   "sensors.ultrasonic2|block": "ultrasonic 2",
   "sensors.ultrasonic3|block": "ultrasonic 3",
   "sensors.ultrasonic4|block": "ultrasonic 4",
   "{id:category}Sensors": "Sensors",
+  "{id:group}Threshold": "Threshold",
   "{id:group}Ultrasonic Sensor": "Ultrasonic Sensor"
 }

libs/ultrasonic-sensor/ultrasonic.ts

@@ -85,7 +85,27 @@ namespace sensors {
             this._setMode(0)
             return this._query();
         }
+
+
+        /**
+         * Sets a threshold value
+         * @param condition the dark or bright light condition
+         * @param value the value threshold
+         */
+        //% blockId=ultrasonicSetThreshold block="set %sensor|%condition|to %value"
+        //% group="Threshold" blockGap=8
+        //% value.min=0 value.max=255
+        setThreshold(condition: UltrasonicSensorEvent, value: number) {            
+            switch(condition) {
+                case UltrasonicSensorEvent.ObjectNear: this.promixityThreshold.setLowThreshold(value); break;
+                case UltrasonicSensorEvent.ObjectFar: this.promixityThreshold.setHighThreshold(value); break;
+                case UltrasonicSensorEvent.ObjectDetected: this.movementThreshold = value; break;
+            }
+        }
     }
+  
+    //% fixedInstance whenUsed block="ultrasonic 4" jres=icons.port4
+    export const ultrasonic4: UltraSonicSensor = new UltraSonicSensor(4)
     
     //% fixedInstance whenUsed block="ultrasonic 1" jres=icons.port1
     export const ultrasonic1: UltraSonicSensor = new UltraSonicSensor(1)
@@ -95,7 +115,4 @@ namespace sensors {
 
     //% fixedInstance whenUsed block="ultrasonic 3" jres=icons.port3
     export const ultrasonic3: UltraSonicSensor = new UltraSonicSensor(3)
-  
-    //% fixedInstance whenUsed block="ultrasonic 4" jres=icons.port4
-    export const ultrasonic4: UltraSonicSensor = new UltraSonicSensor(4)
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-ev3",
-  "version": "0.0.51",
+  "version": "0.0.59",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -399,7 +399,7 @@
       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
       "requires": {
         "bn.js": "4.11.8",
-        "randombytes": "2.0.5"
+        "randombytes": "2.0.6"
       }
     },
     "browserify-sign": {
@@ -792,7 +792,7 @@
         "inherits": "2.0.3",
         "pbkdf2": "3.0.14",
         "public-encrypt": "4.0.0",
-        "randombytes": "2.0.5",
+        "randombytes": "2.0.6",
         "randomfill": "1.0.3"
       }
     },
@@ -956,7 +956,7 @@
       "requires": {
         "bn.js": "4.11.8",
         "miller-rabin": "4.0.1",
-        "randombytes": "2.0.5"
+        "randombytes": "2.0.6"
       }
     },
     "domain-browser": {
@@ -1009,9 +1009,9 @@
       }
     },
     "end-of-stream": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-      "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
       "requires": {
         "once": "1.4.0"
       }
@@ -1562,6 +1562,15 @@
         "verror": "1.10.0"
       }
     },
+    "keytar": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/keytar/-/keytar-3.0.2.tgz",
+      "integrity": "sha1-TcFd01I/4wYx+dOIV4pAFRpgWG8=",
+      "optional": true,
+      "requires": {
+        "nan": "2.3.2"
+      }
+    },
     "kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -1833,9 +1842,9 @@
       "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI="
     },
     "marked": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.9.tgz",
-      "integrity": "sha512-nW5u0dxpXxHfkHzzrveY45gCbi+R4PaO4WRZYqZNl+vB0hVGeqlFn0aOg1c8AKL63TrNFn9Bm2UP4AdiZ9TPLw=="
+      "version": "0.3.12",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.12.tgz",
+      "integrity": "sha512-k4NaW+vS7ytQn6MgJn3fYpQt20/mOgYM5Ft9BYMfQJDz2QT6yEeS9XJ8k2Nw8JTeWK/znPPW2n3UJGzyYEiMoA=="
     },
     "math-expression-evaluator": {
       "version": "1.2.17",
@@ -1966,8 +1975,7 @@
     "nan": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.3.2.tgz",
-      "integrity": "sha1-TU7PF+HaTpie+08nPY0AIBytCH4=",
-      "dev": true
+      "integrity": "sha1-TU7PF+HaTpie+08nPY0AIBytCH4="
     },
     "neatequal": {
       "version": "1.0.0",
@@ -2510,7 +2518,7 @@
         "npmlog": "4.1.2",
         "os-homedir": "1.0.2",
         "pump": "1.0.3",
-        "rc": "1.2.2",
+        "rc": "1.2.3",
         "simple-get": "1.4.3",
         "tar-fs": "1.16.0",
         "tunnel-agent": "0.6.0",
@@ -2558,7 +2566,7 @@
         "browserify-rsa": "4.0.1",
         "create-hash": "1.1.3",
         "parse-asn1": "5.1.0",
-        "randombytes": "2.0.5"
+        "randombytes": "2.0.6"
       }
     },
     "pump": {
@@ -2566,7 +2574,7 @@
       "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz",
       "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==",
       "requires": {
-        "end-of-stream": "1.4.0",
+        "end-of-stream": "1.4.1",
         "once": "1.4.0"
       }
     },
@@ -2576,19 +2584,19 @@
       "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
     },
     "pxt-common-packages": {
-      "version": "0.14.13",
-      "resolved": "https://registry.npmjs.org/pxt-common-packages/-/pxt-common-packages-0.14.13.tgz",
-      "integrity": "sha1-L/axrdv7I1g6xjGC8JXNx/Bv0Ss=",
+      "version": "0.15.4",
+      "resolved": "https://registry.npmjs.org/pxt-common-packages/-/pxt-common-packages-0.15.4.tgz",
+      "integrity": "sha1-hI1q5+UQ7vIuBqlOrIy66PmiePo=",
       "requires": {
         "autoprefixer": "6.7.7",
-        "pxt-core": "3.0.2",
+        "pxt-core": "3.0.8",
         "rtlcss": "2.2.1"
       }
     },
     "pxt-core": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/pxt-core/-/pxt-core-3.0.2.tgz",
-      "integrity": "sha1-q7aCkAXRwvsmhPaeHR1S9osLK98=",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/pxt-core/-/pxt-core-3.0.8.tgz",
+      "integrity": "sha1-wmvgLvyX1lV5ZB6EM9APj22/gIo=",
       "requires": {
         "bluebird": "3.5.1",
         "browserify": "13.3.0",
@@ -2596,15 +2604,16 @@
         "faye-websocket": "0.11.1",
         "fuse.js": "2.6.1",
         "highlight.js": "9.12.0",
+        "keytar": "3.0.2",
         "lzma": "2.3.2",
-        "marked": "0.3.9",
+        "marked": "0.3.12",
         "node-hid": "0.5.7",
-        "postcss": "6.0.15",
+        "postcss": "6.0.16",
         "request": "2.83.0",
         "rimraf": "2.5.4",
         "rtlcss": "2.2.1",
         "serialport": "4.0.7",
-        "uglify-js": "3.3.4"
+        "uglify-js": "3.3.5"
       },
       "dependencies": {
         "ansi-styles": {
@@ -2641,9 +2650,9 @@
           "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE="
         },
         "postcss": {
-          "version": "6.0.15",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",
-          "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==",
+          "version": "6.0.16",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
+          "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==",
           "requires": {
             "chalk": "2.3.0",
             "source-map": "0.6.1",
@@ -2695,9 +2704,9 @@
       "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
     },
     "randombytes": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz",
-      "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
+      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
       "requires": {
         "safe-buffer": "5.1.1"
       }
@@ -2707,14 +2716,14 @@
       "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz",
       "integrity": "sha512-YL6GrhrWoic0Eq8rXVbMptH7dAxCs0J+mh5Y0euNekPPYaxEmdVGim6GdoxoRzKW2yJoU8tueifS7mYxvcFDEQ==",
       "requires": {
-        "randombytes": "2.0.5",
+        "randombytes": "2.0.6",
         "safe-buffer": "5.1.1"
       }
     },
     "rc": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz",
-      "integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.3.tgz",
+      "integrity": "sha1-UVdakA+N1oOBxxC0cSwhVMPiA1s=",
       "optional": true,
       "requires": {
         "deep-extend": "0.4.2",
@@ -4310,7 +4319,7 @@
       "optional": true,
       "requires": {
         "bl": "1.2.1",
-        "end-of-stream": "1.4.0",
+        "end-of-stream": "1.4.1",
         "readable-stream": "2.3.3",
         "xtend": "4.0.1"
       }
@@ -4422,9 +4431,9 @@
       "dev": true
     },
     "uglify-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.4.tgz",
-      "integrity": "sha512-hfIwuAQI5dlXP30UtdmWoYF9k+ypVqBXIdmd6ZKBiaNHHvA8ty7ZloMe3+7S5AEKVkxHbjByl4DfRHQ7QpZquw==",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.5.tgz",
+      "integrity": "sha512-ZebM2kgBL/UI9rKeAbsS2J0UPPv7SBy5hJNZml/YxB1zC6JK8IztcPs+cxilE4pu0li6vadVSFqiO7xFTKuSrg==",
       "requires": {
         "commander": "2.12.2",
         "source-map": "0.6.1"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-ev3",
-  "version": "0.0.52",
+  "version": "0.0.60",
   "description": "LEGO Mindstorms EV3 for Microsoft MakeCode",
   "private": true,
   "keywords": [
@@ -44,8 +44,8 @@
     "webfonts-generator": "^0.4.0"
   },
   "dependencies": {
-    "pxt-common-packages": "0.15.3",
-    "pxt-core": "3.0.5"
+    "pxt-common-packages": "0.15.4",
+    "pxt-core": "3.0.8"
   },
   "scripts": {
     "test": "node node_modules/pxt-core/built/pxt.js travis"

pxtarget.json

@@ -15,6 +15,7 @@
         "libs/ultrasonic-sensor",
         "libs/infrared-sensor",
         "libs/gyro-sensor",
+        "libs/chassis",
         "libs/ev3",
         "libs/tests",
         "libs/behaviors"

sim/dalboard.ts

@@ -3,24 +3,6 @@
 /// <reference path="../built/common-sim.d.ts"/>
 
 namespace pxsim {
-    export enum CPlayPinName {
-        A0,
-        A1,
-        A2,
-        A3,
-        A4,
-        A5,
-        A6,
-        A7,
-        A8,
-        A9,
-        D4,
-        D5,
-        D6,
-        D7,
-        D8,
-        D13
-    }
 
     export class EV3Board extends CoreBoard {
         view: SVGSVGElement;
@@ -36,7 +18,7 @@ namespace pxsim {
         brickNode: BrickNode;
         outputNodes: MotorNode[] = [];
 
-        private motorMap: pxt.Map<number> = {
+        public motorMap: pxt.Map<number> = {
             0x01: 0,
             0x02: 1,
             0x04: 2,
@@ -115,27 +97,40 @@ namespace pxsim {
             return this.brickNode;
         }
 
-        motorUsed(port:number, large: boolean) {
-            for(let i = 0; i < DAL.NUM_OUTPUTS; ++i) {
+        motorUsed(port: number, large: boolean) {
+            for (let i = 0; i < DAL.NUM_OUTPUTS; ++i) {
                 const p = 1 << i;
                 if (port & p) {
                     const motorPort = this.motorMap[p];
                     if (!this.outputNodes[motorPort])
                         this.outputNodes[motorPort] = new MotorNode(motorPort, large);
-                }    
-            }            
+                }
+            }
+        }
+
+        hasMotor(port: number) {
+            for (let i = 0; i < DAL.NUM_OUTPUTS; ++i) {
+                const p = 1 << i;
+                if (port & p) {
+                    const motorPort = this.motorMap[p];
+                    const outputNode = this.outputNodes[motorPort];
+                    if (outputNode)
+                        return true;
+                }
+            }
+            return false;
         }
 
         getMotor(port: number, large?: boolean): MotorNode[] {
             const r = [];
-            for(let i = 0; i < DAL.NUM_OUTPUTS; ++i) {
+            for (let i = 0; i < DAL.NUM_OUTPUTS; ++i) {
                 const p = 1 << i;
                 if (port & p) {
                     const motorPort = this.motorMap[p];
                     const outputNode = this.outputNodes[motorPort];
                     if (outputNode)
                         r.push(outputNode);
-                }    
+                }
             }
             return r;
         }
@@ -144,6 +139,10 @@ namespace pxsim {
             return this.outputNodes;
         }
 
+        hasSensor(port: number) {
+            return !!this.inputNodes[port];
+        }
+
         getSensor(port: number, type: number): SensorNode {
             if (!this.inputNodes[port]) {
                 switch (type) {
@@ -168,6 +167,7 @@ namespace pxsim {
         runtime.postError = (e) => {
             // TODO
             runtime.updateDisplay();
+            console.log('runtime error: ' + e);
         }
     }
 

sim/state/analog.ts

@@ -24,13 +24,14 @@ namespace pxsim {
     }
 
     export class EV3AnalogState {
-
         constructor() {
             let data = new Uint8Array(5172)
             MMapMethods.register("/dev/lms_analog", {
                 data,
                 beforeMemRead: () => {
                     //console.log("analog before read");
+                    util.map16Bit(data, AnalogOff.BatteryTemp, 21);
+                    util.map16Bit(data, AnalogOff.BatteryCurrent, 900);
                     const inputNodes = ev3board().getInputNodes();
                     for (let port = 0; port < DAL.NUM_INPUTS; port++) {
                         const node = inputNodes[port];

sim/state/input.ts

@@ -1,10 +1,17 @@
 
+
+import lf = pxsim.localization.lf;
+
 namespace pxsim.motors {
 
     export function __motorUsed(port: number, large: boolean) {
         //console.log("MOTOR INIT " + port);
-        ev3board().motorUsed(port, large);
-        runtime.queueDisplayUpdate();
+        if (!ev3board().hasMotor(port)) {
+            ev3board().motorUsed(port, large);
+            runtime.queueDisplayUpdate();
+        } else {
+            U.userError(`${lf("Multiple motors are connected to Port")} ${String.fromCharCode('A'.charCodeAt(0) + ev3board().motorMap[port])}`);
+        }
     }
 }
 
@@ -12,7 +19,11 @@ namespace pxsim.sensors {
 
     export function __sensorUsed(port: number, type: number) {
         //console.log("SENSOR INIT " + port + ", type: " + type);
-        const sensor = ev3board().getSensor(port, type);
-        runtime.queueDisplayUpdate();
+        if (!ev3board().hasSensor(port)) {
+            const sensor = ev3board().getSensor(port, type);
+            runtime.queueDisplayUpdate();
+        } else {
+            U.userError(`${lf("Multiple sensors are connected to Port")} ${port + 1}`);
+        }
     }
 }

sim/state/motornode.ts

@@ -15,13 +15,17 @@ namespace pxsim {
         private speedCmdValues: number[];
         private speedCmdTacho: number;
         private speedCmdTime: number;
-        private _synchedMotor: MotorNode; // non-null if master motor
+        private _synchedMotor: MotorNode; // non-null if synchronized
 
         constructor(port: number, large: boolean) {
             super(port);
             this.setLarge(large);
         }
 
+        isReady() {
+            return !this.speedCmd;
+        }
+
         getSpeed() {
             return this.speed * (this.polarity == 0 ? -1 : 1);
         }
@@ -36,6 +40,10 @@ namespace pxsim {
         }
 
         setSpeedCmd(cmd: DAL, values: number[]) {
+            if (this.speedCmd != cmd ||
+                JSON.stringify(this.speedCmdValues) != JSON.stringify(values))
+                this.setChangedState();    
+            // new command TODO: values
             this.speedCmd = cmd;
             this.speedCmdValues = values;
             this.speedCmdTacho = this.angle;
@@ -50,6 +58,7 @@ namespace pxsim {
 
         clearSpeedCmd() {
             delete this.speedCmd;
+            delete this.speedCmdValues;
             delete this._synchedMotor;
         }
 
@@ -88,7 +97,7 @@ namespace pxsim {
         }
 
         updateState(elapsed: number) {
-            console.log(`motor: ${elapsed}ms - ${this.speed}% - ${this.angle}> - ${this.tacho}|`)
+            //console.log(`motor: ${elapsed}ms - ${this.speed}% - ${this.angle}> - ${this.tacho}|`)
             const interval = Math.min(20, elapsed);
             let t = 0;
             while (t < elapsed) {
@@ -135,10 +144,10 @@ namespace pxsim {
                 }
                 case DAL.opOutputStepSync:
                 case DAL.opOutputTimeSync: {
-                    if (!this._synchedMotor) // handled in other motor code
+                    const otherMotor = this._synchedMotor;
+                    if (otherMotor.port < this.port) // handled in other motor code
                         break;
 
-                    const otherMotor = this._synchedMotor;
                     const speed = this.speedCmdValues[0];
                     const turnRatio = this.speedCmdValues[1];
                     const stepsOrTime = this.speedCmdValues[2];
@@ -153,8 +162,21 @@ namespace pxsim {
                         if (brake) this.speed = 0;
                         this.clearSpeedCmd();
                     }
-                    // send synched motor state
-                    otherMotor.speed = Math.floor(this.speed * turnRatio / 100);
+
+                    // turn ratio is a bit weird to interpret
+                    // see https://communities.theiet.org/blogs/698/1706
+                    if (turnRatio < 0) {
+                        otherMotor.speed = speed;
+                        this.speed *= (100 + turnRatio) / 100;
+                    } else {
+                        otherMotor.speed = this.speed * (100 - turnRatio) / 100;
+                    }
+
+                    // clamp
+                    this.speed = Math.max(-100, Math.min(100, this.speed >> 0));
+                    otherMotor.speed = Math.max(-100, Math.min(100, otherMotor.speed >> 0));;
+
+                    // stop other motor if needed
                     if (!this._synchedMotor)
                         otherMotor.clearSpeedCmd();
                     break;
@@ -175,8 +197,15 @@ namespace pxsim {
             // let it coast to speed 0
             if (this.speed && !(this.started || this.speedCmd)) {
                 // decay speed 5% per tick
-                this.speed = Math.round(Math.max(0, Math.abs(this.speed) - 10) * Math.sign(this.speed));
+                this.speed = Math.round(Math.max(0, Math.abs(this.speed) - 10) * sign(this.speed));
             }
         }
     }
+}
+
+namespace pxsim {
+    // A re-implementation of Math.sign (since IE11 doesn't support it)
+    export function sign(num: number) {
+        return num ? num < 0 ? -1 : 1 : 0;
+    }
 }

sim/state/output.ts

@@ -12,10 +12,24 @@ namespace pxsim {
                         data[i] = 0
                 },
                 read: buf => {
-                    let v = "vSIM"
-                    for (let i = 0; i < buf.data.length; ++i)
-                        buf.data[i] = v.charCodeAt(i) || 0
-                    console.log("pwm read");
+                    // console.log("pwm read");
+                    if (buf.data.length == 0) return 2;
+                    const cmd = buf.data[0];
+                    switch (cmd) {
+                        case DAL.opOutputTest:
+                            const port = buf.data[1];
+                            let r = 0;
+                            ev3board().getMotor(port)
+                                .filter(motor => !motor.isReady())
+                                .forEach(motor => r |= (1 << motor.port));
+                            pxsim.BufferMethods.setNumber(buf, BufferMethods.NumberFormat.UInt8LE, 2, r);
+                            break;
+                        default:
+                            let v = "vSIM"
+                            for (let i = 0; i < buf.data.length; ++i)
+                                buf.data[i] = v.charCodeAt(i) || 0
+                            break;
+                    }
                     return buf.data.length
                 },
                 write: buf => {
@@ -70,7 +84,7 @@ namespace pxsim {
                             for (const motor of motors) {
                                 const otherMotor = motors.filter(m => m.port != motor.port)[0];
                                 motor.setSyncCmd(
-                                    motor.port < otherMotor.port ? otherMotor : undefined,
+                                    otherMotor,
                                     cmd, [speed, turnRatio, stepsOrTime, brake]);
                             }
                             return 2;

sim/visuals/board.ts

@@ -50,6 +50,15 @@ namespace pxsim.visuals {
             fill:#5A5A5A;
         }
 
+        .no-drag, .sim-text, .sim-text-pin {
+            user-drag: none;
+            user-select: none;
+            -moz-user-select: none;
+            -webkit-user-drag: none;
+            -webkit-user-select: none;
+            -ms-user-select: none;
+        }
+
         /* Color Grid */
         .sim-color-grid-circle:hover {
             stroke-width: 0.4;

sim/visuals/layoutView.ts

@@ -173,15 +173,15 @@ namespace pxsim.visuals {
             }
 
             // Inject all ports
-            this.setInput(0, new PortView(0, 'A'));
-            this.setInput(1, new PortView(1, 'B'));
-            this.setInput(2, new PortView(2, 'C'));
-            this.setInput(3, new PortView(3, 'D'));
+            this.setInput(0, new PortView(0, '1'));
+            this.setInput(1, new PortView(1, '2'));
+            this.setInput(2, new PortView(2, '3'));
+            this.setInput(3, new PortView(3, '4'));
 
-            this.setOutput(0, new PortView(0, '1'));
-            this.setOutput(1, new PortView(1, '2'));
-            this.setOutput(2, new PortView(2, '3'));
-            this.setOutput(3, new PortView(3, '4'));
+            this.setOutput(0, new PortView(0, 'A'));
+            this.setOutput(1, new PortView(1, 'B'));
+            this.setOutput(2, new PortView(2, 'C'));
+            this.setOutput(3, new PortView(3, 'D'));
 
             return this.contentGroup;
         }

sim/visuals/nodes/largeMotorView.ts

@@ -1,26 +1,51 @@
 /// <reference path="./moduleView.ts" />
+/// <reference path="./motorView.ts" />
 
 namespace pxsim.visuals {
-    export class LargeMotorView extends ModuleView implements LayoutElement {
-
-        private static ROTATING_ECLIPSE_ID = "hole";
+    export class LargeMotorView extends MotorView implements LayoutElement {
 
         constructor(port: number) {
-            super(LARGE_MOTOR_SVG, "large-motor", NodeType.LargeMotor, port);
+            super(LARGE_MOTOR_SVG, "large-motor", NodeType.LargeMotor, port, "hole");
         }
 
+        private syncedMotor: MotorNode;
+        private syncedLabelG: SVGGElement;
+
         updateState() {
             super.updateState();
             const motorState = ev3board().getMotors()[this.port];
             if (!motorState) return;
-            const speed = motorState.getSpeed();
 
-            if (!speed) return;
-            this.setMotorAngle(motorState.getAngle());
+            const syncedMotor = motorState.getSynchedMotor();
+            if ((syncedMotor || this.syncedMotor) && syncedMotor != this.syncedMotor) {
+                this.syncedMotor = syncedMotor;
+                if (this.syncedMotor) {
+                    this.showSyncedLabel(motorState, syncedMotor);
+                } else if (this.syncedLabelG) {
+                    this.syncedLabelG.parentNode.removeChild(this.syncedLabelG);
+                }
+            }
         }
 
-        private setMotorAngle(angle: number) {
-            const holeEl = this.content.getElementById(this.normalizeId(LargeMotorView.ROTATING_ECLIPSE_ID))
+        private showSyncedLabel(motorNode: MotorNode, syncedMotor: MotorNode) {
+            const a = String.fromCharCode('A'.charCodeAt(0) + motorNode.port);
+            const b = String.fromCharCode('A'.charCodeAt(0) + syncedMotor.port);
+
+            this.syncedLabelG = pxsim.svg.child(this.element, 'g', {'transform': 'scale(0.5)'}) as SVGGElement;
+            pxsim.svg.child(this.syncedLabelG, 'rect', {'rx': 15, 'ry': 15, 'x': 0, 'y': 0, 'width': 84, 'height': 34, 'fill': '#A8A9A8'});
+            pxsim.svg.child(this.syncedLabelG, 'circle', {'cx': 17, 'cy': 17, 'r': 15, 'fill': 'white'});
+            const leftLabel = pxsim.svg.child(this.syncedLabelG, 'text', {'transform': 'translate(11, 22)', 'class': 'no-drag', 'style': 'isolation: isolate;font-size: 16px;fill: #A8A9A8;font-family: ArialMT, Arial'});
+            leftLabel.textContent = a;
+
+            pxsim.svg.child(this.syncedLabelG, 'rect', {'rx': 0, 'ry': 0, 'x': 37, 'y': 12, 'width': 10, 'height': 3, 'fill': '#ffffff'});
+            pxsim.svg.child(this.syncedLabelG, 'rect', {'rx': 0, 'ry': 0, 'x': 37, 'y': 18, 'width': 10, 'height': 3, 'fill': '#ffffff'});
+            
+            pxsim.svg.child(this.syncedLabelG, 'circle', {'cx': 67, 'cy': 17, 'r': 15, 'fill': 'white'});
+            const rightLabel = pxsim.svg.child(this.syncedLabelG, 'text', {'transform': 'translate(61, 22)', 'class': 'no-drag', 'style': 'isolation: isolate;font-size: 16px;fill: #A8A9A8;font-family: ArialMT, Arial'});
+            rightLabel.textContent = b;
+        }
+
+        protected renderMotorAngle(holeEl: Element, angle: number) {
             const width = 125.92;
             const height = 37.9;
             const transform = `rotate(${angle} ${width / 2} ${height / 2})`;

sim/visuals/nodes/mediumMotorView.ts

@@ -2,35 +2,17 @@
 
 namespace pxsim.visuals {
 
-    export const MOTOR_ROTATION_FPS = 32;
-
-    export class MediumMotorView extends ModuleView implements LayoutElement {
-
-        private static ROTATING_ECLIPSE_ID = "medmotor_Hole";
-
-        private hasPreviousAngle: boolean;
-        private previousAngle: number;
+    export class MediumMotorView extends MotorView implements LayoutElement {
 
         constructor(port: number) {
-            super(MEDIUM_MOTOR_SVG, "medium-motor", NodeType.MediumMotor, port);
+            super(MEDIUM_MOTOR_SVG, "medium-motor", NodeType.MediumMotor, port, "medmotor_Hole");
         }
 
         public getPaddingRatio() {
             return 1 / 5;
         }
 
-        updateState() {
-            super.updateState();
-            const motorState = ev3board().getMotors()[this.port];
-            if (!motorState) return;
-            const speed = motorState.getSpeed();
-
-            if (!speed) return;
-            this.setMotorAngle(motorState.getAngle());
-        }
-
-        private setMotorAngle(angle: number) {
-            const holeEl = this.content.getElementById(this.normalizeId(MediumMotorView.ROTATING_ECLIPSE_ID))
+        protected renderMotorAngle(holeEl: Element, angle: number) {
             const width = 44.45;
             const height = 44.45;
             const transform = `translate(2 1.84) rotate(${angle} ${width / 2} ${height / 2})`;

sim/visuals/nodes/motorView.ts

@@ -0,0 +1,33 @@
+/// <reference path="./moduleView.ts" />
+
+namespace pxsim.visuals {
+    export abstract class MotorView extends ModuleView implements LayoutElement {
+
+        constructor(xml: string, prefix: string, id: NodeType, port: NodeType,
+            protected rotating_hole_id: string) {
+            super(xml, prefix, id, port);
+        }
+
+        updateState() {
+            super.updateState();
+            const motorState = ev3board().getMotors()[this.port];
+            if (!motorState) return;
+            const speed = motorState.getSpeed();
+
+            if (!speed) return;
+            this.setMotorAngle(motorState.getAngle());
+        }
+
+        private setMotorAngle(angle: number) {
+            const holeEl = this.content.getElementById(this.normalizeId(this.rotating_hole_id))
+            this.renderMotorAngle(holeEl, angle);
+        }
+
+        protected abstract renderMotorAngle(holeEl: Element, angle: number): void;
+
+
+        getWiringRatio() {
+            return 0.37;
+        }
+    }
+}

svgicons/categories/console.svg

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   version="1.1"
+   id="svg41"
+   x="0px"
+   y="0px"
+   viewBox="0 0 23 23"
+   style="enable-background:new 0 0 23 23;"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="console.svg"><metadata
+     id="metadata12"><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>color</dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs10" /><sodipodi:namedview
+     pagecolor="#ffff44"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1090"
+     inkscape:window-height="695"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="10.26087"
+     inkscape:cx="11.5"
+     inkscape:cy="11.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg41" /><style
+     type="text/css"
+     id="style3">
+	.st0{fill:#FFFFFF;}
+</style><title
+     id="title5">color</title><g
+     id="g3830"
+     transform="matrix(0.98283231,0,0,-1.0120366,8.9614614,10.754156)"><path
+       d="m 0,0 -7.762,-3.561 0,2.701 5.142,2.18 -5.142,2.16 0,2.721 L 0,2.62 0,0 Z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="path3832"
+       inkscape:connector-curvature="0" /></g><path
+     d="m 20.692705,17.741823 -11.1512146,0 0,-1.743739 11.1512146,0 0,1.743739 z"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="path3834"
+     inkscape:connector-curvature="0" /></svg>

svgicons/generateIcons.js

@@ -19,6 +19,7 @@ webfontsGenerator({
     "./categories/sensors.svg",
     "./categories/text.svg",
     "./categories/variables.svg",
+    "./categories/console.svg",
     "./categories/advancedcollapsed.svg",
     "./categories/advancedexpanded.svg",
     "./icons/cancel.svg",

targetconfig.json

@@ -8,6 +8,7 @@
         ]
     },
     "galleries": {
-        "Maker Activities": "maker"
+        "Maker Activities": "maker",
+        "Coding Activites": "coding"
     }
 }

tests/touch.ts

@@ -3,5 +3,5 @@ tests.test("Touch sensor pressed", function () {
     brick.print("and click enter", 0, 60)
     brick.buttonEnter.pauseUntil(ButtonEvent.Click)
     brick.clearScreen()
-    tests.assert("Pressed", sensors.touchSensor1.isPressed())
+    tests.assert("Pressed", sensors.touch1.isPressed())
 })