Testing build with pxt-core from branch

.gitignore

@@ -16,7 +16,6 @@ clients/win10/*.opendb
 clients/**/bin/**
 clients/**/obj/**
 clients/electron/projects
-hexcache
 
 *.user
 *.sw?
@@ -25,9 +24,3 @@ hexcache
 *.db
 *.suo
 *.log
-
-.DS_Store
-.idea
-*.iml
-.vscode/.BROWSE.VC.DB-shm
-.vscode/.BROWSE.VC.DB-wal

.travis.yml

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

README.md

@@ -1,11 +1,11 @@
-# Calliope target for PXT
+# micro:bit target for PXT
 
-This target allow to program a [Calliope](http://calliope.cc/) using 
+This target allow to program a [BBC micro:bit](https://www.microbit.co.uk/) using 
 PXT ([Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt)).
 
-[![Build Status](https://travis-ci.org/Microsoft/pxt-calliope.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-calliope)
+* [Try it live](https://codethemicrobit.com)
 
-![](http://calliope.cc/content/1-ueber-mini/mini_board.png)
+[![Build Status](https://travis-ci.org/Microsoft/pxt-microbit.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-microbit)
 
 ## Local server
 
@@ -18,8 +18,8 @@ The following commands are a 1-time setup after synching the repo on your machin
 * if not yet installed, install [Node.js 4.4.5 or higher](https://nodejs.org/en/download/)
 * [clone this repo](https://help.github.com/articles/cloning-a-repository/) to your computer and go in the project folder
 ```
-git clone https://github.com/microsoft/pxt-calliope
-cd pxt-calliope
+git clone https://github.com/microsoft/pxt-microbit
+cd pxt-microbit
 ```
 * install the PXT command line (add ``sudo`` for Mac/Linux shells).
 ```
@@ -32,15 +32,14 @@ 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). On Windows, you must be running
-from the ``Run Yotta`` command prompt.
+If you need modify the `.cpp` files, turn on yotta compilation with the ``-yt`` flag (add ``sudo`` for Mac/Linux shells):
 ```
 pxt serve -yt
 ```
@@ -54,6 +53,11 @@ pxt update
 
 More instructions at https://github.com/Microsoft/pxt#running-a-target-from-localhost 
 
+### Building
+
+* Install Visual Studio 2015 Update 2 or higher. Make sure the Windows 10 templates are installed.
+* open the ``win10/app.sln`` solution and launch the ``codethemicrobit`` project.
+
 ## Testing
 
 The build automatically runs the following:
@@ -62,6 +66,7 @@ The build automatically runs the following:
 * `pxt run` in `libs/lang-test*` - this will run the test in command line runner; 
   there is a number of asserts in both of these
 * `pxt testdir` in `tests` - this makes sure all the files compile and generates .hex files
+* run the TD->TS converter on a number of test scripts from `microbit.co.uk` and make sure the results compile
 
 To test something on the device:
 

clients/chrome/background.ts

@@ -61,7 +61,7 @@ function findNewDevices() {
 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)) {
+    if (/^(micro:bit|touchdevelop|yelm|pxt|codemicrobit|codethemicrobit)$/.test(port.name)) {
       ports.push(port);
       port.onDisconnect.addListener(function () {
         ports = ports.filter(function (x) { return x != port });

clients/chrome/manifest.json

@@ -11,8 +11,8 @@
   "author": "Microsoft Corporation",
   "short_name": "code the micro:bit",
 
-  "description": "Extension for https://pxt.microbit.org.",
-  "homepage_url": "https://pxt.microbit.org",
+  "description": "Extension for https://codethemicrobit.com.",
+  "homepage_url": "https://codethemicrobit.com",
   "offline_enabled": "true",
   "icons": {
     "48": "logo48.png",
@@ -25,6 +25,6 @@
   ],
 
   "externally_connectable": {
-    "matches": [ "*://localhost/*", "https://pxt.microbit.org/*", "https://*.microbit.org/*" ]
+    "matches": [ "*://localhost/*", "https://codethemicrobit.com/*", "https://*.codethemicrobit.com/*" ]
   }
 }

clients/macuploader/Microbit Uploader/AppDelegate.m

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

clients/macuploader/README.md

@@ -3,10 +3,10 @@
 ![](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,
+uploader](https://codethemicrobit.com/uploader), but for OS X. Once launched,
 the app runs in your menu bar and will automatically deploy any HEX files to
 your `micro:bit`. Like the Windows version, it is compatible with any browser
-that can run [pxt.microbit.org](http://pxt.microbit.org).
+that can run [codethemicrobit.com](http://codethemicrobit.com).
 
 ## Install the built version
 

clients/win10/app.sln

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

clients/win10/app/BundleArtifacts/neutral.txt

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

clients/win10/app/codethemicrobitapp.jsproj

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|AnyCPU">
+      <Configuration>Debug</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x86">
+      <Configuration>Debug</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|AnyCPU">
+      <Configuration>Release</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x86">
+      <Configuration>Release</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>39122940-ab16-4cd4-a0ce-79a3eb863ecf</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0'">
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" />
+  <PropertyGroup>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>$(VersionNumberMajor).$(VersionNumberMinor)</MinimumVisualStudioVersion>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <PackageCertificateKeyFile>pxtwinapp_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxBundle>Always</AppxBundle>
+    <AppxBundlePlatforms>neutral</AppxBundlePlatforms>
+  </PropertyGroup>
+  <ItemGroup>
+    <AppxManifest Include="package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+    <Content Include="msapp-error.js" />
+    <Content Include="msapp-error.css" />
+    <Content Include="msapp-error.html" />
+    <Content Include="images\LockScreenLogo.scale-200.png" />
+    <Content Include="images\SplashScreen.scale-200.png" />
+    <Content Include="images\Square150x150Logo.scale-200.png" />
+    <Content Include="images\Square44x44Logo.scale-200.png" />
+    <Content Include="images\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="images\StoreLogo.png" />
+    <Content Include="images\Wide310x150Logo.scale-200.png" />
+    <None Include="pxtwinapp_TemporaryKey.pfx" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
+  <!-- To modify your build process, add your task inside one of the targets below then uncomment
+       that target and the DisableFastUpToDateCheck PropertyGroup. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  <PropertyGroup>
+    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+  </PropertyGroup>
+  -->
+</Project>

clients/win10/app/codethemicrobitapp.sln

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

clients/win10/app/msapp-error.css

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

clients/win10/app/msapp-error.html

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

clients/win10/app/msapp-error.js

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

clients/win10/app/package.appxmanifest

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

clients/winuploader/Microbit.Uploader/MainForm.cs

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

cmds/cmds.ts

@@ -13,20 +13,20 @@ export function deployCoreAsync(res: ts.pxtc.CompileResult) {
     return getBitDrivesAsync()
         .then(drives => {
             if (drives.length == 0) {
-                console.log("cannot find any drives to deploy to");
-                return Promise.resolve(0);
+                let msg = "cannot find any drives to deploy to";
+                console.log(msg);
+                return Promise.reject(new Error(msg));
             }
 
-            console.log(`copy ${ts.pxtc.BINARY_HEX} to ` + drives.join(", "));
+            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);
-        });
+            return Promise.map(drives, d =>
+                writeFileAsync(d + ts.pxtc.BINARY_HEX, res.outfiles[ts.pxtc.BINARY_HEX])
+                    .then(() => {
+                        console.log("wrote hex file to " + d)
+                    }))
+        })
+        .then(() => { })
 }
 
 function getBitDrivesAsync(): Promise<string[]> {

docfiles/apptracking.html

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

docfiles/tracking.html

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

docs/about.md

@@ -79,7 +79,7 @@ When code is compiled to ARM machine code, the calls to JavaScript micro:bit fun
 
 ## [Command Line Tools](/cli)
 
-Looking to use pxt.microbit.org in your favorite editor? Install the [command line tools](/cli) and get rolling!
+Looking to use codethemicrobit.com in your favorite editor? Install the [command line tools](/cli) and get rolling!
 
 ## [Packages](/packages)
 

docs/beta-ref.json

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

docs/browsers.md

@@ -1,6 +1,6 @@
 # Unsupported configuration
 
-[pxt.microbit.org](https://pxt.microbit.org) doesn't currently support
+[codethemicrobit.com](https://codethemicrobit.com) doesn't currently support
 your browser or operating system. The following configurations are supported:
 
 ## Windows

docs/browsers/technical.md

@@ -1,12 +1,12 @@
 # Technical information about browser support
 
-[pxt.microbit.org][] requires that you use a recent version of a modern
+[codethemicrobit.com][] 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
+[codethemicrobit.com]: https://codethemicrobit.com
 [web workers]: http://www.w3.org/TR/workers/
 [typescript]: http://www.typescriptlang.org
 [monaco]: https://microsoft.github.io/monaco-editor/

docs/cli.md

@@ -6,7 +6,7 @@ basic.forever(() => {
 })
 ```
 
-It is possible to use the tools from a command line interface (CLI). The PXT CLI allows to 
+It is possible to use the codethemicrobit 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

docs/device/serial.md

@@ -29,7 +29,7 @@ Unfortunately, using the serial library requires quite a bit of a setup.
 If you are using the Google Chrome browser, you can use our extension to get serial data streaming in the editor.
 
 * Install the [Extension for BBC micro:bit](https://chrome.google.com/webstore/detail/extension-for-bbc-microbi/cihhkhnngbjlhahcfmhekmbnnjcjdbge?hl=en-US) on the Chrome Web Store.
-* Restart Chrome and open the [web editor](https://pxt.microbit.org)
+* Restart Chrome and open the [web editor](https://codethemicrobit.com)
 * The serial data will show below the simulator
 
 ### Windows

docs/device/usb/mac-chrome.md

@@ -34,7 +34,7 @@ it appears as a new drive under Devices.
 
 ## Step 2: Download your program
 
-1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
 2. Click **Download**
 3. When prompted, choose to **save** the compiled file onto your computer. The
    prompt will be different depending on which browser you are using, or

docs/device/usb/mac-firefox.md

@@ -34,7 +34,7 @@ it appears as a new drive under Devices.
 
 ## Step 2: Download your program
 
-1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
 2. Click **Download**
 3. When prompted, choose to **save** the compiled file onto your computer. The
    prompt will be different depending on which browser you are using, or

docs/device/usb/mac-safari.md

@@ -34,7 +34,7 @@ it appears as a new drive under Devices.
 
 ## Step 2: Download your program
 
-1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
 2. Click **Download**
 3. When prompted, choose to **save** the compiled file onto your computer. The
    prompt will be different depending on which browser you are using, or

docs/device/usb/windows-chrome.md

@@ -41,7 +41,7 @@ it appears as a new drive under Devices.
 
 ## Step 2: Download your program
 
-1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
 2. Click **Download**
 3. When prompted, choose to **save** the compiled file onto your computer. The
    prompt will be different depending on which browser you are using, or

docs/device/usb/windows-edge.md

@@ -43,7 +43,7 @@ it appears as a new drive under Devices.
 
 ## Step 2: Download your program
 
-1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
 2. Click **Download**
 3. When prompted, choose to **save** the compiled file onto your computer. The
    prompt will be different depending on which browser you are using, or

docs/device/usb/windows-firefox.md

@@ -43,7 +43,7 @@ it appears as a new drive under Devices.
 
 ## Step 2: Download your program
 
-1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
 2. Click **Download**
 3. When prompted, choose to **save** the compiled file onto your computer. The
    prompt will be different depending on which browser you are using, or

docs/device/usb/windows-ie.md

@@ -41,7 +41,7 @@ it appears as a new drive under Devices.
 
 ## Step 2: Download your program
 
-1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
 2. Click **Download**
 3. When prompted, choose to **save** the compiled file onto your computer. The
    prompt will be different depending on which browser you are using, or

docs/docs.md

@@ -5,8 +5,7 @@
 ### Things to do
 
 * **[Getting Started](/getting-started)**
-* [Projects](/projects)
-* [Lessons](/lessons)
+* [Ten projects](/projects)
 
 ### Micro:bit reference
 
@@ -17,15 +16,16 @@
 
 * [Blocks language](/blocks)
 * [JavaScript language](/javascript)
+* [Streaming data](/streaming)
 
 ### More questions?
 
 * [Frequently Asked Question](/faq)
-* [Help Translate](/translate)
 * [Embedding project](/share)
+* [Help Translate](/translate)
+* [Release notes](/release-notes)
 
 ### Developers
 
 * [Command Line Interface](/cli)
 * Learn about [packages](/packages)
-* [Release notes](/release-notes)

docs/faq.md

@@ -2,4 +2,33 @@
 
 ### @description Frequently asked questions and answers from our users.
 
-Please search for solutions or open a ticket at [support.microbit.org](https://support.microbit.org)!
+### Where can I get a BBC micro:bit?
+
+More information at [http://uk.farnell.com/bbc-microbit](http://uk.farnell.com/bbc-microbit).
+
+### How do I send feedback?
+
+Find the small bubble icon on the bottom of the editor and
+post your feedback from there!
+
+### How do I save my code?
+
+The web editor automatically saves your code in the browser cache. Simply reopen the browser and navigate to the web editor 
+to reopen your latest project. You can also open previous project stored locally through **More -> Open Project**.
+
+The project source is also stored in each compiled ``.hex`` file. Drag and drop the ``.hex`` file into the web editor to load the project.
+
+To share your project with others, you can use the [Embed Project...](/share). 
+It stores your project in the cloud and creates a URL that you can share with others.
+
+If you are using [Visual Studio Code](/code), all your programs are stored as files on your computer and you can use your favorite source control system as needed.
+
+## Is the web site available in other languages?
+
+You can [help us translate](/translate) the web site, documentation and blocks via our crowd-source translations! 
+
+## Troubleshooting
+
+### My micro:bit does not show up as a drive when I connect it to my computer.
+
+A common cause for this is a broken cable. Pick another USB cable and try it. Otherwise, try another computer as well.

docs/index-ref.json

@@ -1,3 +1,3 @@
 {
-    "appref": "v0.5.50"
+  "appref": "264aab1cff34042de75045e93c20ceb7b8c861a0"
 }

docs/js/sequence.md

@@ -41,8 +41,8 @@ In JavaScript, there is the concept of an *empty statement*, which is whitespace
 a semicolon in the context where a statement is expected.
 So, the following code is an infinite loop
 followed by a call to `showNumber` that will never execute:
-```typescript-ignore
-while(true) ;
+```typescript
+while(true) ;  
 basic.showNumber(1);
 ```
 

docs/js/types.md

@@ -51,8 +51,6 @@ I'll be ${ age + 1 } years old next month.`
 This is equivalent to declaring `sentence` like so:
 
 ```ts
-let fullName: string = `Bob Bobbington`;
-let age: number = 37;
 let sentence: string = "Hello, my name is " + fullName + ".\n\n" +
     "I'll be " + (age + 1) + " years old next month."
 ```
@@ -84,7 +82,7 @@ A helpful addition to the standard set of datatypes from JavaScript is the `enum
 As in languages like C#, an enum is a way of giving more friendly names to sets of numeric values.
 
 ```ts
-enum Color {Red, Green, Blue}
+enum Color {Red, Green, Blue};
 let c: Color = Color.Green;
 ```
 
@@ -93,14 +91,14 @@ You can change this by manually setting the value of one of its members.
 For example, we can start the previous example at `1` instead of `0`:
 
 ```ts
-enum Color {Red = 1, Green, Blue}
+enum Color {Red = 1, Green, Blue};
 let c: Color = Color.Green;
 ```
 
 Or, even manually set all the values in the enum:
 
 ```ts
-enum Color {Red = 1, Green = 2, Blue = 4}
+enum Color {Red = 1, Green = 2, Blue = 4};
 let c: Color = Color.Green;
 ```
 

docs/lessons/bop-it/activity.md

@@ -6,43 +6,43 @@ a game similar to "Simon Says" with the BBC micro:bit.
 
 Complete the following guided tutorial. Your code should look like this:
 
-```typescript
-let action  = 0;
-function newAction() {}
+```blocks
+newAction() // ***
 input.onButtonPressed(Button.A, () => {
     if (action == 0) {
-        game.addScore(1);
-        newAction();
+        game.addScore(1) // ***
+        newAction() // ***
     }
-})
+}) // ***
 input.onLogoDown(() => {
     if (action == 1) {
-        game.addScore(1);
-        newAction();
+        game.addScore(1) // ***
+        newAction() 
     }
 }) 
 input.onGesture(Gesture.Shake, () => {
     if (action == 2) {
-        game.addScore(1);
-        newAction();
+        game.addScore(1)
+        newAction()
     }
 }) 
 input.onButtonPressed(Button.B, () => {
-    basic.showNumber(game.score(), 150);
-    basic.pause(2000);
-    newAction();
+    basic.showNumber(game.score(), 150) // ***
+    basic.pause(2000) // ***
+    newAction() // ***
 }) 
 ```
 
 ### Challenge 1
 
-Now let's add some more types of instructions for the player to follow. Let's add `PRESS PIN 0`. 
-Change the global variable `action` to `math->random(4)` so that we can add a new **IF** statement that checks if `action=3`. If it does, display instructions to press pin 0.
+Now let's add some more types of instructions for the player to follow. Let's add `PRESS PIN 0`. Change the global variable `action` to `math->random(4)` so that we can add a new **IF** statement that checks if `action=3`. If it does, display instructions to press pin 0.
 
-```typescript
-let action  = 0;
+```blocks
+/**
+ * {highlight}
+ */
 export function newAction() {
-    action = Math.random(4)
+    action = Math.random(4) // ***
     if (action == 0) {
         basic.showString("PUSH A", 150) // ***
     }
@@ -62,22 +62,19 @@ export function newAction() {
 
 Now let's implement `PRESS PIN 0` in the main. Create a condition of `input->on pin pressed("P0")` that will add one to the score and calls the method `new action`.
 
-```typescript
-let action  = 0;
-export function newAction() {
-    // ...
-}
+```blocks
+// **. . .**
 input.onButtonPressed(Button.B, () => {
-    basic.showNumber(game.score(), 150)
-    basic.pause(2000)
-    newAction()
-})
+    basic.showNumber(game.score(), 150) // ***
+    basic.pause(2000) // ***
+    newAction() // ***
+}) // ***
 input.onPinPressed(TouchPin.P0, () => {
     if (action == 3) {
-        game.addScore(1)
-        newAction()
+        game.addScore(1) // ***
+        newAction() // ***
     }
-})
+}) // ***
 ```
 
 ### Challenge 3

docs/lessons/charting/challenge.md

@@ -88,5 +88,5 @@ Have fun reviewing your simulation and analyze the acceleration by chart the Exc
 * Display acceleration with y or z using plot bar graph by changing acceleration from "x" to "y" or "z" 
 
 ```package
-radio
+microbit-radio
 ```

docs/lessons/headbands/quiz-answers.md

@@ -29,7 +29,6 @@ Write the line of code that will display the string "puppy" using `data->coll`.
 <br/>
 
 ```blocks
-let coll: string[] = []
 basic.showString(coll[0], 150)
 ```
 
@@ -47,7 +46,6 @@ Write the line of code that will display the string "cat" using `data->coll`.
 <br/>
 
 ```blocks
-let coll: string[] = []
 basic.showString(coll[2], 150)
 ```
 

docs/lessons/pogo.md

@@ -44,5 +44,5 @@ radio.onDataReceived(() => { })
 * learn how to pause your code for the specified number of milliseconds
 
 ```package
-radio
+microbit-radio
 ```

docs/lessons/pogo/activity.md

@@ -164,5 +164,5 @@ Connect the second micro:bit to your computer using your USB cable and run the p
 The first person and second person take turns jumping in the “y” direction while the other player uses the micro:bit to track the results on the micro:bit!
 
 ```package
-radio
+microbit-radio
 ```

docs/lessons/seismograph.md

@@ -35,5 +35,5 @@ radio.receiveNumber();
 * learn how to read the connector value as analog as a value comprised between 0 and 1023
 
 ```package
-radio
+microbit-radio
 ```

docs/lessons/seismograph/challenge.md

@@ -196,5 +196,5 @@ Let's select Style 10 as an example.
 * Review and analyze the actual micro:bit device acceleration data on Excel
 
 ```package
-radio
+microbit-radio
 ```

docs/lessons/spinner/quiz-answers.md

@@ -25,9 +25,8 @@ let randomArrow = Math.random(4)
 <br/>
 
 ```blocks
-let randomArrow = Math.random(4);
 if (randomArrow == 1) {
-    basic.showLeds(`
+    basic.plotImage(`
 . . # . .
 . . # . .
 # # # # #
@@ -44,9 +43,8 @@ if (randomArrow == 1) {
 <br />
 
 ```blocks
-let randomArrow = Math.random(4);
 if (randomArrow == 2) {
-    basic.showLeds(`
+    basic.plotImage(`
 . . # . .
 . . # # .
 # # # # #

docs/offline.md

@@ -2,7 +2,7 @@
 
 ## Web application
 
-**https://pxt.microbit.org is an HTML5 web application** that automatically gets cached locally by your browser. 
+**https://codethemicrobit.com is an HTML5 web application** that automatically gets cached locally by your browser. 
 Once the web app is loaded and you have compiled at least once, you will have all the code needed to work without an internet connection.
 
 ## Command line interface

docs/projects.md

@@ -70,19 +70,6 @@ Fun games to build with your micro:bit.
 }]
 ```
 
-## From the community
-
-Projects contributed by the micro:bit community
-
-```codecard
-[{
-  "name": "Magic Button Trick",
-  "url":"/projects/magic-button-trick",
-  "imageUrl":"/static/mb/projects/magic-button-trick.png"
-}]
-```
-
-
 ### See Also
 
 [Flashing Heart](/projects/flashing-heart), [Smiley Buttons](/projects/smiley-buttons), [Love Meter](/projects/love-meter), [Rock Paper Scissors](/projects/rock-paper-scissors), [Compass](/projects/compass), [Hack your headphones](/projects/hack-your-headphones), [Banana keyboard](/projects/banana-keyboard), [Telegraph](/projects/telegraph), [Radio](/projects/radio), [Guitar](/projects/guitar), [Watch](/projects/the-watch)

docs/projects/guitar/displaybuttons.md

@@ -43,7 +43,7 @@ music.beat(BeatFraction.Quarter)
 ```
 
 ## Step 1: Make a Smiley
-Open [pxt.microbit.org](https://pxt.microbit.org) in your web browser
+Open [codethemicrobit.com](https://codethemicrobit.com) in your web browser
 ```blocks
     basic.showLeds(`
         . # . # .

docs/projects/hack-your-headphones.md

@@ -21,7 +21,7 @@ Build your own music player micro:bit from headphones.
 
 ## Activities
 
-* [Connect your headphone](/projects/hack-your-headphones/making)
+* [Connect your headphone](/projects/hack-your-headphone/making)
 * [Play sounds!]()
 
 # ~hint

docs/projects/magic-button-trick.md

@@ -1,101 +0,0 @@
-# magic button trick 
-
-Perform a magic trick where you appear to make the **A** and **B** button of your micro:bit swap over just by moving a sticky label. 
-
-### ~avatar avatar
-
-Welcome! This activity will teach you how to use the micro:bit's compass to detect a nearby magnet
-
-### ~
-This is a simple magic trick you can perform to amaze your friends, where by moving the sticky labels on your micro:bit's **A** and **B** button you appear to make the buttons really switch over. To see the trick performed watch the video below.
-
-https://youtu.be/-9KvmPopov8
-
-## How the trick works
-
-Unfortunately, the only magic here is in the code. This trick uses a magnet, hidden in your hand, to tell the micro:bit to swap over the buttons so that when the magnet is near the microbit the **A** button starts working like the **B** button and the **B** button starts working like the **A** button.
-
-## What you need
-
-The only things you need for this trick are your micro:bit and any magnet that is small enough to fit in your hand, even a fridge magnet will work.
-
-![](/static/mb/projects/magic-button-trick/magnets.jpg "Magnets")
-
-
-## Step 1: getting the buttons to display **A** and **B**
-
-Before we code the trick itself, we need to get the buttons working as you would expect them to so that pressing button **A** displays 'A' and pressing button **B** displays 'B':
-
-```blocks
-input.onButtonPressed(Button.A, () => {
-    basic.showString("A")
-})
-input.onButtonPressed(Button.B, () => {
-    basic.showString("B")
-})
-```
-
-## Step 2: measuring magnetic force
-
-We will use the micro:bit's compass to detect the magnet. Compass's tell us what direction we are pointing by detecting the Earth's magnetic field but they can also detect any other magnet nearby. We will use that to check if our magnet is next to the micro:bit by using the [magnetic force](/reference/input/magnetic-force) block found in the input menu's 'more' section. As we only want to measure the strength we change the drop down to select 'strength':
-
-```blocks
-input.magneticForce(Dimension.Strength)
-```
-
-## Step 3: checking if the magnetic is nearby
-
-Now we can measure the magnetic force near the microbit, we can check if the value we measure is so big that it means there must be a strong magnet nearby. 
-
-If you have ever played with magnets you know they have two ends, often called a north and south 'pole'. Depending on which end of the magnet is pointing at the microbit the magnetic force measurement will either be a negative number like -100 or a positive number like 100. We just want to know if the strength is at least 100 we don't care if its negative or positive so we also use the 'absolute value of' block from the maths menu to tell our code to ignore the negative sign and just treat -100 as if its 100.
-
-So in the code below we will check if the absolute value of our magnetic field strength reading is more than 100 and save the result of that check in a new variable called 'isSwitched':
-
-```blocks
-let isSwitched = Math.abs(input.magneticForce(Dimension.Strength)) > 100
-```
-## Step 4: running our 'magnet nearby' check all the time
-
-At the moment our code to detect the magnet being nearby will only run once so we need to put it into a [forever](/reference/basic/forever) block so that it keeps getting run again and again checking for the magnet to come near to the micro:bit. We should also make sure 'isSwitched' is false when our program starts.
-
-```blocks
-let isSwitched = false;
-basic.forever(() => {
-	let isSwitched = Math.abs(input.magneticForce(Dimension.Strength)) > 100
-})
-```
-
-## Step 5: swapping the buttons when we know the magnet is nearby
-
-Now we can check the value of our variable 'isSwitched' whenever we want and we will know that the magnet is nearby if it's value is 'true'. Let's use that to change how the buttons work and complete the code for our trick. We will add an 'if, else' block to each button's code and check if we should swap over what each button displays because 'isSwitched' is equal to true:
-
-```blocks
-
-let isSwitched = false;
-basic.forever(() => {
-    isSwitched = Math.abs(input.magneticForce(Dimension.Strength)) > 100
-})
-
-input.onButtonPressed(Button.A, () => {
-    if (isSwitched) {
-        basic.showString("B")
-    } else {
-        basic.showString("A")
-    }
-})
-input.onButtonPressed(Button.B, () => {
-    if (isSwitched) {
-        basic.showString("A")
-    } else {
-        basic.showString("B")
-    }
-})
-
-```
-
-## step 5: practice your performance
-Now you just need to program your own micro:bit and practice the trick a few times before performing to friends. Try asking your friends to click the buttons after you have switched the labels and the trick won't work for them as they don't have a hidden magnet in their hand.
-
-
-## about the authors
-This project was contributed by Brian and Jasmine Norman, aka [@MicroMonstersUK](https://twitter.com/MicroMonstersUK). You can chekout their [micro:bit tutorials chanel on youtube](https://www.youtube.com/channel/UCK2DviDexh_Er2QYZerZyZQ) for more projects.

docs/projects/messenger.md

@@ -61,5 +61,5 @@ radio.onDataReceived(() => {
 
 
 ```package
-radio
+microbit-radio
 ```

docs/projects/radio-challenges.md

@@ -90,5 +90,5 @@ Have fun reviewing your simulation and analyze the acceleration by chart the Exc
 * Display acceleration with y or z using plot bar graph by changing acceleration from "x" to "y" or "z" 
 
 ```package
-radio
+microbit-radio
 ```

docs/projects/telegraph/manual-telegraph.md

@@ -8,6 +8,7 @@ We now need to digitally write to pin ``P0`` as **high** (1).
 
 ```blocks
 pins.digitalWritePin(DigitalPin.P0, 1)
+
 ```
 
 ### Step 2
@@ -18,6 +19,7 @@ So insert the appropriate LED plot x, y.
 ```blocks
 pins.digitalWritePin(DigitalPin.P0, 1)
 led.plot(2, 2)
+
 ```
 
 ### Step 3
@@ -29,7 +31,9 @@ Then add a condition that occurs if we do not turn on a LED with plot x, y. We a
 if (input.buttonIsPressed(Button.A)) {
     pins.digitalWritePin(DigitalPin.P0, 1)
     led.plot(2, 2)
-} else { }
+} else {
+
+}
 ```
 
 
@@ -59,8 +63,7 @@ basic.forever(() => {
     } else {
         pins.digitalWritePin(DigitalPin.P0, 0)
         led.unplot(2, 2)
-    }
-})
+    })
 ```
 
 ### Step 6
@@ -84,6 +87,9 @@ basic.forever(() => {
         basic.clearScreen();
     }
 });
+
+
+
 ```
 
 Your telegraph is ready!

docs/projects/timing-gates.md

@@ -87,7 +87,7 @@ The gate is ready to use! Your circuit should look like the picture below:
 
 ## Detecting the car with code
 
-The micro:bit provides an event [on pin pressed](/reference/input/on-pin-pressed) 
+The micro:bit provides an event [on pin pressed](/reference/pins/on-pin-pressed) 
 that is raised when a circuit between ``GND`` and a pin is detected. The circuit conductor could be a wire or even your body!
 We will attach a foil to the bottom of the car. When it passes over the gate, it connect both foil strips, close the circuit and trigger the event. 
 
@@ -146,7 +146,7 @@ Connect the crocodile plugs to the ``GND`` and ``P1`` pins on the micro:bit.
 
 ## Detecting the second gate
 
-Since the second gate is connected to pin ``P1``, we add a second [on pin pressed](/reference/input/on-pin-pressed) event
+Since the second gate is connected to pin ``P1``, we add a second [on pin pressed](/reference/pins/on-pin-pressed) event
 that display 2 columns of LEDs.
 
 ```blocks

docs/raspberry-pi.md

@@ -5,7 +5,7 @@ with [Raspbian Jessie with Pixel](https://www.raspberrypi.org/downloads/raspbian
 
 ## Web editor
 
-Starting with **Raspbian Pixel**, Raspbian comes with Chromium. Simply open [](https://pxt.microbit.org).
+Starting with **Raspbian Pixel**, Raspbian comes with Chromium. Simply open [](https://codethemicrobit.com).
 
 ## Command line
 

docs/reference.md

@@ -37,9 +37,9 @@ bluetooth.onBluetoothConnected(() => {});
 ```
   
 ```package
-radio
-devices
-bluetooth
+microbit-radio
+microbit-devices
+microbit-bluetooth
 ```
 
 ### See Also

docs/reference/basic.md

@@ -35,6 +35,4 @@ basic.showAnimation(`
 
 ### See Also
 
-[showNumber](/reference/basic/show-number), [showLeds](/reference/basic/show-leds), [showString](/reference/basic/show-string), 
-[clearScreen](/reference/basic/clear-screen), [forever](/reference/basic/forever), [pause](/reference/basic/pause), 
-[showAnimation](/reference/basic/show-animation)
+[showNumber](/reference/basic/show-number), [showLeds](/reference/basic/show-leds), [showString](/reference/basic/show-string), [clearScreen](/reference/basic/clear-screen), [forever](/reference/basic/forever), [pause](/reference/basic/pause), [plotLeds](/reference/basic/plot-leds), [showAnimation](/reference/basic/show-animation)

docs/reference/bluetooth.md

@@ -2,14 +2,6 @@
 
 Support for additional Bluetooth services.
 
-### ~hint
-![](/static/bluetooth/Bluetooth_SIG.png)
-
-For another device like a smartphone to use any of the Bluetooth "services" which the micro:bit has, it must first be [paired with the micro:bit](/reference/bluetooth/bluetooth-pairing). Once paired, the other device may connect to the micro:bit and exchange data relating to many of the micro:bit's features.
-
-### ~
-
-
 ```cards
 bluetooth.startAccelerometerService();
 bluetooth.startButtonService();
@@ -17,34 +9,20 @@ bluetooth.startIOPinService();
 bluetooth.startLEDService();
 bluetooth.startMagnetometerService();
 bluetooth.startTemperatureService();
-bluetooth.onBluetoothConnected(() => {});
-bluetooth.onBluetoothDisconnected(() => {});
-```
-
-## UART 
-
-```cards
-bluetooth.startUartService();
-bluetooth.uartReadUntil("");
-bluetooth.uartWriteString("");
-bluetooth.uartWriteNumber(0);
-bluetooth.uartWriteValue("", 0);
+bluetooth.uartRead("");
+bluetooth.uartWrite("");
+bluetooth.onBluetoothConnected(() => {
+    
+});
+bluetooth.onBluetoothDisconnected(() => {
+    
+});
 ```
 
 ```package
-bluetooth
+microbit-bluetooth
 ```
 
-### Advanced
- 
-For more advanced information on the micro:bit Bluetooth UART service including information on using a smartphone, see the [Lancaster University micro:bit runtime technical documentation](http://lancaster-university.github.io/microbit-docs/ble/uart-service/)
-
 ### See Also
 
-[startAccelerometerService](/reference/bluetooth/start-accelerometer-service), [startButtonService](/reference/bluetooth/start-button-service), [startIOPinService](/reference/bluetooth/start-io-pin-service), [startLEDService](/reference/bluetooth/start-led-service), [startMagnetometerService](/reference/bluetooth/start-magnetometer-service), [startTemperatureService](/reference/bluetooth/start-temperature-service), 
-[startUartService](/reference/bluetooth/start-uart-service),
-[uartReadUntil](/reference/bluetooth/uart-read-until), 
-[uartWriteString](/reference/bluetooth/uart-write-string), 
-[uartWriteNumber](/reference/bluetooth/uart-write-number), 
-[uartWriteValue](/reference/bluetooth/uart-write-value), 
-[onBluetoothConnected](/reference/bluetooth/on-bluetooth-connected), [onBluetoothDisconnected](/reference/bluetooth/on-bluetooth-disconnected)
+[startAccelerometerService](/reference/bluetooth/start-accelerometer-service), [startButtonService](/reference/bluetooth/start-button-service), [startIOPinService](/reference/bluetooth/start-io-pin-service), [startLEDService](/reference/bluetooth/start-led-service), [startMagnetometerService](/reference/bluetooth/start-magnetometer-service), [startTemperatureService](/reference/bluetooth/start-temperature-service), [uartRead](/reference/bluetooth/uart-read), [uartWrite](/reference/bluetooth/uart-write), [onBluetoothConnected](/reference/bluetooth/on-bluetooth-connected), [onBluetoothDisconnected](/reference/bluetooth/on-bluetooth-disconnected)

docs/reference/bluetooth/about-bluetooth.md

@@ -95,5 +95,5 @@ https://www.youtube.com/watch?v=aep_GVowKfs
 [About Bluetooth](/reference/bluetooth/about-bluetooth), [micro:bit Bluetooth profile overview ](http://lancaster-university.github.io/microbit-docs/ble/profile/), [micro:bit Bluetooth profile reference](http://lancaster-university.github.io/microbit-docs/resources/bluetooth/microbit-profile-V1.9-Level-2.pdf),  [Bluetooth on micro:bit resources](http://bluetooth-mdw.blogspot.co.uk/p/bbc-microbit.html), [Bluetooth SIG](https://www.bluetooth.com)
 
 ```package
-bluetooth
+microbit-bluetooth
 ```

docs/reference/bluetooth/bluetooth-pairing.md

@@ -96,5 +96,5 @@ If you do find yourself needing to pair again you will first need to remove the
 
 
 ```package
-bluetooth
+microbit-bluetooth
 ```

docs/reference/bluetooth/on-bluetooth-connected.md

@@ -33,5 +33,5 @@ http://www.youtube.com/watch?v=HyBcsD9Eh6I
 [About Bluetooth](/reference/bluetooth/about-bluetooth), [micro:bit Bluetooth profile overview ](http://lancaster-university.github.io/microbit-docs/ble/profile/), [micro:bit Bluetooth profile reference](http://lancaster-university.github.io/microbit-docs/resources/bluetooth/microbit-profile-V1.9-Level-2.pdf),  [Bluetooth on micro:bit resources](http://bluetooth-mdw.blogspot.co.uk/p/bbc-microbit.html), [Bluetooth SIG](https://www.bluetooth.com)
 
 ```package
-bluetooth
+microbit-bluetooth
 ```

docs/reference/bluetooth/on-bluetooth-disconnected.md

@@ -33,5 +33,5 @@ http://www.youtube.com/watch?v=HyBcsD9Eh6I
 [About Bluetooth](/reference/bluetooth/about-bluetooth), [micro:bit Bluetooth profile overview ](http://lancaster-university.github.io/microbit-docs/ble/profile/), [micro:bit Bluetooth profile reference](http://lancaster-university.github.io/microbit-docs/resources/bluetooth/microbit-profile-V1.9-Level-2.pdf),  [Bluetooth on micro:bit resources](http://bluetooth-mdw.blogspot.co.uk/p/bbc-microbit.html), [Bluetooth SIG](https://www.bluetooth.com)
 
 ```package
-bluetooth
+microbit-bluetooth
 ```

docs/reference/bluetooth/start-accelerometer-service.md

@@ -38,5 +38,5 @@ For more advanced information on the micro:bit Bluetooth accelerometer service i
 [About Bluetooth](/reference/bluetooth/about-bluetooth), [micro:bit Bluetooth profile overview ](http://lancaster-university.github.io/microbit-docs/ble/profile/), [micro:bit Bluetooth profile reference](http://lancaster-university.github.io/microbit-docs/resources/bluetooth/microbit-profile-V1.9-Level-2.pdf),  [Bluetooth on micro:bit resources](http://bluetooth-mdw.blogspot.co.uk/p/bbc-microbit.html), [Bluetooth SIG](https://www.bluetooth.com)
 
 ```package
-bluetooth
+microbit-bluetooth
 ```

docs/reference/bluetooth/start-button-service.md

@@ -42,5 +42,5 @@ For more advanced information on the micro:bit Bluetooth button service includin
 [About Bluetooth](/reference/bluetooth/about-bluetooth), [micro:bit Bluetooth profile overview ](http://lancaster-university.github.io/microbit-docs/ble/profile/), [micro:bit Bluetooth profile reference](http://lancaster-university.github.io/microbit-docs/resources/bluetooth/microbit-profile-V1.9-Level-2.pdf),  [Bluetooth on micro:bit resources](http://bluetooth-mdw.blogspot.co.uk/p/bbc-microbit.html), [Bluetooth SIG](https://www.bluetooth.com)
 
 ```package
-bluetooth
+microbit-bluetooth
 ```

docs/reference/bluetooth/start-io-pin-service.md

@@ -36,5 +36,5 @@ For more advanced information on the micro:bit Bluetooth IO pin service includin
 [About Bluetooth](/reference/bluetooth/about-bluetooth), [micro:bit Bluetooth profile overview ](http://lancaster-university.github.io/microbit-docs/ble/profile/), [micro:bit Bluetooth profile reference](http://lancaster-university.github.io/microbit-docs/resources/bluetooth/microbit-profile-V1.9-Level-2.pdf),  [Bluetooth on micro:bit resources](http://bluetooth-mdw.blogspot.co.uk/p/bbc-microbit.html), [Bluetooth SIG](https://www.bluetooth.com)
 
 ```package
-bluetooth
+microbit-bluetooth
 ```

docs/reference/bluetooth/start-led-service.md

@@ -38,5 +38,5 @@ For more advanced information on the micro:bit Bluetooth LED service including i
 [About Bluetooth](/reference/bluetooth/about-bluetooth), [micro:bit Bluetooth profile overview ](http://lancaster-university.github.io/microbit-docs/ble/profile/), [micro:bit Bluetooth profile reference](http://lancaster-university.github.io/microbit-docs/resources/bluetooth/microbit-profile-V1.9-Level-2.pdf),  [Bluetooth on micro:bit resources](http://bluetooth-mdw.blogspot.co.uk/p/bbc-microbit.html), [Bluetooth SIG](https://www.bluetooth.com)
 
 ```package
-bluetooth
+microbit-bluetooth
 ```

docs/reference/bluetooth/start-magnetometer-service.md

@@ -39,5 +39,5 @@ For more advanced information on the micro:bit Bluetooth magnetometer service in
 
 
 ```package
-bluetooth
+microbit-bluetooth
 ```

docs/reference/bluetooth/start-temperature-service.md

@@ -39,6 +39,6 @@ For more advanced information on the micro:bit Bluetooth temperature service inc
 
 
 ```package
-bluetooth
+microbit-bluetooth
 ```
 

docs/reference/bluetooth/start-uart-service.md

@@ -40,5 +40,5 @@ For more advanced information on the micro:bit Bluetooth UART service including
 [About Bluetooth](/reference/bluetooth/about-bluetooth), [micro:bit Bluetooth profile overview ](http://lancaster-university.github.io/microbit-docs/ble/profile/), [micro:bit Bluetooth profile reference](http://lancaster-university.github.io/microbit-docs/resources/bluetooth/microbit-profile-V1.9-Level-2.pdf),  [Bluetooth on micro:bit resources](http://bluetooth-mdw.blogspot.co.uk/p/bbc-microbit.html), [Bluetooth SIG](https://www.bluetooth.com)
 
 ```package
-bluetooth
+microbit-bluetooth
 ```

docs/reference/bluetooth/uart-read.md

@@ -7,12 +7,12 @@ For another device like a smartphone to use any of the Bluetooth "services" whic
 
 ### ~
 
-The [Bluetooth UART service](/reference/bluetooth/start-uart-service) allows another device such as a smartphone to exchange any data it wants to with the micro:bit, in small chunks. 
+The [Bluetooth UART service](start-uart-service.md) allows another device such as a smartphone to exchange any data it wants to with the micro:bit, in small chunks. 
 
 With the Bluetooth UART service running, this block allows a micro:bit to read data which has been received from a Bluetooth connected device, terminating reading and returning the value obtained as soon as a specified delimiter character is encountered. This means that connected devices can send data to the micro:bit and indicate that the complete message has been sent by appending the message with the delimiter character.
 
 ```sig
-bluetooth.uartReadUntil("");
+bluetooth.uartRead("");
 ```
 
 ### Example: Starting the Bluetooth UART service and then reading data received from another device which is terminated by ":" character and then displaying it
@@ -25,7 +25,7 @@ bluetooth.onBluetoothConnected(() => {
     basic.showString("C");
     connected = 1;
     while (connected == 1) {
-        uartData = bluetooth.uartReadUntil(":");
+        uartData = bluetooth.uartRead(":");
         basic.showString(uartData);
     }
 });
@@ -48,5 +48,5 @@ For more advanced information on the micro:bit Bluetooth UART service including
 [About Bluetooth](/reference/bluetooth/about-bluetooth), [micro:bit Bluetooth profile overview ](http://lancaster-university.github.io/microbit-docs/ble/profile/), [micro:bit Bluetooth profile reference](http://lancaster-university.github.io/microbit-docs/resources/bluetooth/microbit-profile-V1.9-Level-2.pdf),  [Bluetooth on micro:bit resources](http://bluetooth-mdw.blogspot.co.uk/p/bbc-microbit.html), [Bluetooth SIG](https://www.bluetooth.com)
 
 ```package
-bluetooth
+microbit-bluetooth
 ```