added the ability to set the lorawan *class* for the module

Author: gigapod

sfeIoTNodeLoRaWAN/flxLoRaWANDigi.cpp

@@ -130,6 +130,10 @@ void flxLoRaWANDigi::set_isEnabled(bool bEnabled)
 
 void flxLoRaWANDigi::update_system_config(void)
 {
+    // have we setup the system yet -- if not, skip this
+    if (_pXBeeLR == nullptr)
+        return;
+
     // Mark this module as not configured. This will force a reconfiguration at boot.
     _moduleConfigured = false;
 
@@ -181,6 +185,36 @@ std::string flxLoRaWANDigi::get_network_key(void)
     return _network_key;
 }
 
+void flxLoRaWANDigi::set_lora_class(uint8_t loraClass)
+{
+    if (_lora_class == loraClass)
+        return;
+
+    _lora_class = loraClass;
+
+    // push the update to the module
+    (void)setupLoRaWANClass();
+}
+
+uint8_t flxLoRaWANDigi::get_lora_class(void)
+{
+    return _lora_class;
+}
+//----------------------------------------------------------------
+// method to capture setting the module class
+bool flxLoRaWANDigi::setupLoRaWANClass(void)
+{
+    if (!_isEnabled || _pXBeeLR == nullptr)
+        return false;
+
+    bool status = _pXBeeLR->setLoRaWANClass(kLoRaWANClasses[_lora_class][0]);
+    if (!status)
+        flxLog_W(F("%s: Error setting the LoRaWAN Class to `%s`"), name(), kLoRaWANClasses[_lora_class]);
+    else
+        flxLog_D(F("%s: Set the LoRaWAN Class to `%s`"), name(), kLoRaWANClasses[_lora_class]);
+
+    return status;
+}
 //----------------------------------------------------------------
 // Config the settings on the module. These settings are persistent, so only need to set once.
 
@@ -374,8 +408,7 @@ bool flxLoRaWANDigi::connect(void)
         return false;
     }
     // We are connected -- make sure the class is set.
-    if (!_pXBeeLR->setLoRaWANClass('C'))
-        flxLog_D(F("%s: Failed to set the LoRaWAN Class"), name());
+    (void)setupLoRaWANClass();
 
     flxSerial.textToGreen();
     flxLog_N(F("Connected!"));
@@ -436,6 +469,8 @@ bool flxLoRaWANDigi::initialize(void)
     flxRegister(appKey, "Application Key", "The LoRaWAN Application Key");
     flxRegister(networkKey, "Network Key", "The LoRaWAN Network Key");
 
+    flxRegister(loraWANClass, "LoRaWAN Class", "The LoRaWAN operating class");
+
     // our hidden module initialized property
     flxRegister(_moduleConfigured, "mod-config");
 

sfeIoTNodeLoRaWAN/flxLoRaWANDigi.h

@@ -48,11 +48,15 @@ class flxLoRaWANDigi : public flxActionType<flxLoRaWANDigi>
 
     void update_system_config(void);
 
+    void set_lora_class(uint8_t);
+    uint8_t get_lora_class(void);
+    uint8_t _lora_class;
+
   public:
     // ctor
     flxLoRaWANDigi()
-        : _app_key{""}, _network_key{""}, _wasConnected{false}, _isEnabled{true}, _delayedStartup{false},
-          _moduleInitialized{false}, _pXBeeLR{nullptr}, _devEUI{'\0'}, _currentOffset{0}
+        : _app_key{""}, _network_key{""}, _lora_class{2}, _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);
@@ -83,6 +87,9 @@ class flxLoRaWANDigi : public flxActionType<flxLoRaWANDigi>
         networkKey;
 
     flxPropertyRWBool<flxLoRaWANDigi, &flxLoRaWANDigi::get_isEnabled, &flxLoRaWANDigi::set_isEnabled> enabled;
+
+    flxPropertyRWUInt8<flxLoRaWANDigi, &flxLoRaWANDigi::get_lora_class, &flxLoRaWANDigi::set_lora_class> loraWANClass =
+        {2, {{kLoRaWANClasses[0], 0}, {kLoRaWANClasses[1], 1}, {kLoRaWANClasses[2], 2}}};
     flxPropertyHiddenBool<flxLoRaWANDigi> _moduleConfigured = {false};
 
     // input params/functions
@@ -121,12 +128,15 @@ class flxLoRaWANDigi : public flxActionType<flxLoRaWANDigi>
     bool sendData(uint8_t tag, const uint8_t *data, size_t len);
     bool flushBuffer(void);
 
+    static constexpr const char *kLoRaWANClasses[3] = {"A", "B", "C"};
+
   private:
     void connectionStatusCB(void);
     bool setupModule(void);
     bool configureModule(void);
     void reconnectJobCB(void);
     void processMessagesCB(void);
+    bool setupLoRaWANClass(void);
 
     // send our payload buffer
     bool sendPayload(const uint8_t *payload, size_t len);

sfeIoTNodeLoRaWAN/sfeIoTNodeLoRaWANAbout.cpp

@@ -84,6 +84,8 @@ void sfeIoTNodeLoRaWAN::displayAppStatus(bool useInfo)
     if (_loraWANConnection.isConnected())
     {
         flxLog__(logLevel, "%cDevice EUI: %s", pre_ch, _loraWANConnection.deviceEUI());
+        flxLog__(logLevel, "%cOperating Class: '%s'", pre_ch,
+                 _loraWANConnection.kLoRaWANClasses[_loraWANConnection.loraWANClass()]);
     }
     flxLog_N("");
     if (!useInfo)
@@ -167,6 +169,7 @@ void sfeIoTNodeLoRaWAN::displayAppStatus(bool useInfo)
     else
         flxLog_N("%.2f (ms)", _logger.getLogRate());
 
+    flxLog_N("");
     flxLog__(logLevel, "%cJSON Buffer - Size: %dB Max Used: %dB", pre_ch, jsonBufferSize(), _fmtJSON.getMaxSizeUsed());
     flxLog__(logLevel, "%cSerial Output: %s", pre_ch, kLogFormatNames[serialLogType()]);
     flxLog_N("%c    Baud Rate: %d", pre_ch, serialBaudRate());