Merging microbit/master

2016-10-24 10:27:48 -07:00
parent 99bee9e796 06641d4e5c
commit cf778686c3
153 changed files with 3846 additions and 481 deletions
--- a/pxtarget.json
+++ b/pxtarget.json
@@ -80,12 +80,12 @@
                    "microbit-pins": "",
                    "microbit-serial": ""
                }
-            }, 
+            },
            {
                "type": "api",
                "map": {
-                    "bluetooth\\.uartRead\\((.*?)\\)" : "bluetooth.uartReadUntil($1)",
-                    "bluetooth\\.uartWrite\\((.*?)\\)" : "bluetooth.uartWriteUntil($1)"
+                    "bluetooth\\.uartRead\\((.*?)\\)": "bluetooth.uartReadUntil($1)",
+                    "bluetooth\\.uartWrite\\((.*?)\\)": "bluetooth.uartWriteUntil($1)"
                }
            }
        ]
@@ -286,7 +286,7 @@
                "name": "Hardware",
                "path": "/device"
            }
-        ],
+        ],        
        "sideDoc": "getting-started",
        "usbDocs": "/device/usb",
        "usbHelp": [