Merge remote-tracking branch 'origin/master' into pxtv50

.github/calibre/image-actions.yml

@@ -1,9 +0,0 @@
-jpeg:
-  quality: 80
-png:
-  quality: 80
-webp:
-  quality: 80
-ignorePaths:
-  - "node_modules/**"
-  - "libs/**"

.github/workflows/compress-images-on-pull-request.yml

@@ -1,16 +0,0 @@
-name: Compress images
-on:
-  pull_request:
-    paths:
-      - 'docs/**.jpg'
-      - 'docs/**.png'
-jobs:
-  build:
-    name: calibreapp/image-actions
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@master
-      - name: calibreapp/image-actions
-        uses: docker://calibreapp/github-image-actions
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -17,7 +17,6 @@ clients/**/bin/**
 clients/**/obj/**
 clients/electron/projects
 libs/**/_locales/**
-package-lock.json
 
 videos/**
 

.travis.yml

@@ -1,9 +0,0 @@
-language: node_js
-node_js:
-  - "8.9.0"
-script:
-  - "node node_modules/pxt-core/built/pxt.js travis"
-sudo: false
-cache:
-  directories:
-    - node_modules

README.md

@@ -1,8 +1,10 @@
-# LEGO® MINDSTORMS® Education EV3 for Microsoft MakeCode [![Build Status](https://travis-ci.org/microsoft/pxt-ev3.svg?branch=master)](https://travis-ci.org/microsoft/pxt-ev3)
+# 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/)
 
 This repo contains the editor target hosted at https://makecode.mindstorms.com
 
-## Local setup
+## Local Dev setup
 
 These instructions assume familiarity with dev tools and languages.
 
@@ -10,6 +12,10 @@ These instructions assume familiarity with dev tools and languages.
 * install Docker; make sure `docker` command is in your `PATH`
 * (optional) install [Visual Studio Code](https://code.visualstudio.com/)
 
+In a common folder,
+
+* clone https://github.com/Microsoft/pxt to ``pxt`` folder
+* clone https://github.com/Microsoft/pxt-common-packages to ``pxt-common-packages`` folder
 * clone https://github.com/Microsoft/pxt-ev3 to ``pxt-ev3`` folder
 * go to ``pxt`` and run
 
@@ -17,18 +23,6 @@ These instructions assume familiarity with dev tools and languages.
 npm install
 ```
 
-* to run the local server,
-```
-pxt serve --cloud
-```
-
-## Local Dev setup
-
-In the common folder,
-
-* clone https://github.com/Microsoft/pxt to ``pxt`` folder
-* clone https://github.com/Microsoft/pxt-common-packages to ``pxt-common-packages`` folder
-
 * go to ``pxt-common-packages`` and run
 
 ```
@@ -60,6 +54,9 @@ cd libs/core
 pxt deploy
 ```
 
+### Jenkins build
+https://ci2.dot.net/job/Private/job/pxt_project_rainbow/job/master/
+
 ## License
 MIT
 

cmds/cmds.ts

@@ -0,0 +1,14 @@
+/// <reference path="../node_modules/pxt-core/built/pxtlib.d.ts" />
+
+import * as fs from 'fs';
+
+const deploy = require("./editor/deploy")
+
+export function deployCoreAsync(resp: pxtc.CompileResult) {
+    return deploy.deployCoreAsync(resp, process.env["PXT_SERIAL"] ? false : true)
+        .then(() => {
+            fs.writeFileSync("built/full-" + pxtc.BINARY_UF2, resp.outfiles[pxtc.BINARY_UF2], {
+                encoding: "base64"
+            })
+        })
+}

cmds/tsconfig.json

@@ -0,0 +1,14 @@
+{
+    "compilerOptions": {
+        "target": "es5",
+        "noImplicitAny": true,
+        "noImplicitReturns": true,
+        "declaration": true,
+        "outDir": "../built",
+        "module": "commonjs",
+        "rootDir": ".",
+        "newLine": "LF",
+        "sourceMap": false,
+        "types": ["node"]
+    }
+}

docs/SUMMARY.md

@@ -4,8 +4,6 @@
 
 * [Troubleshoot](/troubleshoot)
 * [EV3 Manager](https://ev3manager.education.lego.com/)
-* [Bluetooth](/bluetooth)
-* [Forum](https://forum.makecode.com)
 * [LEGO Support](https://www.lego.com/service/)
 * [FIRST LEGO League](/fll)
 
@@ -21,14 +19,11 @@
     * [What Animal Am I?](/tutorials/what-animal-am-i)
     * [Music Brick](/tutorials/music-brick)
     * [Run Motors](/tutorials/run-motors)
-    * [Tank ZigZag](/tutorials/tank-zigzag)
     * [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)
-    * [Reflected Light Measure](/tutorials/reflected-light-measure)
-    * [Reflected Light Calibration](/tutorials/reflected-light-calibration)
     * [Object Near?](/tutorials/object-near)
     * [Security Alert](/tutorials/security-alert)
 

docs/about.md

@@ -19,14 +19,6 @@ brick.buttonEnter.onEvent(ButtonEvent.Bumped, () => {
 
 The editor works in [most modern browsers](/browsers). It works [offline](/offline) once loaded and doesn't require any installation. Take a look at some of the [features](/about/editor-features) of the editor.
 
-### ~ hint
-
-#### Using LEGO® MINDSTORMS® Education NXT
-
-The MakeCode editor works with @boardname@. To create code for LEGO® MINDSTORMS® Education NXT, you need to [download](https://education.lego.com/downloads/retiredproducts/nxt/software) the software to program it.
-
-### ~
-
 ## Compile and Flash: Your Program!
 
 When you have your code ready, you connect your EV3 Brick to a computer with a USB cable so it appears as an attached drive (named **@drivename@**). 
@@ -36,9 +28,7 @@ program to a **.uf2** file, which you then copy to the **@drivename@** drive. Th
 
 ### ~ hint
 
-#### Bluetooth support
-
-**Experimental support** for Bluetooth download is now available. Please read the [Bluetooth](/bluetooth) page for more information.
+Not seeing the **@drivename@** drive? Make sure to upgrade your firmware at https://ev3manager.education.lego.com/. Try these [troubleshooting](/troubleshoot) tips if you still have trouble getting the drive to appear.
 
 ### ~
 

docs/bluetooth.md

@@ -1,62 +0,0 @@
-# Bluetooth
-
-This page describes the procedure to download MakeCode program to the EV3 brick 
-over Bluetooth.
-
-## ~ hint
-
-### WARNING: EXPERIMENTAL FEATURES AHEAD! 
-
-Support for Bluetooth download relies on [Web Serial](https://wicg.github.io/serial/),
-an experimental browser feature. Web Serial is a work [in progress](https://www.chromestatus.com/feature/6577673212002304); 
-it may change or be removed in future versions without notice.
-
-By enabling these experimental browser features, you could lose browser data or compromise your device security 
-or privacy.
-
-## ~
-
-https://youtu.be/VIq8-6Egtqs
-
-## Supported browsers
-
-* Chrome desktop, version 77 and higher, Windows 10 or Mac OS.
-* [Edge Insider desktop](https://www.microsoftedgeinsider.com), version 77 and higher, Windows 10 or Mac OS.
-
-To make sure your browser is up to date, go to the '...' menu, click "Help" then "About".
-
-Next you need to enable the experimental features (this may change in the future)
-
-* go to **chrome://flags/#enable-experimental-web-platform-features** and **enable** 
-**Experimental Web Platform features**
-
-![A screenshot of the flags page in chrome](/static/bluetooth/experimental.png)
-
-## Machine Setup
-
-* pair your EV3 brick with your computer over Bluetooth. This is the usual pairing procedure.
-
-## Download over Bluetooth
-
-* go to https://makecode.mindstorms.com/
-* click on **Download** to start a file download as usual
-* on the download dialog, you should see a **Bluetooth** button. Click on the
-**Bluetooth** button to enable the mode.
-* **make sure the EV3 brick is not running a program**
-* click on **Download** again to download over bluetooth.
-
-## Choosing the correct serial port
-
-Unfortunately, the browser dialog does not make it easy to select which serial port is the brick.
-
-* On Windows, choose ``Standard Serial over Bluetooth``. There might be multiple of those but only one works. Try your luck! Once you know the COM port number, remember it for the next time around.
-* On Mac OS, choose ``cu.BRICKNAME-SerialPort``
-
-## Known issues
-
-* We do not detect properly that the program is running on the brick. Make sure to stop the program before starting the download procedure.
-* The list of programs on the brick screen is not updated when uploading via bluetooth.
-
-## Feedback
-
-Please send us your feedback through https://forum.makecode.com.

docs/coding/line-detection.md

@@ -190,10 +190,12 @@ if (true) {
 
 ```blocks
 forever(function () {
-    while (sensors.color3.color() == ColorSensorColor.Black) {
+    while (true) {
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.Black)
         motors.largeBC.steer(-30, 50)
     }
-    while (sensors.color3.color() == ColorSensorColor.White) {
+    while (true) {
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.White)
         motors.largeBC.steer(30, 50)
     }
 })
@@ -207,9 +209,11 @@ Else the Color Sensor detects the color white, start motors ``B`` and ``C`` (dri
 
 ```blocks
 forever(function () {
-    if (sensors.color3.color() == ColorSensorColor.Black) {
+    if (true) {
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.Black)
         motors.largeBC.steer(-30, 50)
     } else {
+        sensors.color3.pauseUntilColorDetected(ColorSensorColor.White)
         motors.largeBC.steer(30, 50)
     }
 })

docs/examples.md

@@ -212,12 +212,6 @@ Here are some fun programs for your @boardname@!
   "description": "Keep your brick entertained and happy",
   "url":"/examples/happy-unhappy",
   "cardType": "example"
-}, {
-{
-  "name": "Turtle",
-  "description": "Encode moves and run them on a driving base",
-  "url":"/examples/turtle",
-  "cardType": "example"
 }, {
   "name": "Distance Measurer",
   "description": "Use a motor to measure angle and distance",

docs/extensions.md

@@ -1,18 +0,0 @@
-# Extensions
-
-## #gallery
-
-## Using Extensions
-
-In the web editor, click on ``Settings`` then ``Extensions`` to search and add extensions to the project.
-The Blocks and JavaScript definitions will be automatically loaded in the editor.
-
-## Custom extensions
-
-The [Build Your Own Extension](https://makecode.com/extensions/getting-started) manual is for advanced users who want to publish their own extension. 
-
-## ~ hint
-
-**Extensions** were previously called **Packages** in MakeCode.
-
-## ~

docs/fll.md

@@ -2,50 +2,32 @@
 
 ![FIRST LEGO League logo](/static/fll/fll-logo.png)
 
-**For teams participating in City Shaper challenge**, you can use MakeCode for your challenge (see [City Shaper Challenge, page 7 bottom](https://firstinspiresst01.blob.core.windows.net/fll/2020/city-shaper-game-guide-pdf.pdf)!
-
-We’ve compiled a list of resources and information that we hope will be helpful for you.
-
-* **Got a question? Post it on the forums** at https://forum.makecode.com/
+For teams participating in the Open Software Platform Pilot utilizing MakeCode, we’ve compiled a list of resources and information that we hope will be helpful for you.
 
 ## FAQ
 
-### I found a bug what do I do?
-
-If you found a bug, please try if it hasn't been fixed yet! Go to https://makecode.mindstorms.com/beta and try if the bug is corrected. Otherwise, please tell us at https://forum.makecode.com/.
-
 ### How do I use MakeCode with my EV3?
 
 * You will need to install the latest EV3 firmware on your brick. Instructions on how to do that are located here: https://makecode.mindstorms.com/troubleshoot.
 * You will need a computer with a USB port to connect to the EV3 in order to download your programs.
 * You will need internet access and a browser on your computer to get to https://makecode.mindstorms.com.
-* You can [install the app](/offline-app) to use the editor offline.
-
-### I know LabView, how is MakeCode different?
-
-We have compiled a guide for EV3 LabView users at https://makecode.mindstorms.com/labview.
 
 ### What’s the best way to get started with MakeCode?
 
-Go to https://makecode.mindstorms.com. The home screen is filled with videos, tutorials and examples that might be relevant for your missions.
+Watch some of the videos at https://makecode.mindstorms.com (at the bottom of the page).
+Try some of the provided tutorials:
 
-On the home page, scroll down to the **FLL / City Shaper** section for specific lessons related to Mission 2.
+* [Wake Up!](@homeurl@#tutorial:tutorials/wake-up) – show your EV3 brick waking up
+* [Animation](@homeurl@#tutorial:tutorials/make-an-animation) – create a custom animation to show
+* [Music Brick](@homeurl@#tutorial:tutorials/music-brick) – transform your EV3 into a musical instrument
+* [Run Motors](@homeurl@#tutorial:tutorials/run-motors) – control the motors of your robot
+* [Red Light, Green Light](@homeurl@#tutorial:tutorials/redlight-greenlight) – play red light, green light with the color sensor
+* [Line Following](@homeurl@#tutorial:tutorials/line-following) – have your robot follow a line
 
 ### Can I load both LEGO MINDSTORMS EV3 Software and MakeCode programs onto my EV3?
 
 Yes.
 
-### Can I run the program again on the brick?
-
-![EV3 Brick with Try in BrkProg_Save Folder in File Manager](/static/getting-started/try-in-file-manager.png)
-
-Use the Brick Buttons and navigate to the File Manager tab.  Open the **BrkProg_SAVE** folder, 
-select your program and click the center button to run it again.
-
-### Does it work without internet?
-
-No, the editor is cached in your browser cache. However, you can also download the [offline app](/offline-app) in case you need to install it on a computer.
-
 ### How do I figure out what a block does?
 
 You can right-click on any block and select “Help” in the context menu to open the documentation page describing what that block does.
@@ -99,30 +81,20 @@ You can share your projects by clicking on the **share** button in the top left
 
 Sharing programs is also shown in the [Tips and Tricks](https://legoeducation.videomarketingplatform.co/v.ihtml/player.html?token=5c594c2373367f7870196f519f3bfc7a&source=embed&photo%5fid=35719472) video.
 
-### Can I use Bluetooth to transfer my program?
-
-The official answer is currently no. That being said, we have **Experimental support** for Bluetooth download. Please read the [Bluetooth](/bluetooth) page for more information.
-
-https://youtu.be/VIq8-6Egtqs
-
-## Are there YouTube videos on MakeCode for EV3?
-
-The MakeCode has a [FLL / City Shaper YouTube Channel](https://www.youtube.com/watch?v=IqL0Pyeu5Ng&list=PLMMBk9hE-SeqkOObethhlZtBTEK6FYx3n) with useful videos.
-
-https://youtu.be/-AirqwC9DL4
-
-## Do you have examples of program used in competitions?
-
-The MakeCode team ran a team with friends and family in South Seattle and scored 175 points.
-The programs used for the crane, swing, red blocks and ramp are at https://github.com/lego-marshmallows (the robot build is not detailled).
-
 ### Why can't I delete my program (*.uf2) files from the Brick?
 
-There's a bug in the firmware which prevents you from deleting the programs (``*.uf2`` files) from your EV3 Brick. There isn't a firmware update to fix this yet.
+There's a bug in the firmware which prevents you from deleting the programs (``*.uf2`` files) from your EV3 Brick. There isn't a firmware update to fix this yet. As a workaround, you can temporarily downgrade your firmware version, delete the files, and then upgrade back to the version that works with MakeCode.
 
-We have prepared a special program that lets you delete UF2 files from the brick.
-Download [these PDF instructions](/file-manager.pdf) and drop the PDF on the brick drive.
-This will present you with an menu for deleting files.
+Follow these steps to downgrade your firmware version, delete the files, and uprgade back again:
+
+1. Go into **EV3 LabVIEW** - if it's not installed get it [here](https://education.lego.com/en-us/downloads/mindstorms-ev3/software)
+2. Plug in your EV3 Brick and start a new project
+3. Go to the **Tools** menu in the upper right corner, select **Firmware Update**
+4. In the **Firmware Update** dialog box, click on the **Show Details** button
+5. From the **Available Firmware Files** list, select **EV3 Firmware V1.09E**
+6. Click the **Update Firmware** button and wait for the update to complete
+
+Now the firmware version on the EV3 Brick will be **V1.09E**. Also, in the process, the downgrade deleted all of the saved programs from the EV3 Brick. To continue to use MakeCode, the firmware version must be at **V1.10E** or above. So, the Brick firmware needs to be upgraded again. If you don't know or do remember how to do this, see the **Upgrade your @drivename@** section in the [troubleshooting](/troubleshoot) page.
 
 For other common questions, try the FAQ page https://makecode.mindstorms.com/faq.
 
@@ -132,3 +104,9 @@ For other common questions, try the FAQ page https://makecode.mindstorms.com/faq
 
 >* Description: Unable to delete program files from the EV3 brick after downloading them
 >* Status: LEGO Education team is working on a fix, no estimated date yet
+
+## Community connection
+
+For questions, issues, feedback and community for the Open Software Platform Pilot:
+
+We are using a messaging service called **Slack**. Slack can be accessed via an app you download to your computer or mobile device, and via a web interface. For more information about Slack, click [here](https://slack.com/). Anyone in the pilot can participate by signing up with Slack first, and then clicking this [FIRST LEGO League Robot SW](https://fllrobotsw.slack.com/join/shared_invite/enQtNDgxOTQ5MDc2OTkyLTg2ZTRkYzQ4OGMyZTg1OTZmMDFhMWNlOTQ1OWRlNDdmNzNmMjlhMmZiM2M3OWUxYjU1ODEwY2FmODJkNjZkOTA) link to join the Slack workspace.

docs/getting-started.md

@@ -25,12 +25,6 @@
     "description": "Build a robot and drive into the world of robotics!",
     "url": "/getting-started/use",
     "cardType": "side"
-},
-{
-    "name": "First LEGO League",
-    "imageUrl": "/static/fll/fll-big.png",
-    "description": "Information about using MakeCode in FLL competitions",
-    "url": "/fll"
 }
 ]
 ```

docs/getting-started/try-tutorial.md

@@ -73,12 +73,6 @@ Verify that the program you just created shows eyes on the Brick Display, and th
 
 **Well done!**
 
-## Run it Again
-
-![EV3 Brick with Try in BrkProg_Save Folder in File Manager](/static/getting-started/try-in-file-manager.png)
-
-Use the Brick Buttons and navigate to the File Manager tab.  Open the **BrkProg_SAVE** folder, select **Try** and click the center button to run it again.
-
 ## Connect a Large Motor @unplugged
 
 Now you will learn to control the Large Motor.

docs/getting-started/try.md

@@ -54,12 +54,6 @@ Verify that the program you just created shows eyes on the Brick Display, and th
 
 **Well done!**
 
-## Run it Again
-
-![EV3 Brick with Try in BrkProg_Save Folder in File Manager](/static/getting-started/try-in-file-manager.png)
-
-Use the Brick Buttons and navigate to the File Manager tab.  Open the **BrkProg_SAVE** folder, select **Try** and click the center button to run it again.
-
 ## Connect a Large Motor
 
 Now you will learn to control the Large Motor.

docs/index-ref.json

@@ -1,3 +1,3 @@
 {
-    "appref": "v1.2.26"
+    "appref": "v1.0.11"
 }

docs/labview.md

@@ -1,10 +1,10 @@
 # Coding in MakeCode
 
-This guide helps users who are used to working with @boardname@ become 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
 
-Just like in LabView, blocks in the MakeCode editor can be dragged from the cabinet and snapped together
+Just like with LabView, blocks in the MakeCode editor can be dragged from the cabinet and snapped together
 to create a sequence of program instructions.
 
 Take a look a the LabView program below: it **starts**, turns on motor A, waits a second, and finally stops motor A.
@@ -61,12 +61,6 @@ motors.largeBC.steer(0, 50, 1, MoveUnit.Rotations);
 motors.largeBC.stop();
 ```
 
-### ~ hint
-
-The **turn ratio range is -200, 200** unlike LabView who used -100,100.
-
-### ~
-
 ## Tank
 
 The **tank** blocks control the speed of two motors. These are commonly used for a differential drive robot. The blocks can also specify the duration, angle, or number of rotations.
@@ -133,7 +127,7 @@ brick.setStatusLight(StatusLight.OrangePulse);
 
 ## Waiting (pausing)
 
-It is quite common to have to wait for a task to finish or for a sensor state to change, such as when a touch button pressed. The ``||loops:pause||`` and ``||sensors:pause until||`` blocks provide a way for your program to wait for a period of time.
+It is quite common to have to wait for a task to finish or for a sensor state to change, such as a touch button pressed. The ``||loops:pause||`` and ``||sensors:pause until||`` blocks provide a way for your program to wait for a period of time.
 
 ![pause for time](/static/labview/pausefortime.png)      
 
@@ -207,7 +201,7 @@ forever(function () {
 
 ## Concurrent loops
 
-You can start up multiple ``||loops:forever||`` loops that run at the same time. Actually, only the code in just one of the loops is really running at any exact moment in time. Each loop, though, gets a turn to run all of its code and this makes them run [_concurrently_](https://en.wikipedia.org/wiki/Concurrent_computing).
+You can start up multiple ``||loops:forever||`` loops that will run at the same time. Actually, only the code in just one of the loops is really running at any exact moment in time. Each loop, though, gets a turn to run all of its code and this makes them run [_concurrently_](https://en.wikipedia.org/wiki/Concurrent_computing).
 
 ![Multiple loops running at the same time](/static/labview/multipleloops.png)
 

docs/offline-app.html

@@ -388,12 +388,12 @@
         }
         function downloadWin64() {
             // TODO: Keep this link up-to-date with the desired release version
-            window.open("https://makecode.com/api/release/ev3/v1.2.26/win64");
+            window.open("https://makecode.com/api/release/ev3/v1.0.11/win64");
             tickEvent("offlineapp.download", { "target": "ev3", "platform": "win64" });
         }
         function downloadMac64() {
             // TODO: Keep this link up-to-date with the desired release version
-            window.open("https://makecode.com/api/release/ev3/v1.2.26/mac64");
+            window.open("https://makecode.com/api/release/ev3/v1.0.11/mac64");
             tickEvent("offlineapp.download", { "target": "ev3", "platform": "mac64" });
         }
     </script>

docs/offline.md

@@ -3,3 +3,9 @@
 ## Offline app #target-app
 
 The MakeCode editor is available as app which you can install on a computer with Windows or Mac OS. Once installed, the **[MakeCode Offline App](/offline-app)** lets you create, run, and download your projects to the @boardname@. It works the same as the Web application does in your browser but it's a stand-alone application that will work when a connection to the internet is restricted or not available.
+
+### ~ hint
+
+The [MakeCode Offline App](/offline-app) is currently in development and is made available as a **pre-release** version. 
+
+### ~

docs/packages-ref.json

@@ -1,3 +0,0 @@
-{
-    "redirect": "/extensions"
-}

docs/packages/approval-ref.json

@@ -1,3 +0,0 @@
-{
-    "redirect": "https://makecode.com/extensions/approval"
-}

docs/packages/build-your-own-ref.json

@@ -1,3 +0,0 @@
-{
-    "redirect": "https://makecode.com/extensions/getting-started"
-}

docs/packages/versioning-ref.json

@@ -1,3 +0,0 @@
-{
-    "redirect": "https://makecode.com/extensions/versioning"
-}

docs/projects.md

@@ -8,45 +8,10 @@
         "imageUrl": "/static/lessons/firmware.png"
     },
     {
-        "name": "Brick Tutorials",
-        "url": "/tutorials/brick",
+        "name": "Tutorials",
+        "url": "/tutorials",
         "imageUrl": "/static/tutorials/wake-up.png"
     },
-    {
-        "name": "Motor Tutorials",
-        "url": "/tutorials/motors",
-        "imageUrl": "/static/tutorials/run-motors.png"
-    },
-    {
-        "name": "Touch Sensor Tutorials",
-        "url": "/tutorials/touch-sensor",
-        "imageUrl": "/static/tutorials/touch-to-run.png"
-    },
-    {
-        "name": "Color Sensor Tutorials",
-        "url": "/tutorials/color-sensor",
-        "imageUrl": "/static/tutorials/what-color.png"
-    },
-    {
-        "name": "Ultrasonic Sensor Tutorials",
-        "url": "/tutorials/ultrasonic-sensor",
-        "imageUrl": "/static/tutorials/object-near.png"
-    },
-    {
-        "name": "Gyro Tutorials",
-        "url": "/tutorials/gyro",
-        "imageUrl": "/static/tutorials/calibrate-gyro.png"
-    },
-    {
-        "name": "Infrared Sensor Tutorials",
-        "url": "/tutorials/infrared-sensor",
-        "imageUrl": "/static/tutorials/security-alert.png"
-    },
-    {
-        "name": "FLL / City Shaper",
-        "url": "/tutorials/city-shaper",
-        "imageUrl": "/static/tutorials/city-shaper/robot1.jpg"
-    },
     {
         "name": "Design Engineering",
         "url": "/design-engineering",
@@ -63,7 +28,7 @@
         "imageUrl": "/static/lessons/make-a-sound-machine.png"
     },
     {
-        "name": "Tutorial Videos",
+        "name": "Videos",
         "url": "/videos",
         "imageUrl": "https://legoeducation.videomarketingplatform.co/27288170/35719444/5d009e5f93fbf479c2e5ed2bf87a7990/thumbnail.png"
     }
@@ -73,16 +38,9 @@
 ## See Also
 
 [Getting Started](/getting-started),
-[Brick Tutorials](/tutorials/brick),
-[Motor Tutorials](/tutorials/motors),
-[Touch Sensor Tutorials](/tutorials/touch-sensor),
-[Color Sensor Tutorials](/tutorials/color-sensor),
-[Ultrasonic Sensor Tutorials](/tutorials/ultrasonic-sensor),
-[Gyro Tutorials](/tutorials/gyro),
-[Infrared Sensor Tutorials](/tutorials/infrared-sensor),
-[FLL / City Shaper](/tutorials/city-shaper),
+[Tutorials](/tutorials),
 [Design Engineering](/design-engineering),
 [Coding](/coding),
 [Maker](/maker),
-[Tutorial Videos](/videos)
+[Videos](/videos)
 

docs/projects/SUMMARY.md

@@ -4,52 +4,18 @@
   * [Prepare](https://makecode.mindstorms.com/troubleshoot)
   * [Try](/getting-started/try)
   * [Use](/getting-started/use)
-  * [First LEGO League](/fll)
-* [Brick Tutorials](/tutorials/brick)
+* [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)
-  * [Pause On Start](/tutorials/pause-on-start)
-* [Motor Tutorials](/tutorials/motors)
   * [Run Motors](/tutorials/run-motors)
-  * [Spin Turn](/tutorials/spin-turn)
-  * [Pivot Turn](/tutorials/pivot-turn)
-  * [Smooth Turn](/tutorials/smooth-turn)
-  * [Tank ZigZag](/tutorials/tank-zigzag)
-  * [Coast Or Brake](/tutorials/coast-or-brake)
-  * [Turtle](/tutorials/turtle)
-* [Touch Sensor Tutorials](/tutorials/touch-sensor)
   * [Touch to Run](/tutorials/touch-to-run)
-  * [Sensor Values](/tutorials/touch-sensor-values)
-  * [Stop At Object](/tutorials/stop-at-object)
-* [Color Sensor Tutorials](/tutorials/color-sensor)
+  * [Touch Sensor Values](/tutorials/touch-sensor-values)
   * [What Color?](/tutorials/what-color)
   * [Line Following](/tutorials/line-following)
   * [Red Light, Green Light](/tutorials/redlight-greenlight)
-  * [Move To Color](/tutorials/move-to-color)
-  * [Reflected Light Measure](/tutorials/reflected-light-measure)
-  * [Reflected Light Calibration](/tutorials/reflected-light-calibration)
-* [Ultrasonic Sensor Tutorials](/tutorials/ultrasonic-sensor)
-  * [Object Near](/tutorials/object-near)
-  * [Wall Follower](/tutorials/wall-follower)
-* [Gyro Tutorials](/tutorials/gyro)
-  * [Calibrate](/tutorials/calibrate-gyro)
-  * [Turn](/tutorials/turn-with-gyro)
-  * [Move Straight](/tutorials/move-straight-with-gyro)
-  * [Drifter](/tutorials/drifter)
-* [Infrared Sensor Tutorials](/tutorials/infrared-sensor)
   * [Security Alert](/tutorials/security-alert)
-* [FLL / City Shaper](/tutorials/city-shaper)
-  * [Crane Mission / Robot 1](/tutorials/city-shaper/robot-1)
-  * [Crane Mission / Robot 2](/tutorials/city-shaper/robot-2)
-  * [Crane Mission / Video 1](https://youtu.be/IqL0Pyeu5Ng)
-  * [Bluetooth download (beta)](https://youtu.be/VIq8-6Egtqs)
-  * [Turn with Gyro](https://youtu.be/I7ncuXAfBwk)
-  * [Moving with Gyro](https://youtu.be/ufiOPvW37xc)
-  * [Line following with 1 color sensor](https://youtu.be/_LeduyKQVjg)
-  * [Proportional line following with 1 color sensor](https://youtu.be/-AirqwC9DL4)
-  * [Proportional line following with 2 color sensors](https://youtu.be/QWOflBuu9Oo)
 * [Design Engineering](/design-engineering)
   * [Make It Move Without Wheels](/design-engineering/make-it-move)
   * [Make It Smarter and Faster](/design-engineering/make-it-smarter)
@@ -61,7 +27,7 @@
 * [Maker](/maker)
   * [Make A Sound Machine](/maker/sound-machine)
   * [Make A Security Gadget](/maker/security-gadget)
-* [Tutorial Videos](/videos)
+* [Videos](/videos)
   * [undefined](https://legoeducation.videomarketingplatform.co/v.ihtml/player.html?token=5d009e5f93fbf479c2e5ed2bf87a7990&source=embed&photo%5fid=35719444)
   * [undefined](https://legoeducation.videomarketingplatform.co/v.ihtml/player.html?token=2008a566f1fb034d58d5ebe19ba8621f&source=embed&photo%5fid=35719467)
   * [undefined](https://legoeducation.videomarketingplatform.co/v.ihtml/player.html?token=629730c938e452f0fd7653fbc4708166&source=embed&photo%5fid=35719470)

docs/reference/brick/battery-property.md

@@ -1,47 +0,0 @@
-# battery Property
-
-Return the information about the battery
-
-```sig
-brick.batteryInfo(BatteryProperty.Level)
-```
-
-## Parameters
-
-* property: the kind of information
-
-## Returns
-
-* a [number](/types/number) which represents the value of the property requested.
-
-## Example
-
-Show the battery level percentage on the screen. Also, show a green light if the battery level is above 15%. If the battery level is below 15% but above 5%, show a orange light. But, if the battery level is below 5%, show a pulsing red light.
-
-```blocks
-let battery = 0;
-forever(function() {
-    brick.showString("Battery level:", 1)
-    brick.showNumber(battery, 2)
-    battery = brick.batteryInfo(BatteryProperty.Level);
-    if (battery > 15)
-    {
-        brick.setStatusLight(StatusLight.Green);
-    } else if (battery > 5) {
-        brick.setStatusLight(StatusLight.Orange);
-    } else {
-        brick.setStatusLight(StatusLight.RedPulse)
-    }
-    pause(30000)
-})
-```
-
-Or see all the values
-
-```blocks
-forever(function () {
-    brick.showValue("bat V", brick.batteryInfo(BatteryProperty.Voltage), 1)
-    brick.showValue("bat %", brick.batteryInfo(BatteryProperty.Level), 2)
-    brick.showValue("bat I", brick.batteryInfo(BatteryProperty.Current), 3)
-})
-```

docs/reference/brick/exit-program.md

@@ -1,18 +0,0 @@
-# exit Program
-
-Stops the program and returns to the brick menu
-
-```sig
-brick.exitProgram();
-```
-
-## Example
-
-Do a sequence of motor commands and stop the program.
-
-```blocks
-motors.largeA.run(50)
-pause(500)
-motors.stopAll()
-brick.exitProgram();
-```

docs/reference/brick/show-ports.md

@@ -10,12 +10,12 @@ You can find out what's connected to the ports on the brick and show its status.
 
 ## Example
 
-Show the status of the ports on the brick. Resets all motors when ENTER is pressed.
+Show the status of the ports on the brick when the ``enter`` button is pressed.
 
 ```blocks
-brick.showPorts()
+brick.showString("Press ENTER for port status", 1)
 brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
-    motors.resetAll()
+    brick.showPorts()
 })
 ```
 

docs/reference/motors/motor/ramp.md

@@ -1,59 +0,0 @@
-# Ramp
-
-Schedules an acceleration, constant and deceleration phase at a given speed.
-
-```sig
-motors.largeA.ramp(50, 100, 500, 100)
-```
-
-The speed setting is a percentage of the motor's full speed. Full speed is the speed that the motor runs when the brick supplies maximum output voltage to the port.
-
-
-## Parameters
-
-* **speed**: a [number](/types/number) that is the percentage of full speed. A negative value runs the motor in the reverse direction.
-* **acceleration**: the [number](/types/number) of movement units to rotate for while accelerating.
-* **value**: the [number](/types/number) of movement units to rotate for.
-* **deceleration**: the [number](/types/number) of movement units to rotate for while decelerating.
-* **unit**: the movement unit of rotation. This can be `milliseconds`, `seconds`, `degrees`, or `rotations`. If the number for **value** is `0`, this parameter isn't used.
-
-## Example
-
-This is an interactive program that lets you change the values of 
-the acceleration and deceleration and see the effects.
-
-```blocks
-let steady = 0
-let dec = 0
-let acc = 0
-brick.buttonLeft.onEvent(ButtonEvent.Pressed, function () {
-    acc += -100
-})
-brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
-    motors.largeB.ramp(50, steady, MoveUnit.MilliSeconds, acc, dec)
-})
-brick.buttonRight.onEvent(ButtonEvent.Pressed, function () {
-    acc += 100
-})
-brick.buttonUp.onEvent(ButtonEvent.Pressed, function () {
-    dec += 100
-})
-brick.buttonDown.onEvent(ButtonEvent.Pressed, function () {
-    dec += -100
-})
-acc = 500
-steady = 1000
-acc = 500
-forever(function () {
-    brick.showValue("acc", acc, 1)
-    brick.showValue("steady", steady, 2)
-    brick.showValue("dec", dec, 3)
-    brick.showString("acc: left/right", 5)
-    brick.showString("dec: up/down", 6)
-    brick.showString("run large B: enter", 7)
-})
-```
-
-## See also
-
-[tank](/reference/motors/synced/tank), [steer](/reference/motors/synced/steer), [stop](/reference/motors/motor/stop)

docs/reference/motors/motor/run.md

@@ -6,9 +6,9 @@ Set the rotation speed of the motor as a percentage of maximum speed.
 motors.largeA.run(50)
 ```
 
-The speed setting is a percentage of the motor's full speed. Full speed is the speed that the motor runs when the brick supplies maximum output voltage to the port.
+The speed setting is a pecentage of the motor's full speed. Full speed is the speed that the motor runs when the brick supplies maximum output voltage to the port.
 
-If you use just the **speed** number, the motor runs continuously and won't stop unless you tell it to. You can also give a value for a certain amount of distance you want the motor to rotate for. The **value** can be an amount of time, a turn angle in degrees, or a number of full rotations.
+If you use just the **speed** number, the motor runs continously and won't stop unless you tell it to. You can also give a value for a certain amount of distance you want the motor to rotate for. The **value** can be an amount of time, a turn angle in degrees, or a number of full rotations.
 
 If you decide to use a **value** of rotation distance, you need to choose a type of movement **unit**.
 
@@ -30,8 +30,8 @@ Here is how you use each different movement unit to run the motor for a fixed ro
 // Run motor for 700 Milliseconds. 
 motors.largeA.run(25, 700, MoveUnit.MilliSeconds);
 
-// Run motors B and C for 700 Milliseconds again but no units specified. 
-motors.largeBC.run(25, 700);
+// Run motor for 700 Milliseconds again but no units specified. 
+motors.largeA.run(25, 700);
 
 // Run the motor for 45 seconds
 motors.largeA.run(50, 45, MoveUnit.Seconds);
@@ -61,14 +61,6 @@ motors.largeB.run(-25)
 
 ## ~
 
-## Multiple motors
-
-When using **run** with multiple motors, there is no guarantee that their speed will stay in sync. Use [tank](/reference/motors/tank) or [steer](/reference/motors/steer) for synchronized motor operations.
-
-```blocks
-motors.largeBC.run(50)
-```
-
 ## Examples
 
 ### Drive the motor for 20 seconds

docs/reference/motors/motor/set-brake-settle-time.md

@@ -1,30 +0,0 @@
-# set Brake Settle Time
-
-Set the time to wait after a motor stopped to allow it settle
-when brake is enabled. Default is 10ms.
-
-```sig
-motors.largeA.setBrakeSettleTime(200)
-```
-
-When a the motor is stopped and brake is applied, it can still wiggle for a little while. You can use the settle time to automatically way after stopping and let the robot settle.
-
-## Parameters
-
-* **time**: a [number](/types/number) value which represents the number of milliseconds to wait after braking.
-
-## Example
-
-Set the brake mode and the settle time to 500ms. Run the motor connected to port **A** for 2 seconds at a speed of `30` and stop after 2s.
-
-```blocks
-motors.largeA.setBrake(true)
-motors.largeA.setBrakeSettleTime(500)
-motors.largeA.run(30)
-pause(2000)
-motors.largeA.stop()
-```
-
-## See also
-
-[stop](/reference/motors/motor/stop)

docs/reference/motors/motor/set-brake.md

@@ -1,28 +1,28 @@
 # set Brake
 
-Set the brake on the motor so it will brake when it finishes a brake command.
+Set the brake on the motor so it won't turn when it has no power.
 
 ```sig
 motors.largeA.setBrake(false)
 ```
 
-When a the motor is stopped, it can still rotate if an external force is applied to it. This can happen, for example, if you're tanking your brick on a inclined surface and stop the motors. Gravity will push down on the brick and might cause it to start rolling again. You can prevent this movement by setting the brake.
+When a the motor is stopped, it can still rotate if an external force is applied to it. This can happen, for example, if your're tanking your brick on a inclined surface and stop the motors. Gravity will push down on the brick and might cause it to start rolling again. You can prevent this movement by setting the brake.
 
 Also, you can use the brake to do simple skid steering for your brick.
 
-## Parameters
+## Paramters
 
 * **brake**: a [boolean](/types/boolean) value which is either `true` to set the brake on or `false` to set the brake off.
 
 ## Example
 
-Run the motor connected to port **A** for 2 seconds at a speed of `30` and stop after 2s.
+Run the motor connected to port **A** for 2 seconds at a speed of `30`. Stop and set the brake.
 
 ```blocks
-motors.largeA.setBrake(true)
 motors.largeA.run(30)
 pause(2000)
 motors.largeA.stop()
+motors.largeA.setBrake(true)
 ```
 
 ## See also

docs/reference/motors/motor/set-run-phase.md

@@ -1,26 +0,0 @@
-# Set Run Phase
-
-Allows to specify an acceleration or deceleration phases for run commands.
-
-```sig
-motors.largeD.setRunPhase(MovePhase.Acceleration, 1, MoveUnit.Seconds)
-```
-
-Once the run phase is specified on a motor (or pair of motors),
-it will be automatically applied to [run](/reference/motors/run) commands.
-
-## Time vs Rotation
-
-The phases specified for time units (seconds, milliseconds) only apply to run with time
-moves. Similarly, the phases specified for rotation units (# rotation, degrees) only
-apply to run with rotation units.
-
-## Examples
-
-```blocks
-motors.largeB.setRunPhase(MovePhase.Acceleration, 0.5, MoveUnit.Seconds)
-motors.largeB.setRunPhase(MovePhase.Deceleration, 0.2, MoveUnit.Seconds)
-forever(function () {
-    motors.largeB.run(50, 1, MoveUnit.Seconds)
-})
-```

docs/reference/motors/reset-all.md

@@ -1,25 +0,0 @@
-# reset All Motors
-
-Reset all motors currently running on the brick.
-
-```sig
-motors.resetAll();
-```
-
-The motors counters are resetted. 
-
-## Example
-
-Tank the EV3 Brick forward at half speed for 5 seconds and then stop.
-
-```blocks
-motors.largeAB.tank(50, 50);
-pause(5000);
-motors.stopAll();
-motors.resetAll();
-```
-
-## See also
-
-[stop all](/reference/motors/motor/stop-all), 
-[reset](/reference/motors/motor/reset)

docs/reference/motors/stop-all.md

@@ -22,5 +22,4 @@ motors.stopAll();
 
 [stop](/reference/motors/motor/stop), 
 [reset](/reference/motors/motor/reset),
-[reset-all](/reference/motors/motor/reset-all),
 [set brake](/reference/motors/motor/set-brake)

docs/reference/motors/synced/steer.md

@@ -22,7 +22,7 @@ If you decide to use a **value** of rotation distance, you need to choose a type
 
 ## Parameters
 
-* **turnRatio**: a [number](/types/number) that is the percentage of speed of the drive motor. The follower motor runs at this speed. A negative number steers to the left and a positive number steers to the right. This is a number between `-200` and `200`.
+* **turnRatio**: a [number](/types/number) that is the percentage of speed of the drive motor. The follower motor runs at this speed. A negative number steers to the left and a positive number steers to the right. This is a number between `-100` and `100`.
 * **speed**: a [number](/types/number) that is the percentage of full speed. A negative value runs the motors in the reverse direction. This is the speed that the drive motor runs at.
 * **value**: the [number](/types/number) of movement units to rotate for. A value of `0` means run the motor continuously.
 * **unit**: the movement unit of rotation. This can be `milliseconds`, `seconds`, `degrees`, or `rotations`. If the number for **value** is `0`, this parameter isn't used.
@@ -39,13 +39,6 @@ motors.largeBC.steer(-15, -75)
 
 ## ~
 
-## ~ hint
-
-Only one set of synchronized motors will run at the same time. Once you launch tank/steer, it will cancel any existing synchronized speed command.
-
-## ~
-
-
 ## Examples
 
 ### Make a slight right
@@ -86,51 +79,6 @@ for (let i = 0; i < 4; i++) {
 motors.stopAll()
 ```
 
-### Steer tester
-
-This program lets you change the values of speed and turn ratio with the buttons.
-
-```typescript
-let speed = 0;
-let turnRatio = 0;
-
-brick.showString(`steer tester`, 1)
-brick.showString(`connect motors BC`, 7)
-brick.showString(`up/down for speed`, 8)
-brick.showString(`left/right for turn ratio`, 9)
-
-forever(function () {
-    brick.showString(`motor B speed ${motors.largeB.speed()}%`, 4)
-    brick.showString(`motor C speed ${motors.largeC.speed()}%`, 5)
-    pause(100)
-})
-
-function updateSteer() {
-    motors.largeBC.steer(turnRatio, speed);
-    brick.showString(`speed ${speed}%`, 2)
-    brick.showString(`turnRatio ${turnRatio}`, 3)
-}
-
-brick.buttonUp.onEvent(ButtonEvent.Pressed, function () {
-    speed += 10
-    updateSteer()
-})
-brick.buttonDown.onEvent(ButtonEvent.Pressed, function () {
-    speed -= 10
-    updateSteer()
-})
-brick.buttonLeft.onEvent(ButtonEvent.Pressed, function () {
-    turnRatio -= 10
-    updateSteer()
-})
-brick.buttonRight.onEvent(ButtonEvent.Pressed, function () {
-    turnRatio += 10
-    updateSteer()
-})
-
-updateSteer()
-```
-
 ## See also
 
 [tank](/reference/motors/synced/tank), [run](/reference/motors/motor/run)

docs/reference/motors/synced/tank.md

@@ -35,12 +35,6 @@ motors.largeBC.tank(-75, -75)
 
 ## ~
 
-## ~ hint
-
-Only one set of synchronized motors will run at the same time. Once you launch tank/steer, it will cancel any existing synchronized speed command.
-
-## ~
-
 ## Examples
 
 ### Tank forward and backward
@@ -82,51 +76,6 @@ pause(5000)
 motors.stopAll()
 ```
 
-### Tank tester
-
-This program lets you change the tank values using the brick buttons.
-
-```typescript
-let tankB = 0;
-let tankC = 0;
-
-brick.showString(`tank tester`, 1)
-brick.showString(`connect motors BC`, 7)
-brick.showString(`up/down for tank B`, 8)
-brick.showString(`left/right for tank C`, 9)
-
-forever(function () {
-    brick.showString(`motor B speed ${motors.largeB.speed()}%`, 4)
-    brick.showString(`motor C speed ${motors.largeC.speed()}%`, 5)
-    pause(100)
-})
-
-function updateTank() {
-    brick.showString(`tank A: ${tankB}%`, 2)
-    brick.showString(`tank B: ${tankC}%`, 3)
-    motors.largeBC.tank(tankB, tankC);
-}
-
-brick.buttonUp.onEvent(ButtonEvent.Pressed, function () {
-    tankB += 10
-    updateTank();
-})
-brick.buttonDown.onEvent(ButtonEvent.Pressed, function () {
-    tankB -= 10
-    updateTank();
-})
-brick.buttonRight.onEvent(ButtonEvent.Pressed, function () {
-    tankC += 10
-    updateTank();
-})
-brick.buttonLeft.onEvent(ButtonEvent.Pressed, function () {
-    tankC -= 10
-    updateTank();
-})
-
-updateTank();
-```
-
 ## See also
 
 [steer](/reference/motors/synced/steer), [run](/reference/motors/motor/run)

docs/stable-ref.json

@@ -1,3 +0,0 @@
-{
-    "appref": "v1.2"
-}