From ef7fdc2ef78b8df4443f22939ca7827aad353eb4 Mon Sep 17 00:00:00 2001 From: Michal Moskal Date: Thu, 1 Sep 2016 13:06:03 +0100 Subject: [PATCH] Rename pxsim.pxt to pxsim.pxtcore --- sim/state/accelerometer.ts | 2 +- sim/state/buttonpair.ts | 2 +- sim/state/edgeconnector.ts | 4 ++-- sim/state/misc.ts | 4 ++-- sim/state/radio.ts | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sim/state/accelerometer.ts b/sim/state/accelerometer.ts index dc57b1f1..8bc42bd4 100644 --- a/sim/state/accelerometer.ts +++ b/sim/state/accelerometer.ts @@ -7,7 +7,7 @@ namespace pxsim.input { b.useShake = true; runtime.queueDisplayUpdate(); } - pxt.registerWithDal(DAL.MICROBIT_ID_GESTURE, gesture, handler); + pxtcore.registerWithDal(DAL.MICROBIT_ID_GESTURE, gesture, handler); } export function acceleration(dimension: number): number { diff --git a/sim/state/buttonpair.ts b/sim/state/buttonpair.ts index fdad2305..31778c6d 100644 --- a/sim/state/buttonpair.ts +++ b/sim/state/buttonpair.ts @@ -5,7 +5,7 @@ namespace pxsim.input { b.usesButtonAB = true; runtime.queueDisplayUpdate(); } - pxt.registerWithDal(button, DAL.MICROBIT_BUTTON_EVT_CLICK, handler); + pxtcore.registerWithDal(button, DAL.MICROBIT_BUTTON_EVT_CLICK, handler); } export function buttonIsPressed(button: number): boolean { diff --git a/sim/state/edgeconnector.ts b/sim/state/edgeconnector.ts index d3278a64..d5e76ad5 100644 --- a/sim/state/edgeconnector.ts +++ b/sim/state/edgeconnector.ts @@ -3,14 +3,14 @@ namespace pxsim.input { let pin = getPin(pinId); if (!pin) return; pin.isTouched(); - pxt.registerWithDal(pin.id, DAL.MICROBIT_BUTTON_EVT_CLICK, handler); + pxtcore.registerWithDal(pin.id, DAL.MICROBIT_BUTTON_EVT_CLICK, handler); } export function onPinReleased(pinId: number, handler: RefAction) { let pin = getPin(pinId); if (!pin) return; pin.isTouched(); - pxt.registerWithDal(pin.id, DAL.MICROBIT_BUTTON_EVT_UP, handler); + pxtcore.registerWithDal(pin.id, DAL.MICROBIT_BUTTON_EVT_UP, handler); } export function pinIsPressed(pinId: number): boolean { diff --git a/sim/state/misc.ts b/sim/state/misc.ts index 2fd7ae95..8e78d540 100644 --- a/sim/state/misc.ts +++ b/sim/state/misc.ts @@ -147,7 +147,7 @@ namespace pxsim.control { } export function onEvent(id: number, evid: number, handler: RefAction) { - pxt.registerWithDal(id, evid, handler) + pxtcore.registerWithDal(id, evid, handler) } export function raiseEvent(id: number, evid: number, mode: number) { @@ -156,7 +156,7 @@ namespace pxsim.control { } } -namespace pxsim.pxt { +namespace pxsim.pxtcore { export function registerWithDal(id: number, evid: number, handler: RefAction) { board().bus.listen(id, evid, handler); } diff --git a/sim/state/radio.ts b/sim/state/radio.ts index 7a48ea3c..fcb5dbb3 100644 --- a/sim/state/radio.ts +++ b/sim/state/radio.ts @@ -94,7 +94,7 @@ namespace pxsim.radio { } export function onBroadcastMessageReceived(msg: number, handler: RefAction): void { - pxt.registerWithDal(DAL.MES_BROADCAST_GENERAL_ID, msg, handler); + pxtcore.registerWithDal(DAL.MES_BROADCAST_GENERAL_ID, msg, handler); } export function setGroup(id: number): void { @@ -152,7 +152,7 @@ namespace pxsim.radio { } export function onDataReceived(handler: RefAction): void { - pxt.registerWithDal(DAL.MICROBIT_ID_RADIO, DAL.MICROBIT_RADIO_EVT_DATAGRAM, handler); + pxtcore.registerWithDal(DAL.MICROBIT_ID_RADIO, DAL.MICROBIT_RADIO_EVT_DATAGRAM, handler); radio.receiveNumber(); } } \ No newline at end of file