fix naming and pin selection

Merge microbit

.gitignore

@@ -1,14 +1,22 @@
 node_modules
 yotta_modules
 yotta_targets
+pxt_modules
 built
 typings
 tmp
 temp
 projects/**
-win10/app/bin
-win10/app/bld
-win10/*.opendb
+clients/win10/app/AppPackages
+clients/win10/app/BundlePackages
+clients/win10/app/BundleArtifacts
+clients/win10/app/bin
+clients/win10/app/bld
+clients/win10/*.opendb
+clients/**/bin/**
+clients/**/obj/**
+clients/electron/projects
+hexcache
 
 *.user
 *.sw?
@@ -16,4 +24,10 @@ win10/*.opendb
 *.tgz
 *.db
 *.suo
-*.log
+*.log
+
+.DS_Store
+.idea
+*.iml
+.vscode/.BROWSE.VC.DB-shm
+.vscode/.BROWSE.VC.DB-wal

.travis.yml

@@ -3,15 +3,14 @@ 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)"
-  - "node node_modules/pxt-core/built/pxt.js uploaddoc"
-  - "(cd libs/hello; node ../../node_modules/pxt-core/built/pxt.js testconv ../../testconv.json)"
+  - "node node_modules/pxt-core/built/pxt.js testdir tests"
 sudo: false
 notifications:
   email:
-    - touchdevelop-build@microsoft.com
+    - kindscript@microsoft.com
 cache:
   directories:
     - node_modules
     - built/cache
+    - libs/hello/built/cache
 

.vscode/settings.json

@@ -1,5 +1,21 @@
 // Place your settings in this file to overwrite default and user settings.
 {
+    "file.autoSave": "afterDelay",   
+    "files.watcherExclude": {
+        "**/.git/objects/**": true,
+        "**/built/**": true,
+        "**/node_modules/**": true,
+        "**/yotta_modules/**": true,
+        "**/yotta_targets": true,
+        "**/pxt_modules/**": true
+    },    
+    "search.exclude": {
+        "**/node_modules": true,
+        "**/yotta_modules/**": true,
+        "**/yotta_targets": true,
+        "**/pxt_modules/**": true
+    },    
     "tslint.enable": true,
-    "tslint.rulesDirectory": "node_modules/tslint-microsoft-contrib"
+    "tslint.rulesDirectory": "node_modules/tslint-microsoft-contrib",
+    "typescript.tsdk": "./node_modules/typescript/lib"
 }

README.md

@@ -1,19 +1,27 @@
-# micro:bit target for PXT
+# Calliope target for PXT
 
-This target allow to program a [BBC micro:bit](https://www.microbit.co.uk/) using 
+This target allow to program a [Calliope](http://calliope.cc/) using 
 PXT ([Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt)).
 
-* [Try it live](https://m.pxt.io)
+[![Build Status](https://travis-ci.org/Microsoft/pxt-calliope.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-calliope)
 
-[![Build Status](https://travis-ci.org/Microsoft/pxt-microbit.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-microbit)
+![](http://calliope.cc/content/1-ueber-mini/mini_board.png)
 
 ## Local server
 
+The local server allows to run the editor and the documentation from your computer.
+
 ### Setup
 
 The following commands are a 1-time setup after synching the repo on your machine.
 
-* install the PXT command line
+* See requirements for [pxt](https://github.com/Microsoft/pxt)
+* [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
+```
+* install the PXT command line (add ``sudo`` for Mac/Linux shells).
 ```
 npm install -g pxt
 ```
@@ -24,31 +32,44 @@ npm install
 
 ### Running
 
-Run this command to open a local web server (add ``sudo`` for Mac/Linux shells)
+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 modify the `.cpp` files, turn on yotta compilation with the ``-yt`` flag (add ``sudo`` for Mac/Linux shells):
+If you need modify the `.cpp` files, turn on yotta compilation with the ``-yt`` flag (add ``sudo`` for Mac/Linux shells). On Windows, you must be running
+from the ``Run Yotta`` command prompt.
 ```
 pxt serve -yt
 ```
 
-To make sure you're running the latest tools, run (add ``sudo`` for Mac/Linux shells)
+## Updates
+
+To update your PXT version and make sure you're running the latest tools, run (add ``sudo`` for Mac/Linux shells)
 ```
 pxt update
 ```
 
 More instructions at https://github.com/Microsoft/pxt#running-a-target-from-localhost 
 
-## Universal Windows App
+## Testing
 
-The Windows 10 app is a [Universal Windows Hosted Web App](https://microsoftedge.github.io/WebAppsDocs/en-US/win10/CreateHWA.htm)
-that wraps ``m.pxt.io`` and provides additional features.
+The build automatically runs the following:
 
-### Building
+* 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
 
-* 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 ``m.pxt.io`` project.
+To test something on the device:
+
+* 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 `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.

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,67 @@
+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|pxt.microbit.org)$/.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|pxt.microbit.org)$/.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": "pxt.microbit.org",
+  "version": "0.7.0",
+  "author": "Microsoft Corporation",
+  "short_name": "pxt.microbit.org",
+
+  "description": "Extension for https://pxt.microbit.org.",
+  "homepage_url": "https://pxt.microbit.org",
+  "offline_enabled": "true",
+  "icons": {
+    "48": "logo48.png",
+    "128": "logo128.png"
+  },
+
+  "permissions": [
+    "serial",
+    "usb"
+  ],
+
+  "externally_connectable": {
+    "matches": [ "*://localhost/*", "https://pxt.microbit.org/*", "https://*.microbit.org/*" ]
+  }
+}

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/.gitignore

@@ -0,0 +1,137 @@
+
+# Created by https://www.gitignore.io/api/osx,xcode,objective-c,vim
+
+### OSX ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+### Xcode ###
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+
+
+### Objective-C ###
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xcuserstate
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
+
+### Objective-C Patch ###
+*.xcscmblueprint
+
+
+### Vim ###
+# swap
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+# auto-generated tag files
+tags

clients/macuploader/Microbit Uploader.xcodeproj/project.pbxproj

@@ -0,0 +1,307 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		E93040071D895D1F00D931CA /* DirectoryWatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = E93040061D895D1F00D931CA /* DirectoryWatcher.m */; };
+		E930400A1D89620900D931CA /* Uploader.m in Sources */ = {isa = PBXBuildFile; fileRef = E93040091D89620900D931CA /* Uploader.m */; };
+		E9F4FEE21D8709980071D783 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E9F4FEE11D8709980071D783 /* AppDelegate.m */; };
+		E9F4FEE51D8709980071D783 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E9F4FEE41D8709980071D783 /* main.m */; };
+		E9F4FEE71D8709980071D783 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E9F4FEE61D8709980071D783 /* Assets.xcassets */; };
+		E9F4FEEA1D8709980071D783 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = E9F4FEE81D8709980071D783 /* MainMenu.xib */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		E93040051D895D1F00D931CA /* DirectoryWatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryWatcher.h; sourceTree = "<group>"; };
+		E93040061D895D1F00D931CA /* DirectoryWatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DirectoryWatcher.m; sourceTree = "<group>"; };
+		E93040081D89620900D931CA /* Uploader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Uploader.h; sourceTree = "<group>"; };
+		E93040091D89620900D931CA /* Uploader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Uploader.m; sourceTree = "<group>"; };
+		E9F4FEDD1D8709980071D783 /* Microbit Uploader.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Microbit Uploader.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		E9F4FEE01D8709980071D783 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
+		E9F4FEE11D8709980071D783 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		E9F4FEE41D8709980071D783 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		E9F4FEE61D8709980071D783 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		E9F4FEE91D8709980071D783 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
+		E9F4FEEB1D8709980071D783 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		E9F4FEDA1D8709980071D783 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		E9F4FED41D8709980071D783 = {
+			isa = PBXGroup;
+			children = (
+				E9F4FEDF1D8709980071D783 /* Microbit Uploader */,
+				E9F4FEDE1D8709980071D783 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		E9F4FEDE1D8709980071D783 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				E9F4FEDD1D8709980071D783 /* Microbit Uploader.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		E9F4FEDF1D8709980071D783 /* Microbit Uploader */ = {
+			isa = PBXGroup;
+			children = (
+				E9F4FEE01D8709980071D783 /* AppDelegate.h */,
+				E9F4FEE11D8709980071D783 /* AppDelegate.m */,
+				E9F4FEE61D8709980071D783 /* Assets.xcassets */,
+				E9F4FEE81D8709980071D783 /* MainMenu.xib */,
+				E9F4FEEB1D8709980071D783 /* Info.plist */,
+				E9F4FEE31D8709980071D783 /* Supporting Files */,
+				E93040051D895D1F00D931CA /* DirectoryWatcher.h */,
+				E93040061D895D1F00D931CA /* DirectoryWatcher.m */,
+				E93040081D89620900D931CA /* Uploader.h */,
+				E93040091D89620900D931CA /* Uploader.m */,
+			);
+			path = "Microbit Uploader";
+			sourceTree = "<group>";
+		};
+		E9F4FEE31D8709980071D783 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				E9F4FEE41D8709980071D783 /* main.m */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		E9F4FEDC1D8709980071D783 /* Microbit Uploader */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = E9F4FEEE1D8709980071D783 /* Build configuration list for PBXNativeTarget "Microbit Uploader" */;
+			buildPhases = (
+				E9F4FED91D8709980071D783 /* Sources */,
+				E9F4FEDA1D8709980071D783 /* Frameworks */,
+				E9F4FEDB1D8709980071D783 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "Microbit Uploader";
+			productName = "Microbit Uploader";
+			productReference = E9F4FEDD1D8709980071D783 /* Microbit Uploader.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		E9F4FED51D8709980071D783 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0800;
+				ORGANIZATIONNAME = thomasdenney;
+				TargetAttributes = {
+					E9F4FEDC1D8709980071D783 = {
+						CreatedOnToolsVersion = 7.3.1;
+					};
+				};
+			};
+			buildConfigurationList = E9F4FED81D8709980071D783 /* Build configuration list for PBXProject "Microbit Uploader" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = E9F4FED41D8709980071D783;
+			productRefGroup = E9F4FEDE1D8709980071D783 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				E9F4FEDC1D8709980071D783 /* Microbit Uploader */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		E9F4FEDB1D8709980071D783 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				E9F4FEE71D8709980071D783 /* Assets.xcassets in Resources */,
+				E9F4FEEA1D8709980071D783 /* MainMenu.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		E9F4FED91D8709980071D783 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				E9F4FEE51D8709980071D783 /* main.m in Sources */,
+				E930400A1D89620900D931CA /* Uploader.m in Sources */,
+				E9F4FEE21D8709980071D783 /* AppDelegate.m in Sources */,
+				E93040071D895D1F00D931CA /* DirectoryWatcher.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		E9F4FEE81D8709980071D783 /* MainMenu.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				E9F4FEE91D8709980071D783 /* Base */,
+			);
+			name = MainMenu.xib;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		E9F4FEEC1D8709980071D783 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		E9F4FEED1D8709980071D783 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		E9F4FEEF1D8709980071D783 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				COMBINE_HIDPI_IMAGES = YES;
+				INFOPLIST_FILE = "Microbit Uploader/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.thomasdenney.Microbit-Uploader";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		E9F4FEF01D8709980071D783 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				COMBINE_HIDPI_IMAGES = YES;
+				INFOPLIST_FILE = "Microbit Uploader/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.thomasdenney.Microbit-Uploader";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		E9F4FED81D8709980071D783 /* Build configuration list for PBXProject "Microbit Uploader" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				E9F4FEEC1D8709980071D783 /* Debug */,
+				E9F4FEED1D8709980071D783 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		E9F4FEEE1D8709980071D783 /* Build configuration list for PBXNativeTarget "Microbit Uploader" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				E9F4FEEF1D8709980071D783 /* Debug */,
+				E9F4FEF01D8709980071D783 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = E9F4FED51D8709980071D783 /* Project object */;
+}

clients/macuploader/Microbit Uploader.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:Microbit Uploader.xcodeproj">
+   </FileRef>
+</Workspace>

clients/macuploader/Microbit Uploader/AppDelegate.h

@@ -0,0 +1,6 @@
+#import <Cocoa/Cocoa.h>
+
+@interface AppDelegate : NSObject <NSApplicationDelegate>
+
+@end
+

clients/macuploader/Microbit Uploader/AppDelegate.m

@@ -0,0 +1,130 @@
+#import "AppDelegate.h"
+#import "DirectoryWatcher.h"
+#import "Uploader.h"
+
+@interface AppDelegate ()<DirectoryWatcherDelegate, UploaderDelegate, NSUserNotificationCenterDelegate>
+
+@property DirectoryWatcher * watcher;
+@property Uploader * uploader;
+@property NSStatusItem * menubarItem;
+
+@end
+
+@implementation AppDelegate
+
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
+    // Insert code here to initialize your application
+    self.watcher = [[DirectoryWatcher alloc] initWithPath:[self downloadsDirectory]];
+    self.watcher.delegate = self;
+    [self.watcher startWatching];
+    
+    self.uploader = [[Uploader alloc] init];
+    self.uploader.delegate = self;
+    
+    [NSUserNotificationCenter defaultUserNotificationCenter].delegate = self;
+    
+    [self createMenuBarIcon];
+    [self configureVolumeMountNotifications];
+    [self showActiveMicroBits];
+}
+
+- (void)applicationWillTerminate:(NSNotification *)aNotification {
+    // Insert code here to tear down your application
+    [self.watcher stopWatching];
+}
+
+- (void)dealloc {
+    [[NSWorkspace sharedWorkspace].notificationCenter removeObserver:self];
+}
+
+#pragma mark - Directory
+
+- (void)watcher:(DirectoryWatcher *)watcher observedNewFileAtPath:(NSString *)path {
+    NSString * fullPath = [watcher.path stringByAppendingPathComponent:path];
+    if ([self.uploader shouldUploadFileAtPath:fullPath]) {
+        [self.uploader uploadFile:fullPath];
+    }
+}
+
+- (NSString*)downloadsDirectory {
+    NSArray * paths = NSSearchPathForDirectoriesInDomains(NSDownloadsDirectory, NSUserDomainMask, YES);
+    return paths.firstObject;
+}
+
+#pragma mark - Uploader delegate
+
+- (void)uploader:(Uploader *)uploader transferredFile:(NSString *)file toMicroBit:(NSString *)microbit {
+    [self showNotification:@"micro:bit upload" withDescription:[NSString stringWithFormat:@"%@ uploaded to %@", file.lastPathComponent, microbit]];
+}
+
+- (void)uploader:(Uploader *)uploader failedToTransferFile:(NSString *)file toMicroBit:(NSString *)microbit {
+    [self showNotification:@"micro:bit upload failed" withDescription:[NSString stringWithFormat:@"Couldn't transfer %@ to %@", file.lastPathComponent, microbit]];
+}
+
+- (void)showNotification:(NSString*)title withDescription:(NSString*)description {
+    NSUserNotification * notification = [NSUserNotification new];
+    notification.title = title;
+    notification.informativeText = description;
+    notification.soundName = NSUserNotificationDefaultSoundName;
+    [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
+}
+
+#pragma mark - NSUserNotificationCenterDelegate
+
+- (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center shouldPresentNotification:(NSUserNotification *)notification {
+    return YES;
+}
+
+#pragma mark - Volume mount/unmount notification
+
+- (void)configureVolumeMountNotifications {
+    [[NSWorkspace sharedWorkspace].notificationCenter addObserver:self selector:@selector(volumeMountNotification:) name:NSWorkspaceDidRenameVolumeNotification object:nil];
+    [[NSWorkspace sharedWorkspace].notificationCenter addObserver:self selector:@selector(volumeMountNotification:) name:NSWorkspaceDidMountNotification object:nil];
+    [[NSWorkspace sharedWorkspace].notificationCenter addObserver:self selector:@selector(volumeMountNotification:) name:NSWorkspaceDidUnmountNotification object:nil];
+}
+
+- (void)volumeMountNotification:(NSNotification*)sender {
+    //Delay upadting the menu to give the chance for the disk to fully mount or unmount
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [self showActiveMicroBits];
+    });
+}
+
+#pragma mark - Menu bar app
+
+- (void)createMenuBarIcon {
+    self.menubarItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength];
+    self.menubarItem.button.image = [NSImage imageNamed:@"menubar"];
+}
+
+- (void)showActiveMicroBits {
+    NSMenu * menu = [NSMenu new];
+    NSString * countString;
+    NSUInteger count = self.uploader.microBitPaths.count;
+    if (count == 0) {
+        countString = @"No connect micro:bits";
+    }
+    else if (count == 1) {
+        countString = @"1 connected micro:bit";
+    }
+    else {
+        countString = [NSString stringWithFormat:@"%lu connected micro:bits", count];
+    }
+    NSMenuItem * microBitCount = [[NSMenuItem alloc] initWithTitle:countString action:nil keyEquivalent:@""];
+    microBitCount.enabled = NO;
+    [menu addItem:microBitCount];
+    
+    NSMenuItem * websiteItem = [[NSMenuItem alloc] initWithTitle:@"Editor" action:@selector(launchEditor:) keyEquivalent:@"e"];
+    [menu addItem:websiteItem];
+    
+    NSMenuItem * quitItem = [[NSMenuItem alloc] initWithTitle:@"Quit" action:@selector(terminate:) keyEquivalent:@"q"];
+    [menu addItem:quitItem];
+    
+    self.menubarItem.menu = menu;
+}
+
+- (void)launchEditor:(id)sender {
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://pxt.microbit.org/"]];
+}
+
+@end

clients/macuploader/Microbit Uploader/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,68 @@
+{
+  "images" : [
+    {
+      "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "icon_16x16.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "icon_16x16@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "icon_32x32.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "icon_32x32@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "icon_128x128.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "icon_128x128@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "icon_256x256.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "icon_256x256@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "icon_512x512.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "icon_512x512@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

clients/macuploader/Microbit Uploader/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

clients/macuploader/Microbit Uploader/Assets.xcassets/menubar.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "filename" : "menubar.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

clients/macuploader/Microbit Uploader/Base.lproj/MainMenu.xib

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
+            <connections>
+                <outlet property="delegate" destination="Voe-Tx-rLC" id="GzC-gU-4Uq"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customObject id="Voe-Tx-rLC" customClass="AppDelegate"/>
+        <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
+    </objects>
+</document>

clients/macuploader/Microbit Uploader/DirectoryWatcher.h

@@ -0,0 +1,24 @@
+#import <Foundation/Foundation.h>
+
+@class DirectoryWatcher;
+
+@protocol DirectoryWatcherDelegate <NSObject>
+
+- (void)watcher:(DirectoryWatcher*)watcher observedNewFileAtPath:(NSString*)path;
+
+@end
+
+@interface DirectoryWatcher : NSObject
+
+- (instancetype)initWithPath:(NSString*)path;
+
+@property (readonly) NSString * path;
+
+@property id<DirectoryWatcherDelegate> delegate;
+
+- (void)startWatching;
+
+//Automatically called when deallocated
+- (void)stopWatching;
+
+@end

clients/macuploader/Microbit Uploader/DirectoryWatcher.m

@@ -0,0 +1,75 @@
+#import "DirectoryWatcher.h"
+#import <CoreServices/CoreServices.h>
+
+void callback(ConstFSEventStreamRef streamRef, void * info, size_t numEvents, void * eventPaths, const FSEventStreamEventFlags eventFlags[], const FSEventStreamEventId eventIds[]);
+
+@interface DirectoryWatcher ()
+
+@property NSString * path;
+@property NSMutableSet<NSString*>* knownFiles;
+@property FSEventStreamRef stream;
+
+- (void)rescanPathWithEvents:(BOOL)sendEvents;
+
+@end
+
+@implementation DirectoryWatcher
+
+- (instancetype)initWithPath:(NSString *)path {
+    if (!path) {
+        return nil;
+    }
+    
+    self = [super init];
+    if (self) {
+        self.path = path;
+    }
+    return self;
+}
+
+- (void)dealloc {
+    [self stopWatching];
+}
+
+- (void)startWatching {
+    self.knownFiles = [NSMutableSet new];
+    [self rescanPathWithEvents:NO];
+    
+    CFStringRef path = (__bridge CFStringRef)(self.path);
+    CFArrayRef pathsToWatch = CFArrayCreate(NULL, (const void**)&path, 1, NULL);
+    CFAbsoluteTime latency = 1;
+    FSEventStreamContext context = { 0, (__bridge void * _Nullable)(self), NULL, NULL, NULL };
+    self.stream = FSEventStreamCreate(NULL, &callback, &context, pathsToWatch, kFSEventStreamEventIdSinceNow, latency, kFSEventStreamCreateFlagNone);
+    FSEventStreamScheduleWithRunLoop(self.stream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+    FSEventStreamStart(self.stream);
+}
+
+- (void)stopWatching {
+    if (self.stream) {
+        FSEventStreamStop(self.stream);
+        FSEventStreamInvalidate(self.stream);
+        FSEventStreamRelease(self.stream);
+        self.stream = nil;
+    }
+}
+
+- (void)rescanPathWithEvents:(BOOL)sendEvents {
+    NSArray<NSString*>* downloadFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:self.path error:nil];
+    NSMutableSet<NSString*>* fullSet = [NSMutableSet new];
+    for (NSString * file in downloadFiles) {
+        [fullSet addObject:file];
+        if (![self.knownFiles containsObject:file]) {
+            if (sendEvents) {
+                [self.delegate watcher:self observedNewFileAtPath:file];
+            }
+        }
+    }
+    self.knownFiles = fullSet;
+}
+
+@end
+
+void callback(ConstFSEventStreamRef streamRef, void * info, size_t numEvents, void * eventPaths, const FSEventStreamEventFlags eventFlags[], const FSEventStreamEventId eventIds[]) {
+    DirectoryWatcher * watcher = (__bridge DirectoryWatcher*)info;
+    [watcher rescanPathWithEvents:YES];
+}

clients/macuploader/Microbit Uploader/Info.plist

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.01</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>2</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+	<key>LSUIElement</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2016 Thomas Denney. All rights reserved.</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

clients/macuploader/Microbit Uploader/Uploader.h

@@ -0,0 +1,21 @@
+#import <Foundation/Foundation.h>
+
+@class Uploader;
+
+@protocol UploaderDelegate <NSObject>
+
+- (void)uploader:(Uploader*)uploader transferredFile:(NSString*)file toMicroBit:(NSString*)microbit;
+- (void)uploader:(Uploader*)uploader failedToTransferFile:(NSString*)file toMicroBit:(NSString*)microbit;
+
+@end
+
+@interface Uploader : NSObject
+
+@property id<UploaderDelegate> delegate;
+
+- (BOOL)shouldUploadFileAtPath:(NSString*)path;
+- (NSArray<NSString*>*)microBitPaths;
+- (void)uploadFile:(NSString*)file;
+- (void)uploadFile:(NSString*)file toMicroBit:(NSString*)path;
+
+@end

clients/macuploader/Microbit Uploader/Uploader.m

@@ -0,0 +1,74 @@
+#import "Uploader.h"
+
+@interface Uploader ()
+
+@property NSOperationQueue * backgroundCopyQueue;
+
+@end
+
+@implementation Uploader
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        self.backgroundCopyQueue = [NSOperationQueue new];
+    }
+    return self;
+}
+
+- (BOOL)shouldUploadFileAtPath:(NSString *)path {
+    //Whilst Safari is downloading the file it appends .download to the name
+    NSRegularExpression * ignoreDownload = [NSRegularExpression regularExpressionWithPattern:@".download$" options:NSRegularExpressionCaseInsensitive error:nil];
+    if ([ignoreDownload numberOfMatchesInString:path.lastPathComponent options:0 range:NSMakeRange(0, path.lastPathComponent.length)] > 0) {
+        return NO;
+    }
+    
+    //Chrome and Firefox create .hex files
+    NSRegularExpression * hexFiles = [NSRegularExpression regularExpressionWithPattern:@".hex$" options:NSRegularExpressionCaseInsensitive error:nil];
+    if ([hexFiles numberOfMatchesInString:path.lastPathComponent options:0 range:NSMakeRange(0, path.lastPathComponent.length)] > 0) {
+        return YES;
+    }
+    
+    //Safari tends to just name files 'Unknown X'
+    NSRegularExpression * unknownFiles = [NSRegularExpression regularExpressionWithPattern:@"^Unknown(( |-)[0-9]+)?" options:NSRegularExpressionCaseInsensitive error:nil];
+    if ([unknownFiles numberOfMatchesInString:path.lastPathComponent options:0 range:NSMakeRange(0, path.lastPathComponent.length)]) {
+        return YES;
+    }
+    
+    return NO;
+}
+
+- (NSArray<NSString*>*)microBitPaths {
+    NSArray<NSURL*>* allVolumes = [[NSFileManager defaultManager] mountedVolumeURLsIncludingResourceValuesForKeys:nil options:NSVolumeEnumerationSkipHiddenVolumes];
+    NSMutableArray<NSString*>* microbitPaths = [NSMutableArray new];
+    NSRegularExpression * microbitRegex = [NSRegularExpression regularExpressionWithPattern:@"^MICROBIT" options:NSRegularExpressionCaseInsensitive error:nil];
+    for (NSURL * volume in allVolumes) {
+        NSString * lastPathComponent = volume.lastPathComponent;
+        if ([microbitRegex numberOfMatchesInString:lastPathComponent options:0 range:NSMakeRange(0, lastPathComponent.length)] > 0) {
+            [microbitPaths addObject:volume.path];
+        }
+    }
+    
+    return microbitPaths;
+}
+
+- (void)uploadFile:(NSString *)file {
+    for (NSString * microbit in [self microBitPaths]) {
+        [self uploadFile:file toMicroBit:microbit];
+    }
+}
+
+- (void)uploadFile:(NSString *)file toMicroBit:(NSString *)path {
+    [self.backgroundCopyQueue addOperationWithBlock:^{
+        NSError * copyError;
+        NSString * destination = [path stringByAppendingPathComponent:file.lastPathComponent];
+        if (![[NSFileManager defaultManager] copyItemAtPath:file toPath:destination error:&copyError]) {
+            [self.delegate uploader:self failedToTransferFile:file toMicroBit:path.lastPathComponent];
+        }
+        else {
+            [self.delegate uploader:self transferredFile:file toMicroBit:path.lastPathComponent];
+        }
+    }];
+}
+
+@end

clients/macuploader/Microbit Uploader/main.m

@@ -0,0 +1,5 @@
+#import <Cocoa/Cocoa.h>
+
+int main(int argc, const char * argv[]) {
+    return NSApplicationMain(argc, argv);
+}

clients/macuploader/README.md

@@ -0,0 +1,40 @@
+# 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://pxt.microbit.org/uploader), but for OS X. Once launched,
+the app runs in your menu bar and will automatically deploy any HEX files to
+your `micro:bit`. Like the Windows version, it is compatible with any browser
+that can run [pxt.microbit.org](http://pxt.microbit.org).
+
+## Install the built version
+
+1. Download the latest `.zip` release from the `Release` directory
+2. Unzip it
+3. Drag `Microbit Uploader` to your Applications folder and launch it
+
+## Building
+
+To build the project you'll need a copy of OS X 10.11 or higher and Xcode 8 or
+higher (you may be able to build on earlier OSes or versions of Xcode, but this
+remains untested). Once you have a development environment set up, just build
+and run `Microbit Uploader.xcodeproj`.
+
+## Distributing
+
+1. Open the Xcode project
+2. Product > Archive
+3. Export:
+
+    ![Export](Graphics/export.png)
+
+4. You will then have the option of either signing or not-signing the
+   application:
+
+    a) If you have an Apple developer account, select 'Export a Developer
+       ID-signed Application'
+
+    b) If you don't have a developer ID, select 'Export as a macOS App'
+
+5. Zip the produced app and upload to CDN or equivalent

clients/winuploader/CodeTheMicroBit.sln

@@ -0,0 +1,40 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeTheMicrobit", "Microbit.Uploader\CodeTheMicrobit.csproj", "{7DC6CA45-FD75-44BC-805E-708C812CD4BF}"
+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
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|ARM.Build.0 = Debug|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|x64.Build.0 = Debug|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Debug|x86.Build.0 = Debug|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|ARM.ActiveCfg = Release|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|ARM.Build.0 = Release|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|x64.ActiveCfg = Release|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|x64.Build.0 = Release|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|x86.ActiveCfg = Release|Any CPU
+		{7DC6CA45-FD75-44BC-805E-708C812CD4BF}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

clients/winuploader/Microbit.Uploader/App.config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0"/>
+    <supportedRuntime version="v2.0.50727"/>
+  </startup>
+</configuration>

clients/winuploader/Microbit.Uploader/CodeTheMicrobit.csproj

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{7DC6CA45-FD75-44BC-805E-708C812CD4BF}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Microsoft.MicroBit</RootNamespace>
+    <AssemblyName>CodeTheMicrobit</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>
+    </ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <DelaySign>false</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Settings.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Settings.Designer.cs">
+      <DependentUpon>Settings.cs</DependentUpon>
+    </Compile>
+    <Compile Include="GlobalSuppressions.cs" />
+    <Compile Include="KnownFolders.cs" />
+    <Compile Include="LicenseDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="LicenseDialog.Designer.cs">
+      <DependentUpon>LicenseDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MainForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MainForm.Designer.cs">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SingleInstanceAppHelper.cs" />
+    <Compile Include="SingleInstanceAppStarter.cs" />
+    <EmbeddedResource Include="LicenseDialog.resx">
+      <DependentUpon>LicenseDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MainForm.resx">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <EmbeddedResource Include="Settings.resx">
+      <DependentUpon>Settings.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="MSFT_logo_png.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="Resources\MSR-LA - 2576.rtf" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="favicon.ico" />
+    <EmbeddedResource Include="microbit.red.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

clients/winuploader/Microbit.Uploader/KnownFolders.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Management;
+using System.Runtime.InteropServices;
+using System.Security;
+
+namespace Microsoft.MicroBit
+{
+    /// <summary>
+    /// Class containing methods to retrieve specific file system paths.
+    /// </summary>
+    internal static class KnownFoldersNativeMethods
+    {
+        [SecurityCritical]
+        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
+        public static string GetDownloadPath()
+        {
+            IntPtr outPath;
+            int result = SHGetKnownFolderPath(new Guid("{374DE290-123F-4565-9164-39C4925E467B}"), 0x00004000, new IntPtr(0), out outPath);
+            if (result >= 0)
+                return Marshal.PtrToStringUni(outPath);
+            else return null;
+        }
+
+        [SuppressMessage("Microsoft.Security", "CA5122:PInvokesShouldNotBeSafeCriticalFxCopRule")]
+        [DllImport("Shell32.dll")]
+        [SecurityCritical]
+        private static extern int SHGetKnownFolderPath(
+            [MarshalAs(UnmanagedType.LPStruct)]Guid rfid, uint dwFlags, IntPtr hToken,
+            out IntPtr ppszPath);
+    }
+
+}

clients/winuploader/Microbit.Uploader/LicenseDialog.Designer.cs

@@ -0,0 +1,93 @@
+namespace Microsoft.MicroBit
+{
+    partial class LicenseDialog
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.textBox = new System.Windows.Forms.RichTextBox();
+            this.acceptButton = new System.Windows.Forms.Button();
+            this.exitButton = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // textBox
+            // 
+            this.textBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.textBox.Location = new System.Drawing.Point(13, 13);
+            this.textBox.Name = "textBox";
+            this.textBox.ReadOnly = true;
+            this.textBox.Size = new System.Drawing.Size(465, 438);
+            this.textBox.TabIndex = 0;
+            this.textBox.Text = "";
+            // 
+            // acceptButton
+            // 
+            this.acceptButton.Location = new System.Drawing.Point(322, 457);
+            this.acceptButton.Name = "acceptButton";
+            this.acceptButton.Size = new System.Drawing.Size(75, 23);
+            this.acceptButton.TabIndex = 1;
+            this.acceptButton.Text = "Accept";
+            this.acceptButton.UseVisualStyleBackColor = true;
+            this.acceptButton.Click += new System.EventHandler(this.acceptButton_Click);
+            // 
+            // exitButton
+            // 
+            this.exitButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.exitButton.Location = new System.Drawing.Point(403, 457);
+            this.exitButton.Name = "exitButton";
+            this.exitButton.Size = new System.Drawing.Size(75, 23);
+            this.exitButton.TabIndex = 2;
+            this.exitButton.Text = "Exit";
+            this.exitButton.UseVisualStyleBackColor = true;
+            this.exitButton.Click += new System.EventHandler(this.exitButton_Click);
+            // 
+            // LicenseDialog
+            // 
+            this.AcceptButton = this.acceptButton;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.exitButton;
+            this.ClientSize = new System.Drawing.Size(490, 492);
+            this.ControlBox = false;
+            this.Controls.Add(this.exitButton);
+            this.Controls.Add(this.acceptButton);
+            this.Controls.Add(this.textBox);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "LicenseDialog";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "code the micro:bit terms of use";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.RichTextBox textBox;
+        private System.Windows.Forms.Button acceptButton;
+        private System.Windows.Forms.Button exitButton;
+    }
+}

clients/winuploader/Microbit.Uploader/LicenseDialog.cs

@@ -0,0 +1,32 @@
+using Microsoft.MicroBit.Properties;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Microsoft.MicroBit
+{
+    public partial class LicenseDialog : Form
+    {
+        public LicenseDialog()
+        {
+            InitializeComponent();
+            this.textBox.Text = Resources.MSR_LA___2576;
+        }
+
+        private void acceptButton_Click(object sender, EventArgs e)
+        {
+            this.DialogResult = DialogResult.Yes;
+            this.Close();
+        }
+
+        private void exitButton_Click(object sender, EventArgs e)
+        {
+            this.DialogResult = DialogResult.No;
+            this.Close();
+        }
+    }
+}

clients/winuploader/Microbit.Uploader/LicenseDialog.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

clients/winuploader/Microbit.Uploader/MainForm.Designer.cs

@@ -0,0 +1,173 @@
+namespace Microsoft.MicroBit
+{
+    partial class MainForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
+            this.statusLabel = new System.Windows.Forms.Label();
+            this.backgroundPictureBox = new System.Windows.Forms.PictureBox();
+            this.trayIcon = new System.Windows.Forms.NotifyIcon(this.components);
+            this.versionLabel = new System.Windows.Forms.LinkLabel();
+            this.label1 = new System.Windows.Forms.Label();
+            this.SettingsLabel = new System.Windows.Forms.LinkLabel();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.linkLabel1 = new System.Windows.Forms.LinkLabel();
+            ((System.ComponentModel.ISupportInitialize)(this.backgroundPictureBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // statusLabel
+            // 
+            this.statusLabel.BackColor = System.Drawing.SystemColors.Window;
+            this.statusLabel.Font = new System.Drawing.Font("Consolas", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.statusLabel.Location = new System.Drawing.Point(11, 30);
+            this.statusLabel.Name = "statusLabel";
+            this.statusLabel.Size = new System.Drawing.Size(364, 23);
+            this.statusLabel.TabIndex = 1;
+            this.statusLabel.Text = "loading...";
+            // 
+            // backgroundPictureBox
+            // 
+            this.backgroundPictureBox.BackColor = System.Drawing.Color.White;
+            this.backgroundPictureBox.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.backgroundPictureBox.Image = global::Microsoft.MicroBit.Properties.Resources.MSFT_logo_png;
+            this.backgroundPictureBox.InitialImage = null;
+            this.backgroundPictureBox.Location = new System.Drawing.Point(226, 91);
+            this.backgroundPictureBox.Name = "backgroundPictureBox";
+            this.backgroundPictureBox.Size = new System.Drawing.Size(149, 52);
+            this.backgroundPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+            this.backgroundPictureBox.TabIndex = 0;
+            this.backgroundPictureBox.TabStop = false;
+            this.backgroundPictureBox.Click += new System.EventHandler(this.backgroundPictureBox_Click);
+            // 
+            // trayIcon
+            // 
+            this.trayIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("trayIcon.Icon")));
+            this.trayIcon.Visible = true;
+            this.trayIcon.Click += new System.EventHandler(this.trayIcon_Click);
+            // 
+            // versionLabel
+            // 
+            this.versionLabel.AutoSize = true;
+            this.versionLabel.Location = new System.Drawing.Point(12, 121);
+            this.versionLabel.Name = "versionLabel";
+            this.versionLabel.Size = new System.Drawing.Size(28, 13);
+            this.versionLabel.TabIndex = 2;
+            this.versionLabel.TabStop = true;
+            this.versionLabel.Text = "v0.9";
+            this.versionLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.versionLabel_LinkClicked);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label1.Location = new System.Drawing.Point(12, 103);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(169, 15);
+            this.label1.TabIndex = 3;
+            this.label1.Text = "Automatic upload of .hex files.";
+            // 
+            // SettingsLabel
+            // 
+            this.SettingsLabel.AutoSize = true;
+            this.SettingsLabel.Location = new System.Drawing.Point(151, 121);
+            this.SettingsLabel.Name = "SettingsLabel";
+            this.SettingsLabel.Size = new System.Drawing.Size(43, 13);
+            this.SettingsLabel.TabIndex = 4;
+            this.SettingsLabel.TabStop = true;
+            this.SettingsLabel.Text = "settings";
+            this.SettingsLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.SettingsLabel_LinkClicked);
+            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.BackColor = System.Drawing.Color.White;
+            this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.pictureBox1.Image = global::Microsoft.MicroBit.Properties.Resources.microbit_red;
+            this.pictureBox1.InitialImage = null;
+            this.pictureBox1.Location = new System.Drawing.Point(226, 6);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(149, 79);
+            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+            this.pictureBox1.TabIndex = 5;
+            this.pictureBox1.TabStop = false;
+            this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click);
+            // 
+            // linkLabel1
+            // 
+            this.linkLabel1.AutoSize = true;
+            this.linkLabel1.Location = new System.Drawing.Point(62, 121);
+            this.linkLabel1.Name = "linkLabel1";
+            this.linkLabel1.Size = new System.Drawing.Size(60, 13);
+            this.linkLabel1.TabIndex = 6;
+            this.linkLabel1.TabStop = true;
+            this.linkLabel1.Text = "open editor";
+            this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
+            // 
+            // MainForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.White;
+            this.ClientSize = new System.Drawing.Size(388, 143);
+            this.Controls.Add(this.linkLabel1);
+            this.Controls.Add(this.pictureBox1);
+            this.Controls.Add(this.SettingsLabel);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.versionLabel);
+            this.Controls.Add(this.statusLabel);
+            this.Controls.Add(this.backgroundPictureBox);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.Name = "MainForm";
+            this.ShowInTaskbar = false;
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "code the micro:bit";
+            this.Load += new System.EventHandler(this.MainForm_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.backgroundPictureBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.PictureBox backgroundPictureBox;
+        private System.Windows.Forms.Label statusLabel;
+        private System.Windows.Forms.NotifyIcon trayIcon;
+        private System.Windows.Forms.LinkLabel versionLabel;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.LinkLabel SettingsLabel;
+        private System.Windows.Forms.PictureBox pictureBox1;
+        private System.Windows.Forms.LinkLabel linkLabel1;
+    }
+}
+

clients/winuploader/Microbit.Uploader/MainForm.cs

@@ -0,0 +1,267 @@
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.IO;
+using System.Security;
+using System.Threading;
+using System.Windows.Forms;
+
+namespace Microsoft.MicroBit
+{
+    internal partial class MainForm : Form
+    {
+        FileSystemWatcher watcher;
+        private string customcopypath = "";
+
+        public MainForm()
+        {
+            InitializeComponent();
+            var v = typeof(MainForm).Assembly.GetName().Version;
+            this.versionLabel.Text = "v" + v.Major + "." + v.Minor;
+        }
+
+        private void MainForm_Load(object sender, EventArgs e)
+        {
+            this.initializeFileWatch();
+            customcopypath = (string)Application.UserAppDataRegistry.GetValue("CustomDirectory", "");
+            this.openEditor();
+        }
+
+        private void openEditor()
+        {
+            // lanch editor
+            try { Process.Start("https://pxt.microbit.org#uploader"); } catch (Exception) { }
+        }
+
+        private void initializeFileWatch()
+        {
+            if (!checkTOU()) return;
+
+            var downloads = KnownFoldersNativeMethods.GetDownloadPath();
+            if (downloads == null)
+            {
+                this.updateStatus("oops, can't find the `Downloads` folder");
+                return;
+            }
+
+            this.watcher = new FileSystemWatcher(downloads);
+            this.watcher.Renamed += (sender, e) => this.handleFileEvent(e);
+            this.watcher.Created += (sender, e) => this.handleFileEvent(e);
+            this.watcher.EnableRaisingEvents = true;
+
+            this.waitingForHexFileStatus();
+        }
+
+        private void waitingForHexFileStatus()
+        {
+            this.updateStatus("waiting for .hex file...");
+            this.trayIcon.ShowBalloonTip(3000, "ready...", "waiting for .hex file...", ToolTipIcon.None);
+        }
+
+        static bool checkTOU()
+        {
+            var v = (int)Application.UserAppDataRegistry.GetValue("TermOfUse", 0);
+            if (v != 1)
+            {
+                using (var f = new LicenseDialog())
+                {
+                    var r = f.ShowDialog();
+                    if (r != DialogResult.Yes)
+                    {
+                        Application.Exit();
+                        return false;
+                    }
+                }
+                Application.UserAppDataRegistry.SetValue("TermOfUse", 1, RegistryValueKind.DWord);
+            }
+
+            return true;
+        }
+
+        delegate void Callback();
+
+        private void updateStatus(string value)
+        {
+            Callback a = (Callback)(() =>
+            {
+                this.statusLabel.Text = value;
+                this.trayIcon.Text = value;
+            });
+            this.Invoke(a);
+        }
+
+        void handleFileEvent(FileSystemEventArgs e)
+        {
+            this.handleFile(e.FullPath);
+        }
+
+        volatile int copying;
+        void handleFile(string fullPath)
+        {
+            try
+            {
+                // In case this is data-url download, at least Chrome will not rename file, but instead write to it
+                // directly. This mean we may catch it in the act. Let's leave it some time to finish writing.
+                Thread.Sleep(500);
+
+                var info = new System.IO.FileInfo(fullPath);
+                Trace.WriteLine("download: " + info.FullName);
+
+                if (info.Extension != ".hex") return;
+
+                var infoName = info.Name;
+                Trace.WriteLine("download name: " + info.Name);
+                if (!infoName.StartsWith("microbit-", StringComparison.OrdinalIgnoreCase)) return;
+                if (info.Name.EndsWith(".uploaded.hex", StringComparison.OrdinalIgnoreCase)) return;
+                if (info.Length > 1000000) return; // make sure we don't try to copy large files
+
+
+                // already copying?
+                if (Interlocked.Exchange(ref this.copying, 1) == 1)
+                    return;
+
+                try
+                {
+
+                    var driveletters = getMicrobitDrives();
+                    List<String> drives = new List<String>();
+                    foreach (var d in driveletters)
+                    {
+                        drives.Add(d.RootDirectory.FullName);
+                    }
+                    if (!String.IsNullOrEmpty(customcopypath) && Directory.Exists(customcopypath))
+                    {
+                        drives.Add(customcopypath);
+                    }
+                    if (drives.Count == 0)
+                    {
+                        this.updateStatus("no board found");
+                        this.trayIcon.ShowBalloonTip(3000, "cancelled uploading...", "no board found", ToolTipIcon.None);
+                        return;
+                    }
+
+                    this.updateStatus("uploading .hex file");
+                    this.trayIcon.ShowBalloonTip(3000, "uploading...", "uploading .hex file", ToolTipIcon.None);
+
+                    // copy to all boards
+                    copyFirmware(info.FullName, drives);
+
+                    // move away hex file
+                    var temp = System.IO.Path.ChangeExtension(info.FullName, ".uploaded.hex");
+                    try
+                    {
+                        File.Copy(info.FullName, temp, true);
+                        File.Delete(info.FullName);
+                    }
+                    catch (IOException) { }
+                    catch (NotSupportedException) { }
+                    catch (UnauthorizedAccessException) { }
+                    catch (ArgumentException) { }
+
+                    // update ui
+                    this.updateStatus("uploading done");
+                    this.waitingForHexFileStatus();
+                }
+                finally
+                {
+                    Interlocked.Exchange(ref this.copying, 0);
+                }
+            }
+            catch (IOException) { }
+            catch (NotSupportedException) { }
+            catch (UnauthorizedAccessException) { }
+            catch (ArgumentException) { }
+        }
+
+        static void copyFirmware(string file, List<string> drives)
+        {
+            var waitHandles = new List<WaitHandle>();
+            foreach (var drive in drives)
+            {
+                var ev = new AutoResetEvent(false);
+                waitHandles.Add(ev);
+                ThreadPool.QueueUserWorkItem((state) =>
+                {
+                    try
+                    {
+                        var trg = System.IO.Path.Combine(drive, "firmware.hex");
+                        File.Copy(file, trg, true);
+                    }
+                    catch (IOException) { }
+                    catch (NotSupportedException) { }
+                    catch (UnauthorizedAccessException) { }
+                    catch (ArgumentException) { }
+                    ev.Set();
+                }, ev);
+            }
+
+            //waits for all the threads (waitHandles) to call the .Set() method
+            //and inform that the execution has finished.
+            WaitHandle.WaitAll(waitHandles.ToArray());
+        }
+
+        static DriveInfo[] getMicrobitDrives()
+        {
+            var drives = System.IO.DriveInfo.GetDrives();
+            var r = new System.Collections.Generic.List<DriveInfo>();
+            foreach (var di in drives)
+            {
+                var label = getVolumeLabel(di);
+                if (label.StartsWith("MICROBIT", StringComparison.Ordinal))
+                    r.Add(di);
+            }
+            return r.ToArray();
+        }
+
+        static string getVolumeLabel(DriveInfo di)
+        {
+            try { return di.VolumeLabel; }
+            catch (IOException) { }
+            catch (SecurityException) { }
+            catch (UnauthorizedAccessException) { }
+            return "";
+        }
+
+        private void trayIcon_Click(object sender, EventArgs e)
+        {
+            this.WindowState = FormWindowState.Minimized;
+            this.WindowState = FormWindowState.Normal;
+            this.Show();
+            this.Activate();
+        }
+
+        private void versionLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            try
+            {
+                Process.Start("https://pxt.microbit.org/uploader");
+            }
+            catch (IOException) { }
+        }
+
+        private void backgroundPictureBox_Click(object sender, EventArgs e)
+        {
+            this.openEditor();
+        }
+
+        private void SettingsLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            var settings = new Settings(customcopypath);
+            settings.ShowDialog();
+            customcopypath = settings.CustomCopyPath;
+            Application.UserAppDataRegistry.SetValue("CustomDirectory", customcopypath, RegistryValueKind.String);
+        }
+
+        private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            this.openEditor();
+        }
+
+        private void pictureBox1_Click(object sender, EventArgs e)
+        {
+            this.openEditor();
+        }
+    }
+}

clients/winuploader/Microbit.Uploader/MainForm.resx

@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="trayIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="trayIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAMIOAADCDgAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAN6bIZTOkxoUtj62FL5W1hTWpzYUvlbWFLY+thTKgwoUxnb+FLY6shS6TsoUzpMaFL5a1hS2P
+        rYUxnb6FNZ2+ZTCTsvkriaf/KYKe/yuIpf8uk7L/K4il/ymBnP8tjqz/K4qn/yiBnP8qhaL/KoWh/yqG
+        o/8ogJv/JXeQ/yqDnvkRMjz/Di02/wofJv8MJS3/Di02/wskLP8HGB3/Di43/w0qM/8HFxz/CyMr/w4s
+        Nv8MJi7/CiAm/w4sNv8RMTv/BQsN/wUQE/8BAgL/AQQF/wYRFP8EBgf/AgIA/xAYJv8TGy3/AgIA/wMF
+        Bv8HEhX/AQUG/wECAv8FEBT/BQsN/wYFD/8LByT/AQAC/wAAAP8CAgL/AwMD/woKEv8LCxT/DAwY/woK
+        Ev8DAwT/AgIC/wAAAP8AAAD/AAAA/wICAv8JCA//IBs//wwMEP8AAAD/AgIC/wQEBv8bGzf/BgYK/wQE
+        Bf8bGzj/BgYJ/wMDA/8AAAD/CgoK/xEREf8HBwf/Li4u/1FRUf9ERET/AQEA/wwMGf8UFCj/BAQE/wMD
+        Av8DAwL/BAQE/xAQIP8RESL/AAAA/z8/P/9SUlH/NTU1/y4uLv9QUFD/QUFB/wEBAP8LCxf/EhIk/wIC
+        Af8JCRH/CwsV/wICAf8PDx3/Dw8f/wAAAP89PT3/UVFQ/zQ0M/8FBQX/DAwM/wgICP8AAAD/CwsW/xIS
+        JP8FBQb/Dg4b/xERIv8FBQb/Dw8d/w8PHv8AAAD/CAgK/xwXO/8KCRT/BAMI/wAAAP8AAAD/AAAA/wIC
+        Av8EBAX/HR06/wgIEP8GBgv/HR07/wYGCf8DAwL/AAAA/wAAAP8JBh3/BwUS/y0fhf8FBBD/AAAA/wAA
+        AP8AAAD/AAAA/xIOMv8fFVz/HhVa/xQPOP8AAQD/AAAA/wAAAP8AAAD/AAAA/wICAv9UO/v/MiKX/wUD
+        D/8FAw7/AwIK/wAAAP8RCzP/IBZi/yAWYP8TDTr/AAAA/wAAAP8AAAD/AAAA/wAAAP8CAgL/VTz/+FQ6
+        /P8yI5j/IBZg/ywehf8MCCX/BAMN/wUEEP8GBBH/AQED/wAAAP8AAAD/AAAA/wAAAP8AAAD/AgIC9Vc+
+        /2BVOv9+Ujj0fTwptH5ONul9OCapfRUOPn4AAAB+AAAAfQAAAH4AAAB+AAAAfQAAAH4AAAB+AAAAfgQE
+        BFkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA//8AAA==
+</value>
+  </data>
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAMIOAADCDgAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAN6bIZTOkxoUtj62FL5W1hTWpzYUvlbWFLY+thTKgwoUxnb+FLY6shS6TsoUzpMaFL5a1hS2P
+        rYUxnb6FNZ2+ZTCTsvkriaf/KYKe/yuIpf8uk7L/K4il/ymBnP8tjqz/K4qn/yiBnP8qhaL/KoWh/yqG
+        o/8ogJv/JXeQ/yqDnvkRMjz/Di02/wofJv8MJS3/Di02/wskLP8HGB3/Di43/w0qM/8HFxz/CyMr/w4s
+        Nv8MJi7/CiAm/w4sNv8RMTv/BQsN/wUQE/8BAgL/AQQF/wYRFP8EBgf/AgIA/xAYJv8TGy3/AgIA/wMF
+        Bv8HEhX/AQUG/wECAv8FEBT/BQsN/wYFD/8LByT/AQAC/wAAAP8CAgL/AwMD/woKEv8LCxT/DAwY/woK
+        Ev8DAwT/AgIC/wAAAP8AAAD/AAAA/wICAv8JCA//IBs//wwMEP8AAAD/AgIC/wQEBv8bGzf/BgYK/wQE
+        Bf8bGzj/BgYJ/wMDA/8AAAD/CgoK/xEREf8HBwf/Li4u/1FRUf9ERET/AQEA/wwMGf8UFCj/BAQE/wMD
+        Av8DAwL/BAQE/xAQIP8RESL/AAAA/z8/P/9SUlH/NTU1/y4uLv9QUFD/QUFB/wEBAP8LCxf/EhIk/wIC
+        Af8JCRH/CwsV/wICAf8PDx3/Dw8f/wAAAP89PT3/UVFQ/zQ0M/8FBQX/DAwM/wgICP8AAAD/CwsW/xIS
+        JP8FBQb/Dg4b/xERIv8FBQb/Dw8d/w8PHv8AAAD/CAgK/xwXO/8KCRT/BAMI/wAAAP8AAAD/AAAA/wIC
+        Av8EBAX/HR06/wgIEP8GBgv/HR07/wYGCf8DAwL/AAAA/wAAAP8JBh3/BwUS/y0fhf8FBBD/AAAA/wAA
+        AP8AAAD/AAAA/xIOMv8fFVz/HhVa/xQPOP8AAQD/AAAA/wAAAP8AAAD/AAAA/wICAv9UO/v/MiKX/wUD
+        D/8FAw7/AwIK/wAAAP8RCzP/IBZi/yAWYP8TDTr/AAAA/wAAAP8AAAD/AAAA/wAAAP8CAgL/VTz/+FQ6
+        /P8yI5j/IBZg/ywehf8MCCX/BAMN/wUEEP8GBBH/AQED/wAAAP8AAAD/AAAA/wAAAP8AAAD/AgIC9Vc+
+        /2BVOv9+Ujj0fTwptH5ONul9OCapfRUOPn4AAAB+AAAAfQAAAH4AAAB+AAAAfQAAAH4AAAB+AAAAfgQE
+        BFkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA//8AAA==
+</value>
+  </data>
+</root>

clients/winuploader/Microbit.Uploader/Program.cs

@@ -0,0 +1,30 @@
+using Microsoft.VisualBasic.ApplicationServices;
+using System;
+using System.Windows.Forms;
+
+namespace Microsoft.MicroBit
+{
+    static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
+        [STAThread]
+        static void Main()
+        {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            SingleInstanceAppStarter.Start(new MainForm(), StartNewInstance);
+        }
+
+        // The handler when attempting to start another instance of this application
+        // We can customize the logic here for which form to activate in different 
+        // conditions. Like in this sample, we will be selectively activate the LoginForm
+        // or MainForm based on the login state of the user.
+        static void StartNewInstance(object sender, StartupNextInstanceEventArgs e)
+        {
+            e.BringToForeground = true;
+        }
+    }
+}

clients/winuploader/Microbit.Uploader/Properties/AssemblyInfo.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Code The micro:bit Uploader")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("MicrosoftMicrobitUploader")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("7dc6ca45-fd75-44bc-805e-708c812cd4bf")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("0.10.0.0")]
+[assembly: AssemblyFileVersion("0.10.0.0")]
+[assembly: CLSCompliant(true)]
+[assembly: NeutralResourcesLanguage("en-US")]

clients/winuploader/Microbit.Uploader/Properties/Resources.Designer.cs

@@ -0,0 +1,92 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.MicroBit.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.MicroBit.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap microbit_red {
+            get {
+                object obj = ResourceManager.GetObject("microbit_red", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap MSFT_logo_png {
+            get {
+                object obj = ResourceManager.GetObject("MSFT_logo_png", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to TBD.
+        /// </summary>
+        internal static string MSR_LA___2576 {
+            get {
+                return ResourceManager.GetString("MSR_LA___2576", resourceCulture);
+            }
+        }
+    }
+}

clients/winuploader/Microbit.Uploader/Properties/Resources.resx

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="microbit_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\microbit.red.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="MSFT_logo_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\MSFT_logo_png.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="MSR_LA___2576" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MSR-LA - 2576.rtf;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+</root>

clients/winuploader/Microbit.Uploader/Resources/MSR-LA - 2576.rtf

@@ -0,0 +1 @@
+TBD

clients/winuploader/Microbit.Uploader/Settings.Designer.cs

@@ -0,0 +1,76 @@
+namespace Microsoft.MicroBit
+{
+    partial class Settings
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // textBox1
+            // 
+            this.textBox1.Location = new System.Drawing.Point(107, 12);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(100, 20);
+            this.textBox1.TabIndex = 0;
+            this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(34, 15);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(67, 13);
+            this.label1.TabIndex = 1;
+            this.label1.Text = "Custom Path";
+            // 
+            // Settings
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(246, 48);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.textBox1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "Settings";
+            this.ShowIcon = false;
+            this.Text = "Settings";
+            this.Load += new System.EventHandler(this.Settings_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.Label label1;
+    }
+}

clients/winuploader/Microbit.Uploader/Settings.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Security.AccessControl;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Microsoft.MicroBit
+{
+    public partial class Settings : Form
+    {
+        public string CustomCopyPath;
+        public Settings(string currentpath)
+        {
+            InitializeComponent();
+            CustomCopyPath = currentpath;
+
+        }
+
+        private void Settings_Load(object sender, EventArgs e)
+        {
+            textBox1.Text = CustomCopyPath;
+        }
+
+        private void label1_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void textBox1_TextChanged(object sender, EventArgs e)
+        {
+            CustomCopyPath = textBox1.Text;
+        }
+    }
+}

clients/winuploader/Microbit.Uploader/Settings.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

clients/winuploader/Microbit.Uploader/SingleInstanceAppHelper.cs

@@ -0,0 +1,39 @@
+/****************************** Module Header ******************************\
+* Module Name:  SingleInstanceAppHelper.cs
+* Project:      CSWinFormSingleInstanceApp
+* Copyright (c) Microsoft Corporation.
+* 
+* The  sample demonstrates how to achieve the goal that only 
+* one instance of the application is allowed in Windows Forms application..
+* 
+* This source is subject to the Microsoft Public License.
+* See http://www.microsoft.com/en-us/openness/resources/licenses.aspx#MPL.
+* All other rights reserved.
+* 
+* THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, 
+* EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED 
+* WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
+\***************************************************************************/
+
+using System;
+using Microsoft.VisualBasic.ApplicationServices;
+using System.Windows.Forms;
+
+namespace Microsoft.MicroBit
+{
+    // We need to add Microsoft.VisualBasic reference to use
+    // WindowsFormsApplicationBase type.
+    class SingleInstanceApp : WindowsFormsApplicationBase 
+    {
+        public SingleInstanceApp()
+        {
+        }
+        public SingleInstanceApp(Form f)
+        {
+            // Set IsSingleInstance property to true to make the application 
+            base.IsSingleInstance = true;
+            // Set MainForm of the application.
+            this.MainForm = f;
+        }
+    }
+}

clients/winuploader/Microbit.Uploader/SingleInstanceAppStarter.cs

@@ -0,0 +1,39 @@
+/****************************** Module Header ******************************\
+* Module Name:  SingleInstanceAppStarter.cs
+* Project:      CSWinFormSingleInstanceApp
+* Copyright (c) Microsoft Corporation.
+* 
+* The  sample demonstrates how to achieve the goal that only 
+* one instance of the application is allowed in Windows Forms application..
+* 
+* This source is subject to the Microsoft Public License.
+* See http://www.microsoft.com/en-us/openness/resources/licenses.aspx#MPL.
+* All other rights reserved.
+* 
+* THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, 
+* EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED 
+* WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
+\***************************************************************************/
+
+using System;
+using System.Windows.Forms;
+using Microsoft.VisualBasic.ApplicationServices;
+
+namespace Microsoft.MicroBit
+{
+    internal static class SingleInstanceAppStarter
+    {
+        static SingleInstanceApp app = null;
+
+        // Construct SingleInstanceApp object, and invoke its run method.
+        public static void Start(Form f, StartupNextInstanceEventHandler handler)
+        {
+            if (app == null && f != null)
+                app = new SingleInstanceApp(f);
+
+            // Wire up StartupNextInstance event handler.
+            app.StartupNextInstance += handler;
+            app.Run(Environment.GetCommandLineArgs());
+        }
+    }
+}

cmds/cmds.ts

@@ -6,37 +6,53 @@ 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.pxt.CompileResult) {
+
+export function deployCoreAsync(res: ts.pxtc.CompileResult) {
     return getBitDrivesAsync()
         .then(drives => {
             if (drives.length == 0) {
-                console.log("cannot find any drives to deploy to")
-            } else {
-                console.log(`copy ${ts.pxt.BINARY_HEX} to ` + drives.join(", "))
+                console.log("cannot find any drives to deploy to");
+                return Promise.resolve(0);
             }
-            return Promise.map(drives, d =>
-                writeFileAsync(d + ts.pxt.BINARY_HEX, res.outfiles[ts.pxt.BINARY_HEX])
-                    .then(() => {
-                        console.log("wrote hex file to " + d)
-                    }))
-        })
-        .then(() => { })
+
+            console.log(`copy ${ts.pxtc.BINARY_HEX} to ` + drives.join(", "));
+
+            let writeHexFile = (filename: string) => {
+                return writeFileAsync(filename + ts.pxtc.BINARY_HEX, res.outfiles[ts.pxtc.BINARY_HEX])
+                    .then(() => console.log("wrote hex file to " + filename));
+            };
+
+            return Promise.map(drives, d => writeHexFile(d))
+                .then(() => drives.length);
+        });
 }
 
 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 = /^([A-Z]:).* MICROBIT/.exec(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([])
     }

docs/_locales/pl/_theme.json

@@ -1,22 +0,0 @@
-{
-    "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

@@ -1,7 +0,0 @@
-# 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,3 +1,50 @@
+![](/static/mb/device/pano.jpg)
+
+# About
+
+### @description A Blocks / Javascript code editor for the micro:bit, a pocket-size computer with 5x5 display, sensors and Bluetooth.
+
+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 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 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 micro:bit using [Blocks](/blocks) or [JavaScript](/javascript) in your web browser via the [micro:bit APIs](/reference):
+
+```block
+input.onButtonPressed(Button.A, () => {
+    basic.showString("Hi!");
+})
+```
+```typescript
+input.onButtonPressed(Button.A, () => {
+    basic.showString("Hi!");
+})
+```
+
+The editor work in [most modern browsers](/browsers), work [offline](/offline) once loaded and do not require any installation. 
+
+## [Compile and Flash: Your Program!](/device/usb)
+
+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.
+
+## Simulator: Test Your Code
+
+You can run your code using the micro:bit simulator, all within the confines of a web browser. 
+The simulator has support for the LED screen, buttons, as well as compass, accelerometer, and digital I/O pins.
+
 ```sim
 basic.forever(() => {
   basic.showString("Hi!");
@@ -20,39 +67,25 @@ input.onButtonPressed(Button.B, () => {
 . # . # .
 . . # . .`);
 });
-``` 
-# About
-
-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 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. 
-
-## Blocks or JavaScript
-
-The student can program the BBC micro:bit using [visual blocks](http://www.github.com/Google/blockly) or JavaScript.
-
-```blocks
-basic.showString("BBC micro:bit!");
 ```
 
-## Compile and Flash
-
-When a user has her code ready, she can connect her BBC micro:bit to a computer via a USB cable, so it appears as a mounted drive.
-
-Compilation to the ARM thumb machine code happens in the browser.
-
-The student is prompted to save the ARM binary program to a file, which she then simply drags to the micro:bit mounted drive, 
-which flashes the micro:bit device with the new program.
-
-## Simulator: Test Your Code
-Before a student compiles her code for the micro:bit, she can run it using the micro:bit simulator, all within the confines of a web browser. 
-The simulator has support for the LED screen, buttons, as well as compass, accelerometer, and digital I/O pins.
-
 ## C++ Runtime
 
-The [C++ BBC 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, 
+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, 
 as well as a set of helper functions (such as displaying a number/image/string on the LED screen). 
-The JavaScript micro:bit library mirrors the functions of the C++ library. 
+
+The [micro:bit library](/reference) mirrors the functions of the C++ library. 
 When code is compiled to ARM machine code, the calls to JavaScript micro:bit functions are replaced with calls to the corresponding C++ functions.
+
+## [Command Line Tools](/cli)
+
+Looking to use pxt.microbit.org in your favorite editor? Install the [command line tools](/cli) and get rolling!
+
+## [Packages](/packages)
+
+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 micro:bit is [open source](/open-source) on GitHub. Contributors are welcome!

docs/beta-ref.json

@@ -0,0 +1,3 @@
+{
+    "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/boolean.md

@@ -2,56 +2,40 @@
 
 true or false.
 
-### @parent js/language
+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.
 
-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:
 
-### Block Editor
-
-In the Block Editor, the following blocks represent the true and false Boolean values, which can be plugged in anywhere a Boolean value is expected:
-
-![](/static/mb/boolean-0.png)
+```blocks
+true;
+false;
+```
 
 The next three blocks represent the three Boolean (logic) operators:
 
-![](/static/mb/boolean-1.png)
+```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):
 
-![](/static/mb/boolean-2.png)
-
-### Touch Develop
-
-### ~hide
-
-```
-let condition = true
-let condition2 = true
+```blocks
+42 == 0;
+42 != 0;
+42 < 0;
+42 > 0;
+42 <= 0;
+42 >= 0;
 ```
 
-### ~
-
-Boolean values and operators are often used with an [if](/reference/logic/if) or [while](/js/while) statement to determine which code will execute next. For example:
-
-```
-if (condition && condition2) {
-    // This code runs if both `condition` and `condition2` are `true`
-} else {
-    // This code runs if either `condition` or `condition2` is `false`
-}
-```
+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`:
 
-```
-let on = led.point(1, 2)
-if (on) {
-    basic.clearScreen()
-}
-```
-
 ### Boolean operators
 
 Boolean operators take Boolean inputs and evaluate to a Boolean output:
@@ -60,40 +44,40 @@ Boolean operators take Boolean inputs and evaluate to a Boolean output:
 
 `A and B` evaluates to `true` if-and-only-if both A and B are true:
 
-- `false and false` = `false`
-
-- `false and true` = `false`
-
-- `true and false` = `false`
-
-- `true and true` = `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:
 
-- `false or false` = `false`
-
-- `false or true` = `true`
-
-- `true or false` = `true`
-
-- `true or true` = `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:
 
-* `not false` = `true`
-* `not true` = `false`
+```blocks
+!false == true;
+!true == false;
+```
 
 ### Example
 
 This example turns on LED `3 , 3`, if LEDs `1 , 1` and `2 , 2` are both on:
 
-```
-if (led.point(1, 1) && led.point(2, 2)) {
-    led.plot(3, 3)
+```blocks
+if (led.point(1,1) && led.point(2,2)) {
+   led.plot(3,3)
 }
 ```
 
@@ -101,22 +85,18 @@ if (led.point(1, 1) && led.point(2, 2)) {
 
 When you compare two Numbers, you get a Boolean value, such as the comparison `x < 5` in the code below:
 
-```
-let x = Math.random(10)
-if (x < 5) {
-    basic.showString("Low", 150)
-} else {
-    basic.showString("High", 150)
-}
+```blocks
+let x = Math.random(5)
+if(x < 5) {
+   basic.showString("low");
+} else { 
+   basic.showString("high");
+} 
 ```
 
 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.
 
-### Lessons
-
-[rotation animation](/lessons/rotation-animation), [digi yoyo](/lessons/digi-yoyo), [love meter](/lessons/love-meter), [zoomer](/lessons/zoomer)
-
 ### See also
 
-[if](/reference/logic/if), [while](/js/while), [number](/reference/types/number)
+[if](/blocks/logic/if), [while](/blocks/loops/while), [number](/reference/types/number)
 

docs/blocks/logic/if.md

@@ -0,0 +1,28 @@
+# If
+
+### @parent blocks/language
+ 
+
+Conditionally run code depending on whether a [Boolean](/blocks/logic/boolean) condition is true or false.
+
+```blocks
+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

@@ -2,7 +2,6 @@
 
 ```cards
 for(let i = 0;i<5;i++) {}
-for(let i = 1;i<5;i++) {}
 while(true) {}
-basic.forever(() => {})
+basic.forever(() => {});
 ```

docs/blocks/loops/for.md

@@ -14,11 +14,7 @@ basic.showNumber(i)
 }
 ```
 
-### Lessons
-
-[looper](/lessons/looper)
-
 ### See also
 
-[repeat](/reference/loops/repeat), [while](/reference/loops/while), [if](/reference/logic/if), [show number](/reference/basic/show-number)
+[repeat](/blocks/loops/repeat), [while](/blocks/loops/while), [if](/blocks/logic/if), [show number](/reference/basic/show-number)
 

docs/blocks/loops/repeat.md

@@ -0,0 +1,12 @@
+# Repeat
+
+Run part of the program the number of times you say.
+
+### Block Editor
+
+![](/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)
+

docs/blocks/loops/while.md

@@ -1,16 +1,13 @@
 # While
 
-### @parent blocks/language
- 
-
-Repeat code while a [Boolean](/reference/types/boolean) `condition` is true.
+Repeat code while a [Boolean](/blocks/logic/boolean) `condition` is true.
 
 ```blocks
 while(true) {
 }
 ```
 
-The while loop has a *condition* that evaluates to a [Boolean](/reference/types/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 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.
 
@@ -26,11 +23,7 @@ while(index >= 0) {
 }
 ```
 
-### Lessons
-
-[rotation animation](/lessons/rotation-animation)
-
 ### See also
 
-[on button pressed](/reference/input/on-button-pressed), [for](/reference/loops/for), [if](/reference/logic/if), [forever](/reference/basic/forever)
+[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/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;
+```

docs/blocks/variables/assign.md

@@ -1,6 +1,6 @@
 # Assignment Operator
 
-Use an equals sign to make a [variable](/reference/variables/var) store the [number](/reference/types/number) 
+Use an equals sign to make a [variable](/blocks/variables/var) store the [number](/reference/types/number) 
 or [string](/reference/types/string) you say.
 
 When you use the equals sign to store something in a variable, the equals sign is called
@@ -30,11 +30,7 @@ You can use the assignment operator with variables of
 every [type](/reference/types). A *type* is which kind of thing
 a variable can store, like a number or string.
 
-### Lessons
-
-[rotation animation](/lessons/rotation-animation)
-
 ### See also
 
-[variable](/reference/variables/var), [types](/reference/types)
+[variable](/blocks/variables/var), [types](/reference/types)
 

docs/blocks/variables/change-var.md

@@ -0,0 +1,40 @@
+# Change Value
+
+Set the value for local and global variables.
+
+### @parent blocks/change-value
+
+Change the value of a variable
+
+```blocks
+let x = 0
+x += 1
+```
+
+### Declare a variable
+
+Use the assignment operator to set the value of a [variable](/blocks/variables/var). Change the value of a variable from 0 to 1 using the change item block. Like this:
+
+```blocks
+let x = 0
+x += 1
+```
+
+### Example
+
+Use the assignment operator to set the value of a [variable](/blocks/variables/var). Change the value of a variable from 0 to 1 using the change item block. Then display the new value of the variable on the LED screen. Like this:
+
+```blocks
+let x = 0;
+x += 1;
+basic.showNumber(x);
+```
+
+### Notes
+
+* You can use the assignment operator with variables of each of the supported [types](/reference/types).
+
+### See also
+
+[variable](/blocks/variables/var), [types](/reference/types)
+

docs/blocks/variables/var.md

@@ -13,7 +13,7 @@ A variable is a place where you can store and retrieve data. Variables have a na
 ### Var statement
 
 Use the Block Editor variable statement to create a variable 
-and the [assignment operator](/reference/variables/assign) 
+and the [assignment operator](/blocks/variables/assign) 
 to store something in the variable.
 
 For example, this code stores the number `2` in the `x` variable:
@@ -27,7 +27,7 @@ Here's how to define a variable in the Block Editor:
 
 2. Change the default variable name if you like.
 
-3. Drag a block type on the right-side of the [assignment operator](/reference/variables/assign) and click the down arrow to change the variable name.
+3. Drag a block type on the right-side of the [assignment operator](/blocks/variables/assign) and click the down arrow to change the variable name.
 
 A variable is created for the number returned by the [brightness](/reference/led/brightness) function.
 
@@ -46,7 +46,7 @@ basic.showNumber(counter);
 
 To change the contents of a variable use the assignment operator. The following code sets `counter` to 1 and then increments `counter` by 10:
 
-```blocks 
+```blocks
 let counter = 1;
 counter = counter + 10;
 basic.showNumber(counter);
@@ -81,11 +81,7 @@ if (led.brightness() > 128) {
 
 * You can use the default variable names if you'd like, however, it's best to use descriptive variable names. To change a variable name in the editor, select the down arrow next to the variable and then click "new variable".
 
-### Lessons
-
-[glowing pendulum](/lessons/glowing-pendulum), [love meter](/lessons/love-meter), [temperature](/lessons/temperature), [zoomer](/lessons/zoomer)
-
 ### See also
 
-[types](/reference/types), [assignment operator](/reference/variables/assign)
+[types](/reference/types), [assignment operator](/blocks/variables/assign)
 

docs/browsers.md

@@ -0,0 +1,103 @@
+# Unsupported configuration
+
+Your browser is currently not supported. The following configurations are supported:
+
+## Windows
+
+You need one of these browsers running on Windows 7, Windows 8, Windows 8.1, or
+Windows 10:
+
+* Internet Explorer 11
+* Microsoft Edge
+* Google Chrome
+* Mozilla Firefox
+
+## Mac
+
+You need one of these browsers running on OS X 10.9 Mavericks, OS X 10.10
+Yosemite, OS X 10.11 El Capitan, or macOS 10.12 Sierra:
+
+* Safari
+* Google Chrome
+* Mozilla Firefox
+
+## Linux
+
+If you're using a Raspberry Pi, please see [the documentation
+here](/raspberry-pi).
+
+You need to be running a Linux distribution recent enough to run the most recent
+version of one of the following:
+
+* Google Chrome, or Chromium
+* Mozilla Firefox, Iceweasel, or Seamonkey
+
+## How to check your OS or browser
+
+### Windows
+
+* Click on the Start menu
+* Type 'System'
+* Click on the app called 'System'
+* The version of Windows you are using will be displayed:
+
+![](/static/configurations/windows-version.png)
+
+### Mac
+
+* Click on the Apple icon in the top left
+* Click on 'About this Mac'
+* This window will be displayed:
+
+![](/static/configurations/osx-version.png)
+
+### Internet Explorer
+
+* Click on the Settings icon in the top right
+* Click 'About Internet Explorer'
+* This window will be displayed:
+
+![](/static/configurations/ie-version.png)
+
+### Edge
+
+Edge automatically updates, so you should always be using the latest version
+
+* Click on the menu icon in the top right (three dots)
+* Scroll to the bottom
+* Information similar to the following will be displayed:
+
+![](/static/configurations/edge-version.png)
+
+### Google Chrome
+
+Google Chrome automatically updates, so you should always be using the latest version
+
+* Click on the menu icon in the top right (three dots)
+* Click Help, and About Google Chrome
+* Information similar to the following will be displayed:
+
+![](/static/configurations/chrome-version.png)
+
+### Firefox
+
+Firefox automatically updates, so you should always be using the latest version
+
+* Click on the menu icon in the top right (three horizontal lines)
+* Click the question mark icon (help button)
+* Click 'About Firefox'
+
+![](/static/configurations/firefox-version.png)
+
+### Safari
+
+Safari updates when your operating system updates, so if you are using the
+latest version of OS X then you'll be using the latest version of Safari.
+
+* Click on the Safari menu in the top left
+* Click 'About Safari'
+
+![](/static/configurations/safari-version.png)
+
+IT administrators should check which browser versions are supported
+[here](/browsers/technical).

docs/browsers/linux.md

@@ -0,0 +1,16 @@
+# Recommended browser for Linux
+
+As you are using Linux, it is recommended that you use [Mozilla
+Firefox][firefox] or [Google Chrome][chrome].
+
+Please see [here][technical] for technical information on which browsers are
+supported, or [here][versions] to check which version you are using.
+
+[edge]: https://www.microsoft.com/en-us/windows/microsoft-edge
+[ie]: https://www.microsoft.com/en-us/download/internet-explorer.aspx
+[firefox]: https://www.mozilla.org/en-US/firefox/new/
+[chrome]: https://www.google.com/chrome/
+[opera]: https://www.opera.com
+[safari]: http://www.apple.com/safari/
+[technical]: /browsers/technical
+[versions]: /browsers

docs/browsers/mac.md

@@ -0,0 +1,16 @@
+# Recommended browser for Mac
+
+As you are using a Mac, it is recommended that you use [Safari][]. Alternatively,
+[Google Chrome][chrome] and [Mozilla Firefox][firefox] are also supported.
+
+Please see [here][technical] for technical information on which browsers are
+supported, or [here][versions] to check which version you are using.
+
+[edge]: https://www.microsoft.com/en-us/windows/microsoft-edge
+[ie]: https://www.microsoft.com/en-us/download/internet-explorer.aspx
+[firefox]: https://www.mozilla.org/en-US/firefox/new/
+[chrome]: https://www.google.com/chrome/
+[opera]: https://www.opera.com
+[safari]: http://www.apple.com/safari/
+[technical]: /browsers/technical
+[versions]: /browsers

docs/browsers/technical.md

@@ -0,0 +1,36 @@
+# Technical information about browser support
+
+[pxt.microbit.org][] requires that you use a recent version of a modern
+browser, such as Microsoft Edge, Google Chrome, Mozilla Firefox, Safari, Opera,
+or IE11.  This is because the editor uses modern web technologies such as [web
+workers][] to enable compiling [TypeScript][] in the browser, or the using the
+same [Monaco][] editor that powers [Visual Studio Code][].
+
+[pxt.microbit.org]: https://pxt.microbit.org
+[web workers]: http://www.w3.org/TR/workers/
+[typescript]: http://www.typescriptlang.org
+[monaco]: https://microsoft.github.io/monaco-editor/
+[visual studio code]: http://code.visualstudio.com
+
+Most modern browsers automatically update themselves, but in some environments
+such as schools these automatic updates are disabled for security. **We
+strongly recommend that you use the most recent version of any of these
+browsers**, but if you can't then you must use at least:
+
+| Browser           | Minimum version | Release date   | Windows     | Mac        |
+| ----------------- | --------------- | -------------- | ----------- | ---------- |
+| Edge              | 12              | March 2015     | Windows 10+ | N/A        |
+| Internet Explorer | 11              | October 2013   | Windows 7+  | N/A        |
+| Mozilla Firefox   | 31 ESR          | July 2014      | Windows XP+ | OS X 10.6+ |
+| Google Chrome     | 38              | October 2014   | Windows XP+ | OS X 10.6+ |
+| Safari            | 9               | September 2015 | N/A         | OS X 10.9+ |
+| Opera             | 21              | May 2014       | Windows 7+  | OS X 10.9+ |
+
+
+Please see our information for which browsers are recommended for [Windows][],
+[Mac][], [Linux][], or [Raspberry Pi][].
+
+[Windows]: /browsers/windows
+[Mac]: /browsers/mac
+[Linux]: /browsers/linux
+[Raspberry Pi]: /raspberry-pi

docs/browsers/windows.md

@@ -0,0 +1,18 @@
+# Recommended browser for Windows
+
+We recommend [Microsoft Edge][edge] if you are running Windows 10, but users on
+Windows 7 or higher can use [Internet Explorer 11][ie] or recent versions of
+[Mozilla Firefox][firefox], [Google Chrome][chrome], or [Opera][opera].
+
+
+Please see [here][technical] for technical information on which browsers are
+supported, or [here][versions] to check which version you are using.
+
+[edge]: https://www.microsoft.com/en-us/windows/microsoft-edge
+[ie]: https://www.microsoft.com/en-us/download/internet-explorer.aspx
+[firefox]: https://www.mozilla.org/en-US/firefox/new/
+[chrome]: https://www.google.com/chrome/
+[opera]: https://www.opera.com
+[safari]: http://www.apple.com/safari/
+[technical]: /browsers/technical
+[versions]: /browsers

docs/cli.md

@@ -0,0 +1,17 @@
+# Command Line Interface
+
+```sim
+basic.forever(() => {
+    basic.showString("CLI<3")
+})
+```
+
+It is possible to use the tools from a command line interface (CLI). The PXT CLI allows to 
+* edit, compile or deploy JavaScript programs
+* can easily be integrated in most IDEs. It comes with built-in support for [Visual Studio Code](/code)!
+* run a local web server for the web editor
+* author packages using JavaScript and/or C++
+
+Using the CLI assumes that you have some experience with programming and will require to install tools on your machine as well.
+
+* **[LET'S GET STARTED](https://pxt.io/cli)**

docs/code.md

@@ -0,0 +1,16 @@
+# Visual Studio Code
+
+[Visual Studio Code](https://code.visualstudio.com) is a Free Open Source code editor that you can use to edit your programs.
+
+Working from Visual Studio code allows you to benefit from all the features
+of a professional IDE while working with PXT: working with files, 
+git integration (or source control of your choice), hundreds of extensions.
+
+* background compilation
+* auto-completion
+* pxt command line integration
+
+**Follow [these instructions](https://pxt.io/cli)** to setup your machine and edit your programs in Visual Studio Code.
+
+![](/static/mb/vscode.png)
+

docs/device.md

@@ -1,6 +1,6 @@
 # Device
 
-All the bits and pieces that make up your BBC micro:bit
+All the bits and pieces that make up the BBC micro:bit
 
 ![](/static/mb/device-0.png)
 
@@ -15,19 +15,21 @@ It flashes yellow when the system wants to tell the user that something has happ
 ### Buttons
 
 Buttons A and B are a form of input.  When you press a button, it completes an electrical circuit. 
-The micro:bit can detect either of its two buttons being pressed and un-pressed and be programmed 
-to act on that or send the information to another device.
+The micro:bit can detect either of its two buttons being pressed/released and be programmed 
+to act on these events.
 
 Button R on the back of the micro:bit is a system button. It has different uses. 
 When you have downloaded and run your code onto your micro:bit, press Button R to restart and run your program from the beginning.
 
-When you plug in your micro:bit, it should appear as MICROBIT. 
+### USB connection
+
+When you plug in your micro:bit, it should appear as ``MICROBIT``. 
 If you accidentally hold down the reset button as you’re plugging in your micro:bit, 
-the micro:bit will appear as a MAINTENANCE drive instead of MICROBIT. This is known as maintenance mode.**
+the micro:bit will appear as a MAINTENANCE drive instead of ``MICROBIT``. This is known as maintenance mode.**
 
-To continue programming your micro:bit YOU MUST unplug your USB and reconnect it. Check that the drive now shows as MICROBIT.
+To continue programming your micro:bit YOU MUST unplug your USB and reconnect it. Check that the drive now shows as ``MICROBIT``.
 
-**Use with caution. If you click on the drive while it shows as MAINTENANCE, 
+**Use with caution. If you click on the drive while it shows as ``MAINTENANCE``, 
 you can see which version of firmware you have running on your micro:bit. 
 Firmware on your micro:bit should be up-to-date already. 
 You can find the version of firmware in the 'version.txt' file on the micro:bit. Further information on the firmware can be found here:
@@ -43,7 +45,7 @@ This data can be used by the micro:bit in a program or be sent to another device
 
 ### Accelerometer
 
-There is a an accelerometer on your micro:bit which detects changes in the micro:bit’s speed. 
+There is an accelerometer on your micro:bit which detects changes in the micro:bit’s speed. 
 It converts analogue information into digital form that can be used in micro:bit programs. 
 Output is in milli-g. The device will also detect a small number of standard actions e.g. shake, tilt and free-fall.
 
@@ -53,6 +55,10 @@ The pins can be a form of input or output.
 There are labels for the input/output pins P0, P1, P2, which you can attach external sensors to such as thermometers or moisture detectors. 
 You can read more about large and small pins [here](/device/pins).
 
+### Light level
+
+The screen can also be used a light level sensor (it's a really cool trick).
+
 ### How do I connect the micro:bit to my computer?
 
 Your micro:bit can be connected to your computer via a micro USB cable. 
@@ -63,7 +69,7 @@ and about the error messages you might get [here](/device/error-codes).
 
 ### Powering your micro:bit
 
-When your micro:bit  is connected to your computer with the micro USB, it doesn’t need another power source.  
+When your micro:bit is connected to your computer with the micro USB, it doesn’t need another power source.  
 When your micro:bit isn’t connected to your computer, tablet or mobile, you will need 2 x AAA 1.5 V batteries to power it.
 
 The pins labelled 3V and GND are the power supply pins. 
@@ -71,11 +77,11 @@ You can attach an external device such as a motor to these and power it using th
 
 ### Serial Communication
 
-The BBC micro:bit can send an receive data via [serial communication](/device/serial). The serial data can be transfered via USB or BlE.
+The micro:bit can send an receive data via [serial communication](/device/serial). The serial data can be transfered via USB or BLE.
 
 ### Bluetooth Low Energy (BLE) Antenna
 
-You will see the label BLE ANNTENA on the back of your micro:bit. It is for a messaging service, 
+You will see the label BLE ANTENNA on the back of your micro:bit. It is for a messaging service, 
 so that devices can talk to each other. The micro:bit is a peripheral 
 device which can talk to a central device like a smart phone or tablet that has Bluetooth Low Energy (BLE). 
 The micro:bit can send signals and receive signals from a central device so another BLE device can 

docs/device/contents.md

@@ -1,7 +1,5 @@
 # micro:bit - the device
 
-The micro:bit device
-
 The micro:bit is a very capable device with many components:
 
 * [the USB connector](/device/usb)