Channel mask instead of sub band ID.

Author: ilcato

src/Arduino_LoRaConnectionHandler.cpp

@@ -43,12 +43,12 @@ typedef enum
 /******************************************************************************
    CTOR/DTOR
  ******************************************************************************/
-LoRaConnectionHandler::LoRaConnectionHandler(char const * appeui, char const * appkey, _lora_band const band, uint8_t const sub_band_id, _lora_class const device_class)
+LoRaConnectionHandler::LoRaConnectionHandler(char const * appeui, char const * appkey, _lora_band const band, char const * channelMask, _lora_class const device_class)
 : ConnectionHandler{false}
 , _appeui(appeui)
 , _appkey(appkey)
 , _band(band)
-, _sub_band_id(sub_band_id)
+, _channelMask(channelMask)
 , _device_class(device_class)
 {
 
@@ -107,17 +107,9 @@ NetworkConnectionState LoRaConnectionHandler::update_handleInit()
     Debug.print(DBG_ERROR, F("Something went wrong; are you indoor? Move near a window, then reset and retry."));
     return NetworkConnectionState::ERROR;
   } 
-  // Set channelmask based on frequency sub band index
-  if (_sub_band_id) {
-    String mask;
-    for (int i = 12; i > 0; i--) {
-        if (i == _sub_band_id) {
-          mask.concat("FF");
-        } else {
-          mask.concat("00");
-        }
-    }      
-    _modem.sendMask(mask);
+  // Set channelmask based on configuration
+  if (_channelMask) {
+    _modem.sendMask(_channelMask);
   }
   //A delay is required between _modem.begin(band) and _modem.joinOTAA(appeui, appkey) in order to let the chip to be correctly initialized before the connection attempt
   delay(100);

src/Arduino_LoRaConnectionHandler.h

@@ -32,7 +32,7 @@ class LoRaConnectionHandler : public ConnectionHandler
 {
   public:
 
-    LoRaConnectionHandler(char const * appeui, char const * appkey, _lora_band const band = _lora_band::EU868, uint8_t const sub_band_id = 0, _lora_class const device_class = _lora_class::CLASS_A);
+    LoRaConnectionHandler(char const * appeui, char const * appkey, _lora_band const band = _lora_band::EU868, char const * channelMask = NULL, _lora_class const device_class = _lora_class::CLASS_A);
 
     virtual int write(const uint8_t *buf, size_t size) override;
     virtual int read() override;
@@ -67,7 +67,7 @@ class LoRaConnectionHandler : public ConnectionHandler
     char const * _appeui;
     char const * _appkey;
     _lora_band _band;
-    uint8_t    _sub_band_id;
+    char const * _channelMask;
     _lora_class _device_class;
     LoRaModem _modem;
 };