Radio stuff moved for new style

libs/microbit-radio/enums.d.ts

@@ -0,0 +1,5 @@
+// Auto-generated. Do not edit.
+declare namespace radio {
+}
+
+// Auto-generated. Do not edit. Really.

libs/microbit-radio/kind.json

@@ -3,6 +3,9 @@
     "description": "The radio services",
     "files": [
         "README.md",
+        "shims.d.ts",
+        "enums.d.ts",
+        "radio.cpp",
         "radio.ts"
     ],
     "public": true,

libs/microbit-radio/radio.cpp

@@ -0,0 +1,124 @@
+#include "kindscript.h"
+
+using namespace kindscript;
+
+//% color=270 weight=34
+namespace radio {
+
+    // -------------------------------------------------------------------------
+    // Radio
+    // -------------------------------------------------------------------------    
+    bool radioEnabled = false;
+    PacketBuffer packet;
+    
+    int radioEnable() {
+        int r = uBit.radio.enable();
+        if (r != MICROBIT_OK) return r;
+        if (!radioEnabled) {
+            uBit.radio.setGroup(kindscript::programHash());
+            radioEnabled = true;
+        }
+        return r;
+    }
+
+    void broadcastMessage(int message) {
+        if (radioEnable() != MICROBIT_OK) return;
+        uBit.radio.event.eventReceived(MicroBitEvent(MES_BROADCAST_GENERAL_ID, message, CREATE_ONLY));
+    }
+        
+    void onBroadcastMessageReceived(int message, Action f) {
+        if (radioEnable() != MICROBIT_OK) return;
+        registerWithDal(MES_BROADCAST_GENERAL_ID, message, f);
+    }
+
+
+    /**
+     * Broadcasts 4 numbers over radio to any connected micro:bit in the group.
+     */
+    //% help=radio/send-numbers
+    //% weight=59
+    //% blockId=radio_datagram_send_numbers block="send numbers|0: %VALUE0|1: %VALUE1|2: %VALUE2|3: %VALUE3"
+    void sendNumbers(int value_0, int value_1, int value_2, int value_3) {
+        if (radioEnable() != MICROBIT_OK) return;
+        int buf[] = { value_0, value_1, value_2, value_3 };
+        uBit.radio.datagram.send((uint8_t*)buf, 4*sizeof(int));
+    }
+
+    /**
+     * Registers code to run when a packet is received over radio.
+     */
+    //% help=radio/on-data-received
+    //% weight=50
+    //% blockId=radio_datagram_received_event block="on data received" blockGap=8
+    void onDataReceived(Action body) {
+        if (radioEnable() != MICROBIT_OK) return;
+        registerWithDal(MICROBIT_ID_RADIO, MICROBIT_RADIO_EVT_DATAGRAM, body);    
+    }
+
+    /**
+     * Reads a number at a given index, between ``0`` and ``3``, from the packet received by ``receive number``. Not supported in simulator.
+     * @param index index of the number to read from 0 to 3. 1 eg
+     */
+    //% help=radio/received-number-at
+    //% weight=45
+    //% blockId=radio_datagram_received_number_at block="receive number|at %VALUE" blockGap=8
+    int receivedNumberAt(int index) {
+        if (radioEnable() != MICROBIT_OK) return 0;
+        if (0 <= index && index < packet.length() / 4) {
+            // packet.getBytes() is not aligned
+            int r;
+            memcpy(&r, packet.getBytes() + index * 4, 4);
+            return r;
+        }
+        return 0;
+    }
+
+    /**
+     * Reads the next packet as a number from the radio queue.
+     */
+    //% help=radio/receive-number
+    //% weight=46
+    //% blockId=radio_datagram_receive block="receive number" blockGap=8
+    int receiveNumber()
+    {
+        if (radioEnable() != MICROBIT_OK) return 0;
+        packet = uBit.radio.datagram.recv();
+        return receivedNumberAt(0);
+    }
+
+    /**
+     * Gets the received signal strength indicator (RSSI) from the packet received by ``receive number``. Not supported in simulator.
+     * namespace=radio
+     */
+    //% help=radio/received-signal-strength
+    //% weight=40
+    //% blockId=radio_datagram_rssi block="received signal strength"
+    int receivedSignalStrength() {
+        if (radioEnable() != MICROBIT_OK) return 0;
+        return packet.getRSSI();
+    }
+
+    /**
+     * Sets the group id for radio communications. A micro:bit can only listen to one group ID at any time.
+     * @ param id the group id between ``0`` and ``255``, 1 eg
+     */
+    //% help=radio/set-group
+    //% weight=10
+    //% blockId=radio_set_group block="set group %ID"
+    void setGroup(int id) {
+        if (radioEnable() != MICROBIT_OK) return;
+        uBit.radio.setGroup(id);
+    }
+    
+    /**
+     * Change the output power level of the transmitter to the given value.
+    * @param power a value in the range 0..7, where 0 is the lowest power and 7 is the highest, 7 eg
+    */
+    //% help=radio/set-transmit-power
+    //% weight=9
+    //% blockId=radio_set_transmit_power block="set transmit power %power"
+    void setTransmitPower(int power) {
+        if (radioEnable() != MICROBIT_OK) return;
+        uBit.radio.setTransmitPower(power);
+    }
+}

libs/microbit-radio/radio.ts

@@ -9,89 +9,4 @@ namespace radio {
     export function sendNumber(value: number) : void { 
         sendNumbers(value, 0, 0, 0);
     }
-
-    /**
-     * Broadcasts 4 numbers over radio to any connected micro:bit in the group.
-     */
-    //% help=radio/send-numbers
-    //% shim=micro_bit::datagramSendNumbers
-    //% weight=59
-    //% blockId=radio_datagram_send_numbers block="send numbers|0: %VALUE0|1: %VALUE1|2: %VALUE2|3: %VALUE3"
-    export function sendNumbers(value_0: number, value_1: number, value_2: number, value_3: number) : void {
-        //        noBleWarning();
-    }
-
-    /**
-     * Registers code to run when a packet is received over radio.
-     */
-    //% help=radio/on-data-received
-    //% shim=micro_bit::onDatagramReceived
-    //% weight=50
-    //% blockId=radio_datagram_received_event block="on data received" blockGap=8
-    export function onDataReceived(body:Action) : void {
-        //      noBleWarning();
-    }
-
-    /**
-     * Reads the next packet as a number from the radio queue.
-     */
-    //% help=radio/receive-number
-    //% shim=micro_bit::datagramReceiveNumber
-    //% weight=46
-    //% blockId=radio_datagram_receive block="receive number" blockGap=8
-    export function receiveNumber() : number
-        {
-        //noBleWarning();
-        return 0;
-    }
-
-    /**
-     * Reads a number at a given index, between ``0`` and ``3``, from the packet received by ``receive number``. Not supported in simulator.
-     * @param index index of the number to read from 0 to 3. eg: 1
-     */
-    //% help=radio/received-number-at
-    //% shim=micro_bit::datagramGetNumber
-    //% weight=45
-    //% blockId=radio_datagram_received_number_at block="receive number|at %VALUE" blockGap=8
-    export function receivedNumberAt(index: number) : number {
-        /*      if (index < 0 || index >= 4) {
-            TD.simulator.warning("index should be between ``0`` and ``3``.");
-        }*/
-        return 0;
-    }
-
-    /**
-     * Gets the received signal strength indicator (RSSI) from the packet received by ``receive number``. Not supported in simulator.
-     * namespace=radio
-     */
-    //% help=radio/received-signal-strength
-    //% shim=micro_bit::datagramGetRSSI
-    //% weight=40
-    //% blockId=radio_datagram_rssi block="received signal strength"
-    export function receivedSignalStrength() : number {
-        return 0;
-    }
-
-    /**
-     * Sets the group id for radio communications. A micro:bit can only listen to one group ID at any time.
-     * @ param id the group id between ``0`` and ``255``, eg: 1
-     */
-    //% help=radio/set-group
-    //% shim=micro_bit::setGroup
-    //% weight=10
-    //% blockId=radio_set_group block="set group %ID"
-    export function setGroup(id: number) : void {
-    }
-    
-    /**
-     * Change the output power level of the transmitter to the given value.
-    * @param power a value in the range 0..7, where 0 is the lowest power and 7 is the highest, eg: 7
-    */
-    //% help=radio/set-transmit-power
-    //% shim=micro_bit::setTransmitPower
-    //% weight=9
-    //% blockId=radio_set_transmit_power block="set transmit power %power"
-    export function setTransmitPower(power:number) {
-        
-    }
 }

libs/microbit-radio/shims.d.ts

@@ -0,0 +1,69 @@
+// Auto-generated. Do not edit.
+
+
+
+    //% color=270 weight=34
+declare namespace radio {
+
+    /**
+     * Broadcasts 4 numbers over radio to any connected micro:bit in the group.
+     */
+    //% help=radio/send-numbers
+    //% weight=59
+    //% blockId=radio_datagram_send_numbers block="send numbers|0: %VALUE0|1: %VALUE1|2: %VALUE2|3: %VALUE3" shim=radio::sendNumbers
+    function sendNumbers(value_0: number, value_1: number, value_2: number, value_3: number): void;
+
+    /**
+     * Registers code to run when a packet is received over radio.
+     */
+    //% help=radio/on-data-received
+    //% weight=50
+    //% blockId=radio_datagram_received_event block="on data received" blockGap=8 shim=radio::onDataReceived
+    function onDataReceived(body: () => void): void;
+
+    /**
+     * Reads a number at a given index, between ``0`` and ``3``, from the packet received by ``receive number``. Not supported in simulator.
+     * @param index index of the number to read from 0 to 3. 1 eg
+     */
+    //% help=radio/received-number-at
+    //% weight=45
+    //% blockId=radio_datagram_received_number_at block="receive number|at %VALUE" blockGap=8 shim=radio::receivedNumberAt
+    function receivedNumberAt(index: number): number;
+
+    /**
+     * Reads the next packet as a number from the radio queue.
+     */
+    //% help=radio/receive-number
+    //% weight=46
+    //% blockId=radio_datagram_receive block="receive number" blockGap=8 shim=radio::receiveNumber
+    function receiveNumber(): number;
+
+    /**
+     * Gets the received signal strength indicator (RSSI) from the packet received by ``receive number``. Not supported in simulator.
+     * namespace=radio
+     */
+    //% help=radio/received-signal-strength
+    //% weight=40
+    //% blockId=radio_datagram_rssi block="received signal strength" shim=radio::receivedSignalStrength
+    function receivedSignalStrength(): number;
+
+    /**
+     * Sets the group id for radio communications. A micro:bit can only listen to one group ID at any time.
+     * @ param id the group id between ``0`` and ``255``, 1 eg
+     */
+    //% help=radio/set-group
+    //% weight=10
+    //% blockId=radio_set_group block="set group %ID" shim=radio::setGroup
+    function setGroup(id: number): void;
+
+    /**
+     * Change the output power level of the transmitter to the given value.
+     * @param power a value in the range 0..7, where 0 is the lowest power and 7 is the highest, 7 eg
+     */
+    //% help=radio/set-transmit-power
+    //% weight=9
+    //% blockId=radio_set_transmit_power block="set transmit power %power" shim=radio::setTransmitPower
+    function setTransmitPower(power: number): void;
+}
+
+// Auto-generated. Do not edit. Really.