fetch pxt-microbit v2.2.30 (#102)

* undo buttonEvent

* fetch microbit v2.2.30

Co-authored-by: Amerlander <gitkraken@juriwolf.de>

sim/state/edgeconnectorsim.ts

@@ -32,6 +32,11 @@ namespace pxsim {
 
         setPull(pull: number) {
             this.pull = pull;
+            switch(pull) {
+                case PinPullMode.PullDown: this.value = 0; break;
+                case PinPullMode.PullUp: this.value = 1023; break;
+                default: this.value = Math_.randomRange(0, 1023); break;
+            }
         }
 
         analogReadPin(): number {

sim/state/misc.ts

@@ -47,6 +47,19 @@ namespace pxsim.control {
     export function waitMicros(micros: number) {
         // TODO
     }
+    export function waitForEvent(id: number, evid: number) {
+        const cb = getResume();
+        board().bus.wait(id, evid, cb);
+    }
+
+    export function millis(): number {
+        return runtime.runningTime();
+    }
+
+    export function micros(): number {
+        return runtime.runningTimeUs();
+    }
+
 
     export function deviceName(): string {
         let b = board();
@@ -94,14 +107,6 @@ namespace pxsim.pxtcore {
 }
 
 namespace pxsim.input {
-    export function runningTime(): number {
-        return runtime.runningTime();
-    }
-
-    export function runningTimeMicros(): number {
-        return runtime.runningTimeUs();
-    }
-
     export function calibrateCompass() {
         // device calibrates...
     }

sim/state/radio.ts

@@ -1,147 +0,0 @@
-namespace pxsim {
-    export interface PacketBuffer {
-        payload: SimulatorRadioPacketPayload;
-        rssi: number;
-        serial: number;
-        time: number;
-    }
-
-    // Extends interface in pxt-core
-    export interface SimulatorRadioPacketPayload {
-        bufferData?: Uint8Array;
-    }
-
-    export class RadioDatagram {
-        datagram: PacketBuffer[] = [];
-        lastReceived: PacketBuffer = RadioDatagram.defaultPacket();
-
-        constructor(private runtime: Runtime) {
-        }
-
-        queue(packet: PacketBuffer) {
-            if (this.datagram.length < 4) {
-                this.datagram.push(packet);
-            }
-            (<DalBoard>runtime.board).bus.queue(DAL.MICROBIT_ID_RADIO, DAL.MICROBIT_RADIO_EVT_DATAGRAM);
-        }
-
-        send(payload: SimulatorRadioPacketPayload) {
-            const b = board();
-            Runtime.postMessage(<SimulatorRadioPacketMessage>{
-                type: "radiopacket",
-                broadcast: true,
-                rssi: -42, // -42 is the strongest signal
-                serial: b.radioState.transmitSerialNumber ? pxsim.control.deviceSerialNumber() : 0,
-                time: new Date().getTime(),
-                payload
-            })
-        }
-
-        recv(): PacketBuffer {
-            let r = this.datagram.shift();
-            if (!r) r = RadioDatagram.defaultPacket();
-            return this.lastReceived = r;
-        }
-
-        private static defaultPacket(): PacketBuffer {
-            return {
-                rssi: -1,
-                serial: 0,
-                time: 0,
-                payload: { type: -1, groupId: 0, bufferData: new Uint8Array(0) }
-            };
-        }
-    }
-
-    export class RadioState {
-        power = 0;
-        transmitSerialNumber = false;
-        datagram: RadioDatagram;
-        groupId: number;
-        band: number;
-
-        constructor(runtime: Runtime) {
-            this.datagram = new RadioDatagram(runtime);
-            this.power = 6; // default value
-            this.groupId = 0;
-            this.band = 7; // https://github.com/lancaster-university/microbit-dal/blob/master/inc/core/MicroBitConfig.h#L320
-        }
-
-        public setGroup(id: number) {
-            this.groupId = id & 0xff; // byte only
-        }
-
-        setTransmitPower(power: number) {
-            power = power | 0;
-            this.power = Math.max(0, Math.min(7, power));
-        }
-
-        setTransmitSerialNumber(sn: boolean) {
-            this.transmitSerialNumber = !!sn;
-        }
-
-        setFrequencyBand(band: number) {
-            band = band | 0;
-            if (band < 0 || band > 83) return;
-            this.band = band;
-        }
-
-        raiseEvent(id: number, eventid: number) {
-            Runtime.postMessage(<SimulatorEventBusMessage>{
-                type: "eventbus",
-                broadcast: true,
-                id,
-                eventid,
-                power: this.power,
-                group: this.groupId
-            })
-        }
-
-        receivePacket(packet: SimulatorRadioPacketMessage) {
-            if (this.groupId == packet.payload.groupId)
-                this.datagram.queue(packet)
-        }
-    }
-}
-
-namespace pxsim.radio {
-    export function raiseEvent(id: number, eventid: number): void {
-        board().radioState.raiseEvent(id, eventid);
-    }
-
-    export function setGroup(id: number): void {
-        board().radioState.setGroup(id);
-    }
-
-    export function setTransmitPower(power: number): void {
-        board().radioState.setTransmitPower(power);
-    }
-
-    export function setFrequencyBand(band: number) { 
-        board().radioState.setFrequencyBand(band);
-    }
-
-    export function sendRawPacket(buf: RefBuffer) {
-        let cb = getResume();
-        board().radioState.datagram.send({
-            type: 0,
-            groupId: board().radioState.groupId,
-            bufferData: buf.data
-        });
-        setTimeout(cb, 1);
-    }
-
-    export function readRawPacket() {
-        const packet = board().radioState.datagram.recv();
-        return new RefBuffer(packet.payload.bufferData)
-    }
-
-    export function receivedSignalStrength(): number {
-        return board().radioState.datagram.lastReceived.rssi;
-    }
-
-    export function onDataReceived(handler: RefAction): void {
-        pxtcore.registerWithDal(DAL.MICROBIT_ID_RADIO, DAL.MICROBIT_RADIO_EVT_DATAGRAM, handler);
-        readRawPacket();
-    }
-}