status should be set to "// Datarate range KO" if any of these condition is true

Corentin BOURGET · Corentin BOURGET · commit 6c30fd4d24d8 · 2015-06-26T10:04:06.000+02:00
min datarate &gt; max datarate
        min datarate not in the range
        max datarate not in the range
diff --git a/src/mac/LoRaMac.c b/src/mac/LoRaMac.c
@@ -1191,11 +1191,11 @@ static void LoRaMacProcessMacCommands( uint8_t *payload, uint8_t macIndex, uint8
                         status &= 0xFE; // Channel frequency KO
                     }
 
-                    if( ( chParam.DrRange.Fields.Min > chParam.DrRange.Fields.Max ) &&
-                        ( ( LORAMAC_MIN_DATARATE <= chParam.DrRange.Fields.Min ) &&
-                          ( chParam.DrRange.Fields.Min <= LORAMAC_MAX_DATARATE ) == false ) &&
-                        ( ( LORAMAC_MIN_DATARATE <= chParam.DrRange.Fields.Max ) &&
-                          ( chParam.DrRange.Fields.Max <= LORAMAC_MAX_DATARATE ) == false ) )
+                    if( ( chParam.DrRange.Fields.Min > chParam.DrRange.Fields.Max ) ||
+                        ( ( ( LORAMAC_MIN_DATARATE <= chParam.DrRange.Fields.Min ) &&
+                            ( chParam.DrRange.Fields.Min <= LORAMAC_MAX_DATARATE ) ) == false ) ||
+                        ( ( ( LORAMAC_MIN_DATARATE <= chParam.DrRange.Fields.Max ) &&
+                            ( chParam.DrRange.Fields.Max <= LORAMAC_MAX_DATARATE ) ) == false ) )
                     {
                         status &= 0xFD; // Datarate range KO
                     }

Original file line number	Diff line number	Diff line change
`@@ -1191,11 +1191,11 @@ static void LoRaMacProcessMacCommands( uint8_t *payload, uint8_t macIndex, uint8`
`1191`	`1191`	`status &= 0xFE; // Channel frequency KO`
`1192`	`1192`	`}`
`1193`	`1193`
`1194`		`- if( ( chParam.DrRange.Fields.Min > chParam.DrRange.Fields.Max ) &&`
`1195`		`- ( ( LORAMAC_MIN_DATARATE <= chParam.DrRange.Fields.Min ) &&`
`1196`		`- ( chParam.DrRange.Fields.Min <= LORAMAC_MAX_DATARATE ) == false ) &&`
`1197`		`- ( ( LORAMAC_MIN_DATARATE <= chParam.DrRange.Fields.Max ) &&`
`1198`		`- ( chParam.DrRange.Fields.Max <= LORAMAC_MAX_DATARATE ) == false ) )`
	`1194`	`+ if( ( chParam.DrRange.Fields.Min > chParam.DrRange.Fields.Max ) \|\|`
	`1195`	`+ ( ( ( LORAMAC_MIN_DATARATE <= chParam.DrRange.Fields.Min ) &&`
	`1196`	`+ ( chParam.DrRange.Fields.Min <= LORAMAC_MAX_DATARATE ) ) == false ) \|\|`
	`1197`	`+ ( ( ( LORAMAC_MIN_DATARATE <= chParam.DrRange.Fields.Max ) &&`
	`1198`	`+ ( chParam.DrRange.Fields.Max <= LORAMAC_MAX_DATARATE ) ) == false ) )`
`1199`	`1199`	`{`
`1200`	`1200`	`status &= 0xFD; // Datarate range KO`
`1201`	`1201`	`}`