Testing build with pxt-core from branch

.clang-format

@@ -1,6 +0,0 @@
-BasedOnStyle: LLVM
-IndentWidth: 4
-UseTab: Never
-ColumnLimit: 100
-AllowShortFunctionsOnASingleLine: Inline
-SortIncludes: false

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,35 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-Add screenshots to help explain your problem. You can copy paste the screenshot in the github report. The .gif screen recording is very useful as well. 
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,17 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/lock.yml

@@ -1,69 +0,0 @@
-# Configuration for Lock Threads - https://github.com/dessant/lock-threads
-
-
-
-# Number of days of inactivity before a closed issue or pull request is locked
-
-daysUntilLock: 365
-
-
-
-# Skip issues and pull requests created before a given timestamp. Timestamp must
-
-# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
-
-skipCreatedBefore: false
-
-
-
-# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
-
-exemptLabels: []
-
-
-
-# Label to add before locking, such as `outdated`. Set to `false` to disable
-
-lockLabel: false
-
-
-
-# Comment to post before locking. Set to `false` to disable
-
-lockComment: false
-
-
-
-# Assign `resolved` as the reason for locking. Set to `false` to disable
-
-setLockReason: true
-
-
-
-# Limit to only `issues` or `pulls`
-
-# only: issues
-
-
-
-# Optionally, specify configuration settings just for `issues` or `pulls`
-
-# issues:
-
-#   exemptLabels:
-
-#     - help-wanted
-
-#   lockLabel: outdated
-
-
-
-# pulls:
-
-#   daysUntilLock: 30
-
-
-
-# Repository to extend settings from
-
-# _extends: repo

.github/workflows/codeql.yml

@@ -1,51 +0,0 @@
-name: "Code scanning - action"
-
-on:
-  push:
-  pull_request:
-  schedule:
-    - cron: '0 19 * * 0'
-
-jobs:
-  CodeQL-Build:
-
-    # CodeQL runs on ubuntu-latest and windows-latest
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-      
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-         languages: javascript
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

.github/workflows/pxt-buildmain.yml

@@ -1,40 +0,0 @@
-name: pxt-buildmain
-
-on:
-  push:
-    branches:
-      - 'master'
-      - 'main'
-  create:
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [8.x]
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: npm install
-        run: |
-          sudo apt-get install xvfb
-          sudo npm install -g pxt
-          npm install
-      - name: pxt ci
-        run: |
-          pxt ci
-        env:
-          CROWDIN_KEY: ${{ secrets.CROWDIN_KEY }}
-          PXT_ACCESS_TOKEN: ${{ secrets.PXT_ACCESS_TOKEN }}
-          PXT_RELEASE_REPO: ${{ secrets.PXT_RELEASE_REPO }}
-          NPM_ACCESS_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
-          CHROME_BIN: chromium-browser
-          DISPLAY: :99.0
-          CI: true

.github/workflows/pxt-buildpr.yml

@@ -1,31 +0,0 @@
-name: pxt-buildpr
-
-on: [pull_request]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [8.x]
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: npm install
-        run: |
-          sudo apt-get install xvfb
-          sudo npm install -g pxt
-          npm install
-      - name: pxt ci
-        run: |
-          pxt ci
-        env:
-          CHROME_BIN: chromium-browser
-          DISPLAY: :99.0
-          CI: true

.github/workflows/pxt-buildpush.yml

@@ -1,39 +0,0 @@
-name: pxt-buildpush
-
-on:
-  push:
-    # main/master has its own build that includes the crowdin key
-    branches-ignore:
-      - 'main'
-      - 'master'
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [8.x]
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: npm install
-        run: |
-          sudo apt-get install xvfb
-          sudo npm install -g pxt
-          npm install
-      - name: pxt ci
-        run: |
-          pxt ci
-        env:
-          PXT_ACCESS_TOKEN: ${{ secrets.PXT_ACCESS_TOKEN }}
-          PXT_RELEASE_REPO: ${{ secrets.PXT_RELEASE_REPO }}
-          NPM_ACCESS_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
-          CHROME_BIN: chromium-browser
-          DISPLAY: :99.0
-          CI: true

.github/workflows/testghpkgs.yml

@@ -1,52 +0,0 @@
-name: pxt-testghpkgs
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [8.x]
-        branch: [stable3.0]
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ matrix.branch }}
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: npm install
-        run: |
-          sudo npm install -g pxt
-          npm install
-      - name: pxt buildtarget
-        run: pxt buildtarget
-      - name: cache build output
-        uses: actions/cache@v1
-        env:
-          cache-name: cache-testghpkgs
-        with:
-          path: temp/ghpkgs
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-       
-      - name: pxt testghpkgs
-        run: pxt testghpkgs
-        env:
-          PXT_FORCE_GITHUB_PROXY: 1
-          PXT_ACCESS_TOKEN: ${{ secrets.PXT_ACCESS_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.TRAVIS_GITHUB_ACCESS_TOKEN }}
-      - name: upload build log
-        uses: actions/upload-artifact@v2
-        if: ${{ always() }}
-        with:
-          name: logs-${{ matrix.branch }}
-          path: temp/ghpkgs/*.txt

.gitignore

@@ -15,10 +15,7 @@ clients/win10/app/bld
 clients/win10/*.opendb
 clients/**/bin/**
 clients/**/obj/**
-electron-out
-hexcache
-build
-crowdinstats.csv
+clients/electron/projects
 
 *.user
 *.sw?
@@ -27,7 +24,3 @@ crowdinstats.csv
 *.db
 *.suo
 *.log
-.vscode/.BROWSE.VC.DB-shm
-.vscode/.BROWSE.VC.DB-wal
-package-lock.json
-.DS_Store

.travis.yml

@@ -0,0 +1,22 @@
+language: node_js
+node_js:
+  - "5.7.0"
+script:
+  - "node node_modules/pxt-core/built/pxt.js travis"  
+  - "(cd libs/lang-test0; node ../../node_modules/pxt-core/built/pxt.js run)"
+  - "(cd libs/lang-test1; node ../../node_modules/pxt-core/built/pxt.js run)"
+  - "(cd libs/lang-test0; node ../../node_modules/pxt-core/built/pxt.js test)"
+  - "(cd libs/lang-test1; node ../../node_modules/pxt-core/built/pxt.js test)"
+  - "node node_modules/pxt-core/built/pxt.js testdir tests"
+  - "node node_modules/pxt-core/built/pxt.js uploaddoc"
+  - "(cd libs/hello; node ../../node_modules/pxt-core/built/pxt.js testconv https://az851932.vo.msecnd.net/files/td-converter-tests-v1.json)"
+sudo: false
+notifications:
+  email:
+    - touchdevelop-build@microsoft.com
+cache:
+  directories:
+    - node_modules
+    - built/cache
+    - libs/hello/built/cache
+

.vscode/launch.json

@@ -1,46 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Launch",
-            "type": "node",
-            "request": "launch",
-            "program": "${workspaceRoot}/../pxt/built/pxt.js",
-            "stopOnEntry": false,
-            "args": ["serve"],
-            "cwd": "${workspaceRoot}",
-            "preLaunchTask": null,
-            "runtimeExecutable": null,
-            "runtimeArgs": [
-                "--nolazy"
-            ],
-            "env": {
-                "NODE_ENV": "development"
-            },
-            "console": "internalConsole",
-            "sourceMaps": false,
-            "outDir": null
-        },
-        {
-            "name": "Attach",
-            "type": "node",
-            "request": "attach",
-            "port": 5858,
-            "address": "localhost",
-            "restart": false,
-            "sourceMaps": false,
-            "outDir": null,
-            "localRoot": "${workspaceRoot}",
-            "remoteRoot": null
-        },
-        {
-            "name": "Attach to Process",
-            "type": "node",
-            "request": "attach",
-            "processId": "${command.PickProcess}",
-            "port": 5858,
-            "sourceMaps": false,
-            "outDir": null
-        }
-    ]
-}

.vscode/settings.json

@@ -1,5 +1,6 @@
 // Place your settings in this file to overwrite default and user settings.
 {
+    "file.autoSave": "afterDelay",   
     "files.watcherExclude": {
         "**/.git/objects/**": true,
         "**/built/**": true,

.vscode/tasks.json

@@ -1,19 +1,20 @@
 {
-	"version": "2.0.0",
+	"version": "0.1.0",
 	// Task runner is jake
 	"command": "pxt",
+	// Need to be executed in shell / cmd
+	"isShellCommand": true,
+	"showOutput": "always",
 	"tasks": [
 		{
-			"label": "serve",
-			"type": "shell",
-			"command": "pxt",
-			"args": [
-				"serve"
-			],
+			// TS build command is local.
+			"taskName": "serve",
+			// Make this the default build command.
+			"isBuildCommand": true,
+			// Use the redefined Typescript output problem matcher.
 			"problemMatcher": [
 				"$tsc"
-			],
-			"group": "build"
+			]
 		}
 	]
 }

CONTRIBUTING.md

@@ -1,26 +0,0 @@
-# Contributing Code
-
-PXT accepts bug fix pull requests. For a bug fix PR to be accepted, it must first have a tracking issue that has been marked approved. Your PR should link to the bug you are fixing. If you've submitted a PR for a bug, please post a comment in the bug to avoid duplication of effort.
-
-PXT also accepts new feature pull requests. For a feature-level PR to be accepted, it first needs to have design discussion. Design discussion can take one of two forms a) a feature request in the issue tracker that has been marked as approved or b) the PR must be accompanied by a full design spec and this spec is later approved in the open design discussion. Features are evaluated against their complexity, impact on other features, roadmap alignment, and maintainability.
-
-These two blogs posts on contributing code to open source projects are a good reference: [Open Source Contribution Etiquette](http://tirania.org/blog/archive/2010/Dec-31.html) by Miguel de Icaza and [Don't "Push" Your Pull Requests](https://www.igvita.com/2011/12/19/dont-push-your-pull-requests/) by Ilya Grigorik.
-
-## Security
-
-If you believe you have found a security issue in PXT, please share it with us privately following the guidance at the Microsoft [Security TechCenter](https://technet.microsoft.com/en-us/security/ff852094). Reporting it via this channel helps minimize risk to projects built with PXT.
-
-## Legal
-
-You will need to complete a Contributor License Agreement (CLA) before your pull request can be accepted. This agreement testifies that you are granting us permission to use the source code you are submitting, and that this work is being submitted under appropriate license that we can use it.
-
-You can complete the CLA by going through the steps at https://cla.microsoft.com. Once we have received the signed CLA, we'll review the request. You will only need to do this once.
-
-## Housekeeping
-
-Your pull request should:
-* Include a description of what your change intends to do
-* Be a child commit of a reasonably recent commit in the master branch
-* Pass all unit tests
-* Have a clear commit message
-* Include adequate tests

LICENSE.txt

@@ -1,25 +0,0 @@
-PXT - Programming Experience Toolkit
-
-The MIT License (MIT)
-
-Copyright (c) Microsoft Corporation
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -1,149 +1,80 @@
-# calliope target for PXT
+# micro:bit target for PXT
 
+This target allow to program a [BBC micro:bit](https://www.microbit.co.uk/) using 
+PXT ([Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt)).
 
+* [Try it live](https://codethemicrobit.com)
 
-pxt-calliope is a [Microsoft Programming Experience Toolkit (PXT)](https://github.com/Microsoft/pxt) target that allows you to program a [Calliope mini](https://calliope.cc/en). 
+[![Build Status](https://travis-ci.org/Microsoft/pxt-microbit.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-microbit)
 
+## Local server
 
-* [Try it live](https://makecode.calliope.cc/)
+The local server allows to run the editor and the documentation from your computer.
 
-## Issue tracking
+### Setup
 
-Please add an issue if you discover an (unreported) bug.
+The following commands are a 1-time setup after synching the repo on your machine.
 
-## Developing new extensions
-
-Authoring and testing of new extensions can be done directly from the web editor. See [our documentation](https://makecode.com/blog/github-packages) on how to get started. If you want to run the editor locally, keep reading.
-
-## Local server setup
-
-The local server lets you to run the editor and serve the documentation from your own computer. It is meant for a single developer used and not designed to serve the editor to a large amount of users.
-
-1. Install [Node.js](https://nodejs.org/) 8.9.4 or higher.
-2. Clone this repository.
+* if not yet installed, install [Node.js 4.4.5 or higher](https://nodejs.org/en/download/)
+* [clone this repo](https://help.github.com/articles/cloning-a-repository/) to your computer and go in the project folder
 ```
-git clone https://github.com/microsoft/pxt-calliope
-cd pxt-calliope
+git clone https://github.com/microsoft/pxt-microbit
+cd pxt-microbit
 ```
-3. Install the PXT command line (add `sudo` for Mac/Linux shells).
+* install the PXT command line (add ``sudo`` for Mac/Linux shells).
 ```
 npm install -g pxt
 ```
-4. Install the pxt-calliope dependencies.
+* install the dependencies
 ```
 npm install
 ```
 
-Go to the **Running** section.
-
-### Developer Setup
-
-This is the typical setup used by the MakeCode team to work on the microbit.
-
-1. Install [Node.js](https://nodejs.org/) 8.9.4 or higher.
-2. Install [Docker](https://www.docker.com/get-started) if you plan to build ``.cpp`` files.
-3. Clone the pxt repository.
-```
-git clone https://github.com/microsoft/pxt
-cd pxt
-```
-4. Install the dependencies of pxt and build it
-```
-npm install
-npm run build
-cd ..
-```
-5. Clone the pxt-common-packages repository
-```
-git clone https://github.com/microsoft/pxt-common-packages
-cd pxt-common-packages
-npm install
-cd ..
-```
-6. Clone this repository.
-```
-git clone https://github.com/microsoft/pxt-calliope
-cd pxt-calliope
-```
-7. Install the PXT command line (add `sudo` for Mac/Linux shells).
-```
-npm install -g pxt
-```
-8. Install the pxt-calliope dependencies.
-```
-npm install
-```
-8. Link pxt-calliope back to base pxt repo (add `sudo` for Mac/Linux shells). 
-This step is only required if you intend to make changes to pxt and/or 
-pxt-common-packages repos. If all you want is serve a local Makecode, you can skip
-this step.
-```
-pxt link ../pxt
-pxt link ../pxt-common-packages
-```
-Note the above command assumes the folder structure of   
-```
-       makecode
-          |
-  ----------------------------------
-  |       |                        |
- pxt      pxt-common-packages  pxt-calliope
- ```
-
 ### Running
 
-Run this command from inside pxt-calliope to open a local web server
+Run this command to open a local web server (add ``sudo`` for Mac/Linux shells)
 ```
 pxt serve
 ```
 If the local server opens in the wrong browser, make sure to copy the URL containing the local token. 
 Otherwise, the editor will not be able to load the projects.
 
-If you need to modify the `.cpp` files (and have installed yotta), enable yotta compilation using the `--localbuild` flag:
+If you need modify the `.cpp` files, turn on yotta compilation with the ``-yt`` flag (add ``sudo`` for Mac/Linux shells):
 ```
-pxt serve --local
+pxt serve -yt
 ```
 
-If you want to speed up the build, you can use the ``rebundle`` option, which skips building and simply refreshes the target information
+## Updates
+
+To update your PXT version and make sure you're running the latest tools, run (add ``sudo`` for Mac/Linux shells)
 ```
-pxt serve --rebundle
+pxt update
 ```
 
-### Cleaning
+More instructions at https://github.com/Microsoft/pxt#running-a-target-from-localhost 
 
-Sometimes, your built folder might be in a bad state, clean it and try again.
-```
-pxt clean
-```
+### Building
 
-### Updates
+* Install Visual Studio 2015 Update 2 or higher. Make sure the Windows 10 templates are installed.
+* open the ``win10/app.sln`` solution and launch the ``codethemicrobit`` project.
 
-Make sure to pull changes from all repos regularly. More instructions are at https://github.com/Microsoft/pxt#running-a-target-from-localhost
+## Testing
 
-## Update playlists in markdown
+The build automatically runs the following:
 
-Get a Google API key and store it in the ``GOOGLE_API_KEY`` environment variables (turn on data from the app).
+* make sure the built-in packages compile
+* `pxt run` in `libs/lang-test*` - this will run the test in command line runner; 
+  there is a number of asserts in both of these
+* `pxt testdir` in `tests` - this makes sure all the files compile and generates .hex files
+* run the TD->TS converter on a number of test scripts from `microbit.co.uk` and make sure the results compile
 
-```
-pxt downloadplaylists
-```
+To test something on the device:
 
-## Repos 
+* do a `pxt deploy` in `libs/lang-test*` - they should show `1` or `2` on the screen (and not unhappy face)
+* run `pxt testdir` in `tests` and deploy some of the hex files from `tests/built`
 
-The pxt-calliope target depends on several other repos. The main ones are:
-- https://github.com/Microsoft/pxt, the PXT framework
-- https://github.com/Microsoft/pxt-common-packages, common APIs accross various MakeCode editors
-- https://github.com/lancaster-university/microbit, basic wrapper around the DAL
-- https://github.com/lancaster-university/microbit-dal
-
-## History
-
-See the [MakeCode blog](https://makecode.com/blog).
+The `lang-test0` source comes from the `pxt-core` package. It's also tested with `pxt run` there. 
 
 ## Code of Conduct
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
-
-## Trademarks
-
-MICROSOFT, the Microsoft Logo, and MAKECODE are registered trademarks of Microsoft Corporation. They can only be used for the purposes described in and in accordance with Microsoft’s Trademark and Brand guidelines published at https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general.aspx. If the use is not covered in Microsoft’s published guidelines or you are not sure, please consult your legal counsel or MakeCode team (makecode@microsoft.com).

SECURITY.md

@@ -1,41 +0,0 @@
-<!-- BEGIN MICROSOFT SECURITY.MD V0.0.7 BLOCK -->
-
-## Security
-
-Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
-
-If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
-
-## Reporting Security Issues
-
-**Please do not report security vulnerabilities through public GitHub issues.**
-
-Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
-
-If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
-
-You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
-
-Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
-
-  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
-  * Full paths of source file(s) related to the manifestation of the issue
-  * The location of the affected source code (tag/branch/commit or direct URL)
-  * Any special configuration required to reproduce the issue
-  * Step-by-step instructions to reproduce the issue
-  * Proof-of-concept or exploit code (if possible)
-  * Impact of the issue, including how an attacker might exploit the issue
-
-This information will help us triage your report more quickly.
-
-If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
-
-## Preferred Languages
-
-We prefer all communications to be in English.
-
-## Policy
-
-Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
-
-<!-- END MICROSOFT SECURITY.MD BLOCK -->

THIRD-PARTY-NOTICES.txt

@@ -1,229 +0,0 @@
-/*!----------------- PXT ThirdPartyNotices -------------------------------------------------------
-
-PXT uses third party material from the projects listed below.
-The original copyright notice and the license under which Microsoft
-received such third party material are set forth below. Microsoft
-reserves all other rights not expressly granted, whether by
-implication, estoppel or otherwise.
-
-In the event that we accidentally failed to list a required notice, please
-bring it to our attention. Post an issue or email us:
-
-           abchatra@microsoft.com
-
----------------------------------------------
-Third Party Code Components
----------------------------------------------
-
-Some code derived (as noted) from
-
-https://github.com/bbcmicrobit/micropython
-
-The MIT License (MIT)
-
-Copyright (c) 2013-2016 The MicroPython-on-micro:bit Developers, as listed
-in the accompanying AUTHORS file
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
------------------ google/blockly -------------------
-
-Sounds under sim/public/blockly/media from Google Blockly.
-
-
-Copyright 2013 Google Inc
-
-                                 Apache License
-                           Version 2.0, January 2011
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
----------------------------------------------

clients/chrome/README.md

@@ -0,0 +1,26 @@
+# microbit-chrome
+Prototype chrome addon that exposes the micro:bit's serial output to webpages. 
+* watch the [demo video](https://vimeo.com/146207766)
+
+# Installation
+See [developer.chrome.com](https://developer.chrome.com/extensions/getstarted#unpacked)
+for instructions on how to install the local version into your chrome browser.
+
+# Requirements
+* Chrome 48 or later.
+
+# Sample page
+The `demo.html` webpage goes along with the
+https://github.com/Microsoft/microbit-touchdevelop/blob/master/examples/tcs34725.cpp
+program. Run `http-server` from this directory, then visit
+http://localhost:8080/demo.html
+(keep in mind that pages served from `file://` cannot open ports).
+
+# Building
+
+Open a command prompt and run the following commands.
+
+````
+npm install
+typings update
+````

clients/chrome/background.js

@@ -0,0 +1,68 @@
+///<reference path='typings/browser.d.ts'/>
+var connections = [];
+// A list of "ports", i.e. connected clients (such as web pages). Multiple web
+// pages can connect to our service: they all receive the same data.
+var ports = [];
+function byPath(path) {
+    return connections.filter(function (x) { return x.path == path; });
+}
+function byId(id) {
+    return connections.filter(function (x) { return x.id == id; });
+}
+function onReceive(data, id) {
+    if (ports.length == 0)
+        return;
+    var view = new DataView(data);
+    var decoder = new TextDecoder("utf-8");
+    var decodedString = decoder.decode(view);
+    ports.forEach(function (port) { return port.postMessage({
+        type: "serial",
+        data: decodedString,
+        id: id
+    }); });
+}
+function findNewDevices() {
+    chrome.serial.getDevices(function (serialPorts) {
+        serialPorts.forEach(function (serialPort) {
+            if (byPath(serialPort.path).length == 0 &&
+                serialPort.displayName == "mbed Serial Port") {
+                chrome.serial.connect(serialPort.path, { bitrate: 115200 }, function (info) {
+                    // In case the [connect] operation takes more than five seconds...
+                    if (info && byPath(serialPort.path).length == 0)
+                        connections.push({
+                            id: info.connectionId,
+                            path: serialPort.path
+                        });
+                });
+            }
+        });
+    });
+}
+function main() {
+    // Register new clients in the [ports] global variable.
+    chrome.runtime.onConnectExternal.addListener(function (port) {
+        if (/^(micro:bit|touchdevelop|yelm|pxt|codemicrobit|codethemicrobit)$/.test(port.name)) {
+            ports.push(port);
+            port.onDisconnect.addListener(function () {
+                ports = ports.filter(function (x) { return x != port; });
+            });
+        }
+    });
+    // When receiving data for one of the connections that we're tracking, forward
+    // it to all connected clients.
+    chrome.serial.onReceive.addListener(function (info) {
+        if (byId(info.connectionId).length > 0)
+            onReceive(info.data, info.connectionId);
+    });
+    // When it looks like we've been disconnected, drop the corresponding
+    // connection object from the [connections] global variable.
+    chrome.serial.onReceiveError.addListener(function (info) {
+        if (info.error == "system_error" || info.error == "disconnected" || info.error == "device_lost")
+            connections = connections.filter(function (x) { return x.id != info.connectionId; });
+    });
+    // Probe serial connections at regular intervals. In case we find an mbed port
+    // we haven't yet connected to, connect to it.
+    setInterval(findNewDevices, 5000);
+    findNewDevices();
+}
+document.addEventListener("DOMContentLoaded", main);

clients/chrome/background.ts

@@ -0,0 +1,92 @@
+// A list of: {
+//   id: number;
+//   path: string;
+// } where [id] is the [connectionId] (internal to Chrome) and [path] is the
+// OS' name for the device (e.g. "COM4").
+interface Connection {
+  id: string;
+  path: string;
+}
+let connections: Connection[] = [];
+
+// A list of "ports", i.e. connected clients (such as web pages). Multiple web
+// pages can connect to our service: they all receive the same data.
+let ports = [];
+
+interface Message {
+  type: string;
+  data: string;
+  id: string;
+}
+
+function byPath(path: string): Connection[] {
+  return connections.filter((x) => x.path == path);
+}
+
+function byId(id: string): Connection[] {
+  return connections.filter((x) => x.id == id);
+}
+
+function onReceive(data, id: string) {
+  if (ports.length == 0) return;
+
+  let view = new DataView(data);
+  let decoder = new TextDecoder("utf-8");
+  let decodedString = decoder.decode(view);
+  ports.forEach(port => port.postMessage(<Message>{
+    type: "serial",
+    data: decodedString,
+    id: id,
+  }));
+}
+
+function findNewDevices() {
+  chrome.serial.getDevices(function (serialPorts) {
+    serialPorts.forEach(function (serialPort) {
+      if (byPath(serialPort.path).length == 0 &&
+        serialPort.displayName == "mbed Serial Port") {
+        chrome.serial.connect(serialPort.path, { bitrate: 115200 }, function (info) {
+          // In case the [connect] operation takes more than five seconds...
+          if (info && byPath(serialPort.path).length == 0)
+            connections.push({
+              id: info.connectionId,
+              path: serialPort.path
+            });
+        });
+      }
+    });
+  });
+}
+
+function main() {
+  // Register new clients in the [ports] global variable.
+  chrome.runtime.onConnectExternal.addListener(function (port) {
+    if (/^(micro:bit|touchdevelop|yelm|pxt|codemicrobit|codethemicrobit)$/.test(port.name)) {
+      ports.push(port);
+      port.onDisconnect.addListener(function () {
+        ports = ports.filter(function (x) { return x != port });
+      });
+    }
+  });
+
+  // When receiving data for one of the connections that we're tracking, forward
+  // it to all connected clients.
+  chrome.serial.onReceive.addListener(function (info) {
+    if (byId(info.connectionId).length > 0)
+      onReceive(info.data, info.connectionId);
+  });
+
+  // When it looks like we've been disconnected, drop the corresponding
+  // connection object from the [connections] global variable.
+  chrome.serial.onReceiveError.addListener(function (info) {
+    if (info.error == "system_error" || info.error == "disconnected" || info.error == "device_lost")
+      connections = connections.filter((x) => x.id != info.connectionId);
+  });
+
+  // Probe serial connections at regular intervals. In case we find an mbed port
+  // we haven't yet connected to, connect to it.
+  setInterval(findNewDevices, 5000);
+  findNewDevices();
+}
+
+document.addEventListener("DOMContentLoaded", main);

clients/chrome/manifest.json

@@ -0,0 +1,30 @@
+{
+  "app": {
+    "background": {
+      "scripts": [ "background.js" ]
+    }
+  },
+
+  "manifest_version": 2,
+  "name": "code the micro:bit",
+  "version": "0.6.0",
+  "author": "Microsoft Corporation",
+  "short_name": "code the micro:bit",
+
+  "description": "Extension for https://codethemicrobit.com.",
+  "homepage_url": "https://codethemicrobit.com",
+  "offline_enabled": "true",
+  "icons": {
+    "48": "logo48.png",
+    "128": "logo128.png"
+  },
+
+  "permissions": [
+    "serial",
+    "usb"
+  ],
+
+  "externally_connectable": {
+    "matches": [ "*://localhost/*", "https://codethemicrobit.com/*", "https://*.codethemicrobit.com/*" ]
+  }
+}

clients/chrome/tsconfig.json

@@ -0,0 +1,7 @@
+{
+    "compiler-options": {
+        "target": "ES5",
+        "module": "amd",
+        "sourceMap": false
+    }
+ }

clients/electron/.gitignore

@@ -0,0 +1,2 @@
+node_modules
+projects

clients/electron/README.md

@@ -0,0 +1,5 @@
+# PXT micro:bit Electron app
+
+A very basic wrapper around the web app. To install, copy the contents of this
+directory to somewhere outside the main `pxt-microbit` repository. Then run `npm
+install && npm start`.

clients/electron/index.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <title>code the micro:bit</title>
+  </head>
+  <body>
+    <webview id="webview" style="position:absolute; left:0; top:0; right:0; bottom:0"/>
+    <script>
+      const webview = document.getElementById("webview")
+      const url = `http://localhost:3232/${window.location.hash}`
+      webview.src = url
+    </script>
+  </body>
+</html>

clients/electron/main.js

@@ -0,0 +1,39 @@
+const {app, BrowserWindow, Menu} = require('electron')
+const pxt = require('pxt-core')
+const path = require('path')
+
+let win
+
+const cliPath = path.join(process.cwd(), "node_modules/pxt-microbit") 
+
+function startServerAndCreateWindow() {
+  pxt.mainCli(cliPath, ["serve", "-no-browser"])
+  createWindow()
+}
+
+function createWindow () {
+  win = new BrowserWindow({
+    width: 800,
+    height: 600,
+    title: "code the micro:bit"
+  })
+  Menu.setApplicationMenu(null)
+  win.loadURL(`file://${__dirname}/index.html#local_token=${pxt.globalConfig.localToken}`)
+  win.on('closed', () => {
+    win = null
+  })
+}
+
+app.on('ready', startServerAndCreateWindow)
+
+app.on('window-all-closed', () => {
+  if (process.platform !== 'darwin') {
+    app.quit()
+  }
+})
+
+app.on('activate', () => {
+  if (win === null) {
+    createWindow()
+  }
+})

clients/electron/package.json

@@ -0,0 +1,14 @@
+{
+  "name"    : "code-the-microbit",
+  "version" : "1.0.0",
+  "description": "Blocks / Javascript editor",
+  "author": "Microsoft",
+  "main"    : "main.js",
+  "scripts": {
+      "start": "node_modules/.bin/electron ."
+  },
+  "devDependencies": {
+      "electron": "*",
+      "pxt-microbit": "*"
+  }
+}

clients/macuploader/Microbit Uploader/AppDelegate.m

@@ -124,7 +124,7 @@
 }
 
 - (void)launchEditor:(id)sender {
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://makecode.microbit.org/"]];
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://codethemicrobit.com/"]];
 }
 
 @end

clients/macuploader/README.md

@@ -1,12 +1,12 @@
-# @boardname@ uploader for OS X
+# micro:bit uploader for OS X
 
 ![](Microbit Uploader/Assets.xcassets/AppIcon.appiconset/icon_256x256.png)
 
 This project is a clone of the [Windows
-uploader](https://makecode.microbit.org/uploader), but for OS X. Once launched,
+uploader](https://codethemicrobit.com/uploader), but for OS X. Once launched,
 the app runs in your menu bar and will automatically deploy any HEX files to
-your `@boardname@`. Like the Windows version, it is compatible with any browser
-that can run @homeurl@.
+your `micro:bit`. Like the Windows version, it is compatible with any browser
+that can run [codethemicrobit.com](http://codethemicrobit.com).
 
 ## Install the built version
 

clients/win10/app.sln

@@ -0,0 +1,48 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "m.pxt.io", "app\m.pxt.io.jsproj", "{39122940-AB16-4CD4-A0CE-79A3EB863ECF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.ActiveCfg = Debug|ARM
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Build.0 = Debug|ARM
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Deploy.0 = Debug|ARM
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.ActiveCfg = Debug|x64
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Build.0 = Debug|x64
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Deploy.0 = Debug|x64
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.ActiveCfg = Debug|x86
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Build.0 = Debug|x86
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Deploy.0 = Debug|x86
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.ActiveCfg = Release|ARM
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Build.0 = Release|ARM
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Deploy.0 = Release|ARM
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.ActiveCfg = Release|x64
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Build.0 = Release|x64
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Deploy.0 = Release|x64
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.ActiveCfg = Release|x86
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Build.0 = Release|x86
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Deploy.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

clients/win10/app/BundleArtifacts/neutral.txt

@@ -0,0 +1 @@
+MainPackage=C:\gh\pxt-microbit\win10\app\bin\Debug\m.pxt.io_0.1.4.0_AnyCPU_Debug.appx

clients/win10/app/codethemicrobitapp.jsproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|AnyCPU">
       <Configuration>Debug</Configuration>
@@ -24,21 +24,18 @@
     <ProjectConfiguration Include="Release|ARM">
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
-      <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
-      <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x86">
       <Configuration>Release</Configuration>
       <Platform>x86</Platform>
-      <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>34e8cde2-3991-414e-bb19-bff4bd5e031a</ProjectGuid>
+    <ProjectGuid>39122940-ab16-4cd4-a0ce-79a3eb863ecf</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0'">
@@ -48,35 +45,30 @@
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" />
   <PropertyGroup>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.15063.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>$(VersionNumberMajor).$(VersionNumberMinor)</MinimumVisualStudioVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
-    <PackageCertificateKeyFile>pxtwapp_StoreKey.pfx</PackageCertificateKeyFile>
-    <AppxAutoIncrementPackageRevision>true</AppxAutoIncrementPackageRevision>
+    <PackageCertificateKeyFile>pxtwinapp_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
-    <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
-    <PackageCertificateThumbprint>0F8807625041D61E0F9B573FC89308FB2C535CE2</PackageCertificateThumbprint>
+    <AppxBundlePlatforms>neutral</AppxBundlePlatforms>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
-    <Content Include="images\logo.png" />
-    <Content Include="images\SmallTile.scale-200.png" />
-    <Content Include="images\Square44x44Logo.altform-unplated_targetsize-48.png" />
-    <Content Include="images\Square44x44Logo.targetsize-48.png" />
-    <Content Include="images\storelogo.scale-200.png" />
     <Content Include="msapp-error.js" />
     <Content Include="msapp-error.css" />
     <Content Include="msapp-error.html" />
+    <Content Include="images\LockScreenLogo.scale-200.png" />
     <Content Include="images\SplashScreen.scale-200.png" />
     <Content Include="images\Square150x150Logo.scale-200.png" />
     <Content Include="images\Square44x44Logo.scale-200.png" />
+    <Content Include="images\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="images\StoreLogo.png" />
     <Content Include="images\Wide310x150Logo.scale-200.png" />
-    <None Include="pxtwapp_StoreKey.pfx" />
-    <None Include="Package.StoreAssociation.xml" />
-    <None Include="pxtwapp_TemporaryKey.pfx" />
+    <None Include="pxtwinapp_TemporaryKey.pfx" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
   <!-- To modify your build process, add your task inside one of the targets below then uncomment

clients/win10/app/codethemicrobitapp.sln

@@ -0,0 +1,48 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "codethemicrobitapp", "codethemicrobitapp.jsproj", "{39122940-AB16-4CD4-A0CE-79A3EB863ECF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.ActiveCfg = Debug|ARM
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Build.0 = Debug|ARM
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Deploy.0 = Debug|ARM
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.ActiveCfg = Debug|x64
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Build.0 = Debug|x64
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Deploy.0 = Debug|x64
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.ActiveCfg = Debug|x86
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Build.0 = Debug|x86
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Deploy.0 = Debug|x86
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.ActiveCfg = Release|ARM
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Build.0 = Release|ARM
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Deploy.0 = Release|ARM
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.ActiveCfg = Release|x64
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Build.0 = Release|x64
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Deploy.0 = Release|x64
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.ActiveCfg = Release|x86
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Build.0 = Release|x86
+		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Deploy.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

clients/win10/app/msapp-error.css

@@ -0,0 +1,17 @@
+body {
+  margin: 10px;
+} 
+
+.tip {
+  font-size: 90%;
+  padding-left: 20px;
+}
+
+.paramName {
+  font-size: 100%;
+  color: black;
+} 
+
+.paramValue {
+  color: black;
+}

clients/win10/app/msapp-error.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Navigation Error</title>
+  <link href="msapp-error.css" rel="stylesheet" type="text/css"/>
+  <script src="msapp-error.js" type="text/javascript"></script>
+</head>
+<body>
+  <h1>Navigation Error</h1>
+  <div id="failureUrl" class="param"> 
+    <span>-</span><span class="paramName">failureUrl</span><span>=</span> 
+    <span id="failureUrlValue" class="paramValue"></span> 
+    <span class="tip">(indicates the url where the error occurred)</span><br/> 
+  </div><br/> 
+  <div id="httpStatus" class="param"> 
+    <span>-</span><span class="paramName">httpStatus</span><span>=</span> 
+    <span id="httpStatusValue" class="paramValue"></span> 
+    <span class="tip">(available when the error has an http status code)</span><br/> 
+  </div><br/> 
+  <div id="failureName"> 
+    <span>-</span><span class="paramName">failureName</span><span>=</span> 
+    <span id="failureNameValue" class="paramValue"></span> 
+    <span class="tip">(available only when the error does not have a http status code)</span><br/> 
+  </div> 
+</body>
+</html>

clients/win10/app/msapp-error.js

@@ -0,0 +1,22 @@
+(function () { 
+  var validParameterNames = [ "httpStatus", "failureName", "failureUrl" ]; 
+  
+  function parseQueryParameters() { 
+    var query = location.search.slice(1); 
+    return query.split("&").reduce(function (queryParameters, rawPair) {
+                                   var pair = rawPair.split("=").map(decodeURIComponent);
+                                   queryParameters[pair[0]] = pair[1];
+                                   return queryParameters;
+    }, {});
+  }
+ 
+  function initialize() {
+    var queryParameters = parseQueryParameters();
+    validParameterNames.forEach(function (parameterName) {
+                               var parameterValue = queryParameters[parameterName] || "N/A"; 
+                               document.getElementById(parameterName + "Value").textContent = parameterValue;
+    });
+  }
+  
+  document.addEventListener("DOMContentLoaded", initialize);
+}());

clients/win10/app/package.appxmanifest

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
+  <Identity Name="39122940-ab16-4cd4-a0ce-79a3eb863ecf" Version="0.1.5.0" Publisher="CN=jhalleux" />
+  <mp:PhoneIdentity PhoneProductId="39122940-ab16-4cd4-a0ce-79a3eb863ecf" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
+  <Properties>
+    <DisplayName>codethemicrobit</DisplayName>
+    <PublisherDisplayName>Microsoft</PublisherDisplayName>
+    <Logo>images\storelogo.png</Logo>
+  </Properties>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+  </Dependencies>
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="App" StartPage="https://codethemicrobit.com">
+      <uap:ApplicationContentUriRules>
+        <uap:Rule Match="https://m.pxt.io/" Type="include" WindowsRuntimeAccess="all" />
+        <uap:Rule Match="https://codemicrobit.com/" Type="include" WindowsRuntimeAccess="all" />
+        <uap:Rule Match="https://codethemicrobit.com/" Type="include" WindowsRuntimeAccess="all" />
+      </uap:ApplicationContentUriRules>
+      <uap:VisualElements DisplayName="code the micro:bit" Description="A code editor for the BBC micro:bit with Blocks or Javascript." BackgroundColor="white" Square150x150Logo="images\Square150x150Logo.png" Square44x44Logo="images\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="images\Wide310x150Logo.png" ShortName="code the micro:bit">
+        </uap:DefaultTile>
+        <uap:SplashScreen Image="images\splashscreen.png" />
+      </uap:VisualElements>
+      <Extensions>
+        <uap:Extension Category="windows.fileTypeAssociation">
+          <uap:FileTypeAssociation Name="microbithex">
+            <uap:DisplayName>BBC micro:bit binary file</uap:DisplayName>
+            <uap:SupportedFileTypes>
+              <uap:FileType ContentType="application/x-microbit-hex">.hex</uap:FileType>
+            </uap:SupportedFileTypes>
+          </uap:FileTypeAssociation>
+        </uap:Extension>
+      </Extensions>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <Capability Name="internetClient" />
+    <uap:Capability Name="removableStorage" />
+    <DeviceCapability Name="bluetooth" />
+    <DeviceCapability Name="serialcommunication">
+      <Device Id="any">
+        <Function Type="name:serialPort" />
+      </Device>
+    </DeviceCapability>
+  </Capabilities>
+</Package>

clients/winuploader/Microbit.Uploader/MainForm.cs

@@ -32,7 +32,7 @@ namespace Microsoft.MicroBit
         private void openEditor()
         {
             // lanch editor
-            try { Process.Start("https://makecode.microbit.org#uploader"); } catch (Exception) { }
+            try { Process.Start("https://codethemicrobit.com#uploader"); } catch (Exception) { }
         }
 
         private void initializeFileWatch()
@@ -236,7 +236,7 @@ namespace Microsoft.MicroBit
         {
             try
             {
-                Process.Start("https://makecode.microbit.org/uploader");
+                Process.Start("https://codethemicrobit.com/uploader");
             }
             catch (IOException) { }
         }

cmds/cmds.ts

@@ -0,0 +1,59 @@
+/// <reference path="../node_modules/pxt-core/built/pxt.d.ts"/>
+
+import * as fs from "fs";
+import * as path from "path";
+import * as child_process from "child_process";
+
+let writeFileAsync: any = Promise.promisify(fs.writeFile)
+let execAsync: (cmd: string, options?: { cwd?: string }) => Promise<Buffer> = Promise.promisify(child_process.exec)
+let readDirAsync = Promise.promisify(fs.readdir)
+
+
+export function deployCoreAsync(res: ts.pxtc.CompileResult) {
+    return getBitDrivesAsync()
+        .then(drives => {
+            if (drives.length == 0) {
+                let msg = "cannot find any drives to deploy to";
+                console.log(msg);
+                return Promise.reject(new Error(msg));
+            }
+
+            console.log(`copy ${ts.pxtc.BINARY_HEX} to ` + drives.join(", "))
+
+            return Promise.map(drives, d =>
+                writeFileAsync(d + ts.pxtc.BINARY_HEX, res.outfiles[ts.pxtc.BINARY_HEX])
+                    .then(() => {
+                        console.log("wrote hex file to " + d)
+                    }))
+        })
+        .then(() => { })
+}
+
+function getBitDrivesAsync(): Promise<string[]> {
+    if (process.platform == "win32") {
+        const rx = new RegExp("^([A-Z]:).* " + pxt.appTarget.compile.deployDrives)
+        return execAsync("wmic PATH Win32_LogicalDisk get DeviceID, VolumeName, FileSystem")
+            .then(buf => {
+                let res: string[] = []
+                buf.toString("utf8").split(/\n/).forEach(ln => {
+                    let m = rx.exec(ln)
+                    if (m) {
+                        res.push(m[1] + "/")
+                    }
+                })
+                return res
+            })
+    }
+    else if (process.platform == "darwin") {
+        const rx = new RegExp(pxt.appTarget.compile.deployDrives)
+        return readDirAsync("/Volumes")
+            .then(lst => lst.filter(s => rx.test(s)).map(s => "/Volumes/" + s + "/"))
+    } else if (process.platform == "linux") {
+        const rx = new RegExp(pxt.appTarget.compile.deployDrives)
+        const user = process.env["USER"]
+        return readDirAsync(`/media/${user}`)
+            .then(lst => lst.filter(s => rx.test(s)).map(s => `/media/${user}/${s}/`))
+    } else {
+        return Promise.resolve([])
+    }
+}

cmds/tsconfig.json

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

compiler/combiner.ts

@@ -1,131 +0,0 @@
-/// <reference path="../node_modules/pxt-core/built/pxtcompiler.d.ts"/>
-
-namespace ts.pxtc.extension {
-    pxtc.compilerHooks.postBinary = (program: ts.Program, opts: CompileOptions, res: CompileResult) => {
-        if (!opts.target.isNative)
-            return
-        const mbdal = res.outfiles["mbdal-binary.hex"]
-        const mbcodal = res.outfiles["mbcodal-binary.hex"]
-        if (!mbdal || !mbcodal)
-            return
-
-        let outp = ""
-
-        wrapHex(mbdal, 0x00, [0x99, 0x01, 0xc0, 0xde])
-        wrapHex(mbcodal, 0x0D, [0x99, 0x03, 0xc0, 0xde], true)
-
-        outp += ":00000001FF\n"
-
-        res.outfiles["binary.hex"] = outp
-
-        function hex2str(bytes: number[]) {
-            return ts.pxtc.hexfile.hexBytes([bytes.length - 3].concat(bytes)) + "\n"
-        }
-
-        function paddingString(len: number) {
-            let r = ""
-            const len0 = len
-            while (len >= 44) {
-                r += hex2str([0x00, 0x00, 0x0C,
-                    0x42, 0x42, 0x42, 0x42,
-                    0x42, 0x42, 0x42, 0x42,
-                    0x42, 0x42, 0x42, 0x42,
-                    0x42, 0x42, 0x42, 0x42])
-                len -= 44
-            }
-            if (len >= 12) {
-                const numBytes = (len - 11) >> 1
-                const bytes = [0x00, 0x00, 0x0C]
-                for (let i = 0; i < numBytes; ++i) bytes.push(0x42)
-                const add = hex2str(bytes)
-                r += add
-                len -= add.length
-            }
-            while (len--)
-                r += "\n"
-
-            U.assert(r.length == len0)
-
-            return r
-        }
-
-        function addBlock(blk: string) {
-            const leftoff = blk.length & 511
-            outp += blk + paddingString(512 - leftoff)
-        }
-
-        function wrapHex(inpHex: string, dataType: number, deviceType: number[], keepSrc = false) {
-            let blk =
-                hex2str([0x00, 0x00, 0x04, 0x00, 0x00])
-                + hex2str([0x00, 0x00, 0x0A].concat(deviceType))
-            let upperAddr = 0
-            const lines = inpHex.split(/\r?\n/)
-            for (let i = 0; i < lines.length; ++i) {
-                const line = lines[i]
-                if (!line)
-                    continue
-                const parsed = ts.pxtc.hexfile.parseHexRecord(line)
-
-                switch (parsed.type) {
-                    case 0x00:
-                        /*
-                        const parsed2 = parsed.len <= 16 && lines[i + 1] ?
-                            ts.pxtc.hexfile.parseHexRecord(lines[i + 1])
-                            : null
-                        // if this and next line can fit in 32 bytes, concat them
-                        if (parsed2 && parsed2.type == 0x00 &&
-                            parsed2.addr == parsed.addr + parsed.len &&
-                            parsed.len + parsed2.len <= 32) {
-                            parsed.data = parsed.data.concat(parsed2.data)
-                            parsed.len += parsed2.len
-                            i++
-                        }
-                        */
-                        addData([parsed.addr >> 8, parsed.addr & 0xff, dataType]
-                            .concat(parsed.data))
-                        break
-
-                    case 0x01:
-                        flush()
-                        if (keepSrc) break
-                        else return
-
-                    case 0x04:
-                        const newUpper = ((parsed.data[0] << 8) | parsed.data[1]) << 16
-                        if (upperAddr != newUpper) {
-                            upperAddr = newUpper
-                            addData([0, 0, 0x04, parsed.data[0], parsed.data[1]])
-                        }
-                        break
-
-                    case 0x03:
-                    case 0x05:
-                        // ignore
-                        break
-
-                    case 0x0E:
-                        // src record
-                        addData([parsed.addr >> 8, parsed.addr & 0xff, 0x0E]
-                            .concat(parsed.data))
-                        break
-
-                    default:
-                        U.oops(`unknown hex record type: ${line}`)
-                        break
-                }
-            }
-            flush()
-
-            function addData(bytes: number[]) {
-                const newData = hex2str(bytes)
-                blk += newData
-            }
-
-            function flush() {
-                if (blk)
-                    addBlock(blk)
-                blk = ""
-            }
-        }
-    }
-}

compiler/tsconfig.json

@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "target": "es2017",
-        "noImplicitAny": true,
-        "noImplicitReturns": true,
-        "noImplicitThis": true,
-        "declaration": true,
-        "moduleResolution": "node",
-        "isolatedModules": false,
-        "out": "../built/compiler.js",
-        "rootDir": ".",
-        "newLine": "LF",
-        "sourceMap": false,
-        "typeRoots": ["../node_modules/@types"],
-        "lib": [
-            "dom",
-            "dom.iterable",
-            "scripthost",
-            "es2017",
-            "ES2018.Promise"
-        ]
-    }
-}

docfiles/appmeta.html

@@ -0,0 +1,16 @@
+    <meta name="twitter:card" content="summary" />
+    <meta name="twitter:site" content="@codethemicrobit" />
+    <meta name="twitter:title" content="code the micro:bit" />
+    <meta name="twitter:description" content="Blocks+JavaScript for programming your micro:bit" />
+    <meta name="twitter:image" content="https://az851932.vo.msecnd.net/pub/drbwxcth" />
+
+    <meta property="og:title" content="micro:bit editor" />
+    <meta property="og:description" content="Blocks+JavaScript for programming your micro:bit" />
+    <meta property="og:site_name" content="code the micro:bit" />
+    <meta property="og:image" content="https://az851932.vo.msecnd.net/pub/drbwxcth" />
+    <!--
+    Canonical URL needs to wait until main release is updated.
+    <meta property="og:url" content="https://codethemicrobit.com" />
+    <meta property="og:type" content="website" />
+    <meta property="fb:app_id" content="" />
+    -->

docfiles/apptracking.html

@@ -0,0 +1,6 @@
+<script type="text/javascript">
+    (function(e,b){if(!b.__SV){var a,f,i,g;window.mixpanel=b;b._i=[];b.init=function(a,e,d){function f(b,h){var a=h.split(".");2==a.length&&(b=b[a[0]],h=a[1]);b[h]=function(){b.push([h].concat(Array.prototype.slice.call(arguments,0)))}}var c=b;"undefined"!==typeof d?c=b[d]=[]:d="mixpanel";c.people=c.people||[];c.toString=function(b){var a="mixpanel";"mixpanel"!==d&&(a+="."+d);b||(a+=" (stub)");return a};c.people.toString=function(){return c.toString(1)+".people (stub)"};i="disable time_event track track_pageview track_links track_forms register register_once alias unregister identify name_tag set_config reset people.set people.set_once people.increment people.append people.union people.track_charge people.clear_charges people.delete_user".split(" ");
+    for(g=0;g<i.length;g++)f(c,i[g]);b._i.push([a,e,d])};b.__SV=1.2;a=e.createElement("script");a.type="text/javascript";a.async=!0;a.src="undefined"!==typeof MIXPANEL_CUSTOM_LIB_URL?MIXPANEL_CUSTOM_LIB_URL:"file:"===e.location.protocol&&"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js".match(/^\/\//)?"https://cdn.mxpnl.com/libs/mixpanel-2-latest.min.js":"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js";f=e.getElementsByTagName("script")[0];f.parentNode.insertBefore(a,f)}})(document,window.mixpanel||[]);
+    mixpanel.init("762fef19c053a0ea4cec43d2fecae76e", { disable_persistence: true });
+    if (typeof pxtConfig !== "undefined") mixpanel.register({ target: pxtConfig.targetId, version: pxtConfig.targetVersion });
+</script>

docfiles/indexhead.html

@@ -1,29 +0,0 @@
-<meta name="msvalidate.01" content="C458ADC671C51F222A0F655F66596649" />
-<meta property="og:title" content="Microsoft MakeCode" />
-<meta property="og:site_name" content="Microsoft MakeCode" />
-<meta property="og:url" content="https://www.makecode.com">
-<meta property="og:type" content="website" />
-<meta property="og:description" content="Microsoft MakeCode is a free, open-source Block and JavaScript learn-to-code editor that promotes a more inclusive approach to computing education." />
-<meta property="og:image" content="/static/logo/logo-card.png">
-<meta property="fb:app_id" content=""/>
-
-<meta name="msapplication-config" content="/static/logo/favicons/browserconfig.xml">
-<meta name="msapplication-TileImage" content="/static/logo/favicons/mstile-310x310.png">
-<meta name="msapplication-TileColor" content="#b4009e">
-<meta name="application-name" content="MakeCode">
-<link rel="shortcut icon" sizes="16x16 24x24 32x32 48x48" href="/static/logo/favicons/favicon.ico">
-<link rel="icon" type="image/png" sizes="32x32" href="/static/logo/favicons/favicon-32x32.png">
-<link rel="apple-touch-icon" sizes="180x180" href="/static/logo/favicons/apple-touch-icon.png">
-
-<meta name="twitter:card" content="summary"/>
-<meta name="twitter:title" content="Microsoft MakeCode">
-<meta name="twitter:description" content="Microsoft MakeCode is a free, open-source Block and JavaScript learn-to-code editor that promotes a more inclusive approach to computing education.">
-<meta name="twitter:site" content="@MSMakeCode">
-<meta name="twitter:creator" content="@MSMakeCode">
-<meta name="twitter:image" content="/static/logo/logo-card.png"/>
-<link rel="stylesheet" href="/doccdn/semantic.css" />
-<link rel="stylesheet" href="/docfiles/index.css" />
-
-<script src="/doccdn/jquery.js"></script>
-<script src="/static/semantic/semantic.min.js"></script>
-<script src="/docfiles/index.js"></script>

docfiles/meta.html

@@ -0,0 +1,21 @@
+<meta name="twitter:card" content="summary" />
+<meta name="twitter:site" content="@codethemicrobit" />
+<meta name="twitter:title" content="@name@" />
+<meta name="twitter:description" content="@description@" />
+<meta name="twitter:image" content="@cardLogo@" />
+
+<meta property="og:title" content="@name@" />
+<meta property="og:site_name" content="code the micro:bit" />
+<meta property="og:description" content="@description@" />
+<meta property="og:image" content="@cardLogo@" />
+<!--
+    <meta property="og:type" content="website" />
+    <meta property="fb:app_id" content="" />
+    -->
+
+<link rel="apple-touch-icon" href="@appLogo@">
+<link rel="icon" type="image/png" href="@appLogo@">
+<link rel="mask-icon" href="https://az851932.vo.msecnd.net/pub/zwxazere/safari-pinned-tab.svg" color="#000000">
+<link rel="shortcut icon" href="@appLogo@">
+<meta name="theme-color" content="@accentColor@">
+

docfiles/offline-app-trademarks.html

@@ -1,2 +0,0 @@
-Micro:bit and micro:bit logo are trademarks and/ or copyrights of the Micro:bit
-Educational Foundation. © Micro:bit Educational Foundation. All rights reserved.

docfiles/target.css

@@ -0,0 +1,5 @@
+#root .avatar .avatar-image {
+    background-image: url(https://az851932.vo.msecnd.net/pub/jovrytni/microbit.simplified.svg);
+    background-size: contain;
+    background-repeat: no-repeat;
+}

docfiles/tracking.html

@@ -0,0 +1,6 @@
+<script type="text/javascript">
+    (function(e,b){if(!b.__SV){var a,f,i,g;window.mixpanel=b;b._i=[];b.init=function(a,e,d){function f(b,h){var a=h.split(".");2==a.length&&(b=b[a[0]],h=a[1]);b[h]=function(){b.push([h].concat(Array.prototype.slice.call(arguments,0)))}}var c=b;"undefined"!==typeof d?c=b[d]=[]:d="mixpanel";c.people=c.people||[];c.toString=function(b){var a="mixpanel";"mixpanel"!==d&&(a+="."+d);b||(a+=" (stub)");return a};c.people.toString=function(){return c.toString(1)+".people (stub)"};i="disable time_event track track_pageview track_links track_forms register register_once alias unregister identify name_tag set_config reset people.set people.set_once people.increment people.append people.union people.track_charge people.clear_charges people.delete_user".split(" ");
+    for(g=0;g<i.length;g++)f(c,i[g]);b._i.push([a,e,d])};b.__SV=1.2;a=e.createElement("script");a.type="text/javascript";a.async=!0;a.src="undefined"!==typeof MIXPANEL_CUSTOM_LIB_URL?MIXPANEL_CUSTOM_LIB_URL:"file:"===e.location.protocol&&"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js".match(/^\/\//)?"https://cdn.mxpnl.com/libs/mixpanel-2-latest.min.js":"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js";f=e.getElementsByTagName("script")[0];f.parentNode.insertBefore(a,f)}})(document,window.mixpanel||[]);
+    mixpanel.init("762fef19c053a0ea4cec43d2fecae76e", { disable_persistence: true });
+    if (typeof pxtConfig !== "undefined") mixpanel.register({ target: pxtConfig.targetId, version: pxtConfig.targetVersion });    
+</script>

docs/_locales/pl/_theme.json

@@ -0,0 +1,22 @@
+{
+    "name": "koduj z micro:bit",
+    "title": "koduj z micro:bit",
+    "docMenu": [
+        {
+            "name": "O nas",
+            "path": "/about"
+        },
+        {
+            "name": "Lekcje",
+            "path": "/lessons"
+        },
+        {
+            "name": "Instrukcja obsługi",
+            "path": "/reference"
+        },
+        {
+            "name": "Urządzenie",
+            "path": "/device"
+        }
+    ]
+}

docs/_locales/pl/docs.md

@@ -0,0 +1,7 @@
+# Dokumentacja
+
+Witamy na stronach dokumentacji!
+
+* Przeglądnij [instrukcje obsługi](/reference)
+* Dowiedz się więcej o [urządzeniu](/device)
+* Wystartuj z [lekcjami](/lessons)

docs/about.md

@@ -1,37 +1,32 @@
-![](/static/mb/device/calliope_website.jpg)
+![](/static/mb/device/pano.jpg)
 
 # About
 
-## @description A Blocks / Javascript code editor for the Calliope mini, a pocket-size computer with 5x5 display, sensors and Bluetooth.
+### @description A Blocks / Javascript code editor for the micro:bit, a pocket-size computer with 5x5 display, sensors and Bluetooth.
 
-The [Calliope mini](https://calliope.cc) is a [pocket-size computer]([/device](https://calliope.cc/en/calliope-mini/tech-facts)) with a 5x5 display of 25 LEDs, Bluetooth and sensors that can be programmed by anyone.
+The [BBC micro:bit](https://www.microbit.co.uk) is a [pocket-size computer](/device) with a 5x5 display of 25 LEDs, Bluetooth and sensors that can be programmed by anyone.
+The BBC micro:bit was made possible by many [partners](https://www.microbit.co.uk/partners).
 
-The Calliope mini provides an easy and fun introduction to programming and making ??? switch on, program it to do something fun ??? wear it, customize it.
-Just like Arduino, the Calliope mini can additionally be connected to and interact with sensors, displays, and other devices. 
+The micro:bit provides an easy and fun introduction to programming and making – switch on, program it to do something fun – wear it, customize it.
+Just like Arduino, the micro:bit can be connected to and interact with sensors, displays, and other devices. 
 
 * [Read the docs](/docs)
 
 ## [Hardware: The Device](/device)
 
-The Calliope mini is packaged with sensors, radio and other goodies. Learn about the [hardware components]([/device](https://calliope.cc/en/calliope-mini/tech-facts)) of the Calliope mini to make the most of it!
-
-## ~ hint
-
-**Looking to buy a Calliope mini?** See the [list of resellers](https://calliope.cc/en/shops).
-
-## ~
+The BBC micro:bit is packaged with sensors, radio and other goodies. Learn about the [hardware components](/device) of the micro:bit to make the most of it!
 
 ## Programming: [Blocks](/blocks) or [JavaScript](/javascript)
 
-You can program the Calliope mini using [Blocks](/blocks) or [JavaScript](/javascript) in your web browser via the [Calliope mini APIs](/reference):
+You can program the micro:bit using [Blocks](/blocks) or [JavaScript](/javascript) in your web browser via the [micro:bit APIs](/reference):
 
 ```block
-input.onButtonEvent(Button.A, ButtonEvent.Down, () => {
+input.onButtonPressed(Button.A, () => {
     basic.showString("Hi!");
 })
 ```
 ```typescript
-input.onButtonEvent(Button.A, ButtonEvent.Down, () => {
+input.onButtonPressed(Button.A, () => {
     basic.showString("Hi!");
 })
 ```
@@ -40,7 +35,7 @@ The editor work in [most modern browsers](/browsers), work [offline](/offline) o
 
 ## [Compile and Flash: Your Program!](/device/usb)
 
-When you have your code ready, you connect your Calliope mini to a computer via a USB cable, so it appears as a mounted drive (named MINI). If you are using the Calliope mini REV2 you also see another drive (FLASH) that handels up to 25 additional programs.  
+When you have your code ready, you connect your micro:bit to a computer via a USB cable, so it appears as a mounted drive (named MICROBIT). 
 
 Compilation to ARM thumb machine code from [Blocks](/blocks) or [JavaScript](/javascript) happens in the browser. You save the ARM binary 
 program to a file, which you then copy to the micro:bit drive, which flashes the micro:bit device with the new program.
@@ -54,7 +49,7 @@ The simulator has support for the LED screen, buttons, as well as compass, accel
 basic.forever(() => {
   basic.showString("Hi!");
 })
-input.onButtonEvent(Button.A, ButtonEvent.Down, () => {
+input.onButtonPressed(Button.A, () => {
     led.stopAnimation();
     basic.showLeds(`
 . . . . .
@@ -63,7 +58,7 @@ input.onButtonEvent(Button.A, ButtonEvent.Down, () => {
 # . . . #
 . # # # .`);
 });
-input.onButtonEvent(Button.B, ButtonEvent.Down, () => {
+input.onButtonPressed(Button.B, () => {
     led.stopAnimation();
     basic.showLeds(`
 . # . # .
@@ -74,10 +69,6 @@ input.onButtonEvent(Button.B, ButtonEvent.Down, () => {
 });
 ```
 
-## Learn!
-
-We have tons of [projects](/projects), [examples](/examples) and [courses](/courses) to get your started!
-
 ## C++ Runtime
 
 The [C++ micro:bit runtime](http://lancaster-university.github.io/microbit-docs/), created at [Lancaster University](http://www.lancaster.ac.uk/), provides access to the hardware functions of the micro:bit, 
@@ -88,16 +79,13 @@ When code is compiled to ARM machine code, the calls to JavaScript micro:bit fun
 
 ## [Command Line Tools](/cli)
 
-Looking to use @homeurl@ in your favorite editor? Install the [command line tools](/cli) and get rolling!
+Looking to use codethemicrobit.com in your favorite editor? Install the [command line tools](/cli) and get rolling!
 
-## [Extensions](/extensions)
+## [Packages](/packages)
 
-Create, edit and distribute your own blocks and JavaScript using [extensions](/extensions). Extensions are hosted on GitHub and may be written using C++, JavaScript and/or ARM thumb.
+Create, edit and distribute your own blocks and JavaScript using [packages](/packages). Packages are hosted on GitHub and may be written
+using C++, JavaScript and/or ARM thumb.
 
 ## [Open Source](/open-source)
 
-The code for the Calliope mini is [open source](/open-source) on GitHub. Contributors are welcome!
-
-```package
-radio
-```
+The code for the micro:bit is [open source](/open-source) on GitHub. Contributors are welcome!

docs/beta-ref.json

@@ -1,3 +0,0 @@
-{
-    "appref": "v"
-}

docs/blocks.md

@@ -0,0 +1,14 @@
+# Blocks language
+
+### @description Langugage constructs for the Block editor.
+
+```namespaces
+for (let i = 0;i<5;++i) {}
+if (true){}
+let x = 0;
+Math.random(5);
+```
+
+## See Also
+
+[logic](/blocks/logic), [loops](/blocks/loops), [math](/blocks/math), [variables](/blocks/variables)

docs/blocks/logic.md

@@ -0,0 +1,9 @@
+# Logic
+
+```cards
+if(true) {}
+true;
+true && false;
+!true;
+1 != 0;
+```

docs/blocks/logic/boolean.md

@@ -1,8 +1,77 @@
-# @extends
+# Boolean
 
-## #examples
+true or false.
 
-## Example: ``AND`` operator
+A Boolean has one of two possible values: `true`; `false`.  Boolean (logical) operators (*and*, *or*, *not*) take Boolean inputs and yields a Boolean value. Comparison operators on other types ([numbers](/reference/types/number), [strings](/reference/types/string) yields a Boolean value.
+
+The following blocks represent the true and false Boolean values, which can be plugged in anywhere a Boolean value is expected:
+
+```blocks
+true;
+false;
+```
+
+The next three blocks represent the three Boolean (logic) operators:
+
+```blocks
+true && false;
+true || false;
+!true;
+```
+
+The next six blocks represent comparison operators that yield a Boolean value. Most comparisons you will do involve [numbers](/reference/types/number):
+
+```blocks
+42 == 0;
+42 != 0;
+42 < 0;
+42 > 0;
+42 <= 0;
+42 >= 0;
+```
+
+Boolean values and operators are often used with an [if](/blocks/logic/if) or [while](/blocks/loops/while) statement to determine which code will execute next. For example:
+
+### Functions that return a Boolean
+
+Some functions return a Boolean value, which you can store in a Boolean variable. For example, the following code gets the on/off state of `point (1, 2)` and stores this in the Boolean variable named `on`. Then the code clears the screen if `on` is `true`:
+
+### Boolean operators
+
+Boolean operators take Boolean inputs and evaluate to a Boolean output:
+
+### Conjunction: `A and B`
+
+`A and B` evaluates to `true` if-and-only-if both A and B are true:
+
+```blocks
+false && false == false;
+false && true == false;
+true && false == false;
+true && true == true;
+```
+
+### Disjunction: `A or B`
+
+`A or B` evaluates to `true` if-and-only-if either A is true or B is true:
+
+```blocks
+false || false == false;
+false || true == true;
+true || false == true;
+true || true == true;
+```
+
+### Negation: `not A`
+
+`not A` evaluates to the opposite (negation) of A:
+
+```blocks
+!false == true;
+!true == false;
+```
+
+### Example
 
 This example turns on LED `3 , 3`, if LEDs `1 , 1` and `2 , 2` are both on:
 
@@ -12,19 +81,22 @@ if (led.point(1,1) && led.point(2,2)) {
 }
 ```
 
-## Example: Comparisons of numbers and strings
+### Comparisons of numbers and strings
 
 When you compare two Numbers, you get a Boolean value, such as the comparison `x < 5` in the code below:
 
 ```blocks
-input.onButtonEvent(Button.A, ButtonEvent.Down, () => {
-    let x = randint(0, 5)
-    if(x < 5) {
-    basic.showString("low");
-    } else {
-    basic.showString("high");
-    }
-})
+let x = Math.random(5)
+if(x < 5) {
+   basic.showString("low");
+} else { 
+   basic.showString("high");
+} 
 ```
 
-See the documentation on [Numbers](/types/number) for more information on comparing two Numbers.
+See the documentation on [Numbers](/reference/types/number) for more information on comparing two Numbers. You can also [compare strings](/reference/types/string-functions) using the `equals` function.
+
+### See also
+
+[if](/blocks/logic/if), [while](/blocks/loops/while), [number](/reference/types/number)
+

docs/blocks/logic/if.md

@@ -1,15 +1,28 @@
-# @extends
+# If
 
-## #examples
+### @parent blocks/language
+ 
 
-## Example: adjusting screen brightness
-
-If the [light level](/reference/input/light-level) is `< 100`, this code sets the brightness to `255` when the button A is pressed:
+Conditionally run code depending on whether a [Boolean](/blocks/logic/boolean) condition is true or false.
 
 ```blocks
-input.onButtonEvent(Button.A, ButtonEvent.Down, () => {
-    if(input.lightLevel()<100){
-        led.setBrightness(255);
-    }
-})
+if(true) {
+}
 ```
+
+Click on the dark blue gear icon (see above) to add an *else* or *if* to the current block.
+
+### Example: adjusting screen brightness
+
+```blocks
+if(input.lightLevel()<100){
+    led.setBrightness(255);
+}
+```
+
+If the [light level](/reference/input/light-level) is `< 100`, this code sets the brightness to `255`:
+
+### See also
+
+[while loop](/blocks/loops/while), [for](/blocks/loops/for), [boolean](/blocks/logic/boolean)
+

docs/blocks/loops.md

@@ -1,3 +1,7 @@
-# @extends
+# Loops
 
-## #specific
+```cards
+for(let i = 0;i<5;i++) {}
+while(true) {}
+basic.forever(() => {});
+```

docs/blocks/loops/for-of.md

@@ -1,20 +0,0 @@
-# @extends
-
-## #examples
-
-## Example: Find the highest number
-
-Find the highest number in a list of numbers. Display the highest number on the screen.
-
-```blocks
-let list: number[] = []
-let highest = 0
-highest = 0
-list = [5, 8, 6, 2, 4, 3, 7, 1]
-for (let value of list) {
-	if (value > highest) {
-        highest =  value
-    }
-}
-basic.showNumber(highest)
-```

docs/blocks/loops/for.md

@@ -1,15 +1,20 @@
-# @extends
+# For
 
-## #examples
+### @parent blocks/language
+ 
+Run part of the program the number of times you say.
 
-## Example: Count to 4
+### Example: Count to 4
 
 This program will show the numbers 0, 1, 2, 3, and 4 one after another on the LED screen.
 
 ```blocks
-input.onButtonEvent(Button.A, ButtonEvent.Down, () => {
-    for(let i = 0; i < 5; ++i) {
-        basic.showNumber(i)
-    }
-})
+for(let i = 0; i < 5; ++i) {
+basic.showNumber(i)
+}
 ```
+
+### See also
+
+[repeat](/blocks/loops/repeat), [while](/blocks/loops/while), [if](/blocks/logic/if), [show number](/reference/basic/show-number)
+

docs/blocks/loops/repeat.md

@@ -1,16 +1,12 @@
-# @extends
+# Repeat
 
-## #examples
+Run part of the program the number of times you say.
 
-## Example: Blinking heart
+### Block Editor
 
-Flash the ``heart`` icon on the screen `4` times.
+![](/static/mb/blocks/contents-0.png)
+
+### See also
+
+[for](/blocks/loops/for), [while](/blocks/loops/while), [if](/blocks/logic/if), [show number](/reference/basic/show-number)
 
-```blocks
-for (let i = 0; i < 4; i++) {
-    basic.showIcon(IconNames.Heart)
-    basic.pause(300)
-    basic.clearScreen()
-    basic.pause(300)
-}
-```

docs/blocks/loops/while.md

@@ -1,17 +1,29 @@
-# @extends
+# While
 
-## #examples
+Repeat code while a [Boolean](/blocks/logic/boolean) `condition` is true.
 
-## Example: diagonal line
+```blocks
+while(true) {
+}
+```
+
+The while loop has a *condition* that evaluates to a [Boolean](/blocks/logic/boolean) value. After the `do` keyword, add the code that you want to run while the `condition` is `true`. The while loop concludes with `end while`.
+
+The condition is tested before any code runs. Which means that if the condition is false, the code inside the loop doesn't execute.
+
+### Example: diagonal line
 
 The following example uses a while loop to make a diagonal line on the LED screen (points `0, 0`, `1, 1`, `2, 2`, `3, 3`, `4, 4`).
 
 ```blocks
-input.onButtonEvent(Button.A, ButtonEvent.Down, () => {
-    let index = 4;
-    while(index >= 0) {
-        led.plot(index, index);
-        index--;
-    }
-})
+let index = 4;
+while(index >= 0) {
+    led.plot(index, index);
+    index--;
+}
 ```
+
+### See also
+
+[on button pressed](/reference/input/on-button-pressed), [for](/blocks/loops/for), [if](/blocks/logic/if), [forever](/reference/basic/forever)
+

docs/blocks/math.md

@@ -0,0 +1,36 @@
+# Math
+
+### [Numeric](/reference/types/number) values: 0, 1, 2, ...
+
+```block
+0;
+1;
+2;
+```
+
+### Arithmetic binary operation (+, -, *, /)
+
+```block
+0+1;
+0-1;
+1*2;
+3/4;
+```
+
+### Absolute value
+
+```block
+Math.abs(-5);
+```
+
+### Minimum/maximum of two values
+
+```block
+Math.min(0, 1);
+```
+
+### Random value
+
+```block
+Math.random(5);
+```

docs/blocks/math/random-boolean.md

@@ -1,29 +0,0 @@
-# random Boolean
-
-Returns a pseudo-random boolean value that is either `true` or `false`.
-
-```sig
-Math.randomBoolean()
-```
-
-## Returns
-
-* a pseudo-random [boolean](types/boolean) that is either `true` or `false`.
-
-## Example
-
-Make your @boardname@ do a coin toss when it's dropped softly. Have the LEDs show 'heads' or 'tails' as the result of the toss.
-
-```blocks
-input.onGesture(Gesture.FreeFall, () => {
-    if (Math.randomBoolean()) {
-        basic.showIcon(IconNames.Happy)
-    } else {
-        basic.showIcon(IconNames.Sword)
-    }
-})
-```
-
-## See Also
-
-[random](/reference/math/random)

docs/blocks/on-start.md

@@ -1,12 +0,0 @@
-# @extends
-
-## #exstart
-
-In this example, ``on start`` sets a dimmer brightness on the screen and the button handler shows a string.
-
-```blocks
-input.onButtonEvent(Button.A, ButtonEvent.Down, () => {
-    basic.showString("Hello!")
-})
-led.setBrightness(50)
-```

docs/blocks/variables.md

@@ -0,0 +1,21 @@
+# Variables
+
+[Assign](/blocks/variables/assign) (set) a variable's value
+
+```blocks
+let x = 0;
+```
+
+Get a variable's value
+
+```blocks
+let x = 0;
+x;
+```
+
+[Change](/blocks/variables/change-var) a variable's value
+
+```blocks
+let x = 0;
+x+=1;
+```