Some clean-up and improvement

(e.g. no hang if LoRa init fails)

CHANGELOG.md

@@ -4,6 +4,8 @@ Arduino library for RAKWireless WisBlock Core modules that takes all the LoRaWAN
 
 # Release Notes
 
+## 2.0.6 Some clean-up and improvement (e.g. no hang if LoRa init fails)
+
 ## 2.0.5 Fix new AT command
   - Fix wrong implementation of AT+PORT command
 

README.md

@@ -1215,6 +1215,8 @@ AT Command functions: Taylor Lee ([email protected])
 ----
 # Changelog
 [Code releases](CHANGELOG.md)
+- 2023-05-15
+  - Some clean-up and improvement (e.g. no hang if LoRa init fails)
 - 2023-04-30
   - Added option to set the LoRaWAN port using the AT command set. Thanks to @xoseperez## 2.0.5 Fix new AT command
   - Fix wrong implementation of AT+PORT command

library.json

@@ -1,6 +1,6 @@
 {
 	"name": "WisBlock-API-V2",
-	"version": "2.0.5",
+	"version": "2.0.6",
 	"keywords": [
 		"lora",
 		"Semtech",

library.properties

@@ -1,5 +1,5 @@
 name=WisBlock-API-V2
-version=2.0.5
+version=2.0.6
 author=Bernd Giesecke <[email protected]>
 maintainer=Bernd Giesecke <[email protected]>
 sentence=API for WisBlock Core module

src/WisBlock-API-V2.h

@@ -52,6 +52,7 @@
 #include <Arduino.h>
 #include <LoRaWan-Arduino.h>
 #include "wisblock_cayenne.h"
+#include <Wire.h>
 
 #ifdef NRF52_SERIES
 #include <nrf_nvic.h>

src/WisBlock-API.cpp

@@ -199,17 +199,12 @@ void setup()
 		if (lora_init_result != 0)
 		{
 			API_LOG("API", "Init LoRa failed");
-
-			// Without working LoRa we just stop here
-			while (1)
-			{
-				API_LOG("API", "Get your LoRa stuff in order");
-				pinMode(LED_GREEN, OUTPUT);
-				digitalWrite(LED_GREEN, !digitalRead(LED_GREEN));
-				delay(5000);
-			}
+			API_LOG("API", "Get your LoRa stuff in order");
+		}
+		else
+		{
+			API_LOG("API", "LoRa init success");
 		}
-		API_LOG("API", "LoRa init success");
 	}
 	else
 	{
@@ -226,20 +221,6 @@ void setup()
 	{
 		// Without working application we give a warning message
 		API_LOG("API", "Get your application stuff in order");
-		// // Without working LoRa we just stop here
-		// while (1)
-		// {
-		// 	API_LOG("MAIN", "Get your application stuff in order");
-		// 	AT_PRINTF("+EVT:HW Failure");
-		// 	pinMode(LED_GREEN, OUTPUT);
-		// 	digitalWrite(LED_GREEN, !digitalRead(LED_GREEN));
-		// 	while (Serial.available() > 0)
-		// 	{
-		// 		at_serial_input(uint8_t(Serial.read()));
-		// 		delay(5);
-		// 	}
-		// 	delay(5000);
-		// }
 	}
 }
 
@@ -320,12 +301,5 @@ void loop()
 		digitalWrite(LED_GREEN, LOW);
 		delay(10);
 		// Go back to sleep
-#if defined NRF52_SERIES || defined ESP32
-
-		xSemaphoreTake(g_task_sem, 10);
-#endif
-#ifdef ARDUINO_ARCH_RP2040
-		yield();
-#endif
 	}
 }

src/lora.cpp

@@ -69,10 +69,10 @@ int8_t init_lora(void)
 					  g_lorawan_settings.p2p_symbol_timeout, false,
 					  0, true, 0, 0, false, true);
 
+	// LoRa is setup, start the timer that will wakeup the loop frequently
+	api_timer_init();
 	if (g_lorawan_settings.send_repeat_time != 0)
 	{
-		// LoRa is setup, start the timer that will wakeup the loop frequently
-		api_timer_init();
 		api_timer_start();
 	}
 

src/lorawan.cpp

@@ -181,10 +181,13 @@ int8_t init_lorawan(void)
 	// Initialize the app timer
 	api_timer_init();
 
-	API_LOG("LORA", "Start Join");
-	// Start Join process
-	lmh_join();
-
+	/// \todo Join should be only started if g_lorawan_settings.auto_join is true.
+	if (g_lorawan_settings.auto_join)
+	{
+		API_LOG("LORA", "Start Join");
+		// Start Join process
+		lmh_join();
+	}
 	g_lorawan_initialized = true;
 	return 0;
 }