0.5.52

* Adding radio API for receiving a packet

* More new radio API changes

* renaming some properties

* Redoing radio packet parsing and updating new callback api

.gitignore

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

.travis.yml

@@ -3,17 +3,12 @@ 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-v0.json)"
 sudo: false
 notifications:
   email:
-    - touchdevelop-build@microsoft.com
+    - kindscript@microsoft.com
 cache:
   directories:
     - node_modules

.vscode/settings.json

@@ -16,5 +16,6 @@
         "**/pxt_modules/**": true
     },    
     "tslint.enable": true,
-    "tslint.rulesDirectory": "node_modules/tslint-microsoft-contrib"
+    "tslint.rulesDirectory": "node_modules/tslint-microsoft-contrib",
+    "typescript.tsdk": "./node_modules/typescript/lib"
 }

README.md

@@ -1,11 +1,11 @@
-# micro:bit target for PXT
+# Calliope target for PXT
 
-This target allow to program a [BBC micro:bit](https://www.microbit.co.uk/) using 
+This target allow to program a [Calliope](http://calliope.cc/) using 
 PXT ([Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt)).
 
-* [Try it live](https://codethemicrobit.com)
+[![Build Status](https://travis-ci.org/Microsoft/pxt-calliope.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-calliope)
 
-[![Build Status](https://travis-ci.org/Microsoft/pxt-microbit.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-microbit)
+![](http://calliope.cc/content/1-ueber-mini/mini_board.png)
 
 ## Local server
 
@@ -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-microbit
-cd pxt-microbit
+git clone https://github.com/microsoft/pxt-calliope
+cd pxt-calliope
 ```
 * install the PXT command line (add ``sudo`` for Mac/Linux shells).
 ```
@@ -32,14 +32,15 @@ npm install
 
 ### Running
 
-Run this command to open a local web server (add ``sudo`` for Mac/Linux shells)
+Run this command to open a local web server (add ``sudo`` for Mac/Linux shells).
 ```
 pxt serve
 ```
 If the local server opens in the wrong browser, make sure to copy the URL containing the local token. 
 Otherwise, the editor will not be able to load the projects.
 
-If you need modify the `.cpp` files, turn on yotta compilation with the ``-yt`` flag (add ``sudo`` for Mac/Linux shells):
+If you need modify the `.cpp` files, turn on yotta compilation with the ``-yt`` flag (add ``sudo`` for Mac/Linux shells). On Windows, you must be running
+from the ``Run Yotta`` command prompt.
 ```
 pxt serve -yt
 ```
@@ -53,11 +54,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:
@@ -66,7 +62,6 @@ 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)$/.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,17 +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")
-            } else {
-                console.log(`copy ${ts.pxtc.BINARY_HEX} to ` + drives.join(", "))
+                console.log("cannot find any drives to deploy to");
+                return Promise.resolve(0);
             }
-            return Promise.map(drives, d =>
-                writeFileAsync(d + ts.pxtc.BINARY_HEX, res.outfiles[ts.pxtc.BINARY_HEX])
-                    .then(() => {
-                        console.log("wrote hex file to " + d)
-                    }))
-        })
-        .then(() => { })
+
+            console.log(`copy ${ts.pxtc.BINARY_HEX} to ` + drives.join(", "));
+
+            let writeHexFile = (filename: string) => {
+                return writeFileAsync(filename + ts.pxtc.BINARY_HEX, res.outfiles[ts.pxtc.BINARY_HEX])
+                    .then(() => console.log("wrote hex file to " + filename));
+            };
+
+            return Promise.map(drives, d => writeHexFile(d))
+                .then(() => drives.length);
+        });
 }
 
 function getBitDrivesAsync(): Promise<string[]> {

docfiles/apptracking.html

@@ -1,13 +0,0 @@
-<script type="text/javascript">
-    var appInsights=window.appInsights||function(config){
-    function r(config){t[config]=function(){var i=arguments;t.queue.push(function(){t[config].apply(t,i)})}}var t={config:config},u=document,e=window,o="script",s=u.createElement(o),i,f;for(s.src=config.url||"//az416426.vo.msecnd.net/scripts/a/ai.0.js",u.getElementsByTagName(o)[0].parentNode.appendChild(s),t.cookie=u.cookie,t.queue=[],i=["Event","Exception","Metric","PageView","Trace"];i.length;)r("track"+i.pop());return r("setAuthenticatedUserContext"),r("clearAuthenticatedUserContext"),config.disableExceptionTracking||(i="onerror",r("_"+i),f=e[i],e[i]=function(config,r,u,e,o){var s=f&&f(config,r,u,e,o);return s!==!0&&t["_"+i](config,r,u,e,o),s}),t
-    }({ 
-        instrumentationKey:"e9ae05ca-350b-427a-9775-3ba3f6efabce"
-    });window.appInsights=appInsights;
-</script>
-<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");
-</script>

docfiles/tracking.html

@@ -1,13 +0,0 @@
-<script type="text/javascript">
-    var appInsights=window.appInsights||function(config){
-    function r(config){t[config]=function(){var i=arguments;t.queue.push(function(){t[config].apply(t,i)})}}var t={config:config},u=document,e=window,o="script",s=u.createElement(o),i,f;for(s.src=config.url||"//az416426.vo.msecnd.net/scripts/a/ai.0.js",u.getElementsByTagName(o)[0].parentNode.appendChild(s),t.cookie=u.cookie,t.queue=[],i=["Event","Exception","Metric","PageView","Trace"];i.length;)r("track"+i.pop());return r("setAuthenticatedUserContext"),r("clearAuthenticatedUserContext"),config.disableExceptionTracking||(i="onerror",r("_"+i),f=e[i],e[i]=function(config,r,u,e,o){var s=f&&f(config,r,u,e,o);return s!==!0&&t["_"+i](config,r,u,e,o),s}),t
-    }({ 
-        instrumentationKey:"e9ae05ca-350b-427a-9775-3ba3f6efabce"
-    });window.appInsights=appInsights;
-</script>
-<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");
-</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/beta-ref.json

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

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/mac.md

@@ -3,8 +3,6 @@
 As you are using a Mac, it is recommended that you use [Safari][]. Alternatively,
 [Google Chrome][chrome] and [Mozilla Firefox][firefox] are also supported.
 
-You cannot use Safari in private browsing mode when using the editor.
-
 Please see [here][technical] for technical information on which browsers are
 supported, or [here][versions] to check which version you are using.
 

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/faq.md

@@ -2,33 +2,4 @@
 
 ### @description Frequently asked questions and answers from our users.
 
-### 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.
+Please search for solutions or open a ticket at [support.microbit.org](https://support.microbit.org)!

docs/index-ref.json

@@ -0,0 +1,3 @@
+{
+    "appref": "v0.5.51"
+}

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
-while(true) ;  
+```typescript-ignore
+while(true) ;
 basic.showNumber(1);
 ```
 

docs/js/types.md

@@ -51,6 +51,8 @@ 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."
 ```
@@ -82,7 +84,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;
 ```
 
@@ -91,14 +93,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:
 
-```blocks
-newAction() // ***
+```typescript
+let action  = 0;
+function 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.
 
-```blocks
-/**
- * {highlight}
- */
+```typescript
+let action  = 0;
 export function newAction() {
-    action = Math.random(4) // ***
+    action = Math.random(4)
     if (action == 0) {
         basic.showString("PUSH A", 150) // ***
     }
@@ -62,19 +62,22 @@ 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`.
 
-```blocks
-// **. . .**
+```typescript
+let action  = 0;
+export function newAction() {
+    // ...
+}
 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
-microbit-radio
+radio
 ```

docs/lessons/happy-birthday.md

@@ -13,14 +13,8 @@ Music
 
 ## Prior learning/place of lesson in scheme of work
 
-Learn how to convert your BBC micro:bit into a music player using pins P0 and GND, earphones (or speakers), as well as crocodile clips (or spring clips). We will be learning how to code musical notes using simple commands such as play, keys, and notes.
-
-## What the teacher needs to know / QuickStart Computing Glossary
-
-* Hardware: The physical systems and components of digital devices; see also software.
-* Programmable toys: Robots designed for children to use, accepting input, storing short sequences of simple instructions and moving according to this stored program.
-* Program: A stored set of instructions encoded in a language understood by the computer that does some form of computation, processing input and/or stored data to generate output.
-* Simulation: Using a computer to model the state and behaviour of real-world (or imaginary) systems, including physical or social systems; an integral part of most computer games.
+Learn how to convert your BBC micro:bit into a music player using pins P0 and GND, earphones (or speakers), as well as crocodile clips (or spring clips). 
+We will be learning how to code musical notes using simple commands such as play, keys, and notes.
 
 ## Objectives
 

docs/lessons/happy-birthday/activity.md

@@ -1,13 +1,13 @@
 # happy birthday blocks activity
 
-Play sounds with music blocks. 
+Play sounds with music blocks.
 
 Have you ever tried to play a song on an instrument? Let's try coding the song "Happy Birthday" on the micro:bit !
 
 Let's start by adding the code in the music drawer that includes a single musical chord (or pitched sound) with the `play` block. Then insert the chord "C". Once you are done coding, don't forget to run your code in the simulator or the micro:bit.
 
 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
 ```
 
 * click run to see if the code works as expected.
@@ -15,12 +15,12 @@ music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
 We want to continue to adding musical chords with the `play` block. So insert the appropriate chord blocks: `D`, `F`, `G` to complete the first part of the song. Modify your code so that your code looks like this.
 
 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
 basic.pause(100);
 ```
 
@@ -29,19 +29,19 @@ basic.pause(100);
 We want to continue to adding musical chords with the `play` block. Then insert the appropriate chords: `B`, `C`, `D`, `E` , `F` to complete the second part of the song. Modify your code so that your code looks like this.
 
 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
 basic.pause(100);
 ```
 

docs/lessons/happy-birthday/challenges.md

@@ -8,19 +8,19 @@ Complete the [happy birthday](/lessons/happy-birthday/activity) activity and you
 
 
 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
 basic.pause(100);
 
 
@@ -35,26 +35,26 @@ Let's code the third part of Happy Birthday!
 To do this, you need to add blocks after the last line of the `play` blocks. We want to continue to adding musical chords with the `play` block. Then insert the appropriate chord blocks `G`, `E`, `C`, `B`, `A` to complete the third part of the song. Modify your code so that your code looks like this.
 
 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
 basic.pause(100);
 ```
 
@@ -66,33 +66,33 @@ Finally, we continue to adding the appropriate `play` block and fit the followin
 
 
 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.B), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.B), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
 ```
 
 

docs/lessons/headbands/quiz-answers.md

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

@@ -1,7 +1,5 @@
 # hero 
 
-make a game to test hand-eye coordination.
-
 Make a game to test hand-eye coordination
 
 * [activity](/lessons/hero/activity)

docs/lessons/pogo.md

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

docs/lessons/spinner/quiz-answers.md

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

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.md

@@ -2,6 +2,9 @@
 
 Here are some cool projects that you can build with your micro:bit!
 
+## Games
+
+Fun games to build with your micro:bit.
 
 ```codecard
 [{
@@ -20,18 +23,42 @@ Here are some cool projects that you can build with your micro:bit!
   "name": "Rock Paper Scissors",
   "url":"/projects/rock-paper-scissors",
   "imageUrl":"/static/mb/projects/a4-motion.png"
-},{
-  "name": "Compass",
-  "url":"/projects/compass",
-  "imageUrl":"/static/mb/projects/a5-compass.png"
-},{
+}]
+```
+
+## Maker, Arts, Fashion
+
+```codecard
+[{
   "name": "Hack your headphones",
   "url":"/projects/hack-your-headphones",
   "imageUrl":"/static/mb/projects/a6-music.png"
-},{
+}, {
   "name": "Banana keyboard",
   "url":"/projects/banana-keyboard",
   "imageUrl":"/static/mb/projects/a7-conductive.png"
+}, {
+  "name": "Guitar",
+  "url":"/projects/guitar",
+  "imageUrl":"/static/mb/projects/guitar.png"
+}, {
+  "name": "Watch",
+  "url":"/projects/the-watch",
+  "imageUrl":"/static/mb/projects/a10-watch.png"
+}, {
+  "name": "Timing gates",
+  "url":"/projects/timing-gates",
+  "imageUrl":"/static/mb/projects/timing-gates.jpg"
+}]
+```
+
+## More
+
+```codecard
+[{
+  "name": "Compass",
+  "url":"/projects/compass",
+  "imageUrl":"/static/mb/projects/a5-compass.png"
 },{
   "name": "Telegraph",
   "url":"/projects/telegraph",
@@ -40,13 +67,22 @@ Here are some cool projects that you can build with your micro:bit!
   "name": "Radio",
   "url":"/projects/radio",
   "imageUrl":"/static/mb/projects/a9-radio.png"
-},{
-  "name": "Watch",
-  "url":"/projects/the-watch",
-  "imageUrl":"/static/mb/projects/a10-watch.png"
 }]
 ```
 
+## 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), [Watch](/projects/the-watch)
+[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/banana-keyboard.md

@@ -1,12 +1,16 @@
-# banana keyboard activity 
+# banana keyboard
 
-build a banana keyboard 
+### @description A beginner maker activity, building a piano from bananas.
 
-# micro:bit banana keyboard
+### ~avatar
+
+Build your own micro:bit piano using bananas!
+
+### ~
 
 ![](/static/mb/lessons/banana-keyboard-0.png)
 
-In this project, you will build your own music player micro:bit banana keyboard from household fruit. Project duration: 15 minutes.
+## Duration: ~20 minutes.
 
 ## Materials
 
@@ -15,86 +19,11 @@ In this project, you will build your own music player micro:bit banana keyboard
 * Orange
 * Crocodile clips
 
-## Steps
+## Activities
 
-### Step 1
-
-![](/static/mb/lessons/banana-keyboard-1.png)
-
-Using the 1st crocodile clip, connect the end of the crocodile clip onto GND pin on the micro:bit.
-
-### Step 2
-
-![](/static/mb/lessons/banana-keyboard-2.png)
-
-![](/static/mb/lessons/banana-keyboard-3.png)
-
-Using the 2nd crocodile clip, connect the end of the crocodile clip onto the 0 pin on the micro:bit.
-
-### Step 3
-
-![](/static/mb/lessons/banana-keyboard-4.png)
-
-Using the 1st crocodile clip, connect the second end of the crocodile clip onto based of the headphone jack.
-
-### Step 4
-
-![](/static/mb/lessons/banana-keyboard-5.png)
-
-![](/static/mb/lessons/banana-keyboard-6.png)
-
-Using the 2nd crocodile clip, connect the second end of the crocodile clip onto tip of the headphone jack.
-
-### Step 5
-
-![](/static/mb/lessons/banana-keyboard-7.png)
-
-Using the 3rd crocodile clip, connect the end of the crocodile clip onto the 1st crocodile clip already clipped onto GND.
-
-### Step 6
-
-![](/static/mb/lessons/banana-keyboard-8.png)
-
-![](/static/mb/lessons/banana-keyboard-9.png)
-
-Using the 3rd crocodile clip, connect the unattached end of the crocodile clip onto the orange.
-
-### Step 7
-
-![](/static/mb/lessons/banana-keyboard-10.png)
-
-Using the 4th crocodile clip, connect the end of the crocodile clip onto pin 1 on the micro:bit.
-
-### Step 8
-
-![](/static/mb/lessons/banana-keyboard-11.png)
-
-Using the 4th crocodile clip, connect the unattached end of the crocodile clip onto the banana.
-
-### Step 9
-
-![](/static/mb/lessons/banana-keyboard-12.png)
-
-Your banana keyboard is ready!
-
-### Step 10
-
-Connect your micro:bit to your computer using your USB cable and run this script:
-```blocks
-let sound = music.noteFrequency(Note.C);
-input.onPinPressed(TouchPin.P1, () => {
-    for (let i = 0; i < 5; i++) {
-        sound = sound + 25;
-        music.playTone(sound, music.beat(BeatFraction.Sixteenth));
-    }
-});
-```
-
-Tap your banana instrument to play sound against... the fruit!
-
-
-### ~avatar boothing
-
-Excellent, you're ready to continue with the [challenges](/projects/banana-keyboard-challenges)!
+* [Making the keyboard](/projects/banana-keyboard/making)  
+* [Beat box](/projects/banana-keyboard/beat-box)
 
+### ~button /projects/banana-keyboard/making
+Let's get started!
 ### ~

docs/projects/banana-keyboard/beat-box.md

@@ -1,10 +1,4 @@
-# banana keyboard blocks challenges
-
-control images with variables. 
-
-## Before we get started
-
-Control images with variables. 
+# banana keyboard - beat box
 
 Have you ever tried to making beat box sounds? Let's try making a beatbox with code!
 
@@ -35,7 +29,7 @@ input.onPinPressed(TouchPin.P1, () => {
 ```
 
 
-* click *run* to see if the code works as expected.
+* click *Download* to see if the code works as expected.
 
 
 
@@ -57,8 +51,4 @@ input.onPinPressed(TouchPin.P2, () => {
 })
 ```
 
-* click *run* to see if the code works as expected.
-
-### ~button /projects/telegraph
-NEXT: Telegraph
-### ~
+* click *Download* to see if the code works as expected.

docs/projects/banana-keyboard/making.md

@@ -0,0 +1,85 @@
+# banana keyboard - making
+
+## Materials
+
+* micro:bit, battery holder and 2 AAA batteries
+* Bananas
+* Orange
+* Crocodile clips
+
+## Steps
+
+### Step 1
+
+![](/static/mb/lessons/banana-keyboard-1.png)
+
+Using the 1st crocodile clip, connect the end of the crocodile clip onto GND pin on the micro:bit.
+
+### Step 2
+
+![](/static/mb/lessons/banana-keyboard-2.png)
+
+![](/static/mb/lessons/banana-keyboard-3.png)
+
+Using the 2nd crocodile clip, connect the end of the crocodile clip onto the 0 pin on the micro:bit.
+
+### Step 3
+
+![](/static/mb/lessons/banana-keyboard-4.png)
+
+Using the 1st crocodile clip, connect the second end of the crocodile clip onto based of the headphone jack.
+
+### Step 4
+
+![](/static/mb/lessons/banana-keyboard-5.png)
+
+![](/static/mb/lessons/banana-keyboard-6.png)
+
+Using the 2nd crocodile clip, connect the second end of the crocodile clip onto tip of the headphone jack.
+
+### Step 5
+
+![](/static/mb/lessons/banana-keyboard-7.png)
+
+Using the 3rd crocodile clip, connect the end of the crocodile clip onto the 1st crocodile clip already clipped onto GND.
+
+### Step 6
+
+![](/static/mb/lessons/banana-keyboard-8.png)
+
+![](/static/mb/lessons/banana-keyboard-9.png)
+
+Using the 3rd crocodile clip, connect the unattached end of the crocodile clip onto the orange.
+
+### Step 7
+
+![](/static/mb/lessons/banana-keyboard-10.png)
+
+Using the 4th crocodile clip, connect the end of the crocodile clip onto pin 1 on the micro:bit.
+
+### Step 8
+
+![](/static/mb/lessons/banana-keyboard-11.png)
+
+Using the 4th crocodile clip, connect the unattached end of the crocodile clip onto the banana.
+
+### Step 9
+
+![](/static/mb/lessons/banana-keyboard-12.png)
+
+Your banana keyboard is ready!
+
+### Step 10
+
+Connect your micro:bit to your computer using your USB cable and run this script:
+```blocks
+input.onPinPressed(TouchPin.P1, () => {
+    music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+});
+```
+
+Tap your banana instrument to play sound against... the fruit!
+
+### ~button /projects/banana-keyboard/beat-box
+NEXT: beat box
+### ~

docs/projects/compass.md

@@ -103,7 +103,3 @@ basic.forever(() => {
     }
 });
 ```
-
-### ~button /projects/hack-your-headphones
-NEXT: Hack Your Headphones
-### ~

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,26 +98,24 @@ 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);
 })
 ```
-
-### ~button /projects/smiley-buttons
-NEXT: Smiley Buttons
-### ~

docs/projects/guitar.md

@@ -0,0 +1,42 @@
+# Guitar
+
+![guitar icon](/static/mb/projects/guitar.png)
+
+### @description A beginner-intermediate maker activity, building a guitar with the micro:bit  
+
+### ~avatar avatar
+
+Make a micro:bit guitar with this guided tutorial!
+
+### ~
+*playing micro:bit guitar*
+https://youtu.be/GYmdTFvxz80
+
+## Duration
+
+5 Activities, approx 30-45 min each based on familiarity with the coding concepts
+
+## Materials
+
+* Cardboard large pieces (recycle!)
+* Tape (masking, duct tape, and/or packing tape)
+* Markers and/or paint
+* Aluminum Foil
+* Scissors that can cut cardboard
+* 1 micro:bit, battery holder and 2 AAA batteries
+* 4-5 Crocodile clips
+* Headphones
+
+## Activities
+
+* [Making the Guitar Body](/projects/guitar/making)  
+* [Buttons, Display & Sound](/projects/guitar/displaybuttons)  
+* [Light Sensor Tone control](/projects/guitar/lightsensor)  
+* [Accelerometer Beat control](/projects/guitar/accelerometer)  
+* [Pin Press Switch](/projects/guitar/pinpress)  
+
+### ~button /projects/guitar/making
+
+Let's get started!
+
+### ~

docs/projects/guitar/accelerometer.md

@@ -0,0 +1,115 @@
+# Accelerometer Beat control
+
+### @description micro:bit guitar: using accelerometer to control tempo
+
+### ~avatar avatar
+
+Use the Accelerometer to control guitar tempo
+* Concepts:
+     * Gravity
+     * Acceleration
+     * X, Y, Z coordinates
+     * Tempo
+     * Beat
+     * Mapping
+     * Graphing
+     * Absolute value
+
+### ~  
+
+## Duration: 30 - 45 minutes  
+  
+*accelerometer controlled tempo*  
+https://youtu.be/kA0HpqCWsjs
+
+## Blocks
+
+```cards
+input.acceleration(Dimension.Y)
+music.setTempo(120)
+pins.map(0, 0, 1023,60, 320)
+Math.abs(1)            
+```
+
+## Accelerometer, gravity and tilting!
+
+The micro:bit contains an **accelerometer** sensor that is able to measure forces applied to the board.
+On earth, we are subject to the **gravity force** which pulls us to the ground!
+
+https://youtu.be/0SULoTKmkhI
+
+When the micro:bit is flat on a table, with the screen pointing up, the gravity force is aligned
+with the **Z** axis of the micro:bit. 
+
+![micro:bit x, y, z axis image](/static/mb/projects/guitar/accelleration_axis.png)  
+
+If you tilt it up and down, the force will align with the **Y** axis -- this is how we can detect tilting!!!
+If the force along **Y** grows, the micro:bit is tilting more and more vertically!
+
+## Measuring Acceleration along different coordinates (X, Y, Z axis)  
+
+The acceleration block approximately measures **milli-g**, which is 1/1000 of a **g** or the 
+acceleration of gravity. 
+
+### Step 1: Graphing acceleration 
+```blocks
+basic.forever(() => {
+    led.plotBarGraph(input.acceleration(Dimension.Y), 1023)
+})
+```
+**Create the code** that measures the change in the Y axis acceleration as a graph on the LEDs  
+  
+**Dowload the code** to the micro:bit 
+  
+**Test the movements that move the graph from 1 to 5 bars on the LEDs** 
+
+### Extra
+
+Try graphing the acceleration along the **X** and **Z** axis. Can you explain the differences?
+
+### ~hint  
+## Mapping  
+**It is common to map one standard to another - such as with temperature**  
+![Fahrenheit to Celsius](/static/mb/projects/guitar/map_analogy.png "Fahrenheit to Celsius")  
+### ~
+
+### Step 2: Mapping acceleration to Beat
+**micro:bit sensors produce signal values between 0 to 1023. The *[map block](/reference/pins/map)* converts the signal to a desired range.**    
+```blocks
+basic.forever(() => {
+        music.setTempo(pins.map(Math.abs(input.acceleration(Dimension.Y)),
+            0, 1023,
+            60, 320))
+         music.playTone(Note.C, music.beat(BeatFraction.Quarter));
+})
+```  
+
+**Create the code** that *Maps*  Y axis acceleration as *tempo*  
+  
+**Download the code** to the micro:bit on the guitar  
+  
+**Test the movements that speed and slow the tempo**  
+
+### Step 3: Combine with light sensor tone control  
+**Put it all together!**
+
+```blocks
+basic.forever(() => {
+        music.setTempo(pins.map(Math.abs(input.acceleration(Dimension.Y)),
+            0, 1023,
+            60, 320))
+        music.playTone(
+            input.lightLevel() * 25,
+            music.beat(BeatFraction.Quarter)
+        );
+})
+```  
+**Combine the code above with the light sensor tone control code from the previous activity**
+  
+**Download the code** to the micro:bit on the guitar    
+
+###  Now play the guitar adjusting tone and tempo using the light sensor and accelerometer!
+
+### ~button /projects/guitar/pinpress
+NEXT: Pin Press on/off
+### ~

docs/projects/guitar/displaybuttons.md

@@ -0,0 +1,179 @@
+# Buttons, Display & Sound
+### @description micro:bit guitar: using buttons with display and sound
+
+### ~avatar avatar
+Use Button Events to control LED Display and play Sound
+* **Concepts:**
+     * Events
+     * Tone/Note
+     * Sequence
+
+### ~
+
+## Duration: 30 - 45 minutes
+
+## Materials
+
+A micro:bit, battery pack and 2 x AAA batteries
+
+![battery pack and micro:bit](/static/mb/projects/guitar/microbit.jpg)
+
+2 to 4 crocodile clips
+
+![crocodile clips](/static/mb/projects/guitar/crocclips.jpg)
+
+Headphones
+
+![earbud headphones](/static/mb/projects/guitar/headphones.jpg)
+
+## Blocks
+
+```cards
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . # # # .
+        . # . # .
+        . # # # .
+        `);
+input.onButtonPressed(Button.A, () => {});
+music.playTone(Note.C, music.beat(BeatFraction.Quarter))
+music.rest(music.beat(BeatFraction.Whole))
+music.beat(BeatFraction.Quarter)
+```
+
+## Step 1: Make a Smiley
+Open [pxt.microbit.org](https://pxt.microbit.org) in your web browser
+```blocks
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . # # # .
+        . # . # .
+        . # # # .
+        `);
+```
+From **Basics**, drag a **show LEDs** block into the coding area
+  * Create a face with LEDs
+
+![micro:bit USB connection](/static/mb/projects/guitar/connectmicrobit.jpg)
+Connect your micro:bit to your computer via USB and click **`Download`**.
+Follow the instructions to move the code to your micro:bit.
+
+## Step 2: Add Smiley LED Button Events
+```blocks
+input.onButtonPressed(Button.A, () => {
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . # # # .
+        . # . # .
+        . # # # .
+        `)
+})
+input.onButtonPressed(Button.B, () => {
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . . . . .
+        # . . . #
+        . # # # .
+        `)
+})
+```
+
+From **Input**, drag an **on button 'A' pressed** block into the coding area
+
+* Snap the LED face into the block
+
+* Create a 'B' button block with a different LED face
+
+* Download the code to your micro:bit and try the A & B buttons
+
+
+## Step 3: Add Headphone Speakers using Crocodile clips
+
+![crocodile clips attached to pins 0 and GND](/static/mb/projects/guitar/crocclipintoboard.jpg)
+
+![crocodile clips attached to headphone jack](/static/mb/projects/guitar/jacktocrocs.jpg)
+Connect **GND** to the **base of the headphone jack** using a second crocodile clip (usually black)
+
+Connect **pin 0** to the **tip of the headphone jack** with a crocodile clip
+
+*attaching batteries and micro:bit*
+https://youtu.be/zwRTmpKIaVU
+Attach the micro:bit & battery-pack to the guitar body
+
+*connecting headphone speaker*
+https://youtu.be/ewyEW_U5G9M
+Connect the headphones with crocodile clips
+
+### ~hint
+## The micro:bit can play music
+
+The **play tone** block allows a range letter note tones from **C** to **B5**.
+Songs are played using sequences notes.   Like the beginning of a birthday song (C, C, D, C, F, E).
+```blocks
+input.onButtonPressed(Button.A, () => {
+    music.playTone(Note.C, music.beat(BeatFraction.Quarter))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.playTone(Note.C, music.beat(BeatFraction.Quarter))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.playTone(Note.D, music.beat(BeatFraction.Quarter))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.playTone(Note.C, music.beat(BeatFraction.Quarter))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.playTone(Note.F, music.beat(BeatFraction.Half))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.playTone(Note.E, music.beat(BeatFraction.Whole))
+})
+```
+### ~
+## Step 4: Add Tone Playing Events for Buttons A & B
+```blocks
+input.onButtonPressed(Button.A, () => {
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . # # # .
+        . # . # .
+        . # # # .
+        `)
+    music.playTone(Note.A, music.beat(BeatFraction.Whole))
+})
+input.onButtonPressed(Button.B, () => {
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . . . . .
+        # . . . #
+        . # # # .
+        `)
+    music.playTone(Note.G, music.beat(BeatFraction.Whole))
+})
+```
+From **Music**, drag **play tone *C* for *1* beat** block under the **show leds** in **Button A Pressed**
+
+  * modify **tone** by choosing a note (*letter*) and experiment with high and low pitches
+  * set **beat** to 1
+
+**Repeat** for **Button B** event
+
+**Download the code** to the micro:bit
+
+**Try the A & B buttons** with headphones and power connected
+
+## Congratulations on completing the basic guitar!
+**Challenge:** Create samples of longer music to play for each button instead of the single tone
+  * *Tip*: Search for "ABC music notation" or "Easy Music Notes" + the name of a song
+
+## Extra
+
+* [Smiley Buttons tutorial](/projects/smiley-buttons)
+* [Hack your headphones](/projects/hack-your-headphones)
+
+
+### ~button /projects/guitar/lightsensor
+NEXT: Light Sensor Tone Control
+### ~

docs/projects/guitar/lightsensor.md

@@ -0,0 +1,115 @@
+# Light Sensor Tone control
+
+### @description micro:bit guitar: using light sensor to control tone
+
+### ~avatar avatar
+
+Use the Light Sensor to the control tone for this [Theremin](https://en.wikipedia.org/wiki/Theremin) inspired guitar
+
+* **Concepts:**
+     * Inputs
+     * Light Intensity
+     * Tone/Frequency
+     * Ratio Mapping
+     * Forever Loop
+     * Math (multiplication) with code properties
+### ~
+
+## Duration: 30 - 45 minutes
+
+*playing tones with light sensor*
+https://youtu.be/2cKg9pokVC4
+
+## The micro:bit LEDs Light Sensors
+
+- the micro:bit can detect external light level intensity reaching the LEDs
+- the light level block reports a reading of values 0 (*dark*) to 255 (*bright*)
+- a **Forever Loop** is required to continually measure the current light level and control the tone
+
+## Forever Loop
+
+The forever loop really does run forever.  The forever loop is useful when there is a need to continually check for an event or use a changing value in code.
+
+## Blocks
+
+```cards
+basic.forever(() => {})
+input.lightLevel()
+led.plotBarGraph(0, 255)
+music.playTone(Note.C, music.beat(BeatFraction.Quarter))
+```
+
+## Step 1: Create a light level detector
+```blocks
+basic.forever(() => {
+    led.plotBarGraph(input.lightLevel(), 255)
+})
+```
+**Build the  blocks**
+  * From **Basic** drag a **forever loop** block into the coding area
+  * From **Led** drag a **plot bar graph** block into the **forever loop**
+  * From **Input** drag a **light level** block into **plot bar graph *of***
+
+**Set the *plot bar graph* value *up to* = *255* **
+
+## Step 2: Test the light required to move the bar graph height
+
+*graphing light input*
+https://youtu.be/pqU7bTcfQ_s
+Experiment to see the effect on graph height when the **plot bar graph** value ***up to*** is changed
+
+**255 is the maximum light input reading**, try numbers smaller than 255
+**Find a value** that allows the graph to show 1 - 5 bars
+
+### ~hint
+### Frequency
+**Frequency** measured in Hz which are cycles per second or vibrations per second
+  * A healthy human ear can detect frequencies in the range of 20Hz to 20,000Hz.
+  * The micro:bit + headphones reliably produce detectable output ~50Hz - 6,000Hz.
+
+**261Hz** represents a C note
+```blocks
+music.playTone(261, music.beat(BeatFraction.Half))
+```
+**play tone** blocks can specify a numeric  **Frequency**
+by replacing the letter **C** note with a **number** block that has the value it represents
+```blocks
+music.playTone(261, music.beat(BeatFraction.Half))
+```
+### ~
+
+## Step 3: Multiply Frequency using Math blocks
+ ```blocks
+input.onButtonPressed(Button.A, () => {
+    music.playTone(261 * 2, music.beat(BeatFraction.Half))
+})
+```
+Create a **play tone** block using a **Math** section, **multiplication** block to set *tone*
+
+### Next
+**Add** a **B** button block that multiplies the **261** tone by a number other than 2 to set tone
+
+**Download the code to the micro:bit**
+
+**Test the sound for multiples of the 261Hz *C* frequency**
+
+## Step 4: Control the Frequency with the light input
+```blocks
+basic.forever(() => {
+    music.playTone(input.lightLevel() * 25, music.beat(BeatFraction.Quarter))
+})
+```
+**Create a *forever loop* containing a *play tone* block**
+
+**Set *tone*, using *Math* multiplication block that multiplies *light level* input by 25**
+or experiment with multipliers larger and smaller than 25
+
+**Test light tone control on the guitar**
+Cover the LEDs with your hand to vary light detected to control the tone
+
+## Good work, this guitar is sounding good!
+**Challenge:** Create a variable for the light level multiplier that you can change using buttons (optional)
+
+### ~button /projects/guitar/accelerometer
+NEXT: Accelerometer Beat control
+### ~

docs/projects/guitar/making.md

@@ -0,0 +1,59 @@
+# Making the Guitar Body
+### @description Maker Project for Guitar Body for micro:bit
+
+### ~avatar avatar
+
+Make the Guitar Body for your micro:bit Guitar
+
+### ~
+
+## Duration: ~45 minutes
+
+## Materials
+  * Cardboard large pieces (recycle!)
+  * Tape (masking, duct tape, and/or packing tape)
+  * Scissors that can cut cardboard
+  * Markers and/or paint
+
+![Materials: cardboard, tape, scissors, markers](/static/mb/projects/guitar/materials.jpg)
+
+## Step 1: Design the body
+*tracing the guitar design*
+https://youtu.be/xMSrWaOZkFg
+
+* Search for [Guitar Silhouette](https://www.bing.com/images/search?q=Guitar+Silhouettes) design ideas and customize
+the shape of your guitar
+* Trace the design on a flat piece of cardboard (40-80 cm is best)
+
+### ~hint
+
+   * Avoid small details that are difficult to cut into cardboard
+   * Unfolding a box gives longer pieces of cardboard and creases can be reinforced
+
+### ~
+
+## Step 2: Cut out the body
+*cutting the cardboard*
+https://youtu.be/aUQkrFoEank
+
+
+## Step 3: Personalize the Guitar
+
+Create unique styles using tape, markers, paint and other available materials (*calling all artists!*)
+
+*decorating the guitar*
+https://youtu.be/zNAZTJeSxY8
+
+Everyone can come up with a unique design!
+
+![guitar design samples](/static/mb/projects/guitar/otherdesigns.jpg)
+
+## Extra!
+*strengthening the guitar*
+https://youtu.be/q0GkQdJmxjE
+
+Strengthen the guitar next with an angled cardboard strip (*optional*).
+
+### ~button /projects/guitar/displaybuttons
+NEXT: Buttons, Display and Sound
+### ~

docs/projects/guitar/pinpress.md

@@ -0,0 +1,131 @@
+# Pin Press Switch
+
+### @description micro:bit guitar: use pin press to toggle guitar play on/off
+
+### ~avatar avatar
+Use pin press to switch guitar play on/off
+
+* Concepts:
+    * Circuit
+    * Conductor
+    * Variable/Global-Variable
+    * Conditional: **`if`**, **`else`**
+    * Boolean: **`True`/`False`**
+### ~
+
+## Duration: approximately 45 minutes
+
+## Materials:
+2-3 Crocodile clips
+
+## Blocks
+
+```cards
+var on = false
+on;
+if (on) { } else {}
+input.onPinPressed(TouchPin.P1, () => {})
+```
+
+
+
+### ~hint
+## Circuits & Switches
+* **Circuits** need a power supply (battery), a resister (like a LED) & a conductor (metal, water, hand)
+* **Switches** turn electric power on by closing (completing) a circuit with a conductor so power can flow
+
+**Metal foil and wires make excellent conductors**
+
+**In this activity we use YOU to conduct electricity**
+**to close the circuit that switches the guitar ON and OFF!**
+### ~
+
+## Step 1: Pin Press Test
+
+```blocks
+input.onPinPressed(TouchPin.P0, () => {
+    basic.showNumber(0)
+})
+input.onPinPressed(TouchPin.P1, () => {
+    basic.showNumber(1)
+})
+input.onPinPressed(TouchPin.P2, () => {
+    basic.showNumber(2)
+})
+```
+**Create the pin-press code**
+
+**Download the code** on the micro:bit
+
+https://youtu.be/PAIU-vHqyGU
+
+**Hold the micro:bit touching The GND pin with one hand**
+**with the other hand alternately touch the 0, 1 and 2 pins**
+
+### ~hint
+**The electric signal traveled from pins, between your hands to `GND` and the micro:bit detected the electric signal!**
+### ~
+
+## Step 2: Installing conductive foil on the guitar
+https://youtu.be/NX0ECcpXFes
+**Add foil to the guitar body where it is easy to touch while playing**
+
+**Connect the foil to `GND` using a crocodile clip**
+
+https://youtu.be/YkymZGNmkrE
+**Add foil to the guitar neck**
+
+**Connect the foil to `pin 1` using a crocodile clip**
+
+## Step 3: Add a switch to turn the guitar ON and OFF
+**Using the `on` global variable we can switch the message on the micro:bit**
+**between ON and OFF**
+```blocks
+let on = false
+basic.forever(() => {
+    if (on == true) {
+        basic.showString("ON")
+    } else {
+        basic.showString("OFF")
+    }
+})
+input.onPinPressed(TouchPin.P1, () => {
+    if (on == true) {
+        on = false
+    } else {
+        on = true
+    }
+})
+```
+**Create the ON/OFF switch code**
+
+**Download the code on the micro:bit**
+
+**Test by touching `P1` to toggle the LED message between ON and OFF**
+
+*Final code*
+TODO: do we want to use `on = !on;` or be more direct in flipping the switch? `on = true; on = false;`
+```blocks
+var on = false
+basic.forever(() => {
+    if (on) {
+        music.setTempo(pins.map(Math.abs(input.acceleration(Dimension.Y)),
+            0, 1023,
+            60, 320))
+        music.playTone(
+            input.lightLevel() * 25,
+            music.beat(BeatFraction.Quarter)
+        );
+    } else {
+        music.rest(music.beat())
+    }
+})
+input.onPinPressed(TouchPin.P1, () => {
+    on = !on;
+})
+```
+## Now Play!
+**Turn the guitar ON and OFF with a pin press on the connected foil by**
+**touching both pieces of foil at the same time to connect the switches**
+
+https://youtu.be/GYmdTFvxz80

docs/projects/hack-your-headphones.md

@@ -1,12 +1,17 @@
 # hack your headphones 
 
-Hack your headphones
+### @description A beginner maker activity, building a piano from bananas.
 
-#  micro:bit music
+### ~avatar
+
+Build your own music player micro:bit from headphones.
+
+### ~
 
 ![](/static/mb/lessons/hack-your-headphones-0.png)
 
-In this project, you will build your own music player micro:bit from headphones. Project duration: 15 minutes.
+
+## Duration: ~15 minutes.
 
 ## Materials
 
@@ -14,48 +19,19 @@ In this project, you will build your own music player micro:bit from headphones.
 * Headphones
 * Crocodile clips
 
-## Steps
+## Activities
 
-### Step 1
+* [Connect your headphone](/projects/hack-your-headphones/making)
+* [Play sounds!]()
 
-![](/static/mb/lessons/banana-keyboard-1.png)
+# ~hint
 
-Using the 1st crocodile clip, connect the end of the crocodile clip onto GND pin on the micro:bit.
+**No crocodile clips!?!?!** Use wires or Aluminium foil! [Read more...](/device/foil-circuits)
 
-### Step 2
+# ~
 
-![](/static/mb/lessons/banana-keyboard-2.png)
+### ~button /projects/hack-your-headphones/making
 
-![](/static/mb/lessons/banana-keyboard-3.png)
-
-Using the 2nd crocodile clip, connect the end of the crocodile clip onto the 0 pin on the micro:bit.
-
-### Step 3
-
-![](/static/mb/lessons/banana-keyboard-4.png)
-
-Using the 1st crocodile clip, connect the second end of the crocodile clip onto based of the headphone jack. The base of your headphone jack is considered the ground so it is connected to the GND of the micro:bit.
-
-### Step 4
-
-![](/static/mb/lessons/banana-keyboard-5.png)
-
-![](/static/mb/lessons/hack-your-headphones-1.png)
-
-Using the 2nd crocodile clip, connect the second end of the crocodile clip onto the tip of the headphone jack. The tip of your headphone jack feeds into the right speaker on the headphone. You connect from the micro:bit pin 0 to the tip of the right side of your headphone. Use the tip of the headphone jack to play sounds.
-
-### Step 5
-
-![](/static/mb/lessons/hack-your-headphones-0.png)
-
-You hacked your headphones!
-
-### Step 6
-
-Connect your micro:bit to your computer using your USB cable and program  [light beatbox](/projects/hack-your-headphones-challenges) music on it. Press the reset button to restart your music player!
-
-### ~avatar avatar
-
-Excellent, you're ready to continue with the [challenges](/projects/hack-your-headphones-challenges)!
+Let's get started!
 
 ### ~

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

@@ -0,0 +1,53 @@
+# hack your headphones - making
+
+### ~avatar avatar
+
+Did you know you could attach your headhpones to the micro:bit to generate sounds?
+
+### ~
+
+# ~hint
+
+**No crocodile clips!?!?!** Use wires or Aluminium foil! [Read more...](/device/foil-circuits)
+
+# ~
+
+### Step 1
+
+![](/static/mb/lessons/banana-keyboard-1.png)
+
+Using the 1st crocodile clip, connect the end of the crocodile clip onto GND pin on the micro:bit.
+
+### Step 2
+
+![](/static/mb/lessons/banana-keyboard-2.png)
+
+![](/static/mb/lessons/banana-keyboard-3.png)
+
+Using the 2nd crocodile clip, connect the end of the crocodile clip onto the 0 pin on the micro:bit.
+
+### Step 3
+
+![](/static/mb/lessons/banana-keyboard-4.png)
+
+Using the 1st crocodile clip, connect the second end of the crocodile clip onto based of the headphone jack. The base of your headphone jack is considered the ground so it is connected to the GND of the micro:bit.
+
+### Step 4
+
+![](/static/mb/lessons/banana-keyboard-5.png)
+
+![](/static/mb/lessons/hack-your-headphones-1.png)
+
+Using the 2nd crocodile clip, connect the second end of the crocodile clip onto the tip of the headphone jack. The tip of your headphone jack feeds into the right speaker on the headphone. You connect from the micro:bit pin 0 to the tip of the right side of your headphone. Use the tip of the headphone jack to play sounds.
+
+### Step 5
+
+![](/static/mb/lessons/hack-your-headphones-0.png)
+
+You hacked your headphones!
+
+### ~button /projects/hack-your-headphones/music-of-light
+
+NEXT: music of light
+
+### ~

docs/projects/hack-your-headphones/music-of-light.md

@@ -1,6 +1,4 @@
-# hack your headphones challenges
-
-Control sound with the light level. 
+# hack your headphones - music of light
 
 ### ~avatar avatar
 
@@ -70,7 +68,3 @@ input.onButtonPressed(Button.A, () => {
 ```
 
 * click **Download** and run your code on the micro:bit.
-
-### ~button /projects/banana-keyboard
-NEXT: Banana Keyboard
-### ~