added logic to trigger reboot and reconfigure for module if key/id changes; add more error/info messages on key/id setting

Author: gigapod

sfeIoTNodeLoRaWAN/flxLoRaWANDigi.cpp

@@ -9,6 +9,7 @@
  */
 
 #include "flxLoRaWANDigi.h"
+#include <Flux/flxCoreEvent.h>
 #include <Flux/flxNetwork.h>
 #include <Flux/flxSerial.h>
 #include <Flux/flxSettings.h>
@@ -20,9 +21,6 @@
 #define kXBeeLRSerial Serial1
 #define kXBeeLRBaud 9600
 
-// Our Development App EUI
-#define kDevelopmentAppEUI "37D56A3F6CDCF0A5"
-
 // Define a connection iteration value - exceed this, skip the connection
 
 #define kMaxConnectionTries 3
@@ -130,12 +128,59 @@ void flxLoRaWANDigi::set_isEnabled(bool bEnabled)
         disconnect();
 }
 
+void flxLoRaWANDigi::update_system_config(void)
+{
+    // Mark this module as not configured. This will force a reconfiguration at boot.
+    _moduleConfigured = false;
+
+    // Save our settings
+    flxSettings.save(this, true);
+
+    // Indicate that the system needs restart
+    flxSendEvent(flxEvent::kSystemNeedsRestart);
+}
 //----------------------------------------------------------------
 bool flxLoRaWANDigi::get_isEnabled(void)
 {
     return _isEnabled;
 }
 
+void flxLoRaWANDigi::set_app_eui(std::string appEUI)
+{
+    _app_eui = appEUI;
+
+    // Indicate that the system needs restart
+    update_system_config();
+}
+std::string flxLoRaWANDigi::get_app_eui(void)
+{
+    return _app_eui;
+}
+
+void flxLoRaWANDigi::set_app_key(std::string appKey)
+{
+    _app_key = appKey;
+
+    // Indicate that the system needs restart
+    update_system_config();
+}
+std::string flxLoRaWANDigi::get_app_key(void)
+{
+    return _app_key;
+}
+
+void flxLoRaWANDigi::set_network_key(std::string networkKey)
+{
+    _network_key = networkKey;
+
+    // Indicate that the system needs restart
+    update_system_config();
+}
+std::string flxLoRaWANDigi::get_network_key(void)
+{
+    return _network_key;
+}
+
 //----------------------------------------------------------------
 // Config the settings on the module. These settings are persistent, so only need to set once.
 
@@ -151,25 +196,33 @@ bool flxLoRaWANDigi::configureModule(void)
     if (appEUI().size() > 0)
     {
         if (!_pXBeeLR->setLoRaWANAppEUI(appEUI().c_str()))
-            flxLog_D(F("%s: Failed to set the App EUI"), name());
+            flxLog_N_(F(". failed ."));
+        else
+            flxLog_N_(F(". success ."));
     }
     flxLog_N_(F("."));
 
     // App Key
     if (appKey().size() > 0)
     {
-        flxLog_I(F("Setting App Key: %s"), appKey().c_str());
+        flxLog_N_(F(". setting App Key .."));
         if (!_pXBeeLR->setLoRaWANAppKey(appKey().c_str()))
-            flxLog_D(F("%s: Failed to set the App Key"), name());
+            flxLog_N_(F(". failed ."));
+        else
+            flxLog_N_(F(". success ."));
     }
 
     flxLog_N_(F("."));
 
     // Network Key
     if (networkKey().size() > 0)
     {
+        flxLog_N_(F(". setting Network Key .."));
         if (!_pXBeeLR->setLoRaWANNwkKey(networkKey().c_str()))
-            flxLog_W(F("%s: Failed to set the Network Key"), name());
+            flxLog_N_(F(". failed ."));
+        else
+            flxLog_N_(F(". success ."));
+        ;
     }
     flxLog_N_(F("."));
 
@@ -377,12 +430,6 @@ bool flxLoRaWANDigi::initialize(void)
     // Our process messages job
     _processJob.setup("LoRaWAN Process", kProcessMessagesTime, this, &flxLoRaWANDigi::processMessagesCB);
 
-#if defined(FLX_SPARKFUN_LORAWAN_APP_EUI)
-    appEUI = FLX_SPARKFUN_LORAWAN_APP_EUI;
-#else
-    appEUI = kDevelopmentAppEUI;
-#endif
-
     // Do we connect now?
 
     // is it desired to delay the startup/connect call?

sfeIoTNodeLoRaWAN/flxLoRaWANDigi.h

@@ -22,6 +22,9 @@ flxDefineEventID(kLoRaWANSendStatus);
 // Event for received messages
 flxDefineEventID(kLoRaWANReceivedMessage);
 
+// Our Development App EUI
+#define kDevelopmentAppEUI "37D56A3F6CDCF0A5"
+
 class flxLoRaWANDigi : public flxActionType<flxLoRaWANDigi>
 {
   private:
@@ -30,14 +33,36 @@ class flxLoRaWANDigi : public flxActionType<flxLoRaWANDigi>
 
     void reset_module(void);
 
+    void set_app_eui(std::string appEUI);
+    std::string get_app_eui(void);
+    std::string _app_eui;
+
+    void set_app_key(std::string appKey);
+    std::string get_app_key(void);
+
+    std::string _app_key;
+
+    void set_network_key(std::string networkKey);
+    std::string get_network_key(void);
+    std::string _network_key;
+
+    void update_system_config(void);
+
   public:
     // ctor
     flxLoRaWANDigi()
-        : _wasConnected{false}, _isEnabled{true}, _delayedStartup{false}, _moduleInitialized{false}, _pXBeeLR{nullptr},
-          _devEUI{'\0'}, _currentOffset{0}
+        : _app_key{""}, _network_key{""}, _wasConnected{false}, _isEnabled{true}, _delayedStartup{false},
+          _moduleInitialized{false}, _pXBeeLR{nullptr}, _devEUI{'\0'}, _currentOffset{0}
     {
         setName("LoRaWAN Network", "Digi LoRaWAN connection for the system");
         flux_add(this);
+
+        // default app EUI
+#if defined(FLX_SPARKFUN_LORAWAN_APP_EUI)
+        _app_eui = FLX_SPARKFUN_LORAWAN_APP_EUI;
+#else
+        _app_eui = kDevelopmentAppEUI;
+#endif
     }
 
     // dtor
@@ -52,9 +77,10 @@ class flxLoRaWANDigi : public flxActionType<flxLoRaWANDigi>
     }
 
     // Properties
-    flxPropertyString<flxLoRaWANDigi> appEUI;
-    flxPropertySecureString<flxLoRaWANDigi> appKey;
-    flxPropertySecureString<flxLoRaWANDigi> networkKey;
+    flxPropertyRWString<flxLoRaWANDigi, &flxLoRaWANDigi::get_app_eui, &flxLoRaWANDigi::set_app_eui> appEUI;
+    flxPropertyRWSecureString<flxLoRaWANDigi, &flxLoRaWANDigi::get_app_key, &flxLoRaWANDigi::set_app_key> appKey;
+    flxPropertyRWSecureString<flxLoRaWANDigi, &flxLoRaWANDigi::get_network_key, &flxLoRaWANDigi::set_network_key>
+        networkKey;
 
     flxPropertyRWBool<flxLoRaWANDigi, &flxLoRaWANDigi::get_isEnabled, &flxLoRaWANDigi::set_isEnabled> enabled;
     flxPropertyHiddenBool<flxLoRaWANDigi> _moduleConfigured = {false};