Skip to content

Commit 03e7ff5

Browse files
committed
Merge branch 'master' into develop
2 parents 0c69fee + 235b14d commit 03e7ff5

File tree

2 files changed

+24
-12
lines changed

2 files changed

+24
-12
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ Please refer to [Releases pre-certification-results](https://github.com/Lora-net
1111

1212
## [Unreleased]
1313

14+
### General
15+
16+
- Release based on "LoRaWAN specification 1.0.3" and "LoRaWAN Regional Parameters v1.0.3revA"
17+
- GitHub reported issues corrections. Please refer to [Release Version 4.4.4](https://github.com/Lora-net/LoRaMac-node/milestone/6)
18+
19+
### Fixed
20+
21+
- Fixed SX126xSetLoRaSymbNumTimeout to call the workaround only if the number of symbols is equal to or higher than 64.
22+
1423
## [4.4.4] - 2020-05-26
1524

1625
### General

src/radio/sx126x/sx126x.c

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -353,22 +353,25 @@ void SX126xSetStopRxTimerOnPreambleDetect( bool enable )
353353
SX126xWriteCommand( RADIO_SET_STOPRXTIMERONPREAMBLE, ( uint8_t* )&enable, 1 );
354354
}
355355

356-
void SX126xSetLoRaSymbNumTimeout( uint8_t SymbNum )
356+
void SX126xSetLoRaSymbNumTimeout( uint8_t symbNum )
357357
{
358-
SX126xWriteCommand( RADIO_SET_LORASYMBTIMEOUT, &SymbNum, 1 );
358+
SX126xWriteCommand( RADIO_SET_LORASYMBTIMEOUT, &symbNum, 1 );
359359

360-
uint8_t mant = SymbNum >> 1;
361-
uint8_t exp = 0;
362-
uint8_t reg = 0;
363-
364-
while( mant > 31 )
360+
if( symbNum >= 64 )
365361
{
366-
mant >>= 2;
367-
exp++;
368-
}
362+
uint8_t mant = symbNum >> 1;
363+
uint8_t exp = 0;
364+
uint8_t reg = 0;
365+
366+
while( mant > 31 )
367+
{
368+
mant >>= 2;
369+
exp++;
370+
}
369371

370-
reg = exp + ( mant << 3 );
371-
SX126xWriteRegister( REG_LR_SYNCH_TIMEOUT, reg );
372+
reg = exp + ( mant << 3 );
373+
SX126xWriteRegister( REG_LR_SYNCH_TIMEOUT, reg );
374+
}
372375
}
373376

374377
void SX126xSetRegulatorMode( RadioRegulatorMode_t mode )

0 commit comments

Comments
 (0)