Channel index verification should use OR

reissjason · reissjason · commit bc865a9d2bb9 · 2015-06-08T08:57:15.000-05:00
Check was always false.
diff --git a/src/mac/LoRaMac.c b/src/mac/LoRaMac.c
@@ -1181,7 +1181,7 @@ static void LoRaMacProcessMacCommands( uint8_t *payload, uint8_t macIndex, uint8
                     chParam.Frequency *= 100;
                     chParam.DrRange.Value = payload[macIndex++];
                     
-                    if( ( channelIndex < 3 ) && ( channelIndex > LORA_MAX_NB_CHANNELS ) )
+                    if( ( channelIndex < 3 ) || ( channelIndex > LORA_MAX_NB_CHANNELS ) )
                     {
                         status &= 0xFE; // Channel frequency KO
                     }

Original file line number	Diff line number	Diff line change
`@@ -1181,7 +1181,7 @@ static void LoRaMacProcessMacCommands( uint8_t *payload, uint8_t macIndex, uint8`
`1181`	`1181`	`chParam.Frequency *= 100;`
`1182`	`1182`	`chParam.DrRange.Value = payload[macIndex++];`
`1183`	`1183`
`1184`		`- if( ( channelIndex < 3 ) && ( channelIndex > LORA_MAX_NB_CHANNELS ) )`
	`1184`	`+ if( ( channelIndex < 3 ) \|\| ( channelIndex > LORA_MAX_NB_CHANNELS ) )`
`1185`	`1185`	`{`
`1186`	`1186`	`status &= 0xFE; // Channel frequency KO`
`1187`	`1187`	`}`