Merge branch 'master' of https://github.com/Microsoft/pxt-microbit

docfiles/meta.html

@@ -19,10 +19,3 @@
 <link rel="shortcut icon" href="@appLogo@">
 <meta name="theme-color" content="@accentColor@">
 
-<style>
-    #root .avatar .avatar-image {
-        background-image: url(https://az851932.vo.msecnd.net/pub/jovrytni/microbit.simplified.svg);
-        background-size: contain;
-        background-repeat: no-repeat;
-    }
-</style>

docs/device/usb.md

@@ -149,6 +149,10 @@ By copying the script onto the `MICROBIT` drive, you have programmed it into the
 flash memory on the micro:bit, which means even after you unplug the micro:bit,
 your program will still run if the micro:bit is powered by battery.
 
+If you want to save time, you can use the [micro:bit uploader](/uploader) to
+automatically deploy hex files to your micro:bit. It works on Windows and is
+compatible with any browser.
+
 ## Troubleshooting
 
 You can’t drag and drop more than one hex file at once onto your micro:bit. If

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-microbit",
-  "version": "0.3.88",
+  "version": "0.4.1",
   "description": "micro:bit target for PXT",
   "keywords": [
     "JavaScript",
@@ -29,6 +29,6 @@
     "typescript": "^1.8.7"
   },
   "dependencies": {
-    "pxt-core": "0.3.102"
+    "pxt-core": "0.4.2"
   }
 }

pxtarget.json

@@ -143,7 +143,70 @@
                 "path": "/device"
             }
         ],
-        "sideDoc": "getting-started"
+        "sideDoc": "getting-started",
+        "usbDocs": "/device/usb",
+        "usbHelp": [
+            {
+                "name": "connection",
+                "os": "*",
+                "browser": "*",
+                "path": "/static/mb/device/usb-generic.jpg"
+            },
+            {
+                "name": "connection",
+                "os": "mac",
+                "browser": "*",
+                "path": "/static/mb/device/usb-mac.jpg"
+            },
+            {
+                "name": "save",
+                "os": "windows",
+                "browser": "firefox",
+                "path": "/static/mb/device/usb-windows-firefox-1.png"
+            },
+            {
+                "name": "save",
+                "os": "mac",
+                "browser": "firefox",
+                "path": "/static/mb/device/usb-osx-firefox-1.png"
+            },
+            {
+                "name": "save",
+                "os": "mac",
+                "browser": "chrome",
+                "path": "/static/mb/device/usb-osx-chrome.png"
+            },
+            {
+                "name": "save",
+                "os": "windows",
+                "browser": "edge",
+                "path": "/static/mb/device/usb-windows-edge-1.png"
+            },
+            {
+                "name": "save",
+                "os": "windows",
+                "browser": "ie",
+                "path": "/static/mb/device/usb-windows-ie11-1.png"
+            },
+            {
+                "name": "save",
+                "os": "windows",
+                "browser": "chrome",
+                "path": "/static/mb/device/usb-windows-chrome.png"
+            },
+            {
+                "name": "copy",
+                "os": "mac",
+                "browser": "*",
+                "path": "/static/mb/device/usb-osx-dnd.png"
+            },
+            {
+                "name": "copy",
+                "os": "windows",
+                "browser": "*",
+                "path": "/static/mb/device/usb-windows-sendto.jpg"
+            }
+        ]
     },
     "analytics": {
         "userVoiceApiKey": "WEkkIGaj1WtJnSUF59iwaA",