0.2.46

README.md

@@ -1,48 +1,10 @@
-# micro:bit target for KindScript
+# micro:bit target for PXT
 
-This target allow to program a [BBC micro:bit](https://www.microbit.co.uk/) using [KindScript](https://github.com/Microsoft/kindscript).
+This target allow to program a [BBC micro:bit](https://www.microbit.co.uk/) using 
+[Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt).
 
-[![Build Status](https://travis-ci.org/Microsoft/kindscript-microbit.svg?branch=master)](https://travis-ci.org/Microsoft/kindscript-microbit)
+[![Build Status](https://travis-ci.org/Microsoft/pxt-microbit.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-microbit)
 
 # Getting started
 
-> If you're making changes to kindscript repository itself, proceed to **Local installation** below.
-
-* Clone this repo and run
-
-```
-npm install
-```
-
-* Install the `KindScript` tool and launch the local server:
-
-```
-npm install -g kindscript-cli
-kind serve
-```
-To re-build the `built/target.json` file, re-run `kind serve`.
-
-
-## Local installation
-
-* Clone and build [KindScript](https://github.com/Microsoft/kindscript) in a `kindscript` folder.
-* Clone this repo  in a `kindscript-microbit` folder next to `kindscript`
-
-```
-npm install
-```
-* To build and deploy new changes
-
-```
-npm install -g kindscript-cli
-cd ../kindscript
-jake
-cd ../kindscript-microbit
-npm link ../kindscript
-```
-* run this command to build and launch a local editor
-
-```
-kind serve
-```
-* open `localhost:3232` to try your editor!
+Please follow instructions at https://github.com/Microsoft/pxt#running-a-target-from-localhost 

docs/static/microbitlogo.svg

@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<svg xmlns:svg='http://www.w3.org/2000/svg' xmlns='http://www.w3.org/2000/svg' width='193.50101' height='32.755001' version='1.1'><g transform='translate(-1.3555,0.63251107)'><title>micro:bit logo</title><path d='m 38.7185,20.11349 c -1.677,0 -3.035,-1.364 -3.035,-3.042 0,-1.678 1.357,-3.038 3.035,-3.038 1.684,0 3.039,1.36 3.039,3.038 0,1.678 -1.355,3.042 -3.039,3.042 m -22.311,-6.077 c -1.677,0 -3.042,1.357 -3.042,3.035 0,1.678 1.363,3.042 3.042,3.042 1.674,0 3.036,-1.364 3.036,-3.042 0,-1.678 -1.363,-3.035 -3.036,-3.035 m -0.003,-5.99 22.576,0 c 4.979,0 9.027,4.047 9.027,9.027 0,4.979 -4.049,9.031 -9.027,9.031 l -22.576,0 c -4.977,0 -9.03,-4.053 -9.03,-9.031 -0.001,-4.98 4.053,-9.027 9.03,-9.027 m 22.576,24.076 c 8.299,0 15.047,-6.75 15.047,-15.049 0,-8.299 -6.748,-15.051 -15.047,-15.051 l -22.576,0 c -8.299,0 -15.049,6.752 -15.049,15.051 0,8.299 6.75,15.049 15.049,15.049 l 22.576,0 m 112.099,-21.953 c 0,-1.453 -1.195,-2.633 -2.662,-2.633 -1.455,0 -2.639,1.18 -2.639,2.633 0,1.471 1.184,2.672 2.639,2.672 1.466,0 2.662,-1.202 2.662,-2.672 z m -66.786,5.445 c 0,-4.764 -2.893,-8.093 -7.031,-8.093 -2.027,0 -3.814,0.851 -5.223,2.47 -1.467,-1.661 -3.152,-2.47 -5.127,-2.47 -4.162,0 -7.066,3.329 -7.066,8.093 l 0,10.466 3.812,0 0,-10.644 c 0,-2.416 1.336,-4.104 3.254,-4.104 1.617,0 3.25,1.409 3.25,4.104 l 0,10.645 3.848,0 0,-10.645 c 0,-2.416 1.338,-4.104 3.252,-4.104 1.863,0 3.217,1.727 3.217,4.104 l 0,10.645 3.814,0 0,-10.467 z m 6.953,-7.632 -3.846,0 0,18.099 3.846,0 0,-18.099 z m 0.569,-5.128 c 0,-1.377 -1.096,-2.454 -2.492,-2.454 -1.4,0 -2.453,1.054 -2.453,2.454 0,1.398 1.078,2.494 2.453,2.494 1.375,0 2.492,-1.117 2.492,-2.494 z m 18.328,20.914 0.576,-0.521 -2.828,-2.658 -0.488,0.455 c -1.252,1.149 -2.504,1.686 -3.945,1.686 -3.064,0 -5.557,-2.557 -5.557,-5.699 0,-3.121 2.492,-5.66 5.557,-5.66 1.432,0 2.646,0.521 3.949,1.693 l 0.512,0.46 2.748,-2.802 -0.49,-0.502 c -1.754,-1.793 -4.016,-2.696 -6.719,-2.696 -2.459,0 -4.869,1.022 -6.605,2.798 -1.738,1.734 -2.691,4.119 -2.691,6.709 0,2.596 0.953,4.979 2.684,6.705 1.771,1.811 4.117,2.811 6.615,2.811 2.401,-0.003 4.647,-0.937 6.682,-2.779 z m 7.25,-6.947 c 0,-3.322 1.145,-4.686 4.217,-5.029 l 0.641,-0.07 0,-3.797 -0.777,0.058 c -5.629,0.458 -8.143,3.247 -8.143,9.048 l 0,9.051 4.062,0 0,-9.261 0,0 z m 21.998,6.923 c 1.762,-1.756 2.729,-4.146 2.729,-6.715 0,-2.565 -0.967,-4.951 -2.723,-6.702 -1.77,-1.809 -4.105,-2.806 -6.576,-2.806 -2.492,0 -4.84,0.997 -6.613,2.806 -1.752,1.792 -2.721,4.174 -2.721,6.702 0,2.53 0.969,4.916 2.721,6.707 1.771,1.81 4.121,2.808 6.613,2.808 2.472,0 4.808,-0.998 6.57,-2.8 z m -1.229,-6.714 c 0,3.18 -2.361,5.665 -5.377,5.665 -2.945,0 -5.346,-2.541 -5.346,-5.665 0,-3.137 2.398,-5.695 5.346,-5.695 2.963,-0.002 5.377,2.558 5.377,5.695 z m 12.917,6.418 c 0,-1.468 -1.195,-2.667 -2.662,-2.667 -1.455,0 -2.639,1.199 -2.639,2.667 0,1.453 1.184,2.632 2.639,2.632 1.466,0 2.662,-1.179 2.662,-2.632 z m 19.507,0.296 c 1.76,-1.756 2.73,-4.146 2.73,-6.715 0,-2.528 -0.973,-4.911 -2.729,-6.702 -1.746,-1.787 -4.08,-2.77 -6.574,-2.77 -2.035,0 -3.84,0.572 -5.484,1.744 l 0,-9.934 -3.816,0 0.008,15.582 c -0.037,0.411 -0.037,0.821 -0.037,1.198 0,6.119 3.836,10.396 9.33,10.396 2.475,0.001 4.807,-0.997 6.572,-2.799 z m -1.013,-6.677 c 0,3.123 -2.494,5.66 -5.559,5.66 -3.115,0 -5.557,-2.484 -5.557,-5.66 0,-3.143 2.494,-5.698 5.557,-5.698 3.065,0 5.559,2.556 5.559,5.698 z m 10.881,-9.085 -3.846,0 0,18.099 3.846,0 0,-18.099 z m 0.572,-5.128 c 0,-1.377 -1.098,-2.454 -2.492,-2.454 -1.4,0 -2.457,1.054 -2.457,2.454 0,1.398 1.076,2.494 2.457,2.494 1.373,0 2.492,-1.117 2.492,-2.494 z m 13.83,19.759 -0.619,-0.089 c -2.855,-0.409 -4.133,-2.104 -4.133,-5.495 l 0,-5.126 4.752,0 0,-3.674 -4.752,0 0,-4.006 -3.887,0 0,4.006 -1.662,0 0,3.674 1.662,0 0,4.525 c 0,6.215 2.113,8.932 7.783,10.029 l 0.855,0.164 0,-4.008 0.001,0 z' style='fill:#000000' /></g></svg>

libs/i2c-fram/fram.ts

@@ -2,7 +2,7 @@ namespace i2c_fram {
     const devaddr = 0x50;
     const memend = 0x7fff;
 
-    //% shim=ksrt::panic
+    //% shim=pxtrt::panic
     function panic(code: number) { }
 
     function die() { panic(142) }

libs/lang-test0/lang-test0.ts

@@ -3,7 +3,7 @@
 // Do not use anything besides basic.pause, control.inBackground, console.log
 //
 
-//% shim=ksrt::panic
+//% shim=pxtrt::panic
 function panic(code2: number): void { }
 
 function msg(s: string): void {

libs/microbit-devices/devices.cpp

@@ -1,7 +1,7 @@
-#include "kindscript.h"
+#include "pxt.h"
 #include "MESEvents.h"
 
-using namespace kindscript;
+using namespace pxt;
 
 enum class MesCameraEvent {
     //% block="take photo"

libs/microbit-radio/radio.cpp

@@ -1,6 +1,6 @@
-#include "kindscript.h"
+#include "pxt.h"
 
-using namespace kindscript;
+using namespace pxt;
 
 //% color=270 weight=34
 namespace radio {
@@ -15,7 +15,7 @@ namespace radio {
         int r = uBit.radio.enable();
         if (r != MICROBIT_OK) return r;
         if (!radioEnabled) {
-            uBit.radio.setGroup(kindscript::programHash());
+            uBit.radio.setGroup(pxt::programHash());
             radioEnabled = true;
         }
         return r;

libs/microbit/core.cpp

@@ -154,7 +154,7 @@ namespace Array_ {
 }
 
 // Import some stuff directly
-namespace kindscript {
+namespace pxt {
   //%
   void registerWithDal(int id, int event, Action a);
   //%
@@ -181,7 +181,7 @@ namespace kindscript {
   void *ptrOfLiteral(int offset);
 }
 
-namespace ksrt {
+namespace pxtrt {
   //%
   uint32_t ldloc(RefLocal *r) {
     return r->v;

libs/microbit/ksbit.h

@@ -1,7 +1,7 @@
-#include "kindscript.h"
+#include "pxt.h"
 #include "ManagedBuffer.h"
 
-using namespace kindscript;
+using namespace pxt;
 MicroBitPin *getPin(int id);
 typedef ImageData* Image;
 typedef BufferData* Buffer;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-microbit",
-  "version": "0.2.42",
+  "version": "0.2.46",
   "description": "BBC micro:bit target for PXT",
   "keywords": [
     "JavaScript",
@@ -29,6 +29,6 @@
     "typescript": "^1.8.7"
   },
   "dependencies": {
-    "pxt-core": "0.2.43"
+    "pxt-core": "0.2.48"
   }
 }

pxtarget.json

@@ -59,7 +59,7 @@
         "autoRun": true
     },
     "compileService": {
-        "gittag": "v0.1.5",
+        "gittag": "v0.1.6",
         "serviceId": "ws"
     },
     "serial": {
@@ -93,4 +93,4 @@
             }
         ]
     }
-}
+}

sim/libmbit.ts

@@ -2,8 +2,8 @@
 /// <reference path="../node_modules/pxt-core/built/pxtsim.d.ts"/>
 /// <reference path="../libs/microbit/dal.d.ts"/>
 
-namespace pxt.rt {
-    pxt.rt.initCurrentRuntime = () => {
+namespace pxsim {
+    pxsim.initCurrentRuntime = () => {
         U.assert(!runtime.board)
         runtime.board = new Board()
     }
@@ -143,7 +143,7 @@ namespace pxt.rt {
 
 }
 
-namespace pxt.rt.basic {
+namespace pxsim.basic {
     export var pause = thread.pause;
     export var forever = thread.forever;
 
@@ -205,7 +205,7 @@ namespace pxt.rt.basic {
     }
 }
 
-namespace pxt.rt.control {
+namespace pxsim.control {
     export var inBackground = thread.runInBackground;
 
     export function reset() {
@@ -213,7 +213,7 @@ namespace pxt.rt.control {
     }
 
     export function onEvent(id: number, evid: number, handler: RefAction) {
-        kindscript.registerWithDal(id, evid, handler)
+        pxt.registerWithDal(id, evid, handler)
     }
 
     export function raiseEvent(id: number, evid: number, mode: number) {
@@ -222,13 +222,13 @@ namespace pxt.rt.control {
     }
 }
 
-namespace pxt.rt.kindscript {
+namespace pxsim.pxt {
     export function registerWithDal(id: number, evid: number, handler: RefAction) {
         board().bus.listen(id, evid, handler);
     }
 }
 
-namespace pxt.rt.input {
+namespace pxsim.input {
     export function onButtonPressed(button: number, handler: RefAction): void {
         let b = board();
         if (button == DAL.MICROBIT_ID_BUTTON_AB && !board().usesButtonAB) {
@@ -333,7 +333,7 @@ namespace pxt.rt.input {
     }
 }
 
-namespace pxt.rt.led {
+namespace pxsim.led {
     export function plot(x: number, y: number) {
         board().image.set(x, y, 255);
         runtime.queueDisplayUpdate()
@@ -367,7 +367,7 @@ namespace pxt.rt.led {
     }
 }
 
-namespace pxt.rt.serial {
+namespace pxsim.serial {
     export function writeString(s: string) {
         board().writeSerial(s);
     }
@@ -378,7 +378,7 @@ namespace pxt.rt.serial {
 }
 
 
-namespace pxt.rt.radio {
+namespace pxsim.radio {
     export function broadcastMessage(msg: number): void {
         board().radio.broadcast(msg);
     }
@@ -416,7 +416,7 @@ namespace pxt.rt.radio {
     }
 }
 
-namespace pxt.rt.pins {
+namespace pxsim.pins {
     export function digitalReadPin(pinId: number): number {
         let pin = getPin(pinId);
         if (!pin) return;
@@ -504,12 +504,12 @@ namespace pxt.rt.pins {
 
 }
 
-namespace pxt.rt.images {
+namespace pxsim.images {
     export function createImage(img: Image) { return img }
     export function createBigImage(img: Image) { return img }
 }
 
-namespace pxt.rt.ImageMethods {
+namespace pxsim.ImageMethods {
     export function showImage(i: Image, offset: number) {
         // TODO offset?
         i.copyTo(0, 5, board().image, 0)

sim/public/sim.manifest

@@ -0,0 +1,9 @@
+CACHE MANIFEST
+
+CACHE:
+/cdn/bluebird.min.js
+/cdn/pxtsim.js
+/sim/sim.js
+
+NETWORK:
+*

sim/public/simulator.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en" data-framework="typescript">
+<html lang="en" data-manifest="" data-framework="typescript">
 
 <head>
     <meta charset="utf-8">