Fix #841: refer to bandplan for max Rx1DrOffset value

Author: terrillmoore

README.md

@@ -1247,6 +1247,7 @@ function uflt12f(rawUflt12)
 - HEAD has the following changes.
 
   - Enable device time request by default in config file ([#840](https://github.com/mcci-catena/arduino-lmic/issues/840)).
+  - Correct bug in MAC Rx1DrOffset error checking for regions other than US ([#841](https://github.com/mcci-catena/arduino-lmic/issues/840)). Thanks to @GitTibbe for finding this.
   - Refactor the LMIC to enable secure element support ([#578](https://github.com/mcci-catena/arduino-lmic/issues/840)).
   - Start resurrecting Doxygen support.
 

src/lmic/lmic.c

@@ -886,7 +886,7 @@ scan_mac_cmds(
                 LMIC.dn2Ans |= MCMD_RXParamSetupAns_RX2DataRateACK;
             if( freq != 0 )
                 LMIC.dn2Ans |= MCMD_RXParamSetupAns_ChannelACK;
-            if (rx1DrOffset <= 3)
+            if ( rx1DrOffset <= LMICbandplan_queryMaxRx1DrOffset() )
                 LMIC.dn2Ans |= MCMD_RXParamSetupAns_RX1DrOffsetAck;
 
             if( LMIC.dn2Ans == (0xC0|MCMD_RXParamSetupAns_RX2DataRateACK|MCMD_RXParamSetupAns_ChannelACK| MCMD_RXParamSetupAns_RX1DrOffsetAck) ) {

src/lmic/lmic_bandplan.h

@@ -118,6 +118,10 @@
 # error "LMICbandplan_convFreq() not defined by bandplan"
 #endif
 
+#if !defined(LMICbandplan_queryMaxRx1DrOffset)
+# error "LMICbandplan_queryMaxRx1DrOffset() not defined by bandplan"
+#endif
+
 #if !defined(LMICbandplan_setRx1Params)
 # error "LMICbandplan_setRx1Params() not defined by bandplan"
 #endif

src/lmic/lmic_bandplan_as923.h

@@ -82,6 +82,12 @@ void LMICas923_setBcnRxParams(void);
 u4_t LMICas923_convFreq(xref2cu1_t ptr);
 #define LMICbandplan_convFreq(ptr)      LMICas923_convFreq(ptr)
 
+static inline u1_t
+LMICas923_queryMaxRx1DrOffset(void) {
+        return 7;
+}
+#define LMICbandplan_queryMaxRx1DrOffset() LMICas923_queryMaxRx1DrOffset()
+
 void LMICas923_initJoinLoop(void);
 #define LMICbandplan_initJoinLoop()     LMICas923_initJoinLoop()
 

src/lmic/lmic_bandplan_au915.h

@@ -60,6 +60,12 @@ void LMICau915_setBcnRxParams(void);
 u4_t LMICau915_convFreq(xref2cu1_t ptr);
 #define LMICbandplan_convFreq(ptr)      LMICau915_convFreq(ptr)
 
+static inline u1_t
+LMICau915_queryMaxRx1DrOffset(void) {
+        return 5;
+}
+#define LMICbandplan_queryMaxRx1DrOffset() LMICau915_queryMaxRx1DrOffset()
+
 void LMICau915_setRx1Params(void);
 #define LMICbandplan_setRx1Params()     LMICau915_setRx1Params()
 

src/lmic/lmic_bandplan_eu868.h

@@ -69,6 +69,12 @@ void LMICeu868_setBcnRxParams(void);
 u4_t LMICeu868_convFreq(xref2cu1_t ptr);
 #define LMICbandplan_convFreq(ptr)      LMICeu868_convFreq(ptr)
 
+static inline u1_t
+LMICeu868_queryMaxRx1DrOffset(void) {
+        return 5;
+}
+#define LMICbandplan_queryMaxRx1DrOffset() LMICeu868_queryMaxRx1DrOffset()
+
 void LMICeu868_initJoinLoop(void);
 #define LMICbandplan_initJoinLoop()     LMICeu868_initJoinLoop()
 

src/lmic/lmic_bandplan_in866.h

@@ -66,6 +66,12 @@ void LMICin866_setBcnRxParams(void);
 u4_t LMICin866_convFreq(xref2cu1_t ptr);
 #define LMICbandplan_convFreq(ptr)      LMICin866_convFreq(ptr)
 
+static inline u1_t
+LMICin866_queryMaxRx1DrOffset(void) {
+        return 7;
+}
+#define LMICbandplan_queryMaxRx1DrOffset() LMICin866_queryMaxRx1DrOffset()
+
 void LMICin866_initJoinLoop(void);
 #define LMICbandplan_initJoinLoop()     LMICin866_initJoinLoop()
 

src/lmic/lmic_bandplan_kr920.h

@@ -69,6 +69,12 @@ void LMICkr920_setBcnRxParams(void);
 u4_t LMICkr920_convFreq(xref2cu1_t ptr);
 #define LMICbandplan_convFreq(ptr)      LMICkr920_convFreq(ptr)
 
+static inline u1_t
+LMICkr920_queryMaxRx1DrOffset(void) {
+        return 5;
+}
+#define LMICbandplan_queryMaxRx1DrOffset() LMICkr920_queryMaxRx1DrOffset()
+
 void LMICkr920_initJoinLoop(void);
 #define LMICbandplan_initJoinLoop()     LMICkr920_initJoinLoop()
 

src/lmic/lmic_bandplan_us915.h

@@ -57,6 +57,12 @@ void LMICus915_setBcnRxParams(void);
 u4_t LMICus915_convFreq(xref2cu1_t ptr);
 #define LMICbandplan_convFreq(ptr)      LMICus915_convFreq(ptr)
 
+static inline u1_t
+LMICus915_queryMaxRx1DrOffset(void) {
+        return 3;
+}
+#define LMICbandplan_queryMaxRx1DrOffset() LMICus915_queryMaxRx1DrOffset()
+
 void LMICus915_initJoinLoop(void);
 #define LMICbandplan_initJoinLoop()     LMICus915_initJoinLoop()