0.1.13

* renaming pauseforcolor to pause until color detected

* pauseForLight -> pauseUntilLightConditionDetected

* on light changed -> on light condition detected

* fixing docs

* docs tweaks

docs/SUMMARY.md

@@ -18,12 +18,9 @@
 
 * [Maker](/maker)
     * [Make a Sound Machine](/maker/sound-machine)
+    * [Make a Security Gadget](/maker/security-gadget)
 
 * [Examples](/examples)
-    * [Make it move](/lessons/make-it-move)
-    * [Line detection](/lessons/line-detection)
-    * [Sound of Color](/maker/sound-of-color)
-    * [Security Gadget](/maker/security-gadget)
     * [Intruder detector](/maker/intruder-detector)
     * [Puppet](/maker/puppet)
     * [Three Point Turn 1](/coding/three-point-turn-1)
@@ -56,6 +53,7 @@
         * [show mood](/reference/brick/show-mood)
         * [show image](/reference/brick/show-image)
         * [clear screen](/reference/brick/clear-screen)
+        * [show ports](/reference/brick/show-ports)
         * [on event](/reference/brick/button/on-event)
         * [is pressed](/reference/brick/button/is-pressed)
         * [was pressed](/reference/brick/button/was-pressed)
@@ -71,7 +69,6 @@
         * [set regulated](/reference/motors/motor/set-regulated)
         * [tank](/reference/motors/synced/tank)
         * [steer](/reference/motors/synced/steer)
-        * [tacho](/reference/motors/motor/tacho)
         * [angle](/reference/motors/motor/angle)
         * [speed](/reference/motors/motor/speed)
         * [clear counts](/reference/motors/motor/clear-counts)
@@ -102,9 +99,9 @@
             * [set remote channel](/reference/sensors/beacon/set-remote-channel)
         * [Color](/reference/sensors/color-sensor)
             * [on color detected](/reference/sensors/color-sensor/on-color-detected)
-            * [pause for color](/reference/sensors/color-sensor/pause-for-color)
-            * [on light changed](/reference/sensors/color-sensor/on-light-changed)
-            * [pause for light](/reference/sensors/color-sensor/pause-for-light)
+            * [pause until color detected](/reference/sensors/color-sensor/pause-until-color-detected)
+            * [on-light-condition-detected](/reference/sensors/color-sensor/on-light-condition-detected)
+            * [pause until light condition detected](/reference/sensors/color-sensor/pause-until-light-condition-detected)
             * [color](/reference/sensors/color-sensor/color)
             * [light](/reference/sensors/color-sensor/ambient-light)
     * [Music](/reference/music)

docs/coding.md

@@ -7,19 +7,19 @@
 [
 {
   "name": "Autonomous Parking",
-  "description": "Design cars that can park by themselves",
+  "description": "Design cars that can park themselves safely without driver intervention.",
   "url":"/coding/autonomous-parking",
   "imageUrl": "/static/lessons/autonomous-parking.png",
   "cardType": "side"
 }, {
   "name": "Object Detection",
-  "description": "Design ways to avoid accidents between vehicles and objects",
+  "description": "Design ways to avoid accidents between vehicles and objects in the road.",
   "url":"/coding/object-detection",
   "imageUrl": "/static/lessons/object-detection.jpg",
   "cardType": "side"
 }, {
   "name": "Line Detection",
-  "description": "Improve driving safety by helping drivers stay on course",
+  "description": "Design ways to improve driving safety by helping to prevent drivers from falling asleep and causing an accident.",
   "url":"/coding/line-detection",
   "imageUrl": "/static/lessons/line-detection.jpg",
   "cardType": "side"

docs/coding/ignition.md

@@ -22,7 +22,7 @@ Play some motor sounds if touch sensor `1` is pressed at the same moment when an
 
 ```blocks
 while (true) {
-    if (sensors.touch1.wasPressed() &&
+    if (sensors.touch1.isPressed() &&
         sensors.ultrasonic4.distance() < 10) {
         music.playSoundEffectUntilDone(sounds.mechanicalMotorStart)
         music.playSoundEffectUntilDone(sounds.mechanicalMotorIdle);
@@ -38,8 +38,8 @@ Play some motor sounds if touch sensor `1` is pressed when both the `enter` butt
 ```blocks
 while (true) {
     if (sensors.ultrasonic4.distance() < 10 &&
-        sensors.touch1.wasPressed() &&
-        brick.buttonEnter.wasPressed()) {
+        sensors.touch1.isPressed() &&
+        brick.buttonEnter.isPressed()) {
         music.playSoundEffectUntilDone(sounds.mechanicalMotorStart)
         music.playSoundEffectUntilDone(sounds.mechanicalMotorIdle);
     }

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

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

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

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

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

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

docs/coding/line-detection.md

@@ -54,7 +54,7 @@ loops.forever(function () {
 	
 })
 motors.largeBC.steer(0, 50)
-sensors.color3.pauseForColor(ColorSensorColor.Red)
+sensors.color3.pauseUntilColorDetected(ColorSensorColor.Red)
 motors.stopAll()
 ```
 
@@ -70,7 +70,7 @@ motors.stopAll()
 ```blocks
 loops.forever(function () {
     motors.largeBC.steer(0, 50)
-    sensors.color3.pauseForColor(ColorSensorColor.Red)
+    sensors.color3.pauseUntilColorDetected(ColorSensorColor.Red)
     motors.stopAll()
 })
 ```
@@ -94,9 +94,9 @@ Now add to your program and have your robot to drive forward again when the ligh
 ```blocks
 loops.forever(function () {
     motors.largeBC.steer(0, 50)
-    sensors.color3.pauseForColor(ColorSensorColor.Red)
+    sensors.color3.pauseUntilColorDetected(ColorSensorColor.Red)
     motors.stopAll()
-    sensors.color3.pauseForColor(ColorSensorColor.Green)
+    sensors.color3.pauseUntilColorDetected(ColorSensorColor.Green)
 })
 ```
 
@@ -134,10 +134,10 @@ music.playSoundEffect(sounds.systemGeneralAlert)
 ```blocks
 loops.forever(function () {
     motors.largeBC.steer(-30, 20)
-    sensors.color3.pauseForColor(ColorSensorColor.Black)
+    sensors.color3.pauseUntilColorDetected(ColorSensorColor.Black)
     music.playSoundEffect(sounds.systemGeneralAlert)
     motors.largeBC.steer(30, 20)
-    sensors.color3.pauseForColor(ColorSensorColor.White)
+    sensors.color3.pauseUntilColorDetected(ColorSensorColor.White)
 })
 ```
 
@@ -185,11 +185,11 @@ if (true) {
 ```blocks
 forever(function () {
     while (true) {
-        sensors.color3.pauseForColor(ColorSensorColor.Black)
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.Black)
         motors.largeBC.steer(-30, 50)
     }
     while (true) {
-        sensors.color3.pauseForColor(ColorSensorColor.White)
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.White)
         motors.largeBC.steer(30, 50)
     }
 })
@@ -204,10 +204,10 @@ Else the Color Sensor detects the color white, start motors ``B`` and ``C`` (dri
 ```blocks
 forever(function () {
     if (true) {
-        sensors.color3.pauseForColor(ColorSensorColor.Black)
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.Black)
         motors.largeBC.steer(-30, 50)
     } else {
-        sensors.color3.pauseForColor(ColorSensorColor.White)
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.White)
         motors.largeBC.steer(30, 50)
     }
 })

docs/coding/traffic-lights-1.md

@@ -3,7 +3,7 @@
 ```blocks
 brick.buttonEnter.onEvent(ButtonEvent.Bumped, function () {
     motors.largeBC.tank(20, 20)
-    sensors.color3.pauseForColor(ColorSensorColor.Red)
+    sensors.color3.pauseUntilColorDetected(ColorSensorColor.Red)
     motors.largeBC.tank(0, 0)
 })
 ```

docs/design-engineering.md

@@ -6,21 +6,21 @@
 [
     {
         "name": "Make It Move Without Wheels",
-        "description": "TBD",
+        "description": "Design, build and program a robot that can move itself using no wheels for locomotion.",
         "imageUrl": "/static/lessons/make-it-move-without-wheels.png",
         "url": "/design-engineering/make-it-move",
         "cardType": "side"
     },
     {
         "name": "Make It Smarter and Faster",
-        "description": "TBD",
+        "description": "Design, build and program a robotic creature that can sense its environment and respond by moving.",
         "imageUrl": "/static/lessons/make-it-smarter-and-faster.png",
         "url": "/design-engineering/make-it-smarter",
         "cardType": "side"
     },
     {
         "name": "Make a System that Communicates",
-        "description": "A robot that tells you what it is doing.",
+        "description": "Design, build and program a robotic system that follows a path and communicates its position at least twice along the way.",
         "imageUrl": "/static/lessons/make-a-system-that-communicates.png",
         "url": "/design-engineering/make-it-communicate",
         "cardType": "side"

docs/examples/line-follower-pid.md

@@ -14,7 +14,7 @@ v = sensors.color3.light(LightIntensityMode.Reflected)
 min = v
 max = v
 setpoint = v
-while (!(brick.buttonEnter.wasPressed())) {
+while (!(brick.buttonEnter.isPressed())) {
     brick.clearScreen()
     brick.showString("Move robot on terrain", 1)
     brick.showString("Press ENTER when done", 2)

docs/examples/print-ports.md

@@ -1,40 +0,0 @@
-
-# Print Ports
-
-```typescript
-/**
- * Print the port states on the screen
- */
-//% blockId=brickPrintPorts block="print ports"
-//% help=brick/print-ports
-//% weight=1 group="Screen"
-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 * 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) * col;
-        const v = si._query();
-        print(`${scale(v)}`, x, 9 * brick.LINE_HEIGHT)
-    }
-}
-```

docs/getting-started/try.md

@@ -135,7 +135,7 @@ Keeping the Large Motor connected to **Port D**, connect the Color Sensor to **P
 
 ```blocks
 brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
-    sensors.color3.pauseForColor(ColorSensorColor.Green)
+    sensors.color3.pauseUntilColorDetected(ColorSensorColor.Green)
     motors.largeD.run(50, 1, MoveUnit.Rotations)
 })
 ```
@@ -143,7 +143,7 @@ brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
 * Using the same program, replace the ``||sensors:pause until touch 1||`` block with a ``||sensors:pause color sensor 3||`` for color block.
 
 ```block
-sensors.color3.pauseForColor(ColorSensorColor.Green)
+sensors.color3.pauseUntilColorDetected(ColorSensorColor.Green)
 ```
 
 * Select the color you want to detect (e.g., green).

docs/index-ref.json

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

docs/lessons/line-detection.md

@@ -60,18 +60,18 @@ while (true) {
 
 ### Step 3
 
-Place a ``||sensors:pause for color||`` from ``||sensors:Sensors||`` inside the ``||loops:while||`` loop block. Change the color to red.
+Place a ``||sensors:pause until color detected||`` from ``||sensors:Sensors||`` inside the ``||loops:while||`` loop block. Change the color to red.
  
 ```blocks
 motors.largeBC.steer(0, 20)
 while (true) {
-    sensors.color3.pauseForColor(ColorSensorColor.Red)
+    sensors.color3.pauseUntilColorDetected(ColorSensorColor.Red)
 }
 ```
 
 ### Step 4
 
-Place a ``||motors:stop all motors||`` block under the ``||sensors:pause for color||`` block.
+Place a ``||motors:stop all motors||`` block under the ``||sensors:pause until color detected||`` block.
 
 Study the program...what do you think the program will do?
 
@@ -80,7 +80,7 @@ Study the program...what do you think the program will do?
 ```blocks
 motors.largeBC.steer(0, 20)
 while (true) {
-    sensors.color3.pauseForColor(ColorSensorColor.Red)
+    sensors.color3.pauseUntilColorDetected(ColorSensorColor.Red)
     motors.stopAll()
 }
 ```
@@ -128,26 +128,26 @@ while (true) {
 
 ### Step 5
 
-Place a ``||sensors:pause for color||`` block from ``||sensors:Sensors||`` inside the ``||loops:while||`` loop block. Change the color to red.
+Place a ``||sensors:pause until color detected||`` block from ``||sensors:Sensors||`` inside the ``||loops:while||`` loop block. Change the color to red.
 
 ```blocks
 while (true) {
     motors.largeBC.steer(0, 20)
     while (true) {
-        sensors.color3.pauseForColor(ColorSensorColor.Red)
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.Red)
     }
 }
 ```
 
 ### Step 6
 
-Place a ``||motors:stop all motors||`` block under the ``||sensors:pause for color||`` block.  
+Place a ``||motors:stop all motors||`` block under the ``||sensors:pause until color detected||`` block.  
 
 ```blocks
 while (true) {
     motors.largeBC.steer(0, 20)
     while (true) {
-        sensors.color3.pauseForColor(ColorSensorColor.Red)
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.Red)
         motors.stopAll()
     }
 }
@@ -161,7 +161,7 @@ Place a ``||loops:while||`` loop block under the second ``||loops:while||`` loop
 while (true) {
     motors.largeBC.steer(0, 20)
     while (true) {
-        sensors.color3.pauseForColor(ColorSensorColor.Red)
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.Red)
         motors.stopAll()
     }
     while (true) {
@@ -172,7 +172,7 @@ while (true) {
 
 ### Step 8
 
-Place a ``||sensors:pause for color||`` block inside the new ``||loops:while||`` loop block. Change the color to red.
+Place a ``||sensors:pause unril color detected||`` block inside the new ``||loops:while||`` loop block. Change the color to red.
 
 What do you think the program will do?
 
@@ -182,11 +182,11 @@ What do you think the program will do?
 while (true) {
     motors.largeBC.steer(0, 20)
     while (true) {
-        sensors.color3.pauseForColor(ColorSensorColor.Red)
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.Red)
         motors.stopAll()
     }
     while (true) {
-        sensors.color3.pauseForColor(ColorSensorColor.Red)
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.Red)
     }
 }
 ```
@@ -208,16 +208,17 @@ Think about what you have learned, then document it. Describe your pseudocode fo
 ```blocks
 motors.largeBC.steer(0, 20)
 while (true) {
-sensors.color3.pauseForColor(ColorSensorColor.Yellow)
+sensors.color3.pauseUntilColorDetected(ColorSensorColor.Yellow)
 music.playSoundEffect(sounds.systemGeneralAlert)
 }
 while (true) {
-    while (true) {      sensors.color3.pauseForLight(LightIntensityMode.Reflected, LightCondition.Bright)
+    while (true) {      
+        sensors.color3.pauseUntilLightConditionDetected(LightIntensityMode.Reflected, LightCondition.Bright)
         motors.largeB.run(10)
         motors.largeC.run(-10)
     }
     while (true) {
-        sensors.color3.pauseForLight(LightIntensityMode.Reflected, LightCondition.Bright)
+        sensors.color3.pauseUntilLightConditionDetected(LightIntensityMode.Reflected, LightCondition.Bright)
         motors.largeA.run(-10)
         motors.largeA.run(10)
     }
@@ -234,12 +235,13 @@ You will need to constantly debug your program in order to make your robot trave
 
 ```blocks
 while (true) {
-    while (true) {   sensors.color3.pauseForLight(LightIntensityMode.Reflected, LightCondition.Bright)
+    while (true) {   
+        sensors.color3.pauseUntilLightDetected(LightIntensityMode.Reflected, LightCondition.Bright)
         motors.largeB.run(10)
         motors.largeC.run(-10)
     }
     while (true) {
-        sensors.color3.pauseForLight(LightIntensityMode.Reflected, LightCondition.Bright)
+        sensors.color3.pauseUntilLightDetected(LightIntensityMode.Reflected, LightCondition.Bright)
         motors.largeB.run(-10)
         motors.largeC.run(10)
     }

docs/lessons/make-a-security-gadget.md

@@ -1,139 +0,0 @@
-
-# Make a Security Gadget
-
-Invent a Security Gadget that will protect your belongings by warning you!
-
-![Maker – Make a Security Gadget Main Image](/static/lessons/make-a-security-gadget/lego-maker-security-detect.jpg)
-
-## Connect 
-
-Over time, people have come up with many different ways to help protect their personal belongings from theft. These inventions include simple alarm systems and even traps! 
-
-![Make a Security Gadget 3 Stock Footage Images](/static/lessons/make-a-security-gadget/three-stock.jpg)
-
-Look at the photos and think about:
-
-* What do you see?
-* Can you see any new design opportunities?
-* What problems can you see?
-* How could you make use of the LEGO bricks, the EV3 Programmable Brick, motors, and sensors?
-
-### Things You’ll Need
-
-* [LEGO MINDSTORMS Education EV3 Core Set](https://education.lego.com/enus/products/legomindstormseducationev3coreset/5003400)
-
-Additional materials to add to your Security Gadget:
-
-* String
-* Arts and crafts materials such as:
->* Cardboard
->* Construction paper
->* Pipe cleaners
->* Plastic or paper cups 
->* Recycled materials
->* Rubber bands
->* Wire
-
-### Prior Knowledge
-
-This activity uses sensor inputs. You may want to try the [Use](/getting-started/use) or [Object Detection](/coding/object-detection) activity before this one. Or, you can start out with this activity and tinker with coding sensor inputs on your own.
-
-## Contemplate
-
-Follow the steps of the [Maker Design Process](/lessons/classroom-management#design-process) for this lesson:
-
-![LEGO Education Maker Design Process](/static/lessons/common/lego-maker-design-process.jpg)
-
-### Defining the Problem
-
-1. What problems did you imagine? 
-2. Pick one problem and explain it to a partner.
-
-### Brainstorm
-
-Now that you have defined a problem, start to generate ideas for solving it. 
-
-### ~hint
-
-Some things to do while brainstorming:
-
-* Use the bricks from the LEGO set to help you brainstorm or sketch your ideas on paper.
-* The goal of brainstorming is to explore as many solutions as possible. You can use the tinkering examples in the Sample Solutions section below as inspiration for getting started.
-* Share your ideas and get some feedback. It may lead to more ideas!
-
-### ~ 
-
-### Define the Design Criteria
-
-1. You should have generated a number of ideas. Now select the best one to make. 
-2. Write out two or three specific design criteria your design must meet.
-
-### Go Make
-
-It is time to start making!
-
-* Use the components from the LEGO® MINDSTORMS EV3 Core Set and additional materials to make your chosen solution. 
-* Test and analyze your design as you go and record any improvements that you make. 
-
-### Review and Revise Your Solution
-
-* Have you managed to solve the problem that you defined? 
-* Look back at your design criteria. How well does your solution work? 
-* How can you improve your design?
-
-### Communicate Your Solution
-
-Now that you have finished you can:
-
-* Make a sketch or take a photo or video of your model.
-* Label the three most important parts and explain how they work.
-* Share your work with others.
-
-## Continue
-
-### Phone Protector - Sample Solution
-
-This example program combined with the small model will sound an alarm if someone picks it up. The program activates an alarm when an object is lifted from the Touch Sensor.
-
-![Security Gadget Tinkering Example #1 – Phone Stand](/static/lessons/make-a-security-gadget/lego-maker-security-gadget.jpg)
-
-#### Programming
-
-1. Drag a ``||sensors:pause until touch||`` block and place it inside the ``||loops:forever||`` loop.
-2. Drag a ``||music:play sound effect||`` block and place it below the ``||sensors:pause until||`` block.
-3. Change the sound effect to ``mechanical horn1``.
-
-```blocks
-forever(function () {
-    sensors.touch1.pauseUntil(ButtonEvent.Pressed)
-    music.playSoundEffect(sounds.mechanicalHorn1)
-})
-```
-
-Click **Download** and follow the instructions to get your code onto your EV3 Brick. Press the ``center`` button on the EV3 Brick to run the program.
-
-### Object Detection - Sample Solution
-
-This example program combined with the small model will sound an alarm if someone (or something) crosses its path! The program activates an alarm when an object moves in front of the Ultrasonic Sensor.
-
-![Security Gadget Tinkering Example #1 – Mouse detector](/static/lessons/make-a-security-gadget/lego-maker-security-detect.jpg)
-
-#### Programming
-
-1. Drag a ``||sensors:pause until ultrasonic||`` block and place it inside the ``||loops:forever||`` loop.
-2. Drag a ``||music:play sound effect||`` block and place it below the ``||sensors:pause until||`` block.
-3. Change the sound effect to ``mechanical horn1``.
-
-```blocks
-forever(function () {
-    sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectDetected)
-    music.playSoundEffect(sounds.mechanicalHorn1)
-})
-```
-
-Click **Download** and follow the instructions to get your code onto your EV3 Brick. Press the ``center`` button on the EV3 Brick to run the program.
-
-### Well done!
-
-Click [here](/examples) to try out some more projects!
-

docs/lessons/make-a-sound-machine.md

@@ -1,164 +0,0 @@
-# Make a Sound Machine
-
-Make a Sound Machine that can play a rhythm, music or just noise!
-
-![Maker – Make a Sound Machine Main Image](/static/lessons/make-a-sound-machine/lego-maker-sound-machine-1.jpg)
-
-## Connect 
-
-Music is made up of a combination of sounds, notes and rhythm. A rhythm is a regular movement or repeated pattern of movements that can be used in many different ways. In mechanical machines, a rhythm can help keep a machine running smoothly. It can also be used to generate different sounds in music. 
-
-![Sound Machine 3 Stock Footage Images](/static/lessons/make-a-sound-machine/three-stock.jpg)
-
-Look at the photos and think about:
-
-* What do you see?
-* Can you see any new design opportunities?
-* What problems can you see?
-* How could you make use of the LEGO bricks, the EV3 Programmable Brick, motors, and sensors?
-
-### Things You’ll Need
-
-* [LEGO MINDSTORMS Education EV3 Core Set](https://education.lego.com/enus/products/legomindstormseducationev3coreset/5003400)
-
-Additional materials to add to your Sound Machine:
-
-* Small musical instruments, such as chimes, bells, and small drums
-* Arts and crafts materials such as:
->* Cardboard
->* Construction paper
->* Pipe cleaners
->* Plastic or paper cups 
->* Recycled materials
->* Rubber bands
->* Wire
-
-### Prior Knowledge
-
-This activity uses motor rotations and sensor inputs. You may want to try the [Use](/getting-started/use) or [Object Detection](/coding/object-detection) activity before this one. Or, you can start out with this activity and tinker with coding motor and sensor inputs on your own.
-
-## Contemplate
-
-Follow the steps of the [Maker Design Process](/lessons/classroom-management#design-process) for this lesson:
-
-![LEGO Education Maker Design Process](/static/lessons/common/lego-maker-design-process.jpg)
-
-### Defining the Problem
-
-1. What problems did you imagine? 
-2. Pick one problem and explain it to a partner.
-
-### Brainstorm
-
-Now that you have defined a problem, start to generate ideas for solving it. 
-
-### ~hint
-
-Some things to do while brainstorming:
-
-* Use the bricks from the LEGO set to help you brainstorm or sketch your ideas on paper.
-* The goal of brainstorming is to explore as many solutions as possible. You can use the tinkering examples in the Sample Solutions section below as inspiration for getting started.
-* Share your ideas and get some feedback. It may lead to more ideas!
-
-### ~
-
-### Define the Design Criteria
-
-* You should have generated a number of ideas. Now select the best one to make. 
-* Write out two or three specific design criteria your design must meet.
-
-### Go Make
-
-It is time to start making!
-
-* Use the components from the LEGO® MINDSTORMS EV3 Core Set and additional materials to make your chosen solution. 
-* Test and analyze your design as you go and record any improvements that you make. 
-
-### Review and Revise Your Solution
-
-* Have you managed to solve the problem that you defined? 
-* Look back at your design criteria. How well does your solution work? 
-* How can you improve your design?
-
-### Communicate Your Solution
-
-Now that you have finished you can:
-* Make a sketch or take a photo or video of your model.
-* Label the three most important parts and explain how they work.
-* Share your work with others.
-
-## Continue
-
-### Rhythm Maker - Sample Solution
-
-This example program combined with the small model will make a beat and rhythm on any surface when the program is run.
-
-![Sound Machine Tinkering Example](/static/lessons/make-a-sound-machine/lego-maker-sound-machine.jpg)
-
-#### Programming
-
-1. Drag a run ``||motors:large motor A||`` block inside the ``||loops:forever||`` loop.
-2. Press the **(+)**.
-3. Change the rotations to `2`.
-4. Drag a ``||loops:pause||`` block and place it under the motor block.
-5. Change the duration to ``200`` ms.
-6. Drag a ``||run large motor A||`` block inside the ``||loops:forever||`` loop.
-7. Press the **(+)**.
-8. Change the power to `100`.
-9. Change the rotations to `1`.
-
-```blocks
-forever(function () {
-    motors.largeA.run(50, 2, MoveUnit.Rotations)
-    pause(200)
-    motors.largeA.run(100, 1, MoveUnit.Rotations)
-})
-```
-
-Click **Download** and follow the instructions to get your code onto your EV3 Brick. Press the ``center`` button on the EV3 Brick to run the program.
-
-### Color Sensor Sounds - Sample Solution
-
-You can also tinker with the use of sensors.
-
-![Sound Machine Color Sensor](/static/lessons/make-a-sound-machine/lego-maker-sound-machine-color-sensor.jpg)
-
-#### Programming
-
-1. Drag an ``||logic:if else||`` Logic block and place it inside the ``||loops:forever||`` loop.
-2. Drag a ``||sensors:pause color sensor||`` block and place it inside the ``||logic:if true then||`` block.
-3. Change the color to ``blue``.
-4. Drag a ``||music:play tone||`` block and place under the sensor block.
-5. Change the tone to ``Middle G`` (392 Hz).
-6. Drag a ``||sensors:pause color sensor||`` block and place it inside the ``||logic:else||`` block.
-7. Change the color to ``red``.
-8. Drag a ``||music:play tone||`` block and place under the new sensor block.
-9. Change the tone to ``High C`` (523 Hz).
-10. Press the **(+)**.
-11. Drag a ``||sensors:pause color sensor||`` block and place it inside the ``||logic:else if||`` block.
-12. Change the color to ``green``.
-13. Drag a ``||music:play tone||`` block and place under the new sensor block.
-14. Change the tone to ``High D`` (587 Hz).
-
-```blocks
-forever(function () {
-    if (true) {
-        sensors.color3.pauseForColor(ColorSensorColor.Blue)
-        music.playTone(392, music.beat(BeatFraction.Whole))
-    } else if (false) {
-        sensors.color3.pauseForColor(ColorSensorColor.Red)
-        music.playTone(523, music.beat(BeatFraction.Half))
-    } else {
-        sensors.color3.pauseForColor(ColorSensorColor.Green)
-        music.playTone(587, music.beat(BeatFraction.Half))
-    }
-})
-```
-
-Click **Download** and follow the instructions to get your code onto your EV3 Brick. Press the ``center`` button on the EV3 Brick to run the program.
-
-### Well done!
-
-Click [here](/examples) to try out some more projects!
-
-

docs/maker.md

@@ -1,8 +1,8 @@
 # Maker Activites
 
-These six activities require the LEGO® MINDSTORMS® Education EV3 Core Set (45544). Supporting materials for teachers and middle school students are provided, offering everything teachers and students need to explore their inner makers as they follow the design process to solve open-ended, themed challenges...
+These six activities require the [LEGO® MINDSTORMS® Education EV3 Core Set (45544)](https://education.lego.com/en-us/products/lego-mindstorms-education-ev3-core-set-/5003400). Supporting materials for teachers and middle school students are provided, offering everything teachers and students need to explore their inner makers as they follow the design process to solve open-ended, themed challenges...
 
-* [Download Curriculum Materials](https://education.lego.com/en-us/downloads/mindstorms-ev3)
+* [Download Curriculum Materials](https://education.lego.com/en-us/downloads/mindstorms-ev3/curriculum)
 
 ## Activites
 
@@ -10,7 +10,7 @@ These six activities require the LEGO® MINDSTORMS® Education EV3 Core Set (455
 [
 {
   "name": "Make A Sound Machine",
-  "description": "Create instruments with your EV3 Brick!",
+  "description": "Make a Sound Machine that can play a rhythm, music or just noise!",
   "url":"/maker/sound-machine",
   "cardType": "example",
   "imageUrl": "/static/lessons/make-a-sound-machine.png",
@@ -18,7 +18,7 @@ These six activities require the LEGO® MINDSTORMS® Education EV3 Core Set (455
 },
 {
   "name": "Make A Security Gadget",
-  "description": "TBD",
+  "description": "Invent a Security Gadget that will protect your belongings by warning you!",
   "url":"/maker/security-gadget",
   "cardType": "example",
   "imageUrl": "/static/lessons/make-a-security-device.png",

docs/maker/security-gadget.md

@@ -1,9 +1,139 @@
-# Security Gadget
 
-This program will activate an alarm when an object is lifted from the Touch Sensor.
+# Make a Security Gadget
+
+Invent a Security Gadget that will protect your belongings by warning you!
+
+![Maker – Make a Security Gadget Main Image](/static/lessons/make-a-security-gadget/lego-maker-security-detect.jpg)
+
+## Connect 
+
+Over time, people have come up with many different ways to help protect their personal belongings from theft. These inventions include simple alarm systems and even traps! 
+
+![Make a Security Gadget 3 Stock Footage Images](/static/lessons/make-a-security-gadget/three-stock.jpg)
+
+Look at the photos and think about:
+
+* What do you see?
+* Can you see any new design opportunities?
+* What problems can you see?
+* How could you make use of the LEGO bricks, the EV3 Programmable Brick, motors, and sensors?
+
+### Things You’ll Need
+
+* [LEGO MINDSTORMS Education EV3 Core Set](https://education.lego.com/enus/products/legomindstormseducationev3coreset/5003400)
+
+Additional materials to add to your Security Gadget:
+
+* String
+* Arts and crafts materials such as:
+>* Cardboard
+>* Construction paper
+>* Pipe cleaners
+>* Plastic or paper cups 
+>* Recycled materials
+>* Rubber bands
+>* Wire
+
+### Prior Knowledge
+
+This activity uses sensor inputs. You may want to try the [Use](/getting-started/use) or [Object Detection](/coding/object-detection) activity before this one. Or, you can start out with this activity and tinker with coding sensor inputs on your own.
+
+## Contemplate
+
+Follow the steps of the [Maker Design Process](/lessons/classroom-management#design-process) for this lesson:
+
+![LEGO Education Maker Design Process](/static/lessons/common/lego-maker-design-process.jpg)
+
+### Defining the Problem
+
+1. What problems did you imagine? 
+2. Pick one problem and explain it to a partner.
+
+### Brainstorm
+
+Now that you have defined a problem, start to generate ideas for solving it. 
+
+### ~hint
+
+Some things to do while brainstorming:
+
+* Use the bricks from the LEGO set to help you brainstorm or sketch your ideas on paper.
+* The goal of brainstorming is to explore as many solutions as possible. You can use the tinkering examples in the Sample Solutions section below as inspiration for getting started.
+* Share your ideas and get some feedback. It may lead to more ideas!
+
+### ~ 
+
+### Define the Design Criteria
+
+1. You should have generated a number of ideas. Now select the best one to make. 
+2. Write out two or three specific design criteria your design must meet.
+
+### Go Make
+
+It is time to start making!
+
+* Use the components from the LEGO® MINDSTORMS EV3 Core Set and additional materials to make your chosen solution. 
+* Test and analyze your design as you go and record any improvements that you make. 
+
+### Review and Revise Your Solution
+
+* Have you managed to solve the problem that you defined? 
+* Look back at your design criteria. How well does your solution work? 
+* How can you improve your design?
+
+### Communicate Your Solution
+
+Now that you have finished you can:
+
+* Make a sketch or take a photo or video of your model.
+* Label the three most important parts and explain how they work.
+* Share your work with others.
+
+## Continue
+
+### Phone Protector - Sample Solution
+
+This example program combined with the small model will sound an alarm if someone picks it up. The program activates an alarm when an object is lifted from the Touch Sensor.
+
+![Security Gadget Tinkering Example #1 – Phone Stand](/static/lessons/make-a-security-gadget/lego-maker-security-gadget.jpg)
+
+#### Programming
+
+1. Drag a ``||sensors:pause until touch||`` block and place it inside the ``||loops:forever||`` loop.
+2. Drag a ``||music:play sound effect||`` block and place it below the ``||sensors:pause until||`` block.
+3. Change the sound effect to ``mechanical horn1``.
 
 ```blocks
-sensors.touch1.onEvent(ButtonEvent.Released, function () {
-    music.playSoundEffectUntilDone(sounds.informationActivate);
+forever(function () {
+    sensors.touch1.pauseUntil(ButtonEvent.Pressed)
+    music.playSoundEffect(sounds.mechanicalHorn1)
 })
-```
+```
+
+Click **Download** and follow the instructions to get your code onto your EV3 Brick. Press the ``center`` button on the EV3 Brick to run the program.
+
+### Object Detection - Sample Solution
+
+This example program combined with the small model will sound an alarm if someone (or something) crosses its path! The program activates an alarm when an object moves in front of the Ultrasonic Sensor.
+
+![Security Gadget Tinkering Example #1 – Mouse detector](/static/lessons/make-a-security-gadget/lego-maker-security-detect.jpg)
+
+#### Programming
+
+1. Drag a ``||sensors:pause until ultrasonic||`` block and place it inside the ``||loops:forever||`` loop.
+2. Drag a ``||music:play sound effect||`` block and place it below the ``||sensors:pause until||`` block.
+3. Change the sound effect to ``mechanical horn1``.
+
+```blocks
+forever(function () {
+    sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectDetected)
+    music.playSoundEffect(sounds.mechanicalHorn1)
+})
+```
+
+Click **Download** and follow the instructions to get your code onto your EV3 Brick. Press the ``center`` button on the EV3 Brick to run the program.
+
+### Well done!
+
+Click [here](/examples) to try out some more projects!
+

docs/maker/sound-machine.md

@@ -1,12 +1,164 @@
-# Sound Machine
+# Make a Sound Machine
+
+Make a Sound Machine that can play a rhythm, music or just noise!
+
+![Maker – Make a Sound Machine Main Image](/static/lessons/make-a-sound-machine/lego-maker-sound-machine-1.jpg)
+
+## Connect 
+
+Music is made up of a combination of sounds, notes and rhythm. A rhythm is a regular movement or repeated pattern of movements that can be used in many different ways. In mechanical machines, a rhythm can help keep a machine running smoothly. It can also be used to generate different sounds in music. 
+
+![Sound Machine 3 Stock Footage Images](/static/lessons/make-a-sound-machine/three-stock.jpg)
+
+Look at the photos and think about:
+
+* What do you see?
+* Can you see any new design opportunities?
+* What problems can you see?
+* How could you make use of the LEGO bricks, the EV3 Programmable Brick, motors, and sensors?
+
+### Things You’ll Need
+
+* [LEGO MINDSTORMS Education EV3 Core Set](https://education.lego.com/enus/products/legomindstormseducationev3coreset/5003400)
+
+Additional materials to add to your Sound Machine:
+
+* Small musical instruments, such as chimes, bells, and small drums
+* Arts and crafts materials such as:
+>* Cardboard
+>* Construction paper
+>* Pipe cleaners
+>* Plastic or paper cups 
+>* Recycled materials
+>* Rubber bands
+>* Wire
+
+### Prior Knowledge
+
+This activity uses motor rotations and sensor inputs. You may want to try the [Use](/getting-started/use) or [Object Detection](/coding/object-detection) activity before this one. Or, you can start out with this activity and tinker with coding motor and sensor inputs on your own.
+
+## Contemplate
+
+Follow the steps of the [Maker Design Process](/lessons/classroom-management#design-process) for this lesson:
+
+![LEGO Education Maker Design Process](/static/lessons/common/lego-maker-design-process.jpg)
+
+### Defining the Problem
+
+1. What problems did you imagine? 
+2. Pick one problem and explain it to a partner.
+
+### Brainstorm
+
+Now that you have defined a problem, start to generate ideas for solving it. 
+
+### ~hint
+
+Some things to do while brainstorming:
+
+* Use the bricks from the LEGO set to help you brainstorm or sketch your ideas on paper.
+* The goal of brainstorming is to explore as many solutions as possible. You can use the tinkering examples in the Sample Solutions section below as inspiration for getting started.
+* Share your ideas and get some feedback. It may lead to more ideas!
+
+### ~
+
+### Define the Design Criteria
+
+* You should have generated a number of ideas. Now select the best one to make. 
+* Write out two or three specific design criteria your design must meet.
+
+### Go Make
+
+It is time to start making!
+
+* Use the components from the LEGO® MINDSTORMS EV3 Core Set and additional materials to make your chosen solution. 
+* Test and analyze your design as you go and record any improvements that you make. 
+
+### Review and Revise Your Solution
+
+* Have you managed to solve the problem that you defined? 
+* Look back at your design criteria. How well does your solution work? 
+* How can you improve your design?
+
+### Communicate Your Solution
+
+Now that you have finished you can:
+* Make a sketch or take a photo or video of your model.
+* Label the three most important parts and explain how they work.
+* Share your work with others.
+
+## Continue
+
+### Rhythm Maker - Sample Solution
 
 This example program combined with the small model will make a beat and rhythm on any surface when the program is run.
 
+![Sound Machine Tinkering Example](/static/lessons/make-a-sound-machine/lego-maker-sound-machine.jpg)
+
+#### Programming
+
+1. Drag a run ``||motors:large motor A||`` block inside the ``||loops:forever||`` loop.
+2. Press the **(+)**.
+3. Change the rotations to `2`.
+4. Drag a ``||loops:pause||`` block and place it under the motor block.
+5. Change the duration to ``200`` ms.
+6. Drag a ``||run large motor A||`` block inside the ``||loops:forever||`` loop.
+7. Press the **(+)**.
+8. Change the power to `100`.
+9. Change the rotations to `1`.
+
 ```blocks
 forever(function () {
-    motors.largeA.run(50)
-    pause(200)
-    motors.largeA.run(100)
+    motors.largeA.run(50, 2, MoveUnit.Rotations)
     pause(200)
+    motors.largeA.run(100, 1, MoveUnit.Rotations)
 })
-``` 
+```
+
+Click **Download** and follow the instructions to get your code onto your EV3 Brick. Press the ``center`` button on the EV3 Brick to run the program.
+
+### Color Sensor Sounds - Sample Solution
+
+You can also tinker with the use of sensors.
+
+![Sound Machine Color Sensor](/static/lessons/make-a-sound-machine/lego-maker-sound-machine-color-sensor.jpg)
+
+#### Programming
+
+1. Drag an ``||logic:if else||`` Logic block and place it inside the ``||loops:forever||`` loop.
+2. Drag a ``||sensors:pause color sensor||`` block and place it inside the ``||logic:if true then||`` block.
+3. Change the color to ``blue``.
+4. Drag a ``||music:play tone||`` block and place under the sensor block.
+5. Change the tone to ``Middle G`` (392 Hz).
+6. Drag a ``||sensors:pause color sensor||`` block and place it inside the ``||logic:else||`` block.
+7. Change the color to ``red``.
+8. Drag a ``||music:play tone||`` block and place under the new sensor block.
+9. Change the tone to ``High C`` (523 Hz).
+10. Press the **(+)**.
+11. Drag a ``||sensors:pause color sensor||`` block and place it inside the ``||logic:else if||`` block.
+12. Change the color to ``green``.
+13. Drag a ``||music:play tone||`` block and place under the new sensor block.
+14. Change the tone to ``High D`` (587 Hz).
+
+```blocks
+forever(function () {
+    if (true) {
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.Blue)
+        music.playTone(392, music.beat(BeatFraction.Whole))
+    } else if (false) {
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.Red)
+        music.playTone(523, music.beat(BeatFraction.Half))
+    } else {
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.Green)
+        music.playTone(587, music.beat(BeatFraction.Half))
+    }
+})
+```
+
+Click **Download** and follow the instructions to get your code onto your EV3 Brick. Press the ``center`` button on the EV3 Brick to run the program.
+
+### Well done!
+
+Click [here](/examples) to try out some more projects!
+
+

docs/reference/brick.md

@@ -9,6 +9,7 @@ brick.showString("Hello world!", 1);
 brick.showNumber(0, 1);
 brick.showValue("item", 0, 1);
 brick.clearScreen();
+brick.showPorts();
 ```
 
 ## Buttons
@@ -19,8 +20,8 @@ brick.buttonEnter.onEvent(ButtonEvent.Bumped, function () {
 });
 brick.buttonEnter.pauseUntil(ButtonEvent.Bumped);
 brick.buttonEnter.isPressed()
-brick.buttonEnter.wasPressed()
 brick.setStatusLight(StatusLight.Red);
+brick.buttonEnter.wasPressed()
 ```
 
 ## Other

docs/reference/brick/button/was-pressed.md

@@ -14,7 +14,7 @@ The fact that a button was pressed earlier is remembered. Once **was pressed** i
 
 Your @boardname@ has touch sensors that work like buttons. Instead of saying `enter` or `left` as the source button, use a touch sensor block with a sensor name like `touch 1`.
 
-```block
+```typescript
 if (sensors.touch1.wasPressed()) {
     console.log("Hey, I was pressed.");
 }
@@ -32,7 +32,7 @@ Read about [touch sensors](/reference/sensors/touch-sensor) and using them as to
 
 Set the brick light to green if the `right` button was pressed before the `left` button. If not, the brick light is turned off when the `left` button is pressed.
 
-```blocks
+```typescript
 brick.buttonLeft.onEvent(ButtonEvent.Bumped, function() {
     if (brick.buttonRight.wasPressed()) {
         brick.setStatusLight(StatusLight.Green)
@@ -45,6 +45,5 @@ brick.buttonLeft.onEvent(ButtonEvent.Bumped, function() {
 ## See also
 
 [is pressed](/reference/brick/button/is-pressed),
-[on event](/reference/brick/button/on-event)
-
+[on event](/reference/brick/button/on-event),
 [Touch sensors](/reference/sensors/touch-sensor)

docs/reference/brick/show-ports.md

@@ -0,0 +1,24 @@
+# show Ports
+
+Show the status of everything connected to the ports.
+
+```sig
+brick.showPorts()
+```
+
+You can find out what's connected to the ports on the brick and show its status. The status information from each sensor or motor connected is displayed on the screen.
+
+## Example
+
+Show the status of the ports on the brick when the ``enter`` button is pressed.
+
+```blocks
+brick.showString("Press ENTER for port status", 1)
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    brick.showPorts()
+})
+```
+
+## See also
+
+[show string](/reference/brick/show-string), [show value](/reference/brick/show-value)

docs/reference/motors/motor/angle.md

@@ -27,5 +27,5 @@ motorAngle = motors.largeA.angle()
 
 ## See also
 
-[tacho](/reference/motors/motor/tacho), [speed](/reference/motors/motor/speed),
+[speed](/reference/motors/motor/speed),
 [reset](/reference/motors/motor/reset), [clear counts](/reference/motors/motor/clear-counts)

docs/reference/motors/motor/clear-counts.md

@@ -31,5 +31,5 @@ motors.largeA.stop()
 
 ## See also
 
-[tacho](/reference/motors/motor/tacho), [angle](/reference/motors/motor/angle),
+[angle](/reference/motors/motor/angle),
 [speed](/reference/motors/motor/speed), [reset](/reference/motors/motor/reset)

docs/reference/motors/motor/speed.md

@@ -29,5 +29,5 @@ motors.largeA.stop()
 
 ## See also
 
-[tacho](/reference/motors/motor/tacho), [speed](/reference/motors/motor/speed),
+[speed](/reference/motors/motor/speed),
 [reset](/reference/motors/motor/reset), [clear counts](/reference/motors/motor/clear-counts)

docs/reference/sensors.md

@@ -4,9 +4,9 @@
 
 ```cards
 sensors.color1.onColorDetected(ColorSensorColor.Blue, function () {})
-sensors.color1.onLightChanged(LightIntensityMode.Reflected, LightCondition.Dark, function () {})
-sensors.color1.pauseForLight(LightIntensityMode.Reflected, LightCondition.Dark)
-sensors.color1.pauseForColor(ColorSensorColor.Blue)
+sensors.color1.onLightConditionDetected(LightIntensityMode.Reflected, LightCondition.Dark, function () {})
+sensors.color1.pauseUntilLightConditionDetected(LightIntensityMode.Reflected, LightCondition.Dark)
+sensors.color1.pauseUntilColorDetected(ColorSensorColor.Blue)
 sensors.color1.color();
 sensors.color1.light(LightIntensityMode.Ambient)
 sensors.color(ColorSensorColor.Blue)
@@ -17,8 +17,8 @@ sensors.color(ColorSensorColor.Blue)
 ```cards
 sensors.touch1.onEvent(ButtonEvent.Pressed, function () {})
 sensors.touch1.pauseUntil(ButtonEvent.Pressed)
-sensors.touch1.wasPressed()
 sensors.touch1.isPressed()
+sensors.touch1.wasPressed()
 ```
 
 ## Gyro

libs/color-sensor/color.ts

@@ -145,15 +145,15 @@ namespace sensors {
          * Waits for the given color to be detected
          * @param color the color to detect
          */
-        //% help=sensors/color-sensor/pause-for-color
-        //% block="pause **color sensor** %this|for %color=colorEnumPicker"
-        //% blockId=colorPauseForColorDetected
+        //% help=sensors/color-sensor/pause-until-color-detected
+        //% block="pause until **color sensor** %this|detected %color=colorEnumPicker"
+        //% blockId=colorpauseUntilColorDetectedDetected
         //% parts="colorsensor"
         //% blockNamespace=sensors
         //% this.fieldEditor="ports"
         //% weight=99 blockGap=8
         //% group="Color Sensor"
-        pauseForColor(color: number) {
+        pauseUntilColorDetected(color: number) {
             this.setMode(ColorSensorMode.Color);
             if (this.color() != color) {
                 const v = this._colorEventValue(<number>color);
@@ -184,15 +184,15 @@ namespace sensors {
          * @param condition the light condition
          * @param handler the code to run when detected
          */
-        //% help=sensors/color-sensor/on-light-changed
-        //% block="on **color sensor** %this|%mode|%condition"
-        //% blockId=colorOnLightChanged
+        //% help=sensors/color-sensor/on-light-condition-detected
+        //% block="on **color sensor** %this|detected %mode|%condition"
+        //% blockId=colorOnLightDetected
         //% parts="colorsensor"
         //% blockNamespace=sensors
         //% this.fieldEditor="ports"
         //% weight=89 blockGap=12
         //% group="Color Sensor"
-        onLightChanged(mode: LightIntensityMode, condition: LightCondition, handler: () => void) {
+        onLightConditionDetected(mode: LightIntensityMode, condition: LightCondition, handler: () => void) {
             this.setMode(<ColorSensorMode><number>mode)
             control.onEvent(this._id, <number>condition, handler);
         }
@@ -201,15 +201,15 @@ namespace sensors {
          * Wait for the given color to be detected
          * @param color the color to detect
          */
-        //% help=sensors/color-sensor/pause-for-light
-        //% block="pause **color sensor** %this|for %mode|%condition"
-        //% blockId=colorPauseForLight
+        //% help=sensors/color-sensor/pause-until-light-condition-detected
+        //% block="pause until **color sensor** %this|detected %mode|%condition"
+        //% blockId=colorPauseUntilLightConditionDetected
         //% parts="colorsensor"
         //% blockNamespace=sensors
         //% this.fieldEditor="ports"
         //% weight=88 blockGap=8
         //% group="Color Sensor"
-        pauseForLight(mode: LightIntensityMode, condition: LightCondition) {
+        pauseUntilLightConditionDetected(mode: LightIntensityMode, condition: LightCondition) {
             this.setMode(<ColorSensorMode><number>mode)
             if (this.thresholdDetector.state != <number>condition)
                 control.waitForEvent(this._id, <number>condition)

libs/color-sensor/docs/reference/sensors/color-sensor.md

@@ -2,9 +2,9 @@
 
 ```cards
 sensors.color1.onColorDetected(ColorSensorColor.Blue, function () {})
-sensors.color1.onLightChanged(LightIntensityMode.Reflected, LightCondition.Dark, function () {})
-sensors.color1.pauseForLight(LightIntensityMode.Reflected, LightCondition.Dark)
-sensors.color1.pauseForColor(ColorSensorColor.Blue)
+sensors.color1.onLightConditionDetected(LightIntensityMode.Reflected, LightCondition.Dark, function () {})
+sensors.color1.pauseUntilLightConditionDetected(LightIntensityMode.Reflected, LightCondition.Dark)
+sensors.color1.pauseUntilColorDetected(ColorSensorColor.Blue)
 sensors.color1.color();
 sensors.color1.light(LightIntensityMode.Ambient)
 ```
@@ -12,8 +12,8 @@ sensors.color1.light(LightIntensityMode.Ambient)
 ## See slso
 
 [on color detected](/reference/sensors/color-sensor/on-color-detected),
-[pause for color](/reference/sensors/color-sensor/pause-for-color),
-[on light changed](/reference/sensors/color-sensor/on-light-changed),
-[pause for light](/reference/sensors/color-sensor/pause-for-light),
+[pause until color detected](/reference/sensors/color-sensor/pause-until-color-detected),
+[on light condition detected](/reference/sensors/color-sensor/on-light-condition-detected),
+[pause until light condition detected](/reference/sensors/color-sensor/pause-until-light-condition-detected),
 [color](/reference/sensors/color-sensor/color),
 [light](/reference/sensors/color-sensor/ambient-light)

libs/color-sensor/docs/reference/sensors/color-sensor/on-color-detected.md

@@ -24,4 +24,4 @@ sensors.color1.onColorDetected(ColorSensorColor.Blue, function () {
 ```
 ## See also
 
-[pause for color](/reference/sensors/color-sensor/pause-for-color), [color](/reference/sensors/color)
+[pause until color detected](/reference/sensors/color-sensor/pause-until-color-detected), [color](/reference/sensors/color)

libs/color-sensor/docs/reference/sensors/color-sensor/on-light-condition-detected.md

@@ -3,7 +3,7 @@
 Run some code when the amount of light dectected changes.
 
 ```sig
-sensors.color1.onLightChanged(LightIntensityMode.Reflected, LightCondition.Dark, function () {
+sensors.color1.onLightConditionDetected(LightIntensityMode.Reflected, LightCondition.Dark, function () {
 
 })
 ```
@@ -21,7 +21,7 @@ You can check for a change in either _ambient_ or _reflected_ light and run some
 Show a message on the screen when the ambient light goes dark.
 
 ```blocks
-sensors.color1.onLightChanged(LightIntensityMode.Ambient, LightCondition.Dark, function() {
+sensors.color1.onLightConditionDetected(LightIntensityMode.Ambient, LightCondition.Dark, function() {
     brick.clearScreen();
     brick.showString("It just got dark", 1)
     brick.showString("Can you see me?", 2)

libs/color-sensor/docs/reference/sensors/color-sensor/pause-until-color-detected.md

@@ -1,9 +1,9 @@
-# pause For Color
+# pause Until Color Detected
 
 Wait for the sensor to see a certain color.
 
 ```sig
-sensors.color1.pauseForColor(ColorSensorColor.Blue)
+sensors.color1.pauseUntilColorDetected(ColorSensorColor.Blue)
 ```
 
 The [color](/reference/sensors/color) you choose to look for is one of the colors that the sensor can detect. If you want to use colors for tracking, it's best to use a color that is the same or very close to the ones the sensor detects.
@@ -18,7 +18,7 @@ Wait for the sensor to see ``blue``. Then, show an expression on the screen.
 
 ```blocks
 brick.showString("Waiting for blue", 1)
-sensors.color1.pauseForColor(ColorSensorColor.Blue)
+sensors.color1.pauseUntilColorDetected(ColorSensorColor.Blue)
 brick.clearScreen()
 brick.showImage(images.expressionsSick)
 ```

libs/color-sensor/docs/reference/sensors/color-sensor/pause-until-light-condition-detected.md

@@ -1,9 +1,9 @@
-# pause For Light
+# pause Until Light Condition Detected
 
-Wait for the light condition to change.
+Wait until a particular light condition is detected.
 
 ```sig
-sensors.color1.pauseForLight(LightIntensityMode.Reflected, LightCondition.Dark)
+sensors.color1.pauseUntilLightConditionDetected(LightIntensityMode.Reflected, LightCondition.Dark)
 ```
 
 You can wait for a change in either _ambient_ or _reflected_ light. This event happens when the sensor detects light going to ``dark`` or to ``bright``. You choose what condition you will wait for.
@@ -19,11 +19,11 @@ Wait for the ambient light to go dark, then show an expression on the screen.
 
 ```blocks
 brick.showString("Waiting for dark", 1)
-sensors.color1.pauseForLight(LightIntensityMode.Reflected, LightCondition.Dark)
+sensors.color1.pauseUntilLightConditionDetected(LightIntensityMode.Reflected, LightCondition.Dark)
 brick.clearScreen()
 brick.showImage(images.expressionsSick)
 ```
 
 ## See also
 
-[on light changed](/reference/sensors/color-sensor/on-light-changed)
+[on light condition detected](/reference/sensors/color-sensor/on-light-condition-detected)

libs/color-sensor/docs/reference/sensors/color-sensor/set-threshold.md

@@ -12,7 +12,7 @@ After setting a threshold, any event for that light condition won't happen until
 
 ```block
 sensors.color1.setThreshold(LightCondition.Dark, 20)
-sensors.color1.onLightChanged(LightIntensityMode.Reflected, LightCondition.Dark, function () {
+sensors.color1.onLightConditionDetected(LightIntensityMode.Reflected, LightCondition.Dark, function () {
     brick.showMood(moods.sleeping)
 })
 ```
@@ -28,7 +28,7 @@ Make a daylight alarm. When the ambient light reaches `70` flash the status ligh
 
 ```blocks
 sensors.color3.setThreshold(LightCondition.Bright, 70)
-sensors.color3.onLightChanged(LightIntensityMode.Ambient, LightCondition.Bright, function () {
+sensors.color3.onLightConditionDetected(LightIntensityMode.Ambient, LightCondition.Bright, function () {
     brick.setStatusLight(StatusLight.GreenFlash)
     for (let i = 0; i < 5; i++) {
         music.playSoundEffectUntilDone(sounds.mechanicalBackingAlert)

libs/color-sensor/docs/reference/sensors/color-sensor/threshold.md

@@ -17,7 +17,7 @@ Light intensity is measured from `0` (very dark) to `100` (very bright). A _thre
 Find out what light level is set as the ``dark`` threshold when a dark light event happens.
 
 ```blocks
-sensors.color3.onLightChanged(LightIntensityMode.Reflected, LightCondition.Dark, function () {
+sensors.color3.onLightConditionDetected(LightIntensityMode.Reflected, LightCondition.Dark, function () {
     brick.showValue("DarknessThresholdValue", sensors.color3.threshold(LightCondition.Dark), 1)
 })
 ```

libs/core/buttons.ts

@@ -95,6 +95,7 @@ namespace brick {
         //% help=brick/button/was-pressed
         //% block="%button|was pressed"
         //% blockId=buttonWasPressed
+        //% blockHidden=true
         //% parts="brick"
         //% blockNamespace=brick
         //% weight=80

libs/core/console.ts

@@ -59,7 +59,6 @@ namespace console {
 
 namespace console._screen {
     const maxLines = 100;
-    const screenLines = 10;
     let lines: string[];
     let scrollPosition = 0;
 
@@ -75,10 +74,11 @@ namespace console._screen {
     function printLog() {
         brick.clearScreen()
         if (!lines) return;
+        const screenLines = brick.lineCount();
         for (let i = 0; i < screenLines; ++i) {
             const line = lines[i + scrollPosition];
             if (line)
-                screen.print(line, 0, 4 + i * brick.LINE_HEIGHT)
+                screen.print(line, 0, 4 + i * brick.lineHeight(), 1, brick.font)
         }
     }
 
@@ -98,6 +98,7 @@ namespace console._screen {
             scrollPosition = Math.min(scrollPosition, lines.length - 1)
         }
         // move down scroll once it gets large than the screen
+        const screenLines = brick.lineCount();
         if (lines.length > screenLines
             && lines.length >= scrollPosition + screenLines) {
             scrollPosition++;

libs/core/output.ts

@@ -164,7 +164,7 @@ namespace motors {
          */
         //% blockId=outputMotorSetBrakeMode block="set %motor|brake %brake=toggleOnOff"
         //% weight=60 blockGap=8
-        //% group="Move"
+        //% group="Properties"
         //% help=motors/motor/set-brake
         setBrake(brake: boolean) {
             this.init();
@@ -176,7 +176,7 @@ namespace motors {
         */
         //% blockId=motorSetInverted block="set %motor|inverted %reversed=toggleOnOff"
         //% weight=59 blockGap=8
-        //% group="Move"
+        //% group="Properties"
         //% help=motors/motor/set-inverted
         setInverted(inverted: boolean) {
             this.init();
@@ -344,7 +344,7 @@ namespace motors {
          */
         //% blockId=outputMotorSetRegulated block="set %motor|regulated %value=toggleOnOff"
         //% weight=58
-        //% group="Move"
+        //% group="Properties"
         //% help=motors/motor/set-regulated
         setRegulated(value: boolean) {
             this._regulated = value;

libs/ev3/ns.ts

@@ -13,7 +13,7 @@ namespace sensors {
 }
 
 //% color="#00852B" weight=90 icon="\uf10d"
-//% groups='["Move", "Counters"]'
+//% groups='["Move", "Counters", "Properties"]'
 //% labelLineWidth=50
 namespace motors {
 }

libs/infrared-sensor/docs/reference/sensors/beacon/was-pressed.md

@@ -26,7 +26,7 @@ In order to recognize a button event signalled from a remote beacon, an infrared
 
 If the beacon button ``top left`` was pressed, show a `green` status light. Otherwise, set the status light to `orange`.
 
-```blocks
+```typescript
 sensors.infrared1.setRemoteChannel(InfraredRemoteChannel.Ch0)
 forever(function () {
     if (sensors.remoteButtonTopLeft.wasPressed()) {

libs/infrared-sensor/ir.ts

@@ -101,6 +101,7 @@ namespace sensors {
         //% help=sensors/beacon/was-pressed
         //% block="**remote button** %button|was pressed"
         //% blockId=remotebuttonWasPressed
+        //% blockHidden=true
         //% parts="remote"
         //% blockNamespace=sensors
         //% weight=80

libs/music/music.cpp

@@ -136,8 +136,8 @@ void playSample(Buffer buf) {
 
 /**
 * Play a tone through the speaker for some amount of time.
-* @param frequency pitch of the tone to play in Hertz (Hz)
-* @param ms tone duration in milliseconds (ms)
+* @param frequency pitch of the tone to play in Hertz (Hz), eg: Note.C
+* @param ms tone duration in milliseconds (ms), eg: BeatFraction.Half
 */
 //% help=music/play-tone
 //% blockId=music_play_note block="play tone|at %note=device_note|for %duration=device_beat"

libs/music/shims.d.ts

@@ -15,8 +15,8 @@ declare namespace music {
 
     /**
      * Play a tone through the speaker for some amount of time.
-     * @param frequency pitch of the tone to play in Hertz (Hz)
-     * @param ms tone duration in milliseconds (ms)
+     * @param frequency pitch of the tone to play in Hertz (Hz), eg: Note.C
+     * @param ms tone duration in milliseconds (ms), eg: BeatFraction.Half
      */
     //% help=music/play-tone
     //% blockId=music_play_note block="play tone|at %note=device_note|for %duration=device_beat"

libs/screen/targetoverrides.ts

@@ -14,32 +14,55 @@ namespace _screen_internal {
     function updateStats(msg: string): void { }
 
     control.__screen.setupUpdate(() => updateScreen(screen))
-    control.EventContext.onStats = function(msg: string) { 
+    control.EventContext.onStats = function (msg: string) {
         updateStats(msg);
     }
 }
 
 namespace brick {
-    export const LINE_HEIGHT = 12;
+    const textOffset = 4;
+    const lineOffset = 2;
+    export let font = image.font8;
+
+    /**
+     * Gets the text line height
+     */
+    //%
+    export function lineHeight(): number {
+        return font.charHeight + lineOffset;
+    }
+
+    /**
+     * Number of lines
+     */
+    //%
+    export function lineCount(): number {
+        return ((screen.height - textOffset) / lineHeight()) >> 0
+    }
 
     /**
      * 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: 1
+     * @param line the line number to print the text at (starting at 1), eg: 1
      */
     //% blockId=screen_print block="show string %text|at line %line"
     //% weight=98 group="Screen" inlineInputMode="inline" blockGap=8
     //% help=brick/show-string
     //% 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 - 1) / (NUM_LINES + 2)) * DAL.LCD_HEIGHT;
-        screen.print(text, offset, y);
+        // line indexing starts at 1.
+        line = (line - 1) >> 0;
+        const nlines = lineCount();
+        if (line < 0 || line > nlines) return; // out of screen
+
+        const h = lineHeight();
+        const y = textOffset + h * line;
+        screen.fillRect(0, y, screen.width, h, 0); // clear background
+        screen.print(text, textOffset, y, 1, font);
     }
 
     /**
-     * Shows a number on the screen
+     * Show a number on the screen
      * @param value the numeric value
      * @param line the line number to print the text at, eg: 1
      */
@@ -52,7 +75,7 @@ namespace brick {
     }
 
     /**
-     * Shows a name, value pair on the screen
+     * Show a name, value pair on the screen
      * @param value the numeric value
      * @param line the line number to print the text at, eg: 1
      */
@@ -78,13 +101,14 @@ namespace brick {
     }
 
     /**
-    * Display the sensor and motor states attached to ports   
+    * Display the status of the sensors and motors attached to ports   
     */
     //% blockId=brickShowPorts block="show ports"
     //% help=brick/show-ports blockGap=8
     //% weight=10 group="Screen"
     export function showPorts() {
         const col = 44;
+        const lineHeight8 = image.font8.charHeight + 2;
         clearScreen();
 
         function scale(x: number) {
@@ -98,19 +122,22 @@ namespace brick {
             const data = datas[i];
             if (!data.actualSpeed && !data.count) continue;
             const x = i * col;
-            screen.print("ABCD"[i], x, brick.LINE_HEIGHT)
-            screen.print(`${scale(data.actualSpeed)}%`, x, 2* brick.LINE_HEIGHT)
-            screen.print(`${scale(data.count)}>`, x, 3 * brick.LINE_HEIGHT)
+            screen.print("ABCD"[i], x + 2, 1 * lineHeight8, 1, image.font8)
+            screen.print(`${scale(data.actualSpeed)}%`, x + 2, 3 * lineHeight8, 1, image.font8)
+            screen.print(`${scale(data.count)}>`, x + 2, 4 * lineHeight8, 1, image.font5)
         }
+        screen.drawLine(0, 5 * lineHeight8, screen.width, 5 * lineHeight8, 1);
 
         // sensors
         const sis = sensors.internal.getActiveSensors();
+        const h = screen.height;
+        screen.drawLine(0, h - 5 * lineHeight8, screen.width, h - 5 * lineHeight8, 1)
         for (let i = 0; i < sis.length; ++i) {
             const si = sis[i];
             const x = (si.port() - 1) * col;
             const inf = si._info();
-            screen.print(si.port() + "", x, 8 * brick.LINE_HEIGHT)
-            screen.print(inf, x, 9 * brick.LINE_HEIGHT)
+            screen.print(si.port() + "", x, h - 4 * lineHeight8, 1, image.font8)
+            screen.print(inf, x, h - 2 * lineHeight8, 1, inf.length > 4 ? image.font5 : image.font8);
         }
     }
 

libs/touch-sensor/docs/reference/sensors/touch-sensor/was-pressed.md

@@ -16,7 +16,7 @@ If a touch sensor was pressed, then that event is remembered. Once you check if
 
 If the touch sensor ``touch 1`` was pressed, show a `green` status light. Otherwise, set the status light to `orange`.
 
-```blocks
+```typescript
 forever(function () {
     if (sensors.touch1.wasPressed()) {
         brick.setStatusLight(StatusLight.Green)

libs/touch-sensor/touch.ts

@@ -83,6 +83,7 @@ namespace sensors {
         //% help=sensors/touch-sensor/was-pressed
         //% block="**touch** %this|was pressed"
         //% blockId=touchWasPressed
+        //% blockHidden=true
         //% parts="touch"
         //% blockNamespace=sensors
         //% this.fieldEditor="ports"

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-ev3",
-  "version": "0.1.8",
+  "version": "0.1.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-ev3",
-  "version": "0.1.8",
+  "version": "0.1.13",
   "description": "LEGO Mindstorms EV3 for Microsoft MakeCode",
   "private": true,
   "keywords": [
@@ -45,8 +45,8 @@
     "webfonts-generator": "^0.4.0"
   },
   "dependencies": {
-    "pxt-common-packages": "0.20.28",
-    "pxt-core": "3.5.13"
+    "pxt-common-packages": "0.20.31",
+    "pxt-core": "3.7.1"
   },
   "scripts": {
     "test": "node node_modules/pxt-core/built/pxt.js travis"

pxtarget.json

@@ -98,11 +98,14 @@
         "betaUrl": "https://makecode.legoeducation.com/about",
         "boardName": "LEGO Mindstorms EV3 Brick",
         "selectLanguage": true,
+        "availableLocales": [
+            "en"
+        ],
         "highContrast": true,
         "docMenu": [
             {
                 "name": "Support",
-                "path": "https://service.lego.com"
+                "path": "http://service.lego.com"
             },
             {
                 "name": "About",
@@ -163,7 +166,7 @@
             "arrays": "\uf109"
         },
         "monacoColors": {
-            "editor.background": "#ecf6ff"
+            "editor.background": "#f9f9f9"
         }
     },
     "ignoreDocsErrors": true

targetconfig.json

@@ -7,9 +7,6 @@
         "approvedRepos": [
         ]
     },
-    "languages": [
-        "en"
-    ],
     "galleries": {
         "Getting Started": "getting-started",
         "Design Engineering": "design-engineering",