integrated pxt-microbit

libs/bluetooth/pxt.json

@@ -1,5 +1,5 @@
 {
-    "name": "microbit-bluetooth",
+    "name": "bluetooth",
     "description": "Bluetooth services",
     "files": [
         "README.md",
@@ -10,7 +10,7 @@
     ],
     "public": true,
     "dependencies": {
-        "microbit": "file:../microbit"
+        "core": "file:../core"
     },
     "yotta": {
         "config": {

libs/core/pxt.json

@@ -1,5 +1,5 @@
 {
-    "name": "microbit",
+    "name": "core",
     "description": "The microbit core library",
     "installedVersion": "tsmdvf",
     "files": [

libs/devices/pxt.json

@@ -1,5 +1,5 @@
 {
-    "name": "microbit-devices",
+    "name": "devices",
     "description": "The BLE specific services",
     "files": [
         "README.md",
@@ -9,7 +9,7 @@
     ],
     "public": true,
     "dependencies": {
-        "microbit": "file:../microbit"
+        "core": "file:../core"
     },
     "yotta": {
         "config": {

libs/hello/pxt.json

@@ -6,6 +6,6 @@
     ],
     "public": true,
     "dependencies": {
-        "microbit": "file:../microbit"
+        "core": "file:../core",
     }
 }

libs/lang-test0/pxt.json

@@ -8,6 +8,6 @@
     "public": true,
     "additionalFilePath": "../../node_modules/pxt-core/libs/lang-test0",
     "dependencies": {
-        "microbit": "file:../microbit"
+        "core": "file:../core"
     }
 }

libs/lang-test1/pxt.json

@@ -7,6 +7,6 @@
     ],
     "public": true,
     "dependencies": {
-        "microbit": "file:../microbit"
+        "core": "file:../core"
     }
 }

libs/radio/pxt.json

@@ -1,5 +1,5 @@
 {
-    "name": "microbit-radio",
+    "name": "radio",
     "description": "The radio services",
     "files": [
         "README.md",
@@ -10,7 +10,7 @@
     ],
     "public": true,
     "dependencies": {
-        "microbit": "file:../microbit"
+        "core": "file:../core"
     },
     "yotta": {
         "config": {

libs/test-snippets/pxt.json

@@ -7,7 +7,7 @@
     ],
     "public": true,
     "dependencies": {
-        "microbit": "file:../microbit",
+        "core": "file:../core",
-        "microbit-radio": "file:../microbit-radio"
+        "radio": "file:../radio"
     }
 }

pxtarget.json

@@ -4,12 +4,12 @@
     "nickname": "mini",
     "title": "calliope - Blocks / Javascript editor",
     "description": "A Blocks / JavaScript code editor for the calliope.",
-    "corepkg": "microbit",
+    "corepkg": "core",
     "bundleddirs": [
-        "libs/microbit",
+        "libs/core",
-        "libs/microbit-radio",
+        "libs/radio",
-        "libs/microbit-devices",
+        "libs/devices",
-        "libs/microbit-bluetooth"
+        "libs/bluetooth"
     ],
     "cloud": {
         "workspace": false,
@@ -25,8 +25,8 @@
         "config": {
             "name": "{0} block",
             "dependencies": {
-                "microbit": "*",
+                "core": "*",
-                "microbit-radio": "*"
+                "radio": "*"
             },
             "description": "",
             "files": [
@@ -46,8 +46,8 @@
         "config": {
             "name": "{0} bit",
             "dependencies": {
-                "microbit": "*",
+                "core": "*",
-                "microbit-radio": "*"
+                "radio": "*"
             },
             "description": "",
             "files": [
@@ -65,7 +65,23 @@
         "hasHex": true,
         "deployDrives": "MINI",
         "driveName": "MINI",
-        "hexMimeType": "application/x-calliope-hex"
+        "hexMimeType": "application/x-calliope-hex",
+        "upgrades": [
+            {
+                "type": "package",
+                "map": {
+                    "microbit": "core",
+                    "microbit-bluetooth": "bluetooth",
+                    "microbit-radio": "radio",
+                    "microbit-devices": "devices",
+                    "microbit-led": "",
+                    "microbit-music": "",
+                    "microbit-game": "",
+                    "microbit-pins": "",
+                    "microbit-serial": ""
+                }
+            }
+        ]
     },
     "runtime": {
         "mathBlocks": true,

sim/visuals/neopixel.ts

@@ -1,7 +1,7 @@
 /// <reference path="../../node_modules/pxt-core/built/pxtsim.d.ts"/>
-/// <reference path="../../libs/microbit/dal.d.ts"/>
+/// <reference path="../../libs/core/dal.d.ts"/>
-/// <reference path="../../libs/microbit/shims.d.ts"/>
+/// <reference path="../../libs/core/shims.d.ts"/>
-/// <reference path="../../libs/microbit/enums.d.ts"/>
+/// <reference path="../../libs/core/enums.d.ts"/>
 
 namespace pxsim.visuals {
     const PIXEL_SPACING = PIN_DIST * 3;

tests/base/pxt.json

@@ -6,8 +6,8 @@
     ],
     "public": true,
     "dependencies": {
-        "microbit": "*",
+        "core": "*",
-        "microbit-radio": "*"
+        "radio": "*"
     },
     "installedVersion": "file:."
 }