0.4.58

* aligning uart apis with serial

* reorganizing serial/bluetooth blocks

* Autoupdate configuration for UART. (#279)

* Autoupdate configuration for UART.

* removing serial autoupdates.

README.md

@@ -3,7 +3,7 @@
 This target allow to program a [BBC micro:bit](https://www.microbit.co.uk/) using 
 PXT ([Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt)).
 
-* [Try it live](https://codethemicrobit.com)
+* [Try it live](https://pxt.microbit.org)
 
 [![Build Status](https://travis-ci.org/Microsoft/pxt-microbit.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-microbit)
 
@@ -53,11 +53,6 @@ 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:

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)$/.test(port.name)) {
+    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 });

clients/chrome/manifest.json

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

clients/macuploader/Microbit Uploader/AppDelegate.m

@@ -124,7 +124,7 @@
 }
 
 - (void)launchEditor:(id)sender {
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://codethemicrobit.com/"]];
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://pxt.microbit.org/"]];
 }
 
 @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://codethemicrobit.com/uploader), but for OS X. Once launched,
+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 [codethemicrobit.com](http://codethemicrobit.com).
+that can run [pxt.microbit.org](http://pxt.microbit.org).
 
 ## Install the built version
 

clients/win10/app.sln

@@ -1,48 +0,0 @@
-
-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

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

clients/win10/app/codethemicrobitapp.jsproj

@@ -1,85 +0,0 @@
-<?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

@@ -1,48 +0,0 @@
-
-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

@@ -1,17 +0,0 @@
-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

@@ -1,26 +0,0 @@
-<!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

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

@@ -1,50 +0,0 @@
-<?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://codethemicrobit.com#uploader"); } catch (Exception) { }
+            try { Process.Start("https://pxt.microbit.org#uploader"); } catch (Exception) { }
         }
 
         private void initializeFileWatch()
@@ -236,7 +236,7 @@ namespace Microsoft.MicroBit
         {
             try
             {
-                Process.Start("https://codethemicrobit.com/uploader");
+                Process.Start("https://pxt.microbit.org/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) {
-                let msg = "cannot find any drives to deploy to";
-                console.log(msg);
-                return Promise.reject(new Error(msg));
+                console.log("cannot find any drives to deploy to");
+                return Promise.resolve(0);
             }
 
-            console.log(`copy ${ts.pxtc.BINARY_HEX} to ` + drives.join(", "))
+            console.log(`copy ${ts.pxtc.BINARY_HEX} to ` + drives.join(", "));
 
-            return Promise.map(drives, d =>
-                writeFileAsync(d + ts.pxtc.BINARY_HEX, res.outfiles[ts.pxtc.BINARY_HEX])
-                    .then(() => {
-                        console.log("wrote hex file to " + d)
-                    }))
-        })
-        .then(() => { })
+            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[]> {

docfiles/apptracking.html

@@ -2,5 +2,5 @@
     (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 });
+    if (typeof pxtConfig !== "undefined") mixpanel.register({ target: pxtConfig.targetId, version: pxtConfig.targetVersion, targetVersion: pxtConfig.targetId + '/' + pxtConfig.targetVersion });
 </script>

docfiles/tracking.html

@@ -2,5 +2,5 @@
     (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 });    
+    if (typeof pxtConfig !== "undefined") mixpanel.register({ target: pxtConfig.targetId, version: pxtConfig.targetVersion, targetVersion: pxtConfig.targetId + '/' + 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 codethemicrobit.com in your favorite editor? Install the [command line tools](/cli) and get rolling!
+Looking to use pxt.microbit.org in your favorite editor? Install the [command line tools](/cli) and get rolling!
 
 ## [Packages](/packages)
 

docs/browsers.md

@@ -1,6 +1,6 @@
 # Unsupported configuration
 
-[codethemicrobit.com](https://codethemicrobit.com) doesn't currently support
+[pxt.microbit.org](https://pxt.microbit.org) 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
 
-[codethemicrobit.com][] requires that you use a recent version of a modern
+[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][].
 
-[codethemicrobit.com]: https://codethemicrobit.com
+[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/

docs/cli.md

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

docs/device/crocodile-clips.md

@@ -1,11 +1,40 @@
 # crocodile clips
 
-The large holes at the bottom of the board are designed to attach alligator/crocodile clips.
-Register an event that will execute whenever the user attaches one side of the crocodile clip to the `GND` pin, then connects and disconnects the unattached side of the crocodile clip to pin `0`, `1`, or `2`.
+The large holes at the bottom of the board are designed to attach alligator/crocodile clips 
+to create electrical circuit with other components.
 
-### Example: on pin pressed with random numbers
+# ~hint
 
-This example displays a random number every time the crocodile clip holds  `GND` then connects and disconnects the `P0` pin. Each time the crocodile clip is firmly connected and disconnected from pin `P0`, the micro:bit will return a random Number between 0 and the parameter limit
+**No crocodile clips!?!?!** Use wires or Aluminium foil! [Read more...](/device/foil-circuits)
+
+# ~
+
+
+## Connecting Crocodile Clips
+
+The hole for ``P0`` and ``GND`` allow to grab the board on the side which makes for a great grip.
+
+![](/static/mb/device/croc-clips/crocclipsclamped.jpg)
+
+Pass one jaw in the hole and grab the side of the board with the other jaw.
+
+![](/static/mb/device/croc-clips/sideclamp.jpg)
+
+For the center holes, ``P1`` and ``P2``, you can also grab the bottom of the board but they are a bit harder to grip.
+
+You can also grip the board between the jaws. In which case, you will want to make sure to avoid overlapping the jaws 
+with the other pins as it will create short-circuit in the board.
+
+![](/static/mb/device/croc-clips/badclamp.jpg)
+
+Adding a little tape helps keeping the crocodile clips in place.
+
+![](/static/mb/device/croc-clips/frontclamp.jpg)
+
+## Example: on pin pressed with random numbers
+
+This example displays a random number every time the crocodile clip holds  `GND` then connects and disconnects the `P0` pin. 
+Each time the crocodile clip is firmly connected and disconnected from pin `P0`, the micro:bit will return a random Number between 0 and the parameter limit.
 
 ```blocks
 input.onPinPressed(TouchPin.P0, () => {
@@ -13,11 +42,6 @@ input.onPinPressed(TouchPin.P0, () => {
 })
 ```
 
-### Connecting Crocodile Clips
-
-![](/static/mb/crocodile-clips-2.jpg)
-
-### See also
-
-[micro:bit pins](/device/pins), [pin is pressed](/reference/input/pin-is-pressed), [analog read pin](/reference/pins/analog-read-pin), [analog write pin](/reference/pins/analog-write-pin), [digital read pin](/reference/pins/digital-read-pin), [digital write pin](/reference/pins/digital-write-pin)
+## See also
 
+[micro:bit pins](/device/pins)

docs/device/error-codes.md

@@ -1,7 +1,5 @@
 # Error codes
 
-The micro:bit error codes
-
 Your micro:bit may encounter a situation that prevents it from running your code. When this happens, a frowny face will appear on your micro:bit screen (see picture) followed by an error number.
 
 Below is a list of error numbers and what they mean:

docs/device/foil-circuits.md

@@ -0,0 +1,52 @@
+# foil circuits
+
+The large holes at the bottom of the board are designed to attach alligator/crocodile clips 
+to create electrical circuit with other components.
+
+If you do not have crocodile clips at hand, dyou can use wires or even Aluminium foil to acheive the same result.
+We will show you how to connect the micro:bit to headphones using Alumunium foil and tape.
+
+https://youtu.be/mhXYyPuvpz0
+
+### Materials
+
+* micro:bit and battery pack (you can also power it via USB)
+* a small piece of cardboard
+* Aluminium foil
+* tape
+
+### Assembly instructions
+
+Tape the micro:bit and battery pack to the card board. Make sure to remove the batteries while you are building your circuit.
+
+![](/static/mb/device/croc-clips/microbitattached.jpg)
+
+Cut the thinest strip of foil possible and roll it into a cable. You can also try to fold, whatever works for you.
+Build two of those wires.
+
+![](/static/mb/device/croc-clips/foilcut.jpg)
+
+Place the foil wire on the ``GND`` pin and attach with a piece of tape. Press hard to get the best connection between
+the foil and the pin board. Make sure the foil is not overlapping with the other pins!
+
+![](/static/mb/device/croc-clips/groundconnected.jpg)
+
+Place the second wire on the ``P0`` pin the same way. Make sure the wire does not overlap with the other pins!
+
+![](/static/mb/device/croc-clips/microbitconnect.jpg)
+
+Tape the headphone jack connector to the cardboard and roll the wire coming from ``GND`` around the metal base. 
+Make sure the wire does not touch the other metal rings on the jack.
+
+![](/static/mb/device/croc-clips/jackground.jpg)
+
+Tape the second wire on the head of the jack connector.
+
+![](/static/mb/device/croc-clips/jackconnect.jpg)
+
+![](/static/mb/device/croc-clips/foilcircuit.jpg)
+
+
+## See also
+
+[micro:bit pins](/device/pins)

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://codethemicrobit.com)
+* Restart Chrome and open the [web editor](https://pxt.microbit.org)
 * 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 [codethemicrobit.com](https://codethemicrobit.com)
+1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
 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 [codethemicrobit.com](https://codethemicrobit.com)
+1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
 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 [codethemicrobit.com](https://codethemicrobit.com)
+1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
 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 [codethemicrobit.com](https://codethemicrobit.com)
+1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
 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 [codethemicrobit.com](https://codethemicrobit.com)
+1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
 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 [codethemicrobit.com](https://codethemicrobit.com)
+1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
 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 [codethemicrobit.com](https://codethemicrobit.com)
+1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
 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,7 +5,8 @@
 ### Things to do
 
 * **[Getting Started](/getting-started)**
-* [Ten projects](/projects)
+* [Projects](/projects)
+* [Lessons](/lessons)
 
 ### Micro:bit reference
 
@@ -16,16 +17,15 @@
 
 * [Blocks language](/blocks)
 * [JavaScript language](/javascript)
-* [Streaming data](/streaming)
 
 ### More questions?
 
 * [Frequently Asked Question](/faq)
-* [Embedding project](/share)
 * [Help Translate](/translate)
-* [Release notes](/release-notes)
+* [Embedding project](/share)
 
 ### Developers
 
 * [Command Line Interface](/cli)
 * Learn about [packages](/packages)
+* [Release notes](/release-notes)

docs/offline.md

@@ -2,7 +2,7 @@
 
 ## Web application
 
-**https://codethemicrobit.com is an HTML5 web application** that automatically gets cached locally by your browser. 
+**https://pxt.microbit.org 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/flashing-heart.md

@@ -7,11 +7,12 @@
 ```sim
 basic.forever(() => {
 basic.showLeds(`
-. # . # .
-# # # # #
-# # # # #
-. # # # .
-. . # . .`);
+    . # . # .
+    # # # # #
+    # # # # #
+    . # # # .
+    . . # . .`
+    );
 basic.pause(500);
 basic.clearScreen();
 basic.pause(500);
@@ -29,11 +30,12 @@ Use [show leds](/reference/basic/show-leds) and make your code look like this:
 
 ```blocks
 basic.showLeds(`
-. # . # .
-# # # # #
-# # # # #
-. # # # .
-. . # . .`);
+    . # . # .
+    # # # # #
+    # # # # #
+    . # # # .
+    . . # . .`
+    );
 ```
 
 ## Step 2
@@ -42,11 +44,11 @@ Add a [pause](/reference/basic/pause) to wait and [clear screen](/reference/basi
 
 ```blocks
 basic.showLeds(`
-. # . # .
-# # # # #
-# # # # #
-. # # # .
-. . # . .`);
+    . # . # .
+    # # # # #
+    # # # # #
+    . # # # .
+    . . # . .`);
 basic.pause(500);
 basic.clearScreen();
 ```
@@ -58,11 +60,12 @@ Put a [forever loop](/reference/basic/forever) around it.
 ```blocks
 basic.forever(() => {
 basic.showLeds(`
-. # . # .
-# # # # #
-# # # # #
-. # # # .
-. . # . .`);
+    . # . # .
+    # # # # #
+    # # # # #
+    . # # # .
+    . . # . .`
+    );
 basic.pause(500);
 basic.clearScreen();
 })
@@ -75,11 +78,12 @@ Add a [pause](/reference/basic/pause) to wait after clearing the screen.
 ```blocks
 basic.forever(() => {
 basic.showLeds(`
-. # . # .
-# # # # #
-# # # # #
-. # # # .
-. . # . .`);
+    . # . # .
+    # # # # #
+    # # # # #
+    . # # # .
+    . . # . .`
+    );
 basic.pause(500);
 basic.clearScreen();
 basic.pause(500);
@@ -94,20 +98,22 @@ Add a second image of a broken heart.
 ```blocks
 basic.forever(() => {
 basic.showLeds(`
-. # . # .
-# # # # #
-# # # # #
-. # # # .
-. . # . .`);
+    . # . # .
+    # # # # #
+    # # # # #
+    . # # # .
+    . . # . .`
+    );
 basic.pause(500);
 basic.clearScreen();
 basic.pause(500);
 basic.showLeds(`
-. # . # .
-# . # # #
-# . . . #
-. # # # .
-. . # . .`);
+    . # . # .
+    # . # # #
+    # . . . #
+    . # # # .
+    . . # . .`
+    );
 basic.pause(500);
 basic.clearScreen();
 basic.pause(500);

docs/projects/guitar/displaybuttons.md

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

docs/projects/hack-your-headphones.md

@@ -24,6 +24,12 @@ Build your own music player micro:bit from headphones.
 * [Connect your headphone](/projects/hack-your-headphone/making)
 * [Play sounds!]()
 
+# ~hint
+
+**No crocodile clips!?!?!** Use wires or Aluminium foil! [Read more...](/device/foil-circuits)
+
+# ~
+
 ### ~button /projects/hack-your-headphones/making
 
 Let's get started!

docs/projects/hack-your-headphones/making.md

@@ -6,6 +6,12 @@ Did you know you could attach your headhpones to the micro:bit to generate sound
 
 ### ~
 
+# ~hint
+
+**No crocodile clips!?!?!** Use wires or Aluminium foil! [Read more...](/device/foil-circuits)
+
+# ~
+
 ### Step 1
 
 ![](/static/mb/lessons/banana-keyboard-1.png)

docs/projects/smiley-buttons.md

@@ -10,11 +10,12 @@ Use [show leds](/reference/basic/show-leds) to make a smiley face:
 
 ```blocks
 basic.showLeds(`
-. # . # .
-. # . # .
-. . . . .
-# . . . #
-. # # # .`);
+    . # . # .
+    . # . # .
+    . . . . .
+    # . . . #
+    . # # # .`
+    );
 ```
 
 ## Step 2
@@ -24,18 +25,20 @@ frowny face inside it:
 
 ```blocks
 basic.showLeds(`
-. # . # .
-. # . # .
-. . . . .
-# . . . #
-. # # # .`);
-input.onButtonPressed(Button.A, () => { 
-    basic.showLeds(`
     . # . # .
     . # . # .
     . . . . .
-    . # # # .
-    # . . . #`);
+    # . . . #
+    . # # # .`
+    );
+input.onButtonPressed(Button.A, () => { 
+    basic.showLeds(`
+        . # . # .
+        . # . # .
+        . . . . .
+        . # # # .
+        # . . . #`
+        );
 });
 ```
 
@@ -45,25 +48,28 @@ Now add blocks so that when [button B is pressed](/reference/input/button-is-pre
 
 ```blocks
 basic.showLeds(`
-. # . # .
-. # . # .
-. . . . .
-# . . . #
-. # # # .`);
-input.onButtonPressed(Button.A, () => { 
-    basic.showLeds(`
-    . # . # .
-    . # . # .
-    . . . . .
-    . # # # .
-    # . . . #`);
-});
-input.onButtonPressed(Button.B, () => { 
-    basic.showLeds(`
     . # . # .
     . # . # .
     . . . . .
     # . . . #
-    . # # # .`);
+    . # # # .`
+    );
+input.onButtonPressed(Button.A, () => { 
+    basic.showLeds(`
+        . # . # .
+        . # . # .
+        . . . . .
+        . # # # .
+        # . . . #`
+        );
+});
+input.onButtonPressed(Button.B, () => { 
+    basic.showLeds(`
+        . # . # .
+        . # . # .
+        . . . . .
+        # . . . #
+        . # # # .`
+        );
 });
 ```

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://codethemicrobit.com).
+Starting with **Raspbian Pixel**, Raspbian comes with Chromium. Simply open [](https://pxt.microbit.org).
 
 ## Command line
 

docs/reference/bluetooth.md

@@ -2,6 +2,14 @@
 
 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();
@@ -9,20 +17,34 @@ bluetooth.startIOPinService();
 bluetooth.startLEDService();
 bluetooth.startMagnetometerService();
 bluetooth.startTemperatureService();
-bluetooth.uartRead("");
-bluetooth.uartWrite("");
-bluetooth.onBluetoothConnected(() => {
-    
-});
-bluetooth.onBluetoothDisconnected(() => {
-    
-});
+bluetooth.onBluetoothConnected(() => {});
+bluetooth.onBluetoothDisconnected(() => {});
+```
+
+## UART 
+
+```cards
+bluetooth.startUartService();
+bluetooth.uartReadUntil("");
+bluetooth.uartWriteString("");
+bluetooth.uartWriteNumber(0);
+bluetooth.uartWriteValue("", 0);
 ```
 
 ```package
 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), [uartRead](/reference/bluetooth/uart-read), [uartWrite](/reference/bluetooth/uart-write), [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), 
+[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)

docs/reference/bluetooth/uart-read-until.md

@@ -12,7 +12,7 @@ The [Bluetooth UART service](start-uart-service.md) allows another device such a
 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.uartRead("");
+bluetooth.uartReadUntil("");
 ```
 
 ### 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.uartRead(":");
+        uartData = bluetooth.uartReadUntil(":");
         basic.showString(uartData);
     }
 });

docs/reference/bluetooth/uart-write-number.md

@@ -0,0 +1,28 @@
+# UART Write Number
+
+### ~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.
+
+### ~
+
+The [Bluetooth UART service](/reference/bluetooth/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 send data to a Bluetooth connected device.
+
+```sig
+bluetooth.uartWriteNumber(42);
+```
+
+### 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
+
+[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
+microbit-bluetooth
+```

docs/reference/bluetooth/uart-write-string.md

@@ -1,4 +1,4 @@
-# UART Write 
+# UART Write String
 
 ### ~hint
 ![](/static/bluetooth/Bluetooth_SIG.png)
@@ -7,12 +7,12 @@ For another device like a smartphone to use any of the Bluetooth "services" whic
 
 ### ~
 
-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. 
+The [Bluetooth UART service](/reference/bluetooth/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 send data to a Bluetooth connected device.
 
 ```sig
-bluetooth.uartWrite("");
+bluetooth.uartWriteString("");
 ```
 
 ### Example: Starting the Bluetooth UART service and then sending "HELLO" whenever button A is pressed and another device has connected over Bluetooth
@@ -29,7 +29,7 @@ bluetooth.onBluetoothDisconnected(() => {
 });
 input.onButtonPressed(Button.A, () => {
     if (connected == 1) {
-        bluetooth.uartWrite("HELLO");
+        bluetooth.uartWriteString("HELLO");
     }
 });
 ```

docs/reference/bluetooth/uart-write-value.md

@@ -0,0 +1,28 @@
+# UART Write Value
+
+### ~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.
+
+### ~
+
+The [Bluetooth UART service](/reference/bluetooth/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 send data to a Bluetooth connected device.
+
+```sig
+bluetooth.uartWriteValue("x", 42);
+```
+
+### 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
+
+[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
+microbit-bluetooth
+```

docs/share.md

@@ -13,7 +13,7 @@ Once you've made your project, you can save it the cloud, share it, or embed it
 
 ## Sharing the URL
 
-You can share the URL for the project ([https://codethemicrobit.com/httuftrbtg](https://codethemicrobit.com/httuftrbtg) above) with other people, and they will be able to visit that page to see your project, download it, or edit it:
+You can share the URL for the project ([https://pxt.microbit.org/httuftrbtg](https://pxt.microbit.org/httuftrbtg) above) with other people, and they will be able to visit that page to see your project, download it, or edit it:
 
 ![Project page](/static/embed/project-page.png)
 
@@ -36,12 +36,12 @@ Open the HTML editor for your blog or website and paste it with your content
 
 ### Wordpress
 
-[wordpress.com][] blogs do not support embedding content from most websites, so you will need to link to your project instead. Alternatively, if you have a Wordpress VIP account you can follow [these instructions][wordpress-vip] to embed an `iframe` into your blog. The URL that you need to add is like `https://codethemicrobit.com/?sandbox=1#pub:httuftrbtg`, but replace `httuftrbtg` with your project's unique identifier.
+[wordpress.com][] blogs do not support embedding content from most websites, so you will need to link to your project instead. Alternatively, if you have a Wordpress VIP account you can follow [these instructions][wordpress-vip] to embed an `iframe` into your blog. The URL that you need to add is like `https://pxt.microbit.org/?sandbox=1#pub:httuftrbtg`, but replace `httuftrbtg` with your project's unique identifier.
 
 If you self host a Wordpress blog you can install the [iframe-plugin][] and then write the following in your blog-post (again, replacing the `httuftrbtg` with your project's identifier):
 
 ```
-[iframe src="https://codethemicrobit.com/?sandbox=1#pub:httuftrbtg"]
+[iframe src="https://pxt.microbit.org/?sandbox=1#pub:httuftrbtg"]
 ```
 
 ### Blogger

docs/translate.md

@@ -5,24 +5,20 @@ and you can volunteer to translate parts of the web site.
 
 ## Translating the editor interface
 
-The project below contains the resources from https://www.pxt.io and the menu items of https://codethemicrobit.com.
+The project below contains the resources from https://www.pxt.io and the menu items of https://pxt.microbit.org.
 
 * [https://crowdin.com/project/kindscript](https://crowdin.com/project/kindscript)
 
 You will find two files in that project:
 
-* ``string.json``: text contained in the menu items of https://codethemicrobit.com
+* ``string.json``: text contained in the menu items of https://pxt.microbit.org
 * ``website.json``: text contained in the pages served by https://www.pxt.io 
 
 ## Translating the blocks and reference documentation
 
-The project below contains the resources from the blocks and functions using in the https://codethemicrobit.com.
+You will find package files under ``/microbit`` , one for the block definition and one for the descriptions:
 
-* [https://crowdin.com/project/pxt-microbit](https://crowdin.com/project/pxt-microbit)
-
-You will find two files for each package available in the micro:bit, one for the block definition and one for the descriptions:
-
-* ``microbit-strings.json``: contains the block definitions
-* ``microbit-jsdoc-strings.json``: contains the descriptions
+* ``core-strings.json``: contains the block definitions
+* ``core-jsdoc-strings.json``: contains the descriptions
 
 The block definition should be carefully translated using the [block definition syntax](https://www.pxt.io/defining-blocks).

libs/bluetooth/_locales/bluetooth-jsdoc-strings.json

@@ -1,4 +1,5 @@
 {
+  "bluetooth": "Support for additional Bluetooth services.",
   "bluetooth.onBluetoothConnected": "Register code to run when the micro:bit is connected to over Bluetooth",
   "bluetooth.onBluetoothConnected|param|body": "Code to run when a Bluetooth connection is established",
   "bluetooth.onBluetoothDisconnected": "Register code to run when a bluetooth connection to the micro:bit is lost",
@@ -10,6 +11,10 @@
   "bluetooth.startMagnetometerService": "Starts the Bluetooth magnetometer service",
   "bluetooth.startTemperatureService": "Starts the Bluetooth temperature service",
   "bluetooth.startUartService": "Starts the Bluetooth UART service",
-  "bluetooth.uartRead": "Reads from the Bluetooth UART service buffer, returning its contents when the specified delimiter character is encountered.",
-  "bluetooth.uartWrite": "Writes to the Bluetooth UART service buffer. From there the data is transmitted over Bluetooth to a connected device."
+  "bluetooth.uartReadUntil": "Reads from the Bluetooth UART service buffer, returning its contents when the specified delimiter character is encountered.",
+  "bluetooth.uartWriteNumber": "Prints a numeric value to the serial",
+  "bluetooth.uartWriteString": "Writes to the Bluetooth UART service buffer. From there the data is transmitted over Bluetooth to a connected device.",
+  "bluetooth.uartWriteValue": "Writes a ``name: value`` pair line to the serial.",
+  "bluetooth.uartWriteValue|param|name": "name of the value stream, eg: x",
+  "bluetooth.uartWriteValue|param|value": "to write"
 }

libs/bluetooth/_locales/bluetooth-strings.json

@@ -8,7 +8,10 @@
   "bluetooth.startMagnetometerService|block": "bluetooth magnetometer service",
   "bluetooth.startTemperatureService|block": "bluetooth temperature service",
   "bluetooth.startUartService|block": "bluetooth uart service",
-  "bluetooth.uartRead|block": "bluetooth uart read %del=bluetooth_uart_delimiter_conv",
-  "bluetooth.uartWrite|block": "bluetooth uart write %data",
-  "bluetooth|block": "bluetooth"
+  "bluetooth.uartReadUntil|block": "bluetooth uart|read until %del=serial_delimiter_conv",
+  "bluetooth.uartWriteNumber|block": "bluetooth uart|write number %value",
+  "bluetooth.uartWriteString|block": "bluetooth uart|write string %data",
+  "bluetooth.uartWriteValue|block": "bluetooth uart|write value %name|= %value",
+  "bluetooth|block": "bluetooth",
+  "{id:category}Bluetooth": "Bluetooth"
 }

libs/bluetooth/bluetooth.cpp

@@ -4,22 +4,6 @@
 
 using namespace pxt;
 
-enum Delimiters {
-    //% block="new line"
-    NewLine = 1,
-    //% block=","
-    Comma = 2,
-    //% block="$"
-    Dollar = 3,
-    //% block=":"
-    Colon = 4,
-    //% block="."
-    Fullstop = 5,
-    //% block="#"
-    Hash = 6,
-};
-
-
 /**
  * Support for additional Bluetooth services.
  */
@@ -27,12 +11,33 @@ enum Delimiters {
 namespace bluetooth {
     MicroBitUARTService *uart = NULL;
 
+
+    /**
+    *  Starts the Bluetooth accelerometer service
+    */
+    //% help=bluetooth/start-accelerometer-service
+    //% blockId=bluetooth_start_accelerometer_service block="bluetooth accelerometer service"
+    //% parts="bluetooth" weight=90 blockGap=8
+    void startAccelerometerService() {
+        new MicroBitAccelerometerService(*uBit.ble, uBit.accelerometer);        
+    }   
+
+    /**
+    *  Starts the Bluetooth button service
+    */
+    //% help=bluetooth/start-button-service
+    //% blockId=bluetooth_start_button_service block="bluetooth button service" blockGap=8
+    //% parts="bluetooth" weight=89
+    void startButtonService() {
+        new MicroBitButtonService(*uBit.ble);      
+    }
+
     /**
     *  Starts the Bluetooth IO pin service.
     */
     //% help=bluetooth/start-io-pin-service
     //% blockId=bluetooth_start_io_pin_service block="bluetooth io pin service" blockGap=8
-    //% parts="bluetooth"
+    //% parts="bluetooth" weight=88
     void startIOPinService() {
         new MicroBitIOPinService(*uBit.ble, uBit.io);
     }
@@ -42,7 +47,7 @@ namespace bluetooth {
     */
     //% help=bluetooth/start-led-service
     //% blockId=bluetooth_start_led_service block="bluetooth led service" blockGap=8
-    //% parts="bluetooth"
+    //% parts="bluetooth" weight=87
     void startLEDService() {
         new MicroBitLEDService(*uBit.ble, uBit.display);
     }
@@ -52,7 +57,7 @@ namespace bluetooth {
     */
     //% help=bluetooth/start-temperature-service
     //% blockId=bluetooth_start_temperature_service block="bluetooth temperature service" blockGap=8
-    //% parts="bluetooth"
+    //% parts="bluetooth" weight=86
     void startTemperatureService() {    
         new MicroBitTemperatureService(*uBit.ble, uBit.thermometer);        
     }
@@ -61,38 +66,19 @@ namespace bluetooth {
     *  Starts the Bluetooth magnetometer service
     */
     //% help=bluetooth/start-magnetometer-service
-    //% blockId=bluetooth_start_magnetometer_service block="bluetooth magnetometer service" blockGap=8
-    //% parts="bluetooth"
+    //% blockId=bluetooth_start_magnetometer_service block="bluetooth magnetometer service"
+    //% parts="bluetooth" weight=85
     void startMagnetometerService() {    
         new MicroBitMagnetometerService(*uBit.ble, uBit.compass); 
     }
 
-    /**
-    *  Starts the Bluetooth accelerometer service
-    */
-    //% help=bluetooth/start-accelerometer-service
-    //% blockId=bluetooth_start_accelerometer_service block="bluetooth accelerometer service" blockGap=8
-    //% parts="bluetooth"
-    void startAccelerometerService() {
-        new MicroBitAccelerometerService(*uBit.ble, uBit.accelerometer);        
-    }
-
-    /**
-    *  Starts the Bluetooth button service
-    */
-    //% help=bluetooth/start-button-service
-    //% blockId=bluetooth_start_button_service block="bluetooth button service" blockGap=8
-    //% parts="bluetooth"
-    void startButtonService() {
-        new MicroBitButtonService(*uBit.ble);      
-    }
 
     /**
     *  Starts the Bluetooth UART service
     */
     //% help=bluetooth/start-uart-service
-    //% blockId=bluetooth_start_uart_service block="bluetooth uart service" blockGap=8
-    //% parts="bluetooth"
+    //% blockId=bluetooth_start_uart_service block="bluetooth uart service"
+    //% parts="bluetooth" advanced=true
     void startUartService() {
         if (uart) return;
         // 61 octet buffer size is 3 x (MTU - 3) + 1
@@ -102,13 +88,13 @@ namespace bluetooth {
     }
     
     //%
-    void uartWrite(StringData *data) {
+    void uartWriteString(StringData *data) {
         startUartService();
     	uart->send(ManagedString(data));
     }    
 
     //%
-    StringData* uartRead(StringData *del) {
+    StringData* uartReadUntil(StringData *del) {
         startUartService();
         return uart->readUntil(ManagedString(del)).leakData();
     }    
@@ -133,7 +119,5 @@ namespace bluetooth {
     //% parts="bluetooth"
     void onBluetoothDisconnected(Action body) {
         registerWithDal(MICROBIT_ID_BLE, MICROBIT_BLE_EVT_DISCONNECTED, body);
-    }    
-  
-  
+    }  
 }

libs/bluetooth/bluetooth.ts

@@ -1,42 +1,48 @@
+/**
+ * Support for additional Bluetooth services.
+ */
+//% color=#0082FB weight=20
 namespace bluetooth {
-    /**
-     * Returns the delimiter corresponding string
-     */
-    //% blockId="bluetooth_uart_delimiter_conv" block="%del"
-    //% weight=1 parts="bluetooth"
-    export function delimiters(del: Delimiters): string {
-        // even though it might not look like, this is more
-        // (memory) efficient than the C++ implementation, because the
-        // strings are statically allocated and take no RAM 
-        switch (del) {
-            case Delimiters.NewLine: return "\n"
-            case Delimiters.Comma: return ","
-            case Delimiters.Dollar: return "$"
-            case Delimiters.Colon: return ":"
-            case Delimiters.Fullstop: return "."
-            case Delimiters.Hash: return "#"
-            default: return "\n"
-        }
-    }
-
     /**
     *  Writes to the Bluetooth UART service buffer. From there the data is transmitted over Bluetooth to a connected device.
     */
-    //% help=bluetooth/uart-write
-    //% blockId=bluetooth_uart_write block="bluetooth uart write %data" blockGap=8
-    //% parts="bluetooth" shim=bluetooth::uartWrite
-    export function uartWrite(data: string): void {
+    //% help=bluetooth/uart-write-string weight=80
+    //% blockId=bluetooth_uart_write block="bluetooth uart|write string %data" blockGap=8
+    //% parts="bluetooth" shim=bluetooth::uartWriteString advanced=true
+    export function uartWriteString(data: string): void {
         // dummy implementation for simulator
         console.log("UART Write: " + data)
     }
 
+    /**
+     * Prints a numeric value to the serial
+     */
+    //% help=bluetooth/uart-write-number weight=79
+    //% weight=89 blockGap=8 advanced=true
+    //% blockId=bluetooth_uart_writenumber block="bluetooth uart|write number %value"
+    export function uartWriteNumber(value: number): void {
+        uartWriteString(value.toString());
+    }
+
+    /**
+     * Writes a ``name: value`` pair line to the serial.
+     * @param name name of the value stream, eg: x
+     * @param value to write
+     */
+    //% weight=88 weight=78
+    //% help=bluetooth/uart-write-value advanced=true
+    //% blockId=bluetooth_uart_writevalue block="bluetooth uart|write value %name|= %value"
+    export function uartWriteValue(name: string, value: number): void {
+        uartWriteString(name + ":" + value + "\r\n");
+    }
+
     /**
      *  Reads from the Bluetooth UART service buffer, returning its contents when the specified delimiter character is encountered.
      */
-    //% help=bluetooth/uart-read
-    //% blockId=bluetooth_uart_read block="bluetooth uart read %del=bluetooth_uart_delimiter_conv" blockGap=8
-    //% parts="bluetooth" shim=bluetooth::uartRead
-    export function uartRead(del: string): string {
+    //% help=bluetooth/uart-read-until weight=75
+    //% blockId=bluetooth_uart_read block="bluetooth uart|read until %del=serial_delimiter_conv"
+    //% parts="bluetooth" shim=bluetooth::uartReadUntil advanced=true
+    export function uartReadUntil(del: string): string {
         // dummy implementation for simulator
         return "???"
     }

libs/bluetooth/enums.d.ts

@@ -1,20 +1,4 @@
 // Auto-generated. Do not edit.
-
-
-    declare enum Delimiters {
-    //% block="new line"
-    NewLine = 1,
-    //% block=","
-    Comma = 2,
-    //% block="$"
-    Dollar = 3,
-    //% block=":"
-    Colon = 4,
-    //% block="."
-    Fullstop = 5,
-    //% block="#"
-    Hash = 6,
-    }
 declare namespace bluetooth {
 }
 

libs/bluetooth/shims.d.ts

@@ -7,44 +7,12 @@
     //% color=#0082FB weight=20
 declare namespace bluetooth {
 
-    /**
-     *  Starts the Bluetooth IO pin service.
-     */
-    //% help=bluetooth/start-io-pin-service
-    //% blockId=bluetooth_start_io_pin_service block="bluetooth io pin service" blockGap=8
-    //% parts="bluetooth" shim=bluetooth::startIOPinService
-    function startIOPinService(): void;
-
-    /**
-     *  Starts the Bluetooth LED service
-     */
-    //% help=bluetooth/start-led-service
-    //% blockId=bluetooth_start_led_service block="bluetooth led service" blockGap=8
-    //% parts="bluetooth" shim=bluetooth::startLEDService
-    function startLEDService(): void;
-
-    /**
-     *  Starts the Bluetooth temperature service
-     */
-    //% help=bluetooth/start-temperature-service
-    //% blockId=bluetooth_start_temperature_service block="bluetooth temperature service" blockGap=8
-    //% parts="bluetooth" shim=bluetooth::startTemperatureService
-    function startTemperatureService(): void;
-
-    /**
-     *  Starts the Bluetooth magnetometer service
-     */
-    //% help=bluetooth/start-magnetometer-service
-    //% blockId=bluetooth_start_magnetometer_service block="bluetooth magnetometer service" blockGap=8
-    //% parts="bluetooth" shim=bluetooth::startMagnetometerService
-    function startMagnetometerService(): void;
-
     /**
      *  Starts the Bluetooth accelerometer service
      */
     //% help=bluetooth/start-accelerometer-service
-    //% blockId=bluetooth_start_accelerometer_service block="bluetooth accelerometer service" blockGap=8
-    //% parts="bluetooth" shim=bluetooth::startAccelerometerService
+    //% blockId=bluetooth_start_accelerometer_service block="bluetooth accelerometer service"
+    //% parts="bluetooth" weight=90 blockGap=8 shim=bluetooth::startAccelerometerService
     function startAccelerometerService(): void;
 
     /**
@@ -52,15 +20,47 @@ declare namespace bluetooth {
      */
     //% help=bluetooth/start-button-service
     //% blockId=bluetooth_start_button_service block="bluetooth button service" blockGap=8
-    //% parts="bluetooth" shim=bluetooth::startButtonService
+    //% parts="bluetooth" weight=89 shim=bluetooth::startButtonService
     function startButtonService(): void;
 
+    /**
+     *  Starts the Bluetooth IO pin service.
+     */
+    //% help=bluetooth/start-io-pin-service
+    //% blockId=bluetooth_start_io_pin_service block="bluetooth io pin service" blockGap=8
+    //% parts="bluetooth" weight=88 shim=bluetooth::startIOPinService
+    function startIOPinService(): void;
+
+    /**
+     *  Starts the Bluetooth LED service
+     */
+    //% help=bluetooth/start-led-service
+    //% blockId=bluetooth_start_led_service block="bluetooth led service" blockGap=8
+    //% parts="bluetooth" weight=87 shim=bluetooth::startLEDService
+    function startLEDService(): void;
+
+    /**
+     *  Starts the Bluetooth temperature service
+     */
+    //% help=bluetooth/start-temperature-service
+    //% blockId=bluetooth_start_temperature_service block="bluetooth temperature service" blockGap=8
+    //% parts="bluetooth" weight=86 shim=bluetooth::startTemperatureService
+    function startTemperatureService(): void;
+
+    /**
+     *  Starts the Bluetooth magnetometer service
+     */
+    //% help=bluetooth/start-magnetometer-service
+    //% blockId=bluetooth_start_magnetometer_service block="bluetooth magnetometer service"
+    //% parts="bluetooth" weight=85 shim=bluetooth::startMagnetometerService
+    function startMagnetometerService(): void;
+
     /**
      *  Starts the Bluetooth UART service
      */
     //% help=bluetooth/start-uart-service
-    //% blockId=bluetooth_start_uart_service block="bluetooth uart service" blockGap=8
-    //% parts="bluetooth" shim=bluetooth::startUartService
+    //% blockId=bluetooth_start_uart_service block="bluetooth uart service"
+    //% parts="bluetooth" advanced=true shim=bluetooth::startUartService
     function startUartService(): void;
 
     /**

libs/core/_locales/core-jsdoc-strings.json

@@ -161,6 +161,8 @@
   "pins.spiWrite|param|value": "Data to be sent to the SPI slave",
   "serial": "Reading and writing data over a serial connection.",
   "serial.readLine": "Reads a line of text from the serial port.",
+  "serial.readUntil": "Reads a line of text from the serial port and returns the buffer when the delimiter is met.",
+  "serial.readUntil|param|delimiter": "text delimiter that separates each text chunk",
   "serial.redirect": "Dynamically configuring the serial instance to use pins other than USBTX and USBRX.",
   "serial.redirect|param|rx": "the new reception pin",
   "serial.redirect|param|tx": "the new transmission pins",

libs/core/_locales/core-strings.json

@@ -0,0 +1,91 @@
+{
+  "Math.randomBoolean|block": "pick random true or false",
+  "Math|block": "Math",
+  "String.fromCharCode|block": "text from char code %code",
+  "String|block": "String",
+  "basic.clearScreen|block": "clear screen",
+  "basic.forever|block": "forever",
+  "basic.pause|block": "pause (ms) %pause",
+  "basic.showLeds|block": "show leds",
+  "basic.showNumber|block": "show|number %number",
+  "basic.showString|block": "show|string %text",
+  "basic|block": "basic",
+  "control.inBackground|block": "run in background",
+  "control.reset|block": "reset",
+  "control.waitMicros|block": "wait (µs)%micros",
+  "control|block": "control",
+  "game.addScore|block": "change score by|%points",
+  "game.gameOver|block": "game over",
+  "game.score|block": "score",
+  "game.startCountdown|block": "start countdown|(ms) %duration",
+  "game|block": "game",
+  "images.createBigImage|block": "create big image",
+  "images.createImage|block": "create image",
+  "images|block": "images",
+  "input.acceleration|block": "acceleration (mg)|%NAME",
+  "input.buttonIsPressed|block": "button|%NAME|is pressed",
+  "input.compassHeading|block": "compass heading (°)",
+  "input.lightLevel|block": "light level",
+  "input.magneticForce|block": "magnetic force (µT)|%NAME",
+  "input.onButtonPressed|block": "on button|%NAME|pressed",
+  "input.onGesture|block": "on |%NAME",
+  "input.onPinPressed|block": "on pin %NAME|pressed",
+  "input.onPinReleased|block": "on pin %NAME|released",
+  "input.pinIsPressed|block": "pin %NAME|is pressed",
+  "input.rotation|block": "rotation (°)|%NAME",
+  "input.runningTime|block": "running time (ms)",
+  "input.setAccelerometerRange|block": "set accelerometer|range %range",
+  "input.temperature|block": "temperature (°C)",
+  "input|block": "input",
+  "led.brightness|block": "brightness",
+  "led.plotBarGraph|block": "plot bar graph of %value |up to %high",
+  "led.plot|block": "plot|x %x|y %y",
+  "led.point|block": "point|x %x|y %y",
+  "led.setBrightness|block": "set brightness %value",
+  "led.stopAnimation|block": "stop animation",
+  "led.toggle|block": "toggle|x %x|y %y",
+  "led.unplot|block": "unplot|x %x|y %y",
+  "led|block": "led",
+  "music.beat|block": "%fraction|beat",
+  "music.changeTempoBy|block": "change tempo by (bpm)|%value",
+  "music.noteFrequency|block": "%note",
+  "music.playTone|block": "play|tone %note=device_note|for %duration=device_beat",
+  "music.rest|block": "rest(ms)|%duration=device_beat",
+  "music.ringTone|block": "ring tone (Hz)|%note=device_note",
+  "music.setTempo|block": "set tempo to (bpm)|%value",
+  "music.tempo|block": "tempo (bpm)",
+  "music|block": "music",
+  "pins.analogReadPin|block": "analog read|pin %name",
+  "pins.analogSetPeriod|block": "analog set period|pin %pin|to (µs)%micros",
+  "pins.analogWritePin|block": "analog write|pin %name|to %value",
+  "pins.digitalReadPin|block": "digital read|pin %name",
+  "pins.digitalWritePin|block": "digital write|pin %name|to %value",
+  "pins.i2cReadNumber|block": "i2c read number|at address %address|of format %format=i2c_sizeof",
+  "pins.i2cWriteNumber|block": "i2c write number|at address %address|with value %value|of format %format=i2c_sizeof",
+  "pins.map|block": "map %value|from low %fromLow|from high %fromHigh|to low %toLow|to high %toHigh",
+  "pins.onPulsed|block": "on|pin %pin|pulsed %pulse",
+  "pins.pulseDuration|block": "pulse duration (µs)",
+  "pins.servoSetPulse|block": "servo set pulse|pin %value|to (µs) %micros",
+  "pins.servoWritePin|block": "servo write|pin %name|to %value",
+  "pins.setPull|block": "set pull|pin %pin|to %pull",
+  "pins.spiWrite|block": "spi write %value",
+  "pins|block": "pins",
+  "serial.readLine|block": "serial|read line",
+  "serial.readUntil|block": "serial|read until %delimiter=serial_delimiter_conv",
+  "serial.redirect|block": "serial|redirect to|TX %tx|RX %rx|at baud rate %rate",
+  "serial.writeLine|block": "serial|write line %text",
+  "serial.writeNumber|block": "serial|write number %value",
+  "serial.writeString|block": "serial|write string %text",
+  "serial.writeValue|block": "serial|write value %name|= %value",
+  "serial|block": "serial",
+  "{id:category}Basic": "Basic",
+  "{id:category}Control": "Control",
+  "{id:category}Game": "Game",
+  "{id:category}Images": "Images",
+  "{id:category}Input": "Input",
+  "{id:category}Led": "Led",
+  "{id:category}Math": "Math",
+  "{id:category}Music": "Music",
+  "{id:category}Pins": "Pins",
+  "{id:category}Serial": "Serial"
+}