Button presses over radio

Author: KierPalin

controllerbutton.ts

@@ -41,6 +41,10 @@ enum ControllerShieldEvent {
 }
 
 
+// Used by radioControlRx to distinguish this event from a screen() fn request (see user-interface-base/screen.ts)
+export const BUTTON_PRESS_RADIO_ID = 1;
+
+
 namespace controller {
     export class Controller {
         constructor(no: number, v: any) { }
@@ -56,7 +60,7 @@ namespace controller {
     export function onShieldEvent(event: ControllerShieldEvent, handler: () => void) {
         context.onEvent(event, 0, handler);
     }
-    
+
     let _userEventsEnabled = true;
     let defaultRepeatDelay = 500;
     let defaultRepeatInterval = 30;
@@ -71,7 +75,7 @@ namespace controller {
     }
 
     export class ButtonEventHandlerState {
-        constructor(public id: number) {};
+        constructor(public id: number) { };
 
         public user: ButtonHandler[];
         public system: ButtonHandler[];
@@ -112,25 +116,28 @@ namespace controller {
             }
         }
 
-        raiseButtonUp() {
-            if (_userEventsEnabled)
-                control.raiseEvent(ControllerKeys.KEY_UP, this.id)
+        raiseButtonUp(overRadio = false) {
+            const k = _userEventsEnabled ? ControllerKeys.KEY_UP : ControllerKeys.SYSTEM_KEY_UP;
+            if (overRadio)
+                radio.sendBuffer(Buffer.fromArray([BUTTON_PRESS_RADIO_ID, k, this.id]))
             else
-                control.raiseEvent(ControllerKeys.SYSTEM_KEY_UP, this.id);
+                control.raiseEvent(k, this.id);
         }
 
-        raiseButtonDown() {
-            if (_userEventsEnabled)
-                control.raiseEvent(ControllerKeys.KEY_DOWN, this.id)
+        raiseButtonDown(overRadio = false) {
+            const k = _userEventsEnabled ? ControllerKeys.KEY_DOWN : ControllerKeys.SYSTEM_KEY_DOWN;
+            if (overRadio)
+                radio.sendBuffer(Buffer.fromArray([BUTTON_PRESS_RADIO_ID, k, this.id])
             else
-                control.raiseEvent(ControllerKeys.SYSTEM_KEY_DOWN, this.id)
+                control.raiseEvent(k, this.id);
         }
 
-        private raiseButtonRepeat() {
-            if (_userEventsEnabled)
-                control.raiseEvent(ControllerKeys.KEY_REPEAT, this.id)
+        private raiseButtonRepeat(overRadio = false) {
+            const k = _userEventsEnabled ? ControllerKeys.KEY_REPEAT : ControllerKeys.SYSTEM_KEY_REPEAT;
+            if (overRadio)
+                radio.sendBuffer(Buffer.fromArray([BUTTON_PRESS_RADIO_ID, k, this.id]))
             else
-                control.raiseEvent(ControllerKeys.SYSTEM_KEY_REPEAT, this.id)
+                control.raiseEvent(k, this.id);
         }
 
         /**
@@ -167,6 +174,7 @@ namespace controller {
             handlerState.system.push(new ButtonHandler(event, handler));
         }
 
+
         /**
          * Removes an event handler registered with addEventListener.
          *

shieldhelpers.ts

@@ -55,7 +55,7 @@ namespace shieldhelpers {
         }
 
         private sendMessage(msg: string) {
-            control.simmessages.send("microbit-apps/arcadeshield", Buffer.fromUTF8(msg) , false)
+            control.simmessages.send("microbit-apps/arcadeshield", Buffer.fromUTF8(msg), false)
         }
 
         initSim() {
@@ -112,15 +112,15 @@ namespace shieldhelpers {
     function getScreenState() {
         if (!_screenState) {
             _screenState = new ScreenState()
-            startSim()       
+            startSim()
         }
     }
 
     //% shim=TD_NOOP
     function simUpdateScreen(img: Bitmap) {
         getScreenState();
         if (_screenState)
-            _screenState.showImage(img);        
+            _screenState.showImage(img);
     }
 
     export function updateScreen(img: Bitmap) {
@@ -155,23 +155,23 @@ namespace shieldhelpers {
     // getters
 
     let __height = 0
-    
+
     //% shim=TD_NOOP
     function simDisplayHeight() {
         __height = 120
         getScreenState();
         if (_screenState)
             __height = _screenState.displayHeight();
     }
-    
+
     export function displayHeight(): number {
         __height = __screenhelpers.displayHeight()
         simDisplayHeight()
         return __height
     }
 
     let __width = 0
-    
+
     //% shim=TD_NOOP
     function simDisplayWidth() {
         __width = 160
@@ -187,7 +187,7 @@ namespace shieldhelpers {
     }
 
     let __present = undefined
-    
+
     //% shim=TD_NOOP
     function simDisplayPresent() {
         __present = undefined
@@ -210,6 +210,11 @@ namespace shieldhelpers {
         return __present
     }
 
+
+    export function WDSPresent(): boolean {
+        return true;
+    }
+
     function getButton(id: ArcadeButtonId): controller.Button {
         switch (id) {
             case "left": return controller.left
@@ -226,6 +231,11 @@ namespace shieldhelpers {
     function handleShieldMessage(b: Buffer) {
         const s = b.toString()
         const msg = <ArcadeShieldMessage>JSON.parse(s)
+
+        // Presume WDS setup (group & handshake) is done
+        const wds = WDSPresent() // Just returns true
+
+
         if (msg) {
             console.log(msg.type)
             getScreenState();
@@ -234,22 +244,21 @@ namespace shieldhelpers {
             if (msg.type === "button-down" || msg.type === "button-up") {
                 const button = getButton((<ButtonMessage>msg).buttonId)
                 if (button) {
-                    if (msg.type === "button-down") {
-                        button.raiseButtonDown()
-                    } else {
-                        button.raiseButtonUp()
-                    }
+                    if (msg.type === "button-down")
+                        button.raiseButtonDown(wds)
+                    else
+                        button.raiseButtonUp(wds)
                 }
             } else if (msg.type === "display-on") {
                 getScreenState()
                 _screenState.displayOn = true
                 basic.pause(0)
-                control.raiseEvent(ControllerShieldEvent.Present,0)
+                control.raiseEvent(ControllerShieldEvent.Present, 0)
             } else if (msg.type === "display-off") {
                 getScreenState()
                 _screenState.displayOn = false
                 basic.pause(0)
-                control.raiseEvent(ControllerShieldEvent.Absent,0)
+                control.raiseEvent(ControllerShieldEvent.Absent, 0)
             }
         }
     }
@@ -263,4 +272,4 @@ namespace shieldhelpers {
     }
 }
 
-shieldhelpers.registerSim()
+shieldhelpers.registerSim()