Skip to content

Commit 7611f72

Browse files
committed
Merge pull request #7 from Mobiak/patch1
Weird conditions to check datarate on cmd mac SRV_MAC_NEW_CHANNEL_REQ
2 parents 5edd066 + 6c30fd4 commit 7611f72

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/mac/LoRaMac.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,11 +1191,11 @@ static void LoRaMacProcessMacCommands( uint8_t *payload, uint8_t macIndex, uint8
11911191
status &= 0xFE; // Channel frequency KO
11921192
}
11931193

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 ) )
11991199
{
12001200
status &= 0xFD; // Datarate range KO
12011201
}

0 commit comments

Comments
 (0)