0.4.3 update

Author: cjhdev

history.md

@@ -1,6 +1,11 @@
 Release History
 ===============
 
+## 0.4.3
+
+- changed LDL::Device so that worker thread is scheduled to run when a radio ISR
+  event is received
+
 ## 0.4.2
 
 - fixed RegTcxo bug again: got the mapping backwards in 0.4.1

version

@@ -1 +1 @@
-0.4.2
+0.4.3

wrappers/mbed/big_device.cpp

@@ -30,7 +30,8 @@ using namespace LDL;
 
 Device::Device(Store &store, SM &sm, Radio &radio) :
     mac(store, sm, radio),
-    worker_thread(1024U)
+    worker_thread(1024U),
+    radio(radio)
 {
 }
 
@@ -198,6 +199,13 @@ Device::notify_api()
     api.release();
 }
 
+void
+Device::handle_radio_event(enum ldl_radio_event ev)
+{
+    mac.handle_radio_event(ev);
+    do_work();
+}
+
 /* public methods *****************************************************/
 
 bool
@@ -209,6 +217,9 @@ Device::start(enum ldl_region region)
 
     if(mac.start(region)){
 
+        // override the callback set by mac so we can intercept the events
+        radio.set_event_handler(callback(this, &Device::handle_radio_event));
+
         worker_thread.start(callback(this,&Device::worker));
         retval = true;
     }

wrappers/mbed/big_device.h

@@ -44,6 +44,7 @@ namespace LDL {
             Mutex mutex;
             Semaphore work;
             LowPowerTimeout timeout;
+            Radio &radio;
 
             void do_work();
 
@@ -53,6 +54,9 @@ namespace LDL {
             void wait_until_api_done();
             void notify_api();
 
+            /* called by radio in ISR */
+            void handle_radio_event(enum ldl_radio_event ev);
+
             /* executed from the event queue */
             void do_unconfirmed(enum ldl_mac_status *retval, uint8_t port, const void *data, uint8_t len, const struct ldl_mac_data_opts *opts);
             void do_confirmed(enum ldl_mac_status *retval, uint8_t port, const void *data, uint8_t len, const struct ldl_mac_data_opts *opts);

wrappers/mbed/mac.cpp

@@ -206,16 +206,14 @@ MAC::app_handler(void *app, enum ldl_mac_response_type type, const union ldl_mac
     }
 }
 
-/* protected **********************************************************/
+/* public methods *****************************************************/
 
 void
 MAC::handle_radio_event(enum ldl_radio_event event)
 {
     LDL_MAC_radioEvent(&mac, event);
 }
 
-/* public methods *****************************************************/
-
 bool
 MAC::start(enum ldl_region region)
 {
@@ -259,8 +257,6 @@ MAC::start(enum ldl_region region)
 
     arg.session = (session_size == sizeof(session)) ? &session : NULL;
 
-    radio.set_event_handler(callback(this, &MAC::handle_radio_event));
-
     LDL_MAC_init(&mac, region, &arg);
 
     /* apply TTN fair access policy
@@ -275,6 +271,8 @@ MAC::start(enum ldl_region region)
      * */
     LDL_MAC_setMaxDCycle(&mac, 12U);
 
+    radio.set_event_handler(callback(this, &MAC::handle_radio_event));
+
     run_state = ON;
 
     return true;

wrappers/mbed/mac.h

@@ -60,16 +60,14 @@ namespace LDL {
 
             static void app_handler(void *app, enum ldl_mac_response_type type, const union ldl_mac_response_arg *arg);
 
-            /* called by radio in ISR */
-            void handle_radio_event(enum ldl_radio_event event);
-
             static uint32_t _ticks(void *app);
             static uint32_t _rand(void *app);
             static uint8_t _get_battery_level(void *app);
 
         public:
 
-            void do_process();
+            /* called by radio in ISR */
+            void handle_radio_event(enum ldl_radio_event event);
 
             MAC(Store& store, SM& sm, Radio& radio);