Move C++ sim stuff to proper namespace

libs/hello/kind.json

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

sim/libmbit.ts

@@ -88,78 +88,6 @@ namespace ks.rt.micro_bit {
         throw new Error("PANIC " + code)
     }
 
-    /* basic */
-    export function showDigit(v: number) {
-        if (!quiet)
-            console.log("DIGIT:", v)
-        plotLeds(createImageFromString(v.toString()[0]));
-    }
-
-    export function clearScreen() {
-        board().image.clear();
-        runtime.queueDisplayUpdate()
-    }
-
-    export function showLeds(leds: micro_bit.Image, delay: number): void {
-        showAnimation(leds, delay);
-    }
-
-    function scrollImage(leds: micro_bit.Image, interval: number, stride: number): void {
-        let cb = getResume()
-        let off = stride > 0 ? 0 : leds.width - 1;
-        let display = board().image;
-
-        board().animationQ.enqueue({
-            interval: interval,
-            frame: () => {
-                if (off >= leds.width || off < 0) return false;
-                stride > 0 ? display.shiftLeft(stride) : display.shiftRight(-stride);
-                let c = Math.min(stride, leds.width - off);
-                leds.copyTo(off, c, display, 5 - stride)
-                off += stride;
-                return true;
-            },
-            whenDone: cb
-        })
-    }
-
-    export function showAnimation(leds: micro_bit.Image, interval: number = 400): void {
-        scrollImage(leds, interval, 5);
-    }
-
-    export function scrollNumber(x: number, interval: number) {
-        if (interval < 0) return;
-
-        let leds = createImageFromString(x.toString());
-        if (x < 0 || x >= 10) scrollImage(leds, interval, 1);
-        else showLeds(leds, interval * 5);
-    }
-
-    export function scrollString(s: string, interval: number) {
-        if (interval < 0) return;
-        if (s.length == 0) {
-            clearScreen();
-            pause(interval * 5);
-        } else {
-            let leds = createImageFromString(s);
-            if (s.length == 1) showLeds(leds, interval * 5)
-            else scrollImage(leds, interval, 1);
-        }
-    }
-
-    export function forever(a: RefAction) {
-        function loop() {
-            runtime.runFiberAsync(a)
-                .then(() => Promise.delay(20))
-                .then(loop)
-                .done()
-        }
-        incr(a)
-        loop()
-    }
-
-    export var pause = thread.pause;
-
     /* leds */
     export function plot(x: number, y: number) {
         board().image.set(x, y, 255);
@@ -198,20 +126,17 @@ namespace ks.rt.micro_bit {
         runtime.queueDisplayUpdate()
     }
 
-    /* control */
-    export var runInBackground = thread.runInBackground;
-
     /* serial */
     export function serialSendString(s: string) {
         board().writeSerial(s);
     }
 
-    export function serialReadString() : string {
+    export function serialReadString(): string {
         return board().readSerial();
     }
 
     /* input */
-    export function onButtonPressed(button : number, handler: RefAction) : void {
+    export function onButtonPressed(button: number, handler: RefAction): void {
         let ens = enums();
         let b = board();
         if (button == ens.MICROBIT_ID_BUTTON_AB && !board().usesButtonAB) {
@@ -305,7 +230,7 @@ namespace ks.rt.micro_bit {
         }
     }
 
-    export function setAccelerometerRange(range : number) {
+    export function setAccelerometerRange(range: number) {
         let b = board();
         b.accelerometer.setSampleRange(range);
     }
@@ -329,29 +254,29 @@ namespace ks.rt.micro_bit {
     }
 
     /* pins */
-    export function digitalReadPin(pin : Pin) : number {
+    export function digitalReadPin(pin: Pin): number {
         pin.mode = PinMode.Digital | PinMode.Input;
         return pin.value > 100 ? 1 : 0;
     }
 
-    export function digitalWritePin(pin : Pin, value: number) {
+    export function digitalWritePin(pin: Pin, value: number) {
         pin.mode = PinMode.Digital | PinMode.Output;
         pin.value = value > 0 ? 1023 : 0;
         runtime.queueDisplayUpdate();
     }
 
-    export function analogReadPin(pin : Pin) : number {
+    export function analogReadPin(pin: Pin): number {
         pin.mode = PinMode.Analog | PinMode.Input;
         return pin.value || 0;
     }
 
-    export function analogWritePin(pin : Pin, value: number) {
+    export function analogWritePin(pin: Pin, value: number) {
         pin.mode = PinMode.Analog | PinMode.Output;
         pin.value = value ? 1 : 0;
         runtime.queueDisplayUpdate();
     }
 
-    export function setAnalogPeriodUs(pin: Pin, micros:number) {
+    export function setAnalogPeriodUs(pin: Pin, micros: number) {
         pin.mode = PinMode.Analog | PinMode.Output;
         pin.period = micros;
         runtime.queueDisplayUpdate();
@@ -362,28 +287,28 @@ namespace ks.rt.micro_bit {
         // TODO
     }
 
-    export function servoSetPulse(pin: Pin, micros:number) {        
+    export function servoSetPulse(pin: Pin, micros: number) {
     }
 
     module AudioContextManager {
-        var _context : any; // AudioContext
+        var _context: any; // AudioContext
-        var _vco : any; //OscillatorNode;
+        var _vco: any; //OscillatorNode;
         var _vca: any; // GainNode;
 
-        function context() : any {
+        function context(): any {
             if (!_context) _context = freshContext();
             return _context;
         }
 
-        function freshContext() : any {
+        function freshContext(): any {
             (<any>window).AudioContext = (<any>window).AudioContext || (<any>window).webkitAudioContext;
             if ((<any>window).AudioContext) {
                 try {
                     // this call my crash.
                     // SyntaxError: audio resources unavailable for AudioContext construction
-                    return  new (<any>window).AudioContext();
+                    return new (<any>window).AudioContext();
-                } catch(e) {}
+                } catch (e) { }
-             }
+            }
             return undefined;
         }
 
@@ -405,7 +330,7 @@ namespace ks.rt.micro_bit {
                     _vca.connect(ctx.destination);
                     _vca.gain.value = gain;
                     _vco.start(0);
-                } catch(e) {
+                } catch (e) {
                     _vco = undefined;
                     _vca = undefined;
                     return;
@@ -431,7 +356,7 @@ namespace ks.rt.micro_bit {
             pin.period = 0;
         } else {
             pin.value = 512;
-            pin.period = 1000000/frequency;        
+            pin.period = 1000000 / frequency;
         }
         runtime.queueDisplayUpdate();
 
@@ -452,42 +377,118 @@ namespace ks.rt.micro_bit {
 
 
     /* radio */
-    export function broadcastMessage(msg: number) : void {
+    export function broadcastMessage(msg: number): void {
         board().radio.broadcast(msg);
     }
 
-    export function onBroadcastMessageReceived(msg: number, handler: RefAction) : void {
+    export function onBroadcastMessageReceived(msg: number, handler: RefAction): void {
         let ens = enums()
         board().bus.listen(ens.MES_BROADCAST_GENERAL_ID, msg, handler);
     }
 
-    export function setGroup(id : number) : void {
+    export function setGroup(id: number): void {
         board().radio.setGroup(id);
     }
 
-    export function setTransmitPower(power: number) : void {
+    export function setTransmitPower(power: number): void {
         board().radio.setTransmitPower(power);
     }
 
-    export function datagramSendNumbers(value0 : number, value1: number, value2: number, value3: number) : void {
+    export function datagramSendNumbers(value0: number, value1: number, value2: number, value3: number): void {
         board().radio.datagram.send([value0, value1, value2, value3]);
     }
 
-    export function datagramReceiveNumber() : number {
+    export function datagramReceiveNumber(): number {
         return board().radio.datagram.recv().data[0];
     }
 
-    export function datagramGetNumber(index : number) : number {
+    export function datagramGetNumber(index: number): number {
         return board().radio.datagram.lastReceived.data[index] || 0;
     }
 
-    export function datagramGetRSSI() : number {
+    export function datagramGetRSSI(): number {
         return board().radio.datagram.lastReceived.rssi;
     }
 
-    export function onDatagramReceived(handler: RefAction) : void {
+    export function onDatagramReceived(handler: RefAction): void {
         let ens = enums();
         board().bus.listen(ens.MICROBIT_ID_RADIO, ens.MICROBIT_RADIO_EVT_DATAGRAM, handler);
     }
 }
 
+namespace ks.rt.basic {
+    var board = micro_bit.board;
+
+    export var pause = thread.pause;
+
+    export function showNumber(x: number, interval: number) {
+        if (interval < 0) return;
+
+        let leds = micro_bit.createImageFromString(x.toString());
+        if (x < 0 || x >= 10) scrollImage(leds, interval, 1);
+        else showLeds(leds, interval * 5);
+    }
+
+    export function showString(s: string, interval: number) {
+        if (interval < 0) return;
+        if (s.length == 0) {
+            clearScreen();
+            pause(interval * 5);
+        } else {
+            let leds = micro_bit.createImageFromString(s);
+            if (s.length == 1) showLeds(leds, interval * 5)
+            else scrollImage(leds, interval, 1);
+        }
+    }
+
+    export function showLeds(leds: micro_bit.Image, delay: number): void {
+        showAnimation(leds, delay);
+    }
+
+    export function clearScreen() {
+        board().image.clear();
+        runtime.queueDisplayUpdate()
+    }
+
+    function scrollImage(leds: micro_bit.Image, interval: number, stride: number): void {
+        let cb = getResume()
+        let off = stride > 0 ? 0 : leds.width - 1;
+        let display = board().image;
+
+        board().animationQ.enqueue({
+            interval: interval,
+            frame: () => {
+                if (off >= leds.width || off < 0) return false;
+                stride > 0 ? display.shiftLeft(stride) : display.shiftRight(-stride);
+                let c = Math.min(stride, leds.width - off);
+                leds.copyTo(off, c, display, 5 - stride)
+                off += stride;
+                return true;
+            },
+            whenDone: cb
+        })
+    }
+
+    export function showAnimation(leds: micro_bit.Image, interval: number = 400): void {
+        scrollImage(leds, interval, 5);
+    }
+
+    export function forever(a: RefAction) {
+        function loop() {
+            runtime.runFiberAsync(a)
+                .then(() => Promise.delay(20))
+                .then(loop)
+                .done()
+        }
+        incr(a)
+        loop()
+    }
+}
+
+namespace ks.rt.control {
+    export var inBackground = thread.runInBackground;
+
+    export function reset() {
+        U.userError("reset not implemented in simulator yet")
+    }
+}