You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/03/07 21:32:13 UTC
[GitHub] wes3 closed pull request #887: net/lora: Update sx1272 to latest semtech code.
wes3 closed pull request #887: net/lora: Update sx1272 to latest semtech code.
URL: https://github.com/apache/mynewt-core/pull/887
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/hw/drivers/lora/sx1272/src/sx1272.c b/hw/drivers/lora/sx1272/src/sx1272.c
index 326eab25b..9d9020a14 100644
--- a/hw/drivers/lora/sx1272/src/sx1272.c
+++ b/hw/drivers/lora/sx1272/src/sx1272.c
@@ -403,7 +403,7 @@ void SX1272SetRxConfig( RadioModems_t modem, uint32_t bandwidth,
SX1272.Settings.Fsk.IqInverted = iqInverted;
SX1272.Settings.Fsk.RxContinuous = rxContinuous;
SX1272.Settings.Fsk.PreambleLen = preambleLen;
- SX1272.Settings.Fsk.RxSingleTimeout = symbTimeout * ( ( 1.0 / ( double )datarate ) * 8.0 ) * 1e3;
+ SX1272.Settings.Fsk.RxSingleTimeout = ( uint32_t )( symbTimeout * ( ( 1.0 / ( double )datarate ) * 8.0 ) * 1000 );
datarate = ( uint16_t )( ( double )XTAL_FREQ / ( double )datarate );
SX1272Write( REG_BITRATEMSB, ( uint8_t )( datarate >> 8 ) );
@@ -662,7 +662,7 @@ uint32_t SX1272GetTimeOnAir( RadioModems_t modem, uint8_t pktLen )
( ( ( SX1272Read( REG_PACKETCONFIG1 ) & ~RF_PACKETCONFIG1_ADDRSFILTERING_MASK ) != 0x00 ) ? 1.0 : 0 ) +
pktLen +
( ( SX1272.Settings.Fsk.CrcOn == 0x01 ) ? 2.0 : 0 ) ) /
- SX1272.Settings.Fsk.Datarate ) * 1e3 );
+ SX1272.Settings.Fsk.Datarate ) * 1000 );
}
break;
case MODEM_LORA:
@@ -671,13 +671,13 @@ uint32_t SX1272GetTimeOnAir( RadioModems_t modem, uint8_t pktLen )
switch( SX1272.Settings.LoRa.Bandwidth )
{
case 0: // 125 kHz
- bw = 125e3;
+ bw = 125000;
break;
case 1: // 250 kHz
- bw = 250e3;
+ bw = 250000;
break;
case 2: // 500 kHz
- bw = 500e3;
+ bw = 500000;
break;
}
@@ -698,7 +698,7 @@ uint32_t SX1272GetTimeOnAir( RadioModems_t modem, uint8_t pktLen )
// Time on air
double tOnAir = tPreamble + tPayload;
// return ms secs
- airTime = floor( tOnAir * 1e3 + 0.999 );
+ airTime = floor( tOnAir * 1000 + 0.999 );
}
break;
}
@@ -1015,7 +1015,7 @@ void SX1272StartCad( void )
void SX1272SetTxContinuousWave( uint32_t freq, int8_t power, uint16_t time )
{
- uint32_t timeout = ( uint32_t )( time * 1e3 );
+ uint32_t timeout = ( uint32_t )( time * 1000 );
SX1272SetChannel( freq );
@@ -1439,6 +1439,7 @@ void SX1272OnDio0Irq(void *unused)
}
SX1272.Settings.LoRaPacketHandler.Size = SX1272Read( REG_LR_RXNBBYTES );
+ SX1272Write( REG_LR_FIFOADDRPTR, SX1272Read( REG_LR_FIFORXCURRENTADDR ) );
SX1272ReadFifo( RxTxBuffer, SX1272.Settings.LoRaPacketHandler.Size );
if( SX1272.Settings.LoRa.RxContinuous == false )
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services