0.1.21

* removing mindstorms from tutorial names

* lego feedback

* file name issues

* bring back bang

README.md

@@ -1,4 +1,4 @@
-# LEGO Mindstorms EV3 target for PXT
+# LEGO® MINDSTORMS® Education EV3 for Microsoft MakeCode
 
 [![Build Status](https://ci2.dot.net/buildStatus/icon?job=Private/pxt_project_rainbow/master/pxt-ev3_Push)](https://ci2.dot.net/job/Private/job/pxt_project_rainbow/job/master/job/pxt-ev3_Push/)
 

docfiles/footer.html

@@ -0,0 +1,16 @@
+<footer class="ui inverted accent vertical footer segment hideprint" aria-hidden="false">
+    <div class="ui center aligned container">
+        <div class="ui container horizontal inverted small divided link list">
+            <!-- <a class="item" href="https://makecode.com/contact" target="_blank" rel="noopener">Contact Us</a> -->
+            <a class="item" href="https://makecode.com/privacy" target="_blank" rel="noopener">Privacy &amp; Cookies</a>
+            <a class="item" href="https://makecode.com/termsofuse" target="_blank" rel="noopener"> Terms Of Use</a>
+            <a class="item" href="https://makecode.com/trademarks" target="_blank" rel="noopener">Trademarks</a>
+            <div class="item">© 2018 Microsoft</div>
+            <!-- we need to force the browser to load this font -->
+            <div style='font-family: Icons; color: #010101;' aria-hidden="true">.</div>
+        </div>
+        <div class="ui container horizontal inverted small divided link list">
+            <a class="ui centered item" href="https://makecode.com/" title="Microsoft MakeCode" target="_blank" rel="noopener">Powered by Microsoft MakeCode</a>
+        </div>
+    </div>
+</footer>

docs/SUMMARY.md

@@ -1,15 +1,35 @@
 # @extends
 
+## Support #support
+
+* [Troubleshoot](/troubleshoot)
+* [LEGO Support](http://service.lego.com/)
+* [EV3 Manager](https://ev3manager.education.lego.com/)
+
 ## Projects #projects
 
 * [Getting Started](/getting-started)
     * [Try](/getting-started/try)
     * [Use](/getting-started/use)
 
+* [Tutorials](/tutorials)
+    * [Wake Up!](/tutorials/wake-up)
+    * [Make An Animation](/tutorials/make-an-animation)
+    * [What Animal Am I?](/tutorials/what-animal-am-i)
+    * [Music Brick](/tutorials/music-brick)
+    * [Run Motors](/tutorials/run-motors)
+    * [Touch to Run](/tutorials/touch-to-run)
+    * [Touch Sensor Values](/tutorials/touch-sensor-values)
+    * [What Color?](/tutorials/what-color)
+    * [Line Following](/tutorials/line-following)
+    * [Red Light, Green Light](/tutorials/redlight-greenlight)
+    * [Object Near?](/tutorials/object-near)
+    * [Security Alert](/tutorials/security-alert)
+
 * [Coding](/coding)
     * [Autonomous Parking](/coding/autonomous-parking)
     * [Object Detection](/coding/object-detection)
-    * [Line Following](/coding/line-following)
+    * [Line Detection](/coding/line-detection)
         
 * [Design Engineering](/design-engineering)
     * [Make It Move Without Wheels](/design-engineering/make-it-move)
@@ -18,37 +38,7 @@
 
 * [Maker](/maker)
     * [Make a Sound Machine](/maker/sound-machine)
-
-* [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)
-    * [Three Point Turn 2](/coding/three-point-turn-2)
-    * [Three Point Turn 3](/coding/three-point-turn-3)
-    * [Reversing the robot 1](/coding/reversing-the-robot-1)
-    * [Reversing the robot 2](/coding/reversing-the-robot-2)
-    * [Reversing the robot 3](/coding/reversing-the-robot-3)
-    * [Light the way 1](/coding/light-the-way-1)
-    * [Light the way 2](/coding/light-the-way-2)
-    * [Light the way 3](/coding/light-the-way-3)
-    * [Traffic Lights 1](/coding/traffic-lights-1)
-    * [Traffic Lights 2](/coding/traffic-lights-2)
-    * [Traffic Lights 3](/coding/traffic-lights-3)
-    * [Reverse Beeper 1](/coding/reverse-beeper-1)
-    * [Reverse Beeper 2](/coding/reverse-beeper-2)
-    * [Reverse Beeper 3](/coding/reverse-beeper-3)
-    * [Ignition 1](/coding/ignition-1)
-    * [Ignition 2](/coding/ignition-2)
-    * [Ignition 3](/coding/ignition-3)
-    * [Cruise Control 1](/coding/cruise-control-1)
-    * [Cruise Control 2](/coding/cruise-control-2)
-    * [Cruise Control 3](/coding/cruise-control-3)
-    * [Roaming 1](/coding/roaming-1)
-    * [Roaming 2](/coding/roaming-2)
+    * [Make a Security Gadget](/maker/security-gadget)
 
 ## Reference #reference
 
@@ -60,6 +50,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)
@@ -75,7 +66,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)
@@ -106,9 +96,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 detected](/reference/sensors/color-sensor/on-light-detected)
+            * [pause until light condition detected](/reference/sensors/color-sensor/pause-until-light-detected)
             * [color](/reference/sensors/color-sensor/color)
             * [light](/reference/sensors/color-sensor/ambient-light)
     * [Music](/reference/music)

docs/about.md

@@ -27,6 +27,12 @@ so it appears as a mounted drive (named **EV3**).
 Compilation to machine code from [Blocks](/blocks) or [JavaScript](/javascript) happens in the browser. You save the binary 
 program to a **.uf2** file, which you then copy to the **EV3** drive, which flashes the device with the new program.
 
+### ~ hint
+
+Not seeing the **EV3** drive? Make sure to upgrade your firmware at https://ev3manager.education.lego.com/.
+
+### ~
+
 ## Simulator: Test Your Code
 
 You can run your code using the micro:bit simulator, all within the confines of a web browser. 

docs/coding.md

@@ -7,18 +7,21 @@
 [
 {
   "name": "Autonomous Parking",
-  "description": "TBD",
+  "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": "TBD",
+  "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 Following",
-  "description": "TBD",
-  "url":"/coding/line-following",
+  "name": "Line Detection",
+  "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/autonomous-parking.md

@@ -0,0 +1,171 @@
+# Autonomous Parking
+
+Design cars that can park themselves safely without driver intervention.
+
+![Autonomous parking graphic](/static/coding/autonomous-parking/auto-parking-connect.jpg)
+
+## Connect
+
+**Think about:**
+
+* How do autonomous cars work?
+* What would it take to ensure that autonomous cars are safe?
+* What types of movements do autonomous cars need to perform?
+
+## Construct 
+
+### Build
+
+Build a @boardname@ vehicle that can park itself safely without driver intervention. Start by constructing this model:
+
+[![EV3- Robot Driving Base](/static/coding/autonomous-parking/ev3-robot-driving-base.jpg)](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/building-instructions/ev3-rem-driving-base-79bebfc16bd491186ea9c9069842155e.pdf)
+
+### Check
+
+Before you program, check:
+
+* Are all the wires correctly connected from the motors to ports B and C?
+* Are the wheels correctly installed?
+* Are the wheels rotating freely?
+
+### Program 
+
+Write a program that will make the robot turn three times in various ways.
+
+**Think about:**
+
+* How will you make the robot turn in different ways?
+* How can the robot make a three point turn?
+
+### ~hint
+
+Consider using these blocks in your solution:
+
+```block
+motors.largeBC.tank(50, 50)
+pause(500)
+```
+
+### ~
+
+### Sample Solution - Three Point Turn
+
+1. When the brick button is pressed, turn the driving base right and stop after 1.5 seconds.
+2. Turn the driving base left and stop after 1 second.
+3. Move the driving base forward for 3 seconds.
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, 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)
+})
+```
+
+### Download and test
+
+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.
+
+## Contemplate
+
+Choose one of the following autonomous driving scenarios and create a program for it:
+
+* Parallel parking
+* Angle parking
+* Perpendicular parking
+
+### ~hint
+
+Document pseudocode for your program before choosing programming blocks.
+
+### ~
+
+### Sample Solution - Parallel Parking
+
+1. When the brick button is pressed, drive forward in a straight line for 3 rotations.
+2. Wait for 1 second.
+3. Reverse motor rotation while turning for 1.5 rotations.
+4. Reverse motor rotation while turning the other way for 1.5 rotations.
+5. Drive backward in a straight line for 0.5 rotations.
+6. Drive forward in a straight line for 0.5 rotations.
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    motors.largeBC.steer(0, 50, 3, MoveUnit.Rotations)
+    pause(1000)
+motors.largeBC.steer(-50, -50, 1.5, MoveUnit.Rotations)
+    motors.largeBC.steer(50, -50, 1.5, MoveUnit.Rotations)
+    motors.largeBC.steer(0, -50, 0.5, MoveUnit.Rotations)
+    motors.largeBC.steer(0, 50, 0.5, MoveUnit.Rotations)
+})
+```
+
+### Download and test
+
+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.
+
+### Differentiation
+
+Create a program that simulates displaying appropriate warning lights while parking. 
+
+### ~hint
+
+Consider using this block in your solution:
+
+```block
+brick.setStatusLight(StatusLight.OrangeFlash)
+```
+
+### ~
+
+### Sample Solution - Simulating Reverse Gear and Reverse Warning Lights
+
+1. When the brick button is pressed, drive forward in a straight line for 3 rotations.
+2. Wait for 1 second.
+3. Set brick status light to orange flash.
+4. Reverse motor rotation while turning for 1.5 rotations.
+5. Reverse motor rotation while turning the other way for 1.5 rotations.
+6. Drive backward in a straight line for 0.5 rotations.
+7. Set brick status light to off.
+8. Drive forward in a straight line for 0.5 rotations.
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    motors.largeBC.steer(0, 50, 3, MoveUnit.Rotations)
+    pause(1000)
+    brick.setStatusLight(StatusLight.OrangeFlash)
+    motors.largeBC.steer(-50, -50, 1.5, MoveUnit.Rotations)
+    motors.largeBC.steer(50, -50, 1.5, MoveUnit.Rotations)
+    motors.largeBC.steer(0, -50, 0.5, MoveUnit.Rotations)
+    brick.setStatusLight(StatusLight.Off)
+    motors.largeBC.steer(0, 50, 0.5, MoveUnit.Rotations)
+})
+```
+
+### Download and test
+
+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.
+
+### Share
+
+**Think about:**
+
+* What challenged you?
+* Were there any surprises?
+* How can you improve your program?
+* Can your program be more streamlined? Have you used too many blocks?
+* Is there a more efficient way to build your program?
+* How can your program be used in real-world scenarios?
+
+## Continue
+
+* Click on the JavaScript tab and experiment with changing the values in the code.
+* Add a custom image or sounds from the Brick or Music menus.
+* Create a video of your project, especially your final presentation and your robot’s performance. Explain some important features of your software program. 
+* Include an image of your program with comments. 
+* Add a team photograph! 
+
+Congratulations! What will you design next?

docs/coding/cruise-control-1.md

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

docs/coding/cruise-control-2.md

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

docs/coding/cruise-control-3.md

@@ -1,28 +0,0 @@
-# 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.run(speed)
-}
-sensors.touch2.onEvent(ButtonEvent.Pressed, function () {
-    accelerate()
-    update()
-})
-sensors.touch1.onEvent(ButtonEvent.Pressed, function () {
-    decelerate()
-    update()
-})
-```

docs/coding/cruise-control.md

@@ -0,0 +1,65 @@
+# Cruise Control
+
+Learn how to set and adjust motor speeds.
+
+## Activity 1
+
+Increase motor speed when touch sensor `1` is pressed.
+
+```blocks
+let speed = 0;
+sensors.touch1.onEvent(ButtonEvent.Pressed, function () {
+    if (speed < 100)
+        speed = speed + 10;
+    motors.largeBC.run(speed);
+}) 
+```
+
+## Activity 2
+
+Add a "reduce" motor speed action when touch sensor `2` is pressed.
+
+```blocks
+let speed = 0;
+sensors.touch1.onEvent(ButtonEvent.Pressed, function () {
+    if (speed < 100)
+        speed = speed + 10;
+    motors.largeBC.run(speed);
+}) 
+sensors.touch2.onEvent(ButtonEvent.Pressed, function () {
+    if (speed > -100)
+        speed = speed - 10;
+    motors.largeBC.run(speed);
+}) 
+```
+
+## Activity 3
+
+Refactor your code by moving the speed increase and speed decrease code into ``||functions:accelerate||`` and ``||functions:decelerate||`` functions. Run the motors at the new speed in an ``||functions:update||`` function.
+
+```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.run(speed)
+}
+sensors.touch2.onEvent(ButtonEvent.Pressed, function () {
+    accelerate()
+    update()
+})
+sensors.touch1.onEvent(ButtonEvent.Pressed, function () {
+    decelerate()
+    update()
+})
+```

docs/coding/ignition-1.md

@@ -1,11 +0,0 @@
-# Ignition Activity 1
-
-```blocks
-sensors.touch1.onEvent(ButtonEvent.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

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

docs/coding/ignition-3.md

@@ -1,13 +0,0 @@
-# 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);
-    }
-    pause(1);
-}
-```

docs/coding/ignition.md

@@ -0,0 +1,48 @@
+# Ignition
+
+Explore sensor events and sensor status.
+
+## Activity 1
+
+Wait for a touch sensor press or ultrasonic object detection. Show an expression on the screen when they happen.
+
+```blocks
+sensors.touch1.onEvent(ButtonEvent.Pressed, function () {
+    brick.showImage(images.eyesDizzy)
+})
+sensors.ultrasonic4.onEvent(UltrasonicSensorEvent.ObjectDetected, function () {
+    brick.showImage(images.eyesTiredMiddle)
+})
+brick.showImage(images.eyesSleeping)
+```
+
+## Activity 2
+
+Play some motor sounds if touch sensor `1` is pressed at the same moment when and object comes close.
+
+```blocks
+while (true) {
+    if (sensors.touch1.isPressed() &&
+        sensors.ultrasonic4.distance() < 10) {
+        music.playSoundEffectUntilDone(sounds.mechanicalMotorStart)
+        music.playSoundEffectUntilDone(sounds.mechanicalMotorIdle);
+    }
+    pause(1);
+}
+```
+
+## Activity 3
+
+Play some motor sounds if touch sensor `1` is pressed when both the `enter` button is pressed on the brick and an object comes close.
+
+```blocks
+while (true) {
+    if (sensors.ultrasonic4.distance() < 10 &&
+        sensors.touch1.isPressed() &&
+        brick.buttonEnter.isPressed()) {
+        music.playSoundEffectUntilDone(sounds.mechanicalMotorStart)
+        music.playSoundEffectUntilDone(sounds.mechanicalMotorIdle);
+    }
+    pause(1);
+}
+```

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.onLightDetected(LightIntensityMode.Ambient, Light.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.onLightDetected(LightIntensityMode.Ambient, Light.Bright, function () {
     brick.clearScreen()
 })
-sensors.color3.onLightChanged(LightIntensityMode.Ambient, LightCondition.Dark, function () {
+sensors.color3.onLightDetected(LightIntensityMode.Ambient, Light.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.onLightDetected(LightIntensityMode.Ambient, Light.Bright, function () {
     brick.clearScreen()
 })
-sensors.color3.onLightChanged(LightIntensityMode.Ambient, LightCondition.Dark, function () {
+sensors.color3.onLightDetected(LightIntensityMode.Ambient, Light.Dark, function () {
     brick.showImage(images.objectsLightOn)
 })
 sensors.touch1.onEvent(ButtonEvent.Pressed, function () {

docs/coding/line-detection.md

@@ -0,0 +1,239 @@
+# Line Detection
+
+Design ways to improve driving safety by helping to prevent drivers from falling asleep and causing an accident.
+
+![Car following the line on the road](/static/coding/line-detection/car-road-line.jpg)
+
+## Connect
+
+Think about:
+
+* How can autonomous cars react to different traffic light signals?
+* What can happen if a driver falls asleep while driving?
+* How can we detect when a driver is falling asleep?
+
+## Construct
+
+### Build
+
+Build a @boardname@ vehicle that can help prevent drivers from falling asleep and causing an accident. Start by constructing this model:
+
+[![EV3 robot with color sensor](/static/coding/line-detection/ev3-robot-color-sensor-down.jpg)](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/building-instructions/ev3-rem-color-sensor-down-driving-base-d30ed30610c3d6647d56e17bc64cf6e2.pdf)
+
+Build red and green “lights” for your robot to detect. You can use LEGO bricks, colored tape, or marker on white paper. Building instructions:
+
+[![IMAGE: Color Squares](/static/coding/line-detection/ev3-color-squares.jpg)](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/color%20squares-0a88dfd98bb2e64b5b8151fc422bae36.pdf)
+
+### Check
+
+Before you program, check:
+
+* Are all the wires correctly connected from the motors to ports B and C?
+* Are the wheels correctly installed?
+* Are the wheels rotating freely?
+* Are the wires connected from the Color Sensor to port 3?
+
+![EV3 Driving Base](/static/coding/line-detection/ev3-robot-driving-base.jpg)
+
+### Program
+
+Autonomous cars need to recognize and respond to traffic lights automatically. Create a program that will make your robot stop at red lights. Make sure your robot is only responding to the color red. Once you have succeeded, program your robot to drive forward again when the light changes from red to green.
+
+Before you program, think about:
+
+* How will you program the robot to detect a color?
+* How will you program the robot to stop at a color?
+* Which programming blocks will you use?
+
+### ~ hint
+
+Consider using these blocks in your solution:
+
+```block
+loops.forever(function () {
+	
+})
+motors.largeBC.steer(0, 50)
+sensors.color3.pauseUntilColorDetected(ColorSensorColor.Red)
+motors.stopAll()
+```
+
+### ~
+
+### Sample Solution - Red light detection
+
+1. Loop forever.
+2. Start motors ``B`` and ``C`` (drive forward).
+3. Wait for the color sensor to detect the color red.
+4. Stop all motors.
+
+```blocks
+loops.forever(function () {
+    motors.largeBC.steer(0, 50)
+    sensors.color3.pauseUntilColorDetected(ColorSensorColor.Red)
+    motors.stopAll()
+})
+```
+
+### Download and test
+
+Click **Download** and follow the instructions to get your code onto your EV3 Brick. 
+
+Congratulations! Your robot can stop at a red light. 
+
+Now add to your program and have your robot to drive forward again when the light changes from red to green.
+
+### Sample Solution - Red and green light detection in a loop
+
+1. Start motors ``B`` and ``C`` (drive forward).
+2. Wait for the color sensor to detect the color red.
+3. Stop all motors.
+4. Wait for the color sensor to detect the color green.
+5. Loop forever.
+
+```blocks
+loops.forever(function () {
+    motors.largeBC.steer(0, 50)
+    sensors.color3.pauseUntilColorDetected(ColorSensorColor.Red)
+    motors.stopAll()
+    sensors.color3.pauseUntilColorDetected(ColorSensorColor.Green)
+})
+```
+
+### Download and test
+
+Click **Download** and follow the instructions to get your code onto your EV3 Brick. 
+
+## Contemplate
+
+To simulate what could happen if a driver falls asleep while driving, your robot could sound an alarm signal when it crosses the line. This feature is often available in new cars.
+
+Program your robot to perform this function.
+
+Draw a dark line with tape or marker for your robot to cross.
+
+### ~hint
+
+Consider using these blocks in your solution:
+
+```block 
+motors.largeBC.steer(0, 50)
+music.playSoundEffect(sounds.systemGeneralAlert)
+```
+### ~
+
+### Sample Solution - Line detection in a loop
+
+1. Start motors ``B`` and ``C`` (drive forward with a curve toward the line).
+2. Wait for the color sensor to detect the color black.
+3. Play sound effect ``system general alert``.
+4. Start motors ``B`` and ``C`` (drive forward with a curve away from the line).
+5. Wait for the color sensor to detect the color white.
+6. Loop forever.
+
+```blocks
+loops.forever(function () {
+    motors.largeBC.steer(-30, 20)
+    sensors.color3.pauseUntilColorDetected(ColorSensorColor.Black)
+    music.playSoundEffect(sounds.systemGeneralAlert)
+    motors.largeBC.steer(30, 20)
+    sensors.color3.pauseUntilColorDetected(ColorSensorColor.White)
+})
+```
+
+#### Download and test
+
+Click **Download** and follow the instructions to get your code onto your EV3 Brick. 
+
+#### Differentiation
+
+Program your robot to drive on “autopilot” along a given route. You will need to create a program that recognizes and responds to a dark line (or white line). You will create a line-following program and your robot will need to travel along the line without losing contact with it.
+
+You will need to constantly debug your program in order to make your robot travel as smoothly as possible along the line.
+
+### ~hint
+
+Consider using these blocks in your solution:
+
+```block
+while (true) {
+	
+}
+motors.largeBC.steer(0, 50)
+```
+
+> **- OR -**
+
+```block
+if (true) {
+	
+} else {
+
+}
+```
+
+### ~
+
+### Sample Solutions - Line Following in Loop
+
+#### Method 1
+
+1. While the Color Sensor detects the color black, start motors ``B`` and ``C`` (drive forward with a curve toward the line).
+2. While the Color Sensor detects the color white, start motors ``B`` and ``C`` (drive forward with a curve away from the line).
+3. Loop forever.
+
+```blocks
+forever(function () {
+    while (true) {
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.Black)
+        motors.largeBC.steer(-30, 50)
+    }
+    while (true) {
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.White)
+        motors.largeBC.steer(30, 50)
+    }
+})
+```
+
+#### Method 2
+
+1. If the Color Sensor detects the color black, start motors ``B`` and ``C`` (drive forward with a curve toward the line).
+Else the Color Sensor detects the color white, start motors ``B`` and ``C`` (drive forward with a curve away from the line).
+2. Loop forever.
+
+```blocks
+forever(function () {
+    if (true) {
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.Black)
+        motors.largeBC.steer(-30, 50)
+    } else {
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.White)
+        motors.largeBC.steer(30, 50)
+    }
+})
+```
+
+### Download and test
+
+Click **Download** and follow the instructions to get your code onto your EV3 Brick. 
+
+### Share
+
+Think about:
+
+* What challenged you?
+* Were there any surprises?
+* How can you improve your program?
+* Can your program be more streamlined? Have you used too many blocks?
+* Is there a more efficient way to build your program?
+* How can your program be used in real-world scenarios?
+
+Personalize:
+
+* Click on the **JavaScript** tab and experiment with changing the values in the code.
+* Add a custom image or sounds from the ``||brick:Brick||`` or ``||music:Music||`` menus.
+* Create a video of your project, especially your final presentation and your robot’s performance. Explain some important features of your software program. 
+* Include an image of your program with comments. 
+* Add a team photograph! 
+
+Congratulations! What will you design next?

docs/coding/object-detection.md

@@ -0,0 +1,137 @@
+# Object Detection
+
+Design ways to avoid accidents between vehicles and objects in the road.
+
+![Deer in the road](/static/coding/object-detection/road-deer.jpg)
+
+## Connect 
+
+Think about:
+
+* In what driving situations can a car hit an obstacle?
+* What do you need to be aware of to avoid collisions with obstacles?
+* What causes traffic jams in high density areas?
+
+## Construct 
+
+### Build
+
+Build a @boardname@ vehicle that can avoid accidents between vehicles and objects in the road. Start by constructing this model:
+
+[![EV3 Robot Driving Base](/static/coding/object-detection/ev3-robot-driving-base.jpg)](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/building-instructions/ev3-ultrasonic-sensor-driving-base-61ffdfa461aee2470b8ddbeab16e2070.pdf)
+
+Build an obstacle for your robot to detect. You can build the **cuboid model** out of LEGO bricks or an obstacle of your choice. 
+
+[![Cubiod block](/static/coding/object-detection/ev3-cuboid.jpg)](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/building-instructions/ev3-cuboid-dc93b2e60bed2981e76b3bac9ea04558.pdf)
+
+### Check
+
+Before you program, check:
+
+* Are all the wires correctly connected from the motors to ports B and C?
+* Are the wheels correctly installed?
+* Are the wheels rotating freely?
+* Are the wires connected from the Ultrasonic Sensor to port 4?
+
+### Program
+
+* Program your robot to detect any obstacles that might appear while the robot is moving forward (or backward).
+* Make the robot stop when it detects an object that is less than 20 cm away.
+
+Before you program, think about:  
+* How will you program the robot to detect obstacles?
+* How will you program the robot to stop at obstacles?
+* Which programming blocks will you use?
+
+### ~hint
+
+Consider using these blocks in your solution:
+
+```block
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+
+})
+motors.largeBC.steer(0, 50)
+pauseUntil(() => true)
+let near = sensors.ultrasonic4.distance() < 20
+motors.stopAll()
+```
+
+### ~
+
+### Sample Solution 
+
+1. Start the program when EV3 ``enter`` button is pressed.
+2. Turn motors ``B`` and ``C`` on at speed ``50``.
+3. Wait until Ultrasonic Sensor detects an obstacle at a distance of less than ``20`` cm.
+4. Stops all motors.
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    motors.largeBC.steer(0, 50)
+    pauseUntil(() => sensors.ultrasonic4.distance() < 20)
+    motors.stopAll()
+})
+```
+
+### Download and test
+
+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.
+
+## Contemplate
+
+On the road, when a driver sees and object, they slow their car down before coming to a full stop. 
+
+Program your EV3 Driving Base to do the same.
+
+If the Ultrasonic Sensor:
+
+* Detects an object less than `10` cm away, make the robot stop.
+* Detects an object between `10` and `20` cm away, make the robot slow down.
+* Does not detect any object, continue to move at full speed.
+
+### ~hint
+
+Consider using this block in your solution:
+ 
+```block
+if (true) {
+}
+```
+
+### ~
+
+### Sample Solution 
+
+```blocks
+loops.forever(function () {
+    motors.largeBC.steer(0, 50)
+    if (sensors.ultrasonic4.distance() < 10) {
+        motors.stopAll()
+    } else if (sensors.ultrasonic4.distance() < 20) {
+        motors.largeBC.steer(0, 10)
+    }
+})
+```
+
+### Download and test
+
+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.
+
+## Continue 
+
+* Get together with other building teams and make a traffic jam by placing all of your robots in a line with varying amounts of space between them.
+* Have everyone start their robots at the same time and see what happens.
+* Refine your programs so that all of the robots continue driving at the same speed with equal distances between them.
+* Click on the JavaScript tab and experiment with changing the values in the code.
+* Add a custom image or sounds from the Brick or Music menus.
+
+### Share
+
+* Share what you think “efficiency in programming” means.
+* Explore the different solutions other programmers came up with.
+* Create a video of your project, especially your final presentation and your robot’s performance. Explain some important features of your software program. 
+* Include an image of your program with comments. 
+* Add a team photograph! 
+
+Congratulations! What will you design next?

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,22 +6,22 @@
 [
     {
         "name": "Make It Move Without Wheels",
-        "description": "TBD",
-        "imageUrl": "/static/lessons/make-it-move.png",
+        "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",
-        "imageUrl": "/static/lessons/make-it-smarter.png",
+        "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.",
-        "imageUrl": "/static/lessons/make-it-communicate.png",
+        "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/design-engineering/make-it-communicate.md

@@ -8,9 +8,9 @@ Design, build and program a robotic system that follows a path and communicates
 
 https://www.youtube.com/watch?v=6piMI1JPDQc
 
-*	Robotic systems are built from smaller, related subsystems. Look at the automobile system shown in the video. What subsystems can you see?
-*	What kinds of robots follow a path?
-*	What kind of system do you want to make?
+* Robotic systems are built from smaller, related subsystems. Look at the automobile system shown in the video. What subsystems can you see?
+* What kinds of robots follow a path?
+* What kind of system do you want to make?
 
 ### Brainstorm
 
@@ -21,7 +21,7 @@ Think about:
 * How can the robot sense where it is along the path?
 * How can the robot communicate its position?
  
- ![EV3 + LEGO Bricks](/static/lessons/make-it-communicate/hero.png)
+![EV3 + LEGO Bricks](/static/lessons/make-it-communicate/ev3-plus-parts.jpg)
 
 ## Construct 
 
@@ -29,25 +29,26 @@ Think about:
 
 You can start by tinkering with the LEGO elements in the picture and then build on.
 
-More building ideas: 
-* [EV3 Frames](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/ev3%20frames-5054ee378e624fb4cb31158d2fc8e5cf.pdf)
+More building ideas:
 
-* [Tracks](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/tracks-32d7554813af3f25cf5012d54a4bad2b.pdf)
+[![EV3 Frames](/static/lessons/make-it-communicate/ev3-frames.jpg)](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/ev3%20frames-5054ee378e624fb4cb31158d2fc8e5cf.pdf)
 
-* [Color Sensor 2](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/color%20sensor_v2-e7fd54b6fa3cdfe36f414c1d2510f9cb.pdf)
+[![Tracks](/static/lessons/make-it-communicate/ev3-tracks.jpg)](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/tracks-32d7554813af3f25cf5012d54a4bad2b.pdf)
+
+[![Color Sensor 2](/static/lessons/make-it-communicate/ev3-color-sensor2.jpg)](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/color%20sensor_v2-e7fd54b6fa3cdfe36f414c1d2510f9cb.pdf)
 
 
 Build a path for your robot to follow. You can use electrical tape on a floor, or marker on paper. You can use objects as milestones to indicate a path that can be detected by either the Touch Sensor, Color Sensor, or Ultrasonic Sensor. 
 
-## Program 
+### Program 
 
 Before you program, think about: 
  
-*	How will you program the robot to follow a path?
-*	How will you program the robot to communicate its position?
-*	Which programming blocks will you use?
+* How will you program the robot to follow a path?
+* How will you program the robot to communicate its position?
+* Which programming blocks will you use?
 
-### ~ hint
+### ~hint
 
 Explore the different Motor and Sensor blocks in the programming menu.
 
@@ -55,17 +56,25 @@ Explore the different Motor and Sensor blocks in the programming menu.
 
 ### Sample Solution 
 
-[Video: EV3 Track Rover](/static/lessons/make-it-communicate/trackrover.mp4)
+[![Video: EV3 Track Rover](/static/lessons/make-it-communicate/ev3-track-rover.jpg)](https://legoeducation.23video.com/v.ihtml/player.html?token=79c99735f906403a4dd7f2909935983d&source=embed&photo%5fid=19857954)
 
 The Track Rover follows a path using the color sensor. It identifies two locations by color.
 
-[Building Instructions](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/ev3-dep/building%20instructions/track-rover-bi-6aadb1b053df0c58a0dea108b5ce0eea.pdf)
+Track Rover solution combines these building ideas:
+
+* EV3 frames
+* Tracks
+* Color sensor 2
+
+Two copies of the tracks are built: one for the right side and a mirror image for the left side.
+
+[![Track rover assembled](/static/lessons/make-it-communicate/ev3-track-rover2.jpg)](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/ev3-dep/building%20instructions/track-rover-bi-6aadb1b053df0c58a0dea108b5ce0eea.pdf)
 
 ### Sample Program Solution 
 
 This program works with the Track Rover. If you create a different robot, adjust the program to fit your solution. 
 
-#### Program summary: 
+Program summary: 
 
 * If the Color Sensor sees black, Motor B runs at -50 power and Motor C turns off.
 * If the Color Sensor sees white, Motor B turns off and Motor C runs at -50 power.
@@ -91,35 +100,10 @@ forever(function () {
         motors.stopAll()
         music.playSoundEffectUntilDone(sounds.colorsRed)
         motors.largeBC.run(-50)
-    } else {
-
     }
 })
 ```
 
-```blocks
-sensors.color3.onColorDetected(ColorSensorColor.Black, function () {
-    motors.largeB.run(-50)
-    motors.largeC.run(0)    
-})
-sensors.color3.onColorDetected(ColorSensorColor.White, function () {
-    motors.largeB.run(0)    
-    motors.largeC.run(-50)
-})
-sensors.color3.onColorDetected(ColorSensorColor.Green, function () {
-    motors.stopAll()
-    music.playSoundEffect(sounds.colorsGreen)
-    pause(1000)  
-    motors.largeBC.run(-50)
-})
-sensors.color3.onColorDetected(ColorSensorColor.Red, function () {
-    motors.stopAll()
-    music.playSoundEffect(sounds.colorsRed)
-    pause(1000)
-    motors.largeBC.run(-50)
-})
-```
-
 ### Download and test
 
 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.
@@ -128,37 +112,40 @@ Click Download and follow the instructions to get your code onto your EV3 Brick.
 
 ### Test and Analyze 
 
-As you work on your solution: 
+As you work on your solution:
+
 1. Describe one part of your design that worked especially well. 
 2. Describe one design change that you had to make. 
 3. What will you try next? 
 
 
 ### Review and Revise 
+
 Take a moment to reflect on your robot solution. 
 
-### Think about: 
-*	Can the robot’s movement be more accurate? 
-*	What are some ways that others have solved the problem?
+Think about:
+
+* Can the robot’s movement be more accurate? 
+* What are some ways that others have solved the problem?
 
 Describe two ways you could improve your robot.
 
 ## Continue 
 
 ### Personalize your project
-*	Add/remove LEGO elements to improve the way your robot moves. 
-*	Click on the JavaScript tab and experiment with changing the values in the code.
-*	Add a custom image or sounds by adding blocks from the Brick or Music menus.
+
+* Add/remove LEGO elements to improve the way your robot moves. 
+* Click on the JavaScript tab and experiment with changing the values in the code.
+* Add a custom image or sounds by adding blocks from the Brick or Music menus.
 
 ## Communicate 
 
-Here are some ideas: 
-*	Create a video of your project, especially your final presentation and your robot’s performance. 
-*	Explain some important features of your software program. 
-*	Produce a building guide for your model by taking a series of photographs as you deconstruct it. 
-*	Include an image of your program with comments. 
-*	Add a team photograph! 
+Here are some ideas:
+
+* Create a video of your project, especially your final presentation and your robot’s performance. 
+* Explain some important features of your software program. 
+* Produce a building guide for your model by taking a series of photographs as you deconstruct it. 
+* Include an image of your program with comments. 
+* Add a team photograph! 
 
 Congratulations! What will you design next?
-
-

docs/design-engineering/make-it-move.md

@@ -1,90 +1,97 @@
 # Make It Move Without Wheels
 
-## ~ avatar
-
-Design, build and program a robot that can move itself using no wheels for locomotion.
-
-## ~
-
 ## Connect
 
 ### Design Brief
 
-Design, build and program a robot that can move itself a distance of at least 30cm, using at least one motor, using NO wheels for locomotion.
+Design, build and program a robot that can move itself using no wheels for locomotion.
+
+![Make it move banner](/static/lessons/make-it-move/make-it-move-without-wheels.png)
+
+Your robot will:
+
+* Go a distance of at least 30cm
+* Use at least one motor
+* Use NO wheels for locomotion
 
 ### Brainstorm
 
-Discuss different solutions to the design brief.
-
-Think about:
-
-How can robots move without wheels? For example, how will you:
-* Connect the motor(s) to something to make the robot walk, crawl, or wiggle?
-How will you program the robot to move? For example, which programming blocks will you use to:
-* Turn on and turn off the motor or motors?
-* Display the distance moved?
-
-### Select the Best Solution
-
-Describe the solution that you have agreed to build and program.
-
-Think about examples from your brainstorming discussion. Then explain why you chose this solution for the design brief.
-
-![The Mars rover](/static/lessons/make-it-move/hero.png)
-
-https://www.youtube.com/ErC_s3hLGMk
+In nature, creatures use many methods to get around. None of them, however, use wheels to move. Can we copy the method of animal locomotion with our robot? Using motors and legs, make a robot that can move without using any wheels.
 
 ## Construct
 
-### Build and Program
+### Build
 
-Now you are ready to start building and programming your solution!
+Think about a creature’s movement for inspiration. Will you make the robot walk, crawl, hop, or wiggle?  Your mechanism can be attached or unattached to the EV3 brick. You can start by tinkering with the LEGO elements in the picture above and then build on.
+
+### Building Hint
+
+If you want some building help you can follow these instructions.
+
+[![Toddle Bot](/static/lessons/make-it-move/toddle-bot.jpg)](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/toddle%20bot-3dcad146d7f5deac4753f93e9dcc0739.pdf)
+
+### Program
+
+Before you program, think about:
+
+* How will you program the robot to move? 
+* How will you program the robot to stop?
+* How will you program the robot to display the distance moved?
+
+Which programming blocks will you use:
+
+* To turn on and turn off the motor or motors? 
+* To display the distance moved? 
+
+### Sample Code
+
+Example code of a robot that moves without wheels using one motor:
+
+* The robot moves with ``large motor D`` rotating at ``-100`` speed
+* The robot moves for ``30000`` milliseconds (30 seconds)
+* The robot stops 
+* The robot displays the text ``"30cm"``
 
 ```blocks
-motors.largeBC.tank(-60, 60, 9, MoveUnit.Rotations);
-motors.stopAll();
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    motors.largeD.run(-100)
+    loops.pause(30000)
+    motors.stopAll()
+    brick.showString("30cm", 1)
+})
 ```
 
-As you work on your solution:
+### Download and test
 
-* Describe one part of your design that worked especially well.
-* Describe one design change that you had to make.
+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.
 
-What will you try next?
-	
-As you test your design solution, use the table for recording your findings.
-
-[**VIEW BUILDING INSTRUCTIONS**](TODO) for a sample solution. (7.8 MB, PDF)
-
-## Contemplate
+## Contemplate 
 
 ### Test and Analyze
 
-How well does your solution satisfy the design brief? Record your data. Name the columns and rows, such as Trial Number, Distance Moved, and Observations.
-
-### Review and Revise
-
-Take a moment to reflect on your robot solution.
-
 Think about:
+
 * Is the robot using something other than wheels to move? Trace the movement from the motor axle to the mechanism(s) that drives the robot forward, backward or sideways. Wheels can be used to stabilize the robot but not to drive it.
-* Does the robot display the distance moved?
-* Is it accurate? How do you know?
-Describe two ways you could improve your robot.
+* Does the robot display the distance moved? Is it accurate? How do you know?
+* What is one part of your design that worked well?
+* What is a change that you need to make?
+* What will you try next?
 
 ## Continue
 
-### Communicate
+### Personalize your project
+
+* Add/remove LEGO elements to improve the way your robot moves. Will your robot walk, wiggle, hop, or slither? Will it move slower, faster or farther?
+* Click on the JavaScript tab and experiment with changing the values in the code.
+* Add a custom image or sounds by adding blocks from the Brick or Music menus.
+* Does your robot resemble a creature? Add arts and crafts materials to your project.
+
+## Communicate
 
-Here are some ideas:
 * Create a video of your project, especially your final presentation and your robot’s performance.
 * Explain some important features of your software program.
 * Produce a building guide for your model by taking a series of photographs as you deconstruct it.
 * Include an image of your program with comments.
 * Add a team photograph!
 
-## ~ avatar
-
 Congratulations! What will you design next?
-
-## ~

docs/design-engineering/make-it-smarter.md

@@ -1,6 +1,5 @@
 # Make It Smarter and Faster 
 
-
 ## Connect 
 
 ### Design Brief
@@ -34,18 +33,25 @@ Think about:
 ### Build
 
 Think about a creature’s movement for inspiration. Your mechanism can be attached or unattached to the EV3 brick. You can start by tinkering with the LEGO elements in the picture add then build on.
+
 More building ideas: 
 
-* [EV3 Frames](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/ev3%20frames-5054ee378e624fb4cb31158d2fc8e5cf.pdf)
-* [Color Sensor 1](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/color%20sensor_v1-16a7231bdc187cd88a8da120c68f58d5.pdf)
-* [Gyro Sensor](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/gyro%20sensor-6f0fdbd82ae45fe0effa0ebf3f460f3d.pdf)
-* [Ultrasonic Sensor](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/ultrasonic%20sensor-a56156c72e8946ed4c58c5e69f3520d3.pdf)
-* [Touch Sensor](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/touch%20sensor-868fda1b9d6070a0a034fb22456a7fc9.pdf)
-* [Jaw](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/jaw-ee93e8f3243e4d30cd34b0c337c33653.pdf)
-* [Leg 1](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/leg%201-c14624046ea3a95148820ed404f5ac65.pdf)
-* [Leg 2](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/leg%202-8855c35b990205f6b9d7130687a3d4db.pdf)
-* [Leg 3](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/leg%203-575d52ef15fb79f1e4d3350d36607160.pdf)
+| | | | | |
+|-|-|-|-|-|
+|[![EV3 Frames](/static/lessons/make-it-smarter/ev3-parts-frames.jpg)][EV3 Frames] | |[![EV3 Color Sensor 1](/static/lessons/make-it-smarter/ev3-parts-color-sensor-1.jpg)][Color Sensor 1] | |[![EV3 Gyro Sensor](/static/lessons/make-it-smarter/ev3-parts-gyro-sensor.jpg)][Gyro Sensor] |
+| [EV3 Frames] | | [Color Sensor 1] | | [Gyro Sensor] |
+<br/>
 
+| | | | | |
+|-|-|-|-|-|
+|[![EV3 Ultrasonic Sensor](/static/lessons/make-it-smarter/ev3-parts-ultrasonic-sensor.jpg)][Ultrasonic Sensor] | | [![EV3 Touch Sensor](/static/lessons/make-it-smarter/ev3-parts-touch-sensor.jpg)][Touch Sensor] | | [![EV3 Gyro Sensor](/static/lessons/make-it-smarter/ev3-parts-jaw.jpg)][Jaw] |
+| [Ultrasonic Sensor] | | [Touch Sensor] | | [Jaw] |
+<br/>
+
+| | | | | |
+|-|-|-|-|-|
+| [![EV3 Leg 1](/static/lessons/make-it-smarter/ev3-parts-leg-1.jpg)][Leg 1] | | [![EV3 Leg 2](/static/lessons/make-it-smarter/ev3-parts-leg-2.jpg)][Leg 2] | | [![EV3 Leg 3](/static/lessons/make-it-smarter/ev3-parts-leg-3.jpg)][Leg 3] |
+| [Leg 1] | | [Leg 2] | | [Leg 3] |
 
 ### Program 
 
@@ -55,81 +61,46 @@ Before you program, think about:
 * How will you program the robot to respond?
 * Which programming blocks will you use?
 
-### ~ hint
+### ~hint
 
 **Hint:** Explore the different Sensor blocks in the Sensors Menu
 
 ### ~
 
-## SCREEN 5
+### Sample Solution 
 
-Sample Solution 
-
-[Video: EV3 Insect]
-
-This Insect uses its Ultrasonic Sensor to sense danger and move away from threat.
+The Insect uses its Ultrasonic Sensor to sense danger and move away from a threat.
 
+https://www.youtube.com/watch?v=PoeYoiXHHE4
+<br/>
 The Insect solution combines these building ideas:
 
-* EV3 Frames
-* Leg 2
-* Leg 3
-* Ultrasonic Sensor 
+* [EV3 Frames]
+* [Leg 2]
+* [Leg 3]
+* [Ultrasonic Sensor]
 
-Four copies of Leg 3 were built: one for the front left, one for the back right, and two mirror copies for the front right and back left.
+Four copies of Leg 3 are built: one for the front left, one for the back right, and two mirror copies for the front right and back left.
 
-* [Building Instructions](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/insect-94b8a46f0dc5082c9d78ddb734626dc9.pdf)
+Building Instructions:
+
+[![Insect robot](/static/lessons/make-it-smarter/insect-bot.jpg)](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/insect-94b8a46f0dc5082c9d78ddb734626dc9.pdf)
 
 ### Sample Solution 
 
 This program checks if the Ultrasonic Sensor senses something near. 
 
-This program:
+The blocks inside the ``||loops:forever||`` loop have these actions: 
 
-* Turns on the green EV3 brick Status Light
-
-```block
-brick.setStatusLight(StatusLight.Green)
-```
-
-* Waits for Ultrasonic Sensor to detect an object
-
-```block
-sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectDetected)
-```
-
-* Turns on Motors A and D in opposite directions
-
-```block
-motors.largeAD.tank(50, -50)
-```
-
-* Waits for one half of a second (1500 milli seconds)
-
-```block
-pause(1500)
-```
-
-* Reverses the direction of Motors A and D
-
-```block
-motors.largeAD.tank(-50, 50)
-```
-
-* Waits for one half of a second
-* Stops all motors
-
-```block
-motors.stopAll()
-```
-
-* Makes an insect chirping sound
-
-```block
-music.playSoundEffectUntilDone(sounds.animalsInsectChirp)
-```
-
-* Loops so the insect wanders around when the Ultrasonic Sensor is triggered
+1. Turn on the ``green`` EV3 brick Status Light.
+2. Wait for Ultrasonic Sensor to detect an object.
+3. Turn on Motors ``A`` and ``D`` in opposite directions.
+4. Wait for one quarter of a second (``1500`` milli seconds).
+5. Reverse the direction of Motors ``A`` and ``D``.
+6. Wait for one quarter of a second.
+7. Stop all motors.
+8. Make an insect chirping sound.
+9. Loop continuously so that the insect wanders around when the Ultrasonic Sensor is detects something.
 
 ```blocks
 forever(function () {
@@ -146,7 +117,7 @@ forever(function () {
 
 ### Download and test
 
-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.
+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.
 
 ## Contemplate 
 
@@ -157,7 +128,6 @@ As you work on your solution:
 2. Describe one design change that you had to make. 
 3. What will you try next? 
 
-
 ### Review and Revise 
 
 Take a moment to reflect on your robot solution. 
@@ -170,15 +140,14 @@ Think about:
 
 Describe two ways you could improve your robot.
 
-
 ## Continue 
 
-Personalize your project
+Personalize your project:
 
 * Add/remove LEGO elements to improve the way your robot moves. 
 * Click on the JavaScript tab and experiment with changing the values in the code.
 * Add a custom image or sounds by adding blocks from the Brick or Music menus.
-* Does your robot resemble a creature? Add arts and crafts materials to you project.
+* Does your robot resemble a creature? Maybe add more craft materials to your project.
 
 ## Communicate 
 
@@ -190,3 +159,14 @@ Here are some ideas:
 * Add a team photograph! 
 
 Congratulations! What will you design next?
+
+
+[EV3 Frames]: https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/ev3%20frames-5054ee378e624fb4cb31158d2fc8e5cf.pdf
+[Color Sensor 1]: https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/color%20sensor_v1-16a7231bdc187cd88a8da120c68f58d5.pdf
+[Gyro Sensor]: https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/gyro%20sensor-6f0fdbd82ae45fe0effa0ebf3f460f3d.pdf
+[Ultrasonic Sensor]: https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/ultrasonic%20sensor-a56156c72e8946ed4c58c5e69f3520d3.pdf
+[Touch Sensor]: https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/touch%20sensor-868fda1b9d6070a0a034fb22456a7fc9.pdf
+[Jaw]: https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/jaw-ee93e8f3243e4d30cd34b0c337c33653.pdf
+[Leg 1]: https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/leg%201-c14624046ea3a95148820ed404f5ac65.pdf
+[Leg 2]: https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/leg%202-8855c35b990205f6b9d7130687a3d4db.pdf
+[Leg 3]: https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/leg%203-575d52ef15fb79f1e4d3350d36607160.pdf

docs/examples.md

@@ -21,11 +21,11 @@ Here are some fun programs for your @boardname@!
   "imageUrl": "/static/maker/security-gadget.png"
 },
 {
-  "name": "Intruder Detector",
-  "description": "Raise the alarm when an intruder sneaks in",
-  "url":"/maker/intruder-detector",
+  "name": "Movement Detector",
+  "description": "Raise the alarm when an movement sneaks in",
+  "url":"/maker/movement-detector",
   "cardType": "example",
-  "imageUrl": "/static/maker/intruder-detector.png"
+  "imageUrl": "/static/maker/movement-detector.png"
 },
 {
   "name": "Puppet",

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.md

@@ -7,14 +7,14 @@
 {
     "name": "Try",
     "imageUrl": "/static/lessons/try.png",
-    "description": "TBD",
+    "description": "Get a quick introduction to programming.",
     "url": "/getting-started/try",
     "cardType": "side"
 },
 {
-    "name": "use",
+    "name": "Use",
     "imageUrl": "/static/lessons/use.png",
-    "description": "TBD",
+    "description": "Build a robot and drive into the world of robotics!",
     "url": "/getting-started/use",
     "cardType": "side"
 }

docs/getting-started/try.md

@@ -0,0 +1,165 @@
+# Try 
+
+Get a quick introduction to programming with EV3.
+
+![Display on EV3 Brick with Music Notes](/static/getting-started/01_EyesOn_Intro.png)
+
+We are excited to help you get started with @boardname@. In this project we will guide you through connecting your EV3 brick, creating your first program, controlling a Large Motor, a Touch Sensor and a Color Sensor. These steps can take up to 45 minutes.
+
+## Turn on your EV3 Brick
+
+Power on your EV3 Brick by pressing the Center Button.
+
+![Hand pressing power button](/static/getting-started/02_PowerOn.png)
+
+## Connect Your EV3 Brick to Your Device
+
+Use the USB cable to connect your EV3 Brick to your device.
+
+![Computer and cable connected to EV3 Brick](/static/getting-started/03_insert-usb-02.png)
+
+## Create and Run your First Program
+
+**Code it:** Create the program shown here.
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    brick.showMood(moods.neutral)
+    music.playSoundEffect(sounds.communicationHello)
+})
+```
+
+* Drag out a ``||brick:on button||`` block from Buttons section in the ``||brick:Brick||`` Toolbox drawer.
+* Drag a Brick Screen ``||brick:show mood||`` block inside the ``||brick:on button||`` block.
+* Change mood to ``neutral``.
+
+```block
+brick.showMood(moods.neutral)
+```
+
+* Drag a Music ``||music:play sound effect||`` block below the ``||brick:show mood||`` block.
+* Change sound effect to ``communication hello``.
+
+```block
+music.playSoundEffect(sounds.communicationHello)
+```
+
+**Download:** 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.
+
+## Did It Work?
+
+![EV3 Brick with eyes on the display](/static/getting-started/05_EyesOn.png)
+
+Verify that the program you just created shows eyes on the Brick Display, and that the EV3 Brick played the sound “Hello!”
+
+**Well done!**
+
+## Connect a Large Motor
+
+Now you will learn to control the Large Motor.
+
+![EV3 Brick with hands connecting Large Motor to Port D](/static/getting-started/06_PlugInLargeMotor.png)
+
+Connect a Large Motor to **Port D** of your EV3 Brick using any of the connector cables.
+
+## Create and Run This Program
+
+**Code it:** Create the program shown here.
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    motors.largeD.run(50, 1, MoveUnit.Rotations)
+})
+```
+
+* Start a new program.
+* Drag a ``||motors:run large A motor||`` block inside the ``||brick:on button||`` block.
+* Change ``large motor A`` to ``large motor D``.
+* Click on the **(+)** sign.
+* Change to ``1`` rotation.
+
+**Download:** 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.
+
+## Did It Rotate?
+
+Confirm that your motor has turned one rotation at power level 50 before stopping.
+
+![Large Motor D w/Rotating “WHRRR,” Hand, EV3 Brick](/static/getting-started/08_WorkingLargeMotor.png)
+
+Download and run the program as many times as you want in order to verify this, or tinker with different power levels and different rotations.
+
+## Connect a Touch Sensor
+
+We will now control the Large Motor using a Touch Sensor.
+
+![Hands connecting Touch Sensor to Port 1 on EV3 Brick](/static/getting-started/09_Connect_Touch.png)
+
+Keeping the Large Motor connected to **Port D**, connect a Touch Sensor to **Port 1** of your EV3 Brick.
+
+## Modify Your Program
+
+**Code it:** Add code to the program for the Touch Sensor.
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    sensors.touch1.pauseUntil(ButtonEvent.Pressed)
+    motors.largeD.run(50, 1, MoveUnit.Rotations)
+})
+```
+
+* Add a ``||sensors:pause until touch 1 pressed||`` Sensor block on top of the ``||motors:run large motor D||`` block.
+
+```block
+sensors.touch1.pauseUntil(ButtonEvent.Pressed)
+```
+
+**Download:** 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.
+
+## Press the Touch Sensor
+
+Confirm that the Large Motor has turned one rotation AFTER you press the Touch Sensor.
+
+![Hand Touch Sensor Pressed & EV3 Brick & Large Motor](/static/getting-started/11_TouchMotorWorking.png)
+
+Download and run the program as many times as you want in order to verify this, or tinker with different Touch Sensor and Large Motor values.
+
+## Connect a Color Sensor
+
+Now we will try to control the Large Motor using another sensor.
+
+![Hand connecting Color Sensor to Port 4, Large Motor D, EV3 Brick](/static/getting-started/12_ConnectColor.png)
+
+Keeping the Large Motor connected to **Port D**, connect the Color Sensor to **Port 4**.
+
+**Code it:** Modify Your Program to use the Color Sensor.
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    sensors.color3.pauseUntilColorDetected(ColorSensorColor.Green)
+    motors.largeD.run(50, 1, MoveUnit.Rotations)
+})
+```
+
+* 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.pauseUntilColorDetected(ColorSensorColor.Green)
+```
+
+* Select the color you want to detect (e.g., green).
+
+**Download:** 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.
+
+## Place a Colored Brick in Front of the Color Sensor
+
+![IMG: Colored bricks in front of Color Sensor, hands, EV3 Brick](/static/getting-started/14_ColorSensorWorking.png)
+
+Confirm that the Large Motor has turned one rotation AFTER the Color Sensor has detected the colored brick.
+
+Download and run the program as many times as you want in order to verify this, or tinker with different Color Sensor and Large Motor values.
+
+Click on the **JavaScript** tab and change the color the Color Sensor detects to Black, Blue, Green, Yellow, Red, White, or Brown. Use Title Case for the color names.
+
+## Well Done!
+
+You have now learned how to control some of the inputs and outputs of the EV3.

docs/getting-started/use.md

@@ -0,0 +1,109 @@
+# Use
+
+Build a robot and drive into the world of robotics!
+
+![EV3 Driving Base full w/cuboid](/static/getting-started/EV3_GettingStarted_13.jpg)
+
+In this project we will guide you through building a Driving Base Robot and programming it to move straight and turn. You will also build and Object Detector Module, and program it to detect an object. It’s a good idea to have done the [Try](/getting-started/try) sequence first.
+
+## Connect
+
+What if your school had a multipurpose robot? How would you use it?
+
+![Apple Picker Robot](/static/getting-started/02_ApplePickerRobot.jpg)
+
+Would you use it to clean the school or plant trees?
+
+## Build Your Driving Base Robot
+
+Build the robot driving base:
+
+[![EV3 Driving Base](/static/lessons/common/ev3-driving-base.jpg)](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/building-instructions/ev3-rem-driving-base-79bebfc16bd491186ea9c9069842155e.pdf)
+
+## Make It Move
+
+**Code it:** Create a program that makes the Driving Base move forward and stop at the finish line, which is ``1`` meter away.
+
+Start by building this program:
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    motors.largeBC.steer(0, 50, 1, MoveUnit.Rotations)
+})
+```
+
+* Drag a ``||motors:steer large motors B+C||`` block inside an ``||brick:on button||`` block.
+* Click on the **(+)** sign.
+* Change to ``1`` rotation.
+
+### ~hint
+
+**Hint:** You will have to modify the number of rotations until you find the number that matches the robot moving forward 1 meter and stopping.
+
+### ~
+
+**Download:** 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.
+
+## Make It Turn
+
+**Code it:** Create a new program that turns the Driving Base 180 degrees.
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    motors.largeBC.steer(-50, 50, 1, MoveUnit.Rotations)
+})
+```
+
+### ~hint
+
+**Hint:** You will have to modify the turn ratio and the number of rotations until the robot reaches 180 degrees.
+
+### ~
+
+**Download:** 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.
+
+## Add an Ultrasonic Sensor to Your Driving Base
+
+Build and attach an Ultrasonic Sensor to your driving base:
+
+[![EV3 Ultrasonic Sensor Driving Base Building Instructions Main Image](/static/lessons/common/ev3-ultrasonic-sensor-driving-base.jpg)](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/building-instructions/ev3-ultrasonic-sensor-driving-base-61ffdfa461aee2470b8ddbeab16e2070.pdf)
+
+## Detect an Object
+
+**Code it:**  Create a program that moves the Driving Base and makes it stop ``6`` cm from the Cuboid.
+
+Create a new program:
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    motors.largeBC.tank(50, 50)
+    sensors.ultrasonic4.setThreshold(UltrasonicSensorEvent.ObjectDetected, 6)
+    sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectDetected);
+    motors.stopAll()
+})
+```
+
+* Drag a ``||motors:tank large motors B+C||`` motor block inside the ``||brick:on button||`` block.
+* Drag the Ultrasonic Sensor threshold ``||sensors:set ultrasonic 4||``  block and place it below the motor block.
+* Drag a ``|sensors:pause until ultrasonic 4||`` block and place it under the threshold block.
+* Drag a ``||motors:stop all motors||`` block and place it below the sensor block.
+
+### ~hint
+
+**Hint:** You will have to modify the values of the Ultrasonic Sensor block until the robot reaches the desired position.
+
+### ~
+
+**Download:** 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.
+
+Click on the **JavaScript** tab. Change and test the number value of the Ultrasonic
+Sensor.
+
+```typescript
+sensors.ultrasonic4.setThreshold(UltrasonicSensorEvent.ObjectDetected, 10)
+```
+
+**Congratulations!**
+
+You are ready to move on to the next steps.
+Try a [Design Engineering](/design-engineering), [Coding](/coding), or [Maker](/maker) activity.

docs/index-ref.json

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

docs/labview.md

@@ -1,6 +1,6 @@
 # Coding in MakeCode
 
-This guide helps users who are used to the LabView LEGO Minstorms editor quickly get familiar with using blocks in MakeCode.
+This guide helps users who are used to work with @boardname@ to get familiar with using blocks in MakeCode.
 
 ## Snap together the blocks
 

docs/lessons.md

@@ -1,6 +1,6 @@
 # Lessons
 
-Learning activities for LEGO Mindstorms with MakeCode.
+Learning activities for @boardname@ with MakeCode.
 
 ## Motors and motion
 

docs/lessons/classroom-management.md

@@ -0,0 +1,68 @@
+# Classroom Management Tips
+
+## Lesson Planning
+
+### Required Materials
+
+* [@boardname@ Core Set](https://education.lego.com/enus/products/legomindstormseducationev3coreset/5003400)
+* Lesson plan
+* Student Worksheet for each activity
+* Inspirational images for each activity
+* Modeling materials already available in your classroom
+
+### How much time do you need?
+
+Each lesson is designed to take 90 minutes. If you work in shorter class periods, you can break this down into two 45 minute sessions.
+
+### Preparation
+
+It is important to establish student groups. Groups of two work well. Ensure that each student has a copy of the Student Worksheet for recording their design process, or alternatively, they can use their own preferred method for recording their design journey. They will also need the @boardname@ Core Set (one set for every two students is recommended).
+
+### Prior Learning
+
+Before beginning these Maker activities, it is recommended that students complete the lessons from the Introduction to Robotics Lesson Plan. These lessons can be found in both EV3 Lab and EV3 Programming. These tutorial lessons last between 45 - 90 minutes each, and you will need to factor this into your lesson planning.
+
+However, if you prefer a more open-ended, explorative method, you can start out with this activity and allow students to find help on their own by referring to the Robot Educator Tutorials.
+
+## The LEGO Education Maker (Design) Process #design-process
+
+### Defining the Problem
+
+It is important that students define a real problem to solve, or find a new design opportunity from the start. The “Connect” images are provided to help students think about designing their solutions. At this stage of the process, it is important that you not show examples of a final or sample solution.
+
+### Brainstorm
+
+Brainstorming is an active part of making. Some students will find it easier to explore their thoughts through tinkering (hands-on experimentation) with the LEGO bricks, and others will prefer to record sketches and notes. Group work is essential, but it is important to allow time for students to work alone before sharing their ideas with their groups.
+
+### Define the Design Criteria
+
+Discussing and reaching an agreement about the best solution to build can involve a lot of negotiation and may require different techniques that are dependent on the students’ skills. For example:
+
+* Some students draw well.
+* Others may build part of a model, and then describe what they mean.
+* Other students may be good at describing a strategy.
+
+Encourage an ethos where students can share anything, no matter how abstract it might sound. Be active during this phase and ensure that the ideas the students choose are achievable.
+
+It is important that students set clear design criteria. Once the solution to the problem has been made, the students will return to these criteria, which will then form the basis for testing how well their solution works.
+
+### Go Make
+
+Students must make one of their ideas using the LEGO set, and can use other materials if needed. If they are finding it hard to build their idea, encourage them to break problems down into smaller parts. Explain that they do not have to come up with the whole solution from the start. Remind students that this process is iterative and they must test, analyze, and revise their idea as they go.
+
+Using this Maker process does not mean you are following an inflexible set of steps. Instead, think of it as a set of practices.
+For example, brainstorming may be prominent at the beginning of the process. However, students may also need to brainstorm ideas when they are trying to figure out ways to improve their idea, or when they have a bad test result and must change a feature of their design.
+
+### Review and Revise Your Solution
+
+To help students develop their critical thinking and communication skills, you may wish to have students from one group observe and critique another group’s solution. Peer review and formative feedback helps both the students giving, and the students receiving the feedback to improve their work.
+
+### Communicate Your Solution
+
+The Student Worksheet is helpful for basic documentation of the activity. Students can also refer to it when presenting their work in front of the class. You may also wish to use the Student Worksheet as a portfolio for performance evaluations or for student self-evaluation.
+
+## Maker (Design) Process Diagram
+
+Here's a diagram to quickly illustrate the steps of the Maker (Design) Process. You can copy and print this as a poster to give to the students.
+
+![Design process diagram](/static/lessons/common/lego-maker-design-process-large.jpg)

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.pauseUntilLightDetected(LightIntensityMode.Reflected, Light.Bright)
         motors.largeB.run(10)
         motors.largeC.run(-10)
     }
     while (true) {
-        sensors.color3.pauseForLight(LightIntensityMode.Reflected, LightCondition.Bright)
+        sensors.color3.pauseUntilLightDetected(LightIntensityMode.Reflected, Light.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, Light.Bright)
         motors.largeB.run(10)
         motors.largeC.run(-10)
     }
     while (true) {
-        sensors.color3.pauseForLight(LightIntensityMode.Reflected, LightCondition.Bright)
+        sensors.color3.pauseUntilLightDetected(LightIntensityMode.Reflected, Light.Bright)
         motors.largeB.run(-10)
         motors.largeC.run(10)
     }

docs/lessons/make-it-move-tutorial.md

@@ -10,7 +10,7 @@ Your robot will:
 * Use at least one motor
 * Use NO wheels for locomotion
 
-![LECG Mindstorms brick with parts](/static/lessons/make-it-move/locomotion-no-wheels.jpg)
+![@boardname@ with parts](/static/lessons/make-it-move/locomotion-no-wheels.jpg)
 
 
 ## Construct @unplugged
@@ -25,7 +25,7 @@ The legs in the Walker Bot are designed to show how to change the rotary motion
 
 Start by reading [these](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/ev3-dep/building%20instructions/walker-bot-bi-180fc24f9298e1dd6201099627d43903.pdf) instructions first.
  
-![LEGO Mindstorms Walker Bot](/static/lessons/make-it-move/walker-bot.jpg)
+![@boardname@ Walker Bot](/static/lessons/make-it-move/walker-bot.jpg)
 
  
 ## Program 1 @fullscreen

docs/lessons/make-it-move.md

@@ -10,7 +10,7 @@ Your robot will:
 * Use at least one motor
 * Use NO wheels for locomotion
 
-![LECG Mindstorms brick with parts](/static/lessons/make-it-move/locomotion-no-wheels.jpg)
+![@boardname@ with parts](/static/lessons/make-it-move/locomotion-no-wheels.jpg)
 
 ## Construct
 
@@ -24,7 +24,7 @@ The legs in the Walker Bot are designed to show how to change the rotary motion
 
 Start by reading [these](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/ev3-dep/building%20instructions/walker-bot-bi-180fc24f9298e1dd6201099627d43903.pdf) instructions first.
  
-![LEGO Mindstorms Walker Bot](/static/lessons/make-it-move/walker-bot.jpg)
+![@boardname@ Walker Bot](/static/lessons/make-it-move/walker-bot.jpg)
 
  
 ## Program

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 [@boardname@ 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,10 +10,18 @@ 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/maker/sound-machine.png",
+  "imageUrl": "/static/lessons/make-a-sound-machine.png",
+  "cardType": "side"  
+},
+{
+  "name": "Make A Security Gadget",
+  "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",
   "cardType": "side"  
 }
 ]

docs/maker/movement-detector.md

@@ -1,4 +1,4 @@
-# Intruder Detector
+# Movement Detector
 
 This program will activate an alarm when an object moves in front of the Ultrasonic Sensor.
 

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
+
+* [@boardname@ 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 @boardname@ 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
+
+* [@boardname@ 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 @boardname@ 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.md

@@ -1,6 +1,7 @@
 # Reference
 
 ```namespaces
+music.playSoundEffect(sounds.animalsCatPurr);
 sensors.color(null);
 motors.stopAll();
 brick.showMood(moods.sleeping);
@@ -18,5 +19,6 @@ control.runInParallel(function(){});
 [brick](/reference/brick),
 [sensors](/reference/sensors),
 [motors](/reference/motors),
+[music](/reference/music),
 [control](/reference/control),
 [console](/reference/console)

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/control/assert.md

@@ -0,0 +1,12 @@
+# @extends
+
+## Example #example
+
+Stop the program if the gyro dectects an angle greater than 45 degrees.
+
+```blocks
+forever(function () {
+    control.assert(sensors.gyro2.angle() > 45, 15)
+    pause(300)
+})
+```

docs/reference/control/device-serial-number.md

@@ -0,0 +1,9 @@
+# @extends
+
+## Example #example
+
+Log the device serial number to the console.
+
+```blocks
+console.logValue("serialnumber", control.deviceSerialNumber());
+```

docs/reference/control/on-event.md

@@ -0,0 +1,25 @@
+# @extends
+
+# Example #example
+
+Register two events coming from source `22`. Make the brick status light up  when
+the events of `0` and `1` are _raised_.
+
+```blocks
+const statusLighter = 22;
+
+control.runInParallel(() => {
+    for (let i = 0; i < 2; i++) {
+        pause(1000);
+        control.raiseEvent(statusLighter, i);
+    }
+})
+
+control.onEvent(statusLighter, 0, () => {
+    brick.setStatusLight(StatusLight.OrangePulse)
+})
+
+control.onEvent(statusLighter, 1, () => {
+    brick.setStatusLight(StatusLight.GreenPulse)
+})
+```

docs/reference/control/panic.md

@@ -0,0 +1,13 @@
+# @extends
+
+## Example #example
+
+Send a 'code red' error that you created to the error display if the brick crashes into a wall.
+
+```blocks
+let codeRed = 1
+let codeBlue = 2
+sensors.touch1.onEvent(ButtonEvent.Pressed, function () {
+    control.panic(codeRed)	
+})
+```

docs/reference/control/raise-event.md

@@ -0,0 +1,25 @@
+# @extends
+
+# Example #example
+
+Register two events coming from source `22`. Make the brick status light up  when
+the events of `0` and `1` are _raised_.
+
+```blocks
+const statusLighter = 22;
+
+control.runInParallel(() => {
+    for (let i = 0; i < 2; i++) {
+        pause(1000);
+        control.raiseEvent(statusLighter, i);
+    }
+})
+
+control.onEvent(statusLighter, 0, () => {
+    brick.setStatusLight(StatusLight.OrangePulse)
+})
+
+control.onEvent(statusLighter, 1, () => {
+    brick.setStatusLight(StatusLight.GreenPulse)
+})
+```

docs/reference/control/run-in-parallel.md

@@ -0,0 +1,61 @@
+# @extends
+
+## Separate tasks #tasks
+
+As an example, you could have a small task that checks the battery level and gives a warning when it drops below 15 percent. This is placed inside a ``||control:run in parallel||`` block:
+
+```block
+let powerCheck = false;
+
+control.runInParallel(() => {
+    while (!powerCheck) {
+        if (brick.batteryLevel() <= 15) {
+            brick.setStatusLight(StatusLight.RedFlash)
+            powerCheck = true;
+        } else {
+            pause(5000);
+        }
+    }
+})
+```
+
+The code the main program just drives the brick in a constant pattern until the battery check in the parallel task says that the battery level is too low.
+
+```block
+let powerCheck = false;
+while (!powerCheck) {
+    motors.largeBC.tank(50, 50, 5, MoveUnit.Seconds)
+    motors.largeBC.steer(5, 50, 6, MoveUnit.Rotations)
+}
+motors.stopAll()
+```
+
+## #example
+
+Tank the brick in a pattern until the battery warning variable is set. Have a separate task check the battery level and set a warning variable when the level is below `5` percent.
+
+```blocks
+let powerCheck = false;
+
+control.runInParallel(() => {
+    while (!powerCheck) {
+        if (brick.batteryLevel() < 5) {
+            powerCheck = true;
+        } else {
+            pause(5000);
+        }
+    }
+})
+
+while (!powerCheck) {
+    motors.largeBC.tank(20, 20, 5, MoveUnit.Seconds)
+    motors.largeBC.steer(15, 20, 6, MoveUnit.Rotations)
+    motors.largeBC.tank(40, 40, 5, MoveUnit.Seconds)
+    motors.largeBC.steer(-10, 20, 3, MoveUnit.Rotations)
+}
+motors.stopAll()
+```
+
+## See also #seealso
+
+[forever](/reference/loops/forever)

docs/reference/control/wait-micros.md

@@ -0,0 +1,17 @@
+# @extends
+
+## Example #example
+
+Use the a wait and the timer to generate a crazy number.
+
+```blocks
+let crazy = 0
+for (let i = 0; i < 100; i++) {
+    control.waitMicros(100)
+    crazy = control.millis()
+    crazy += control.deviceSerialNumber()
+    if (crazy != 0) {
+        crazy = crazy / 1000000
+    }
+}
+```

docs/reference/motors.md

@@ -19,6 +19,5 @@ motors.stopAll()
 ```cards
 motors.largeA.speed()
 motors.largeA.angle()
-motors.largeA.tacho()
 motors.largeA.clearCounts()
 ```

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

@@ -17,11 +17,11 @@ let tachoCount = 0;
 motors.largeA.reset()
 motors.largeA.run(50)
 pause(10000)
-tachoCount = motors.largeA.tacho()
+tachoCount = motors.largeA.angle()
 motors.largeA.clearCounts()
 motors.largeA.run(50)
 pause(10000)
-if (tachoCount == motors.largeA.tacho()) {
+if (tachoCount == motors.largeA.angle()) {
     brick.showString("Motor turns equal.", 1)
 } else {
     brick.showString("Motor turns NOT equal.", 1)
@@ -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/motors/motor/tacho.md

@@ -1,48 +0,0 @@
-# tacho
-
-Get the current number of degress of rotation.
-
-```sig
-motors.largeA.tacho()
-```
-
-The motors that come with your @boardname@ have a way to detect their own turning motion. They count the amount of motor rotation in degrees. The motor will count each degree of angle rotation up to 360 degrees for a full rotation. As the motor continues to turn, the _tacho_ count keeps adding up the degrees even past one full rotation. So, if the motor makes 3 complete rotations, the count will be 1080.
-
-The name _tacho_ comes from the first part of the word [tachometer](https://en.wikipedia.org/wiki/Tachometer) which is a device to measure how fast something is turning. The motor controller in the brick uses the tacho count to regulate the motor's speed.
-
-## ~hint
-
-**Measure RPM**
-
-A standard way to know how fast a motor is turning is by measuring its _revolutions per minute_ (rpm). One revolution is the same thing as a rotation, or one turn. How do you measure rpm? Well, here's a simple way:
-
-1. Record the current tacho count
-2. Run the motor for 60 seconds
-3. Get the tacho count again
-4. Subtract the first tacho count from the second one
-5. Divide that number by `360`
-
-## ~
-
-## Returns
-
-* a [number](/types/number) which is the total count of degrees of rotation that the motor has turned since it was first started or reset.
-
-## Example
-
-Run the motor connected to port **A** at half speed for 5 seconds. Display the number of full rotations on the screen.
-
-```blocks
-motors.largeA.run(50)
-pause(5000)
-motors.largeA.stop()
-brick.showString("Motor rotations:", 1)
-brick.showNumber(motors.largeA.tacho() / 360, 3)
-motors.largeA.run(50)
-```
-
-## See also
-
-[angle](/reference/motors/motor/tacho), [speed](/reference/motors/motor/speed),
-[set regulated](/reference/motors/motor/set-regulated),
-[reset](/reference/motors/motor/reset), [clear counts](/reference/motors/motor/clear-counts)

docs/reference/music/ring-tone.md

@@ -0,0 +1,11 @@
+# @extends
+
+## Example #example
+
+This program checks the speed from the large `A` motor and uses the speed to adjust a tone it rings.
+
+```blocks
+loops.forever(function () {
+    music.ringTone(motors.largeA.speed() * 100)
+})
+```

docs/reference/music/set-volume.md

@@ -0,0 +1,10 @@
+# @extends
+
+## Example #example
+
+Play a tyrannosaurus roar at half volume.
+
+```blocks
+music.setVolume(50)
+music.playSoundEffect(sounds.animalsTRexRoar)
+```

docs/reference/music/stop-all-sounds.md

@@ -0,0 +1,10 @@
+# @extends
+
+## Example #example
+
+Play a sound effect but stop it right away.
+
+```blocks
+music.playSoundEffect(sounds.expressionsCrying)
+music.stopAllSounds()
+```

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.onLightDetected(LightIntensityMode.Reflected, Light.Dark, function () {})
+sensors.color1.pauseUntilLightDetected(LightIntensityMode.Reflected, Light.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

docs/static/lego-logo.svg

@@ -1,74 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 16.0.3, 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="Layer_1"
-   x="0px"
-   y="0px"
-   width="141.73"
-   height="141.731"
-   viewBox="0 0 141.73 141.73101"
-   enable-background="new 0 0 265.365 141.732"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="lego-logo.svg"><metadata
-     id="metadata26"><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></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs24" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1199"
-     inkscape:window-height="604"
-     id="namedview22"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="1.6520876"
-     inkscape:cx="101.03204"
-     inkscape:cy="98.819336"
-     inkscape:window-x="372"
-     inkscape:window-y="149"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g6" /><g
-     id="product_logo" /><g
-     id="guides" /><g
-     id="LEGO_LOGO_SMALL_RGB"><g
-       id="g6"><path
-         d="m 0.961,0.948 0,139.839 139.84,0 0,-139.839 -139.84,0 z"
-         id="path8"
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff" /><path
-         d="m 0.961,0.948 0,139.839 139.84,0 0,-139.839 -139.84,0 z m 130.536,58.127 c -0.23,4.356 -1.617,9.786 -2.839,13.414 -4.917,14.609 -10.618,23.666 -23.821,23.666 -3.887,0 -10.783,-1.031 -13.324,-7.947 l -0.602,-1.641 -1.082,1.371 C 85.7,93.168 79.564,96.186 72.998,96.217 67.96,96.24 63.912,94.553 61.293,91.334 l -0.718,-0.883 -0.765,0.844 c -2.797,3.088 -7.668,4.859 -13.364,4.859 -4.473,0 -8.335,-1.521 -10.876,-4.277 l -0.692,-0.752 -0.72,0.727 c -2.825,2.852 -7.276,4.289 -12.873,4.158 -6.79,-0.162 -10.924,-3.951 -11.058,-10.141 -0.205,-9.543 9.031,-29.622 12.854,-35.727 2.482,-4.078 5.895,-6.055 10.438,-6.055 3.092,0 5.207,0.646 6.463,1.977 1.144,1.211 1.37,2.232 1.472,4.688 l 0.131,3.175 1.676,-2.7 c 4.054,-6.532 10.773,-7.434 17.43,-7.434 4.628,0 8.667,1.702 10.289,4.336 l 0.599,0.971 0.866,-0.737 c 3.431,-2.916 8.271,-4.521 13.629,-4.521 5.849,0 10.099,1.454 12.634,4.322 0.576,0.651 0.957,1.106 1.486,2.219 l 0.651,1.366 0.977,-1.155 c 3.712,-4.39 8.779,-6.615 15.067,-6.615 4.98,0 8.761,1.324 11.235,3.935 3.104,3.271 3.547,7.875 3.373,11.161 z"
-         id="path10"
-         inkscape:connector-curvature="0"
-         style="fill:#f6ec36" /><path
-         d="m 0.961,0.948 0,139.839 139.84,0 0,-139.839 -139.84,0 z M 135.435,64.44 c -0.633,5.089 -4.072,14.518 -5.899,18.286 -4.903,10.102 -11.453,17.863 -24.074,17.863 -6.742,0 -12.288,-2.15 -15.531,-6.283 -4.749,4.162 -10.627,6.342 -16.956,6.342 -4.876,0 -9.185,-1.408 -12.471,-4.012 -3.626,2.555 -8.52,3.98 -13.943,3.98 -4.53,0 -8.606,-1.244 -11.796,-3.543 -3.529,2.342 -8.154,3.506 -13.583,3.377 C 12.149,100.237 5.912,94.507 5.733,86.188 5.497,75.137 14.803,54.911 19.189,47.907 c 3.282,-5.392 8.292,-8.293 14.431,-8.293 6.663,0 9.078,1.903 10.267,4.326 5.141,-4.366 11.956,-4.617 16.808,-4.617 5.356,0 8.717,1.422 11.575,3.697 3.948,-2.368 8.477,-3.599 13.871,-3.599 6.897,0 12.021,1.604 15.595,5.137 4.168,-3.469 9.388,-5.05 15.23,-5.05 7.725,0 12.808,2.786 15.793,6.94 4.203,5.859 3.451,11.757 2.676,17.992 z"
-         id="path12"
-         inkscape:connector-curvature="0"
-         style="fill:#d01012" /><path
-         d="m 0,0 0,141.731 141.73,0 L 141.73,0 0,0 Z m 139.781,1.952 0,137.832 -137.83,0 0,-137.832 137.83,0 z"
-         id="path14"
-         inkscape:connector-curvature="0" /><path
-         d="m 134.752,42.53 0,-0.965 0.655,0 c 0.479,0 0.728,0.168 0.728,0.479 0,0.247 -0.16,0.486 -0.647,0.486 l -0.736,0 z m 2.351,2.002 -0.408,-0.708 c -0.354,-0.619 -0.452,-0.717 -0.755,-0.823 l 0,-0.019 c 0.596,-0.07 0.95,-0.453 0.95,-0.983 0,-0.56 -0.354,-0.984 -1.109,-0.984 l -1.754,0 0,3.519 0.727,0 0,-1.441 0.133,0 c 0.311,0 0.435,0.035 0.576,0.176 0.142,0.144 0.354,0.443 0.479,0.69 l 0.284,0.575 0.877,-0.002 0,0 z m -1.731,-4.497 c 1.51,0 2.737,1.218 2.737,2.726 0,1.508 -1.229,2.731 -2.737,2.731 -1.506,0 -2.72,-1.225 -2.72,-2.731 0,-1.506 1.214,-2.726 2.72,-2.726 z m 0,-0.67 c -1.877,0 -3.392,1.516 -3.392,3.396 0,1.879 1.515,3.394 3.392,3.394 1.883,0 3.397,-1.515 3.397,-3.394 0.002,-1.882 -1.514,-3.396 -3.397,-3.396 z"
-         id="path16"
-         inkscape:connector-curvature="0" /><path
-         d="m 116.889,43.002 c -7.325,0 -12.386,2.904 -15.812,6.961 -0.579,-1.214 -1.019,-1.746 -1.638,-2.447 -2.805,-3.17 -7.313,-4.649 -13.364,-4.649 -5.912,0 -10.841,1.846 -14.263,4.754 -1.777,-2.89 -6.013,-4.803 -11.121,-4.803 -6.674,0 -13.946,0.944 -18.261,7.896 -0.104,-2.503 -0.33,-3.828 -1.737,-5.317 -1.71,-1.81 -4.477,-2.282 -7.173,-2.282 -4.912,0 -8.605,2.146 -11.266,6.515 -3.859,6.163 -13.212,26.441 -13.001,36.263 0.137,6.344 4.393,10.916 12.01,11.096 5.952,0.143 10.62,-1.449 13.59,-4.447 2.665,2.896 6.731,4.594 11.596,4.594 5.417,0 10.868,-1.627 14.088,-5.182 2.712,3.332 6.979,5.271 12.468,5.244 7.175,-0.035 13.477,-3.438 17.593,-8.652 2.259,6.148 7.985,8.59 14.241,8.59 13.709,0 19.729,-9.428 24.748,-24.332 1.13,-3.357 2.639,-8.963 2.889,-13.672 0.413,-7.839 -2.903,-16.13 -15.587,-16.13 z M 25.672,80.477 c 7.093,-1.232 8.876,1.332 8.653,3.707 -0.669,7.109 -7.191,8.699 -12.854,8.566 -4.107,-0.1 -7.8,-1.98 -7.903,-6.748 -0.18,-8.342 8.328,-27.641 12.333,-34.038 1.85,-3.037 4.104,-4.539 7.698,-4.539 3.406,0 4.25,1.749 4.2,3.844 -0.134,5.589 -9.164,22.574 -12.127,29.208 z M 48.77,73.925 c -0.469,1.27 -1.357,3.93 -2.076,6.75 2.328,-0.582 4.074,-0.986 7.065,-0.914 3.408,0.084 5.586,1.496 5.586,4.314 0,6.832 -7.551,8.838 -12.789,8.838 -5.751,0 -10.803,-3.275 -10.803,-9.564 0,-7.373 3.997,-18.553 7.748,-26.001 4.606,-9.146 9.312,-10.362 17.419,-10.362 3.562,0 7.667,1.524 7.667,4.888 0,4.662 -3.95,6.44 -7.866,6.665 -1.672,0.096 -4.246,0.188 -5.786,0.079 0,0 -1.303,1.985 -2.688,5.523 7.252,-1.021 10.327,0.625 9.103,4.82 -1.657,5.667 -6.567,6.04 -12.58,4.964 z M 84.438,56.293 c -1.961,0 -3.244,1.242 -4.198,2.583 -2.102,2.952 -6.656,14.781 -7.365,19.64 -0.486,3.328 0.951,4.006 2.522,4.006 2.52,0 5.345,-2.666 6.309,-7.064 0,0 -4.797,-0.117 -3.475,-4.371 1.285,-4.128 3.723,-5.022 7.764,-5.188 7.961,-0.325 7.175,5.553 6.538,8.688 -2.069,10.18 -9.314,18.355 -19.562,18.355 -7.016,0 -11.371,-3.881 -11.371,-11.035 0,-5.098 2.529,-13.101 4.534,-17.784 4.267,-9.968 8.742,-16.944 20.143,-16.944 6.84,0 12.235,2.458 11.444,8.866 -0.58,4.703 -2.934,7.465 -7.21,7.799 -1.196,0.093 -6.089,-0.031 -4.466,-4.66 0.565,-1.619 0.799,-2.891 -1.607,-2.891 z m 43.057,8.413 c -1.205,6.002 -3.916,13.101 -6.859,18.392 -4.801,8.633 -10.633,9.842 -15.723,9.781 -5.093,-0.061 -10.83,-1.941 -10.874,-9.795 -0.031,-5.639 2.401,-13.598 4.466,-18.815 3.599,-9.458 7.277,-17.17 18.904,-17.031 13.559,0.161 11.141,12.219 10.086,17.468 z M 115.993,56.49 c -1.164,-0.016 -2.18,0.212 -3.093,1.62 -2.051,2.657 -8.047,19.042 -7.941,22.31 0.038,1.174 0.687,2.201 2.133,2.201 1.659,0.002 2.581,-1.145 3.396,-2.529 1.887,-3.193 7.193,-17.676 7.339,-21.297 0.043,-1.055 -0.133,-2.284 -1.834,-2.305 z"
-         id="path18"
-         inkscape:connector-curvature="0" /></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="141.7" height="141.7"><path d="M1 1v139.8h139.8V.9H1z" fill="#fff"/><path d="M1 1v139.8h139.8V.9H1zm130.5 58a56 56 0 0 1-2.8 13.5c-5 14.6-10.7 23.7-23.9 23.7-3.8 0-10.7-1-13.3-8l-.6-1.6-1 1.3A21.5 21.5 0 0 1 73 96.2c-5 0-9-1.6-11.7-4.9l-.7-.8-.8.8c-2.8 3-7.7 4.9-13.4 4.9-4.4 0-8.3-1.6-10.8-4.3l-.7-.8-.7.8c-2.9 2.8-7.3 4.2-13 4.1-6.7-.2-10.8-4-11-10.1-.2-9.6 9-29.7 12.9-35.8 2.5-4 5.9-6 10.4-6 3.1 0 5.2.6 6.5 2 1.1 1.2 1.4 2.2 1.5 4.7v3.1l1.8-2.7c4-6.5 10.7-7.4 17.4-7.4 4.6 0 8.7 1.7 10.3 4.3l.6 1 .8-.7a21 21 0 0 1 13.7-4.6c5.8 0 10 1.5 12.6 4.4a8 8 0 0 1 1.5 2.2l.6 1.3 1-1.1c3.7-4.4 8.8-6.6 15-6.6 5 0 8.9 1.3 11.3 4 3.1 3.2 3.6 7.8 3.4 11z" fill="#f6ec36"/><path d="M1 1v139.8h139.8V.9H1zm134.4 63.4a80 80 0 0 1-5.9 18.3c-4.9 10.1-11.4 17.9-24 17.9-6.8 0-12.3-2.2-15.6-6.3a25.4 25.4 0 0 1-17 6.3c-4.8 0-9.1-1.4-12.4-4a24.2 24.2 0 0 1-25.7.5 23.3 23.3 0 0 1-13.6 3.3c-9-.2-15.3-5.9-15.5-14.2-.2-11 9.1-31.3 13.5-38.3 3.3-5.4 8.3-8.3 14.4-8.3 6.7 0 9.1 2 10.3 4.3 5.1-4.3 12-4.6 16.8-4.6 5.4 0 8.7 1.4 11.6 3.7 4-2.3 8.4-3.6 13.8-3.6 7 0 12 1.6 15.6 5.2 4.2-3.5 9.4-5 15.3-5 7.7 0 12.8 2.7 15.8 6.8 4.2 6 3.4 11.8 2.6 18z" fill="#d01012"/><path d="M0 0v141.7h141.7V0H0zm139.8 2v137.8H2V2h137.8z"/><path d="M134.8 42.5v-1h.6c.5 0 .7.2.7.5s-.1.5-.6.5h-.7zm2.3 2l-.4-.7c-.4-.6-.5-.7-.8-.8.6 0 1-.5 1-1 0-.6-.4-1-1.1-1H134v3.5h.8v-1.4c.4 0 .5 0 .7.2l.4.7.3.5h.9zm-1.7-4.5a2.7 2.7 0 1 1 0 5.5 2.7 2.7 0 0 1 0-5.5zm0-.6a3.4 3.4 0 1 0 0 6.8 3.4 3.4 0 1 0 0-6.8zM116.9 43c-7.3 0-12.4 3-15.8 7a9 9 0 0 0-1.7-2.5c-2.8-3.2-7.3-4.6-13.3-4.6-6 0-10.9 1.8-14.3 4.7-1.8-2.9-6-4.8-11.1-4.8-6.7 0-14 1-18.3 8 0-2.6-.3-4-1.7-5.4-1.7-1.8-4.5-2.3-7.2-2.3-4.9 0-8.6 2.2-11.2 6.5-4 6.2-13.3 26.5-13 36.3 0 6.3 4.3 11 12 11 6 .2 10.6-1.4 13.6-4.4 2.6 3 6.7 4.6 11.5 4.6 5.5 0 11-1.6 14.1-5.1 2.7 3.3 7 5.2 12.5 5.2 7.2 0 13.5-3.4 17.6-8.7 2.3 6.2 8 8.6 14.2 8.6 13.7 0 19.8-9.4 24.8-24.3a57 57 0 0 0 2.9-13.7c.4-7.8-3-16.1-15.6-16.1zM25.7 80.5c7-1.3 8.8 1.3 8.6 3.7-.6 7-7.2 8.7-12.8 8.5-4.1 0-7.8-2-8-6.7-.1-8.3 8.4-27.6 12.4-34 1.9-3 4.1-4.6 7.7-4.6 3.4 0 4.2 1.8 4.2 3.9-.1 5.6-9.2 22.5-12.1 29.2zm23-6.6c-.4 1.3-1.3 4-2 6.8 2.3-.6 4-1 7-1 3.5.1 5.6 1.6 5.6 4.4 0 6.8-7.5 8.8-12.7 8.8-5.8 0-10.8-3.3-10.8-9.6 0-7.3 4-18.5 7.7-26C48.1 48.2 52.8 47 60.9 47c3.6 0 7.7 1.5 7.7 4.9 0 4.6-4 6.4-7.9 6.6a55 55 0 0 1-5.8.1s-1.3 2-2.7 5.5c7.3-1 10.4.7 9.1 4.9-1.6 5.6-6.5 6-12.5 5zm35.7-17.6c-2 0-3.2 1.2-4.2 2.6-2 3-6.6 14.8-7.3 19.6-.5 3.3 1 4 2.5 4 2.5 0 5.3-2.6 6.3-7 0 0-4.8-.2-3.5-4.4 1.3-4.1 3.8-5 7.8-5.2 8-.3 7.2 5.6 6.5 8.7-2 10.2-9.3 18.3-19.5 18.3-7 0-11.4-3.8-11.4-11 0-5 2.5-13 4.5-17.8 4.3-10 8.8-17 20.2-17 6.8 0 12.2 2.5 11.4 9-.6 4.6-3 7.4-7.2 7.7-1.2.1-6 0-4.5-4.6.6-1.6.8-3-1.6-3zm43 8.4c-1.1 6-3.8 13.1-6.8 18.4-4.8 8.6-10.6 9.8-15.7 9.8-5 0-10.8-2-10.9-9.8 0-5.7 2.4-13.6 4.5-18.8 3.6-9.5 7.3-17.2 19-17 13.5.1 11 12.2 10 17.4zM116 56.5c-1.2 0-2.2.2-3.1 1.6-2 2.7-8 19-8 22.3.1 1.2.7 2.2 2.2 2.2 1.7 0 2.6-1.1 3.4-2.5a95 95 0 0 0 7.3-21.3c0-1-.1-2.3-1.8-2.3z"/></svg>