Diff: source/drivers/MicroBitRadio.cpp

Revision:

25:27299423d813

Parent:

23:6055f6c19fa6

Child:

64:98cb56bf7711

diff -r 3373f1fb0353 -r 27299423d813 source/drivers/MicroBitRadio.cpp
--- a/source/drivers/MicroBitRadio.cpp	Wed Jul 13 12:17:57 2016 +0100
+++ b/source/drivers/MicroBitRadio.cpp	Wed Jul 13 12:17:58 2016 +0100
@@ -99,7 +99,7 @@
 {
     this->id = id;
     this->status = 0;
-	this->group = 0;
+	this->group = MICROBIT_RADIO_DEFAULT_GROUP;
 	this->queueDepth = 0;
     this->rssi = 0;
     this->rxQueue = NULL;
@@ -279,7 +279,7 @@
     NRF_RADIO->BASE0 = MICROBIT_RADIO_BASE_ADDRESS;
 
     // Join the default group. This will configure the remaining byte in the RADIO hardware module.
-    setGroup(MICROBIT_RADIO_DEFAULT_GROUP);
+    setGroup(this->group);
 
     // The RADIO hardware module supports the use of multiple addresses, but as we're running anonymously, we only need one.
     // Configure the RADIO module to use the default address (address 0) for both send and receive operations.
@@ -356,6 +356,9 @@
     // deregister ourselves from the callback event used to empty the receive queue.
     fiber_remove_idle_component(this);
 
+    // record that the radio is now disabled
+    status &= ~MICROBIT_RADIO_STATUS_INITIALISED;
+
     return MICROBIT_OK;
 }