fixes the re-initialization of lora OTAA

gijsio · msariisik · commit c046f5ff3728 · 2021-01-15T13:55:22.000+01:00
return the semaphore taken by the previous, unsuccesful, join attempt.
When re-initializing lora, it would wait indefinitely
diff --git a/esp32/mods/modlora.c b/esp32/mods/modlora.c
@@ -1102,16 +1102,16 @@ static void TASK_LoRa (void *pvParameters) {
                 #endif
                     mibReq.Type = MIB_NETWORK_ACTIVATION;
                     mibReq.Param.NetworkActivation = ACTIVATION_TYPE_OTAA;
-                    LoRaMacMibSetRequestConfirm( &mibReq );
-                    
-                    TimerStart( &TxNextActReqTimer );
+                   LoRaMacMibSetRequestConfirm( &mibReq );
+                   
+                   TimerStart( &TxNextActReqTimer );
                     mlmeReq.Type = MLME_JOIN;
                     mlmeReq.Req.Join.DevEui = (uint8_t *)lora_obj.u.otaa.DevEui;
                     mlmeReq.Req.Join.AppEui = (uint8_t *)lora_obj.u.otaa.AppEui;
                     mlmeReq.Req.Join.AppKey = (uint8_t *)lora_obj.u.otaa.AppKey;
                     mlmeReq.Req.Join.NbTrials = 1;
                     mlmeReq.Req.Join.DR = (uint8_t) lora_obj.otaa_dr;
-                    LoRaMacMlmeRequest( &mlmeReq );
+                   LoRaMacMlmeRequest( &mlmeReq );
                 } else {
                     mibReq.Type = MIB_NETWORK_ACTIVATION;
                     mibReq.Param.NetworkActivation = ACTIVATION_TYPE_ABP;
@@ -1692,6 +1692,13 @@ static bool lora_tx_space (void) {
 /// \class LoRa - Semtech SX1272 radio driver
 static mp_obj_t lora_init_helper(lora_obj_t *self, const mp_arg_val_t *args) {
     lora_cmd_data_t cmd_data;
+    xSemaphoreGive(xLoRaSigfoxSem);
+    // vEventGroupDelete(LoRaEvents);
+    // xQueueReset(xCmdQueue);
+    // xQueueReset(xRxQueue);
+    // xQueueReset(xCbQueue);
+    // LoRaEvents = xEventGroupCreate();
+    
 
     cmd_data.info.init.stack_mode = args[0].u_int;
     lora_validate_mode (cmd_data.info.init.stack_mode);
