sanfan-lora
Fork of SX1276Lib by
Diff: sx1276/sx1276.cpp
- Revision:
- 26:ba9dda357a36
- Parent:
- 25:ff4574f6f1a6
--- a/sx1276/sx1276.cpp Mon Jul 11 07:47:29 2016 +0000 +++ b/sx1276/sx1276.cpp Thu Sep 22 06:30:08 2016 +0000 @@ -13,7 +13,6 @@ Maintainers: Miguel Luis, Gregory Cristian and Nicolas Huguenin */ #include "sx1276.h" -#include "board.h" const FskBandwidth_t SX1276::FskBandwidths[] = { @@ -54,8 +53,8 @@ { wait_ms( 10 ); this->rxTx = 0; - this->rxBuffer = new uint8_t[RX_BUFFER_SIZE]; - previousOpMode = RF_OPMODE_STANDBY; + this->rxtxBuffer = new uint8_t[RX_BUFFER_SIZE]; + currentOpMode = RF_OPMODE_STANDBY; this->RadioEvents = events; @@ -73,7 +72,7 @@ SX1276::~SX1276( ) { - delete this->rxBuffer; + delete this->rxtxBuffer; delete this->dioIrq; } @@ -99,19 +98,19 @@ bool SX1276::IsChannelFree( RadioModems_t modem, uint32_t freq, int16_t rssiThresh ) { int16_t rssi = 0; - + SetModem( modem ); SetChannel( freq ); - + SetOpMode( RF_OPMODE_RECEIVER ); wait_ms( 1 ); - + rssi = GetRssi( modem ); - + Sleep( ); - + if( rssi > rssiThresh ) { return false; @@ -125,7 +124,7 @@ uint32_t rnd = 0; /* - * Radio setup for random number generation + * Radio setup for random number generation */ // Set LoRa modem ON SetModem( MODEM_LORA ); @@ -183,7 +182,7 @@ // Sets a Frequency in HF band SetChannel( 868000000 ); - // Launch Rx chain calibration for HF band + // Launch Rx chain calibration for HF band Write ( REG_IMAGECAL, ( Read( REG_IMAGECAL ) & RF_IMAGECAL_IMAGECAL_MASK ) | RF_IMAGECAL_IMAGECAL_START ); while( ( Read( REG_IMAGECAL ) & RF_IMAGECAL_IMAGECAL_RUNNING ) == RF_IMAGECAL_IMAGECAL_RUNNING ) { @@ -238,7 +237,7 @@ this->settings.Fsk.IqInverted = iqInverted; this->settings.Fsk.RxContinuous = rxContinuous; this->settings.Fsk.PreambleLen = preambleLen; - + datarate = ( uint16_t )( ( double )XTAL_FREQ / ( double )datarate ); Write( REG_BITRATEMSB, ( uint8_t )( datarate >> 8 ) ); Write( REG_BITRATELSB, ( uint8_t )( datarate & 0xFF ) ); @@ -248,14 +247,18 @@ Write( REG_PREAMBLEMSB, ( uint8_t )( ( preambleLen >> 8 ) & 0xFF ) ); Write( REG_PREAMBLELSB, ( uint8_t )( preambleLen & 0xFF ) ); - + if( fixLen == 1 ) { Write( REG_PAYLOADLENGTH, payloadLen ); } - + else + { + Write( REG_PAYLOADLENGTH, 0xFF ); // Set payload length to the maximum + } + Write( REG_PACKETCONFIG1, - ( Read( REG_PACKETCONFIG1 ) & + ( Read( REG_PACKETCONFIG1 ) & RF_PACKETCONFIG1_CRC_MASK & RF_PACKETCONFIG1_PACKETFORMAT_MASK ) | ( ( fixLen == 1 ) ? RF_PACKETCONFIG1_PACKETFORMAT_FIXED : RF_PACKETCONFIG1_PACKETFORMAT_VARIABLE ) | @@ -290,7 +293,7 @@ { datarate = 6; } - + if( ( ( bandwidth == 7 ) && ( ( datarate == 11 ) || ( datarate == 12 ) ) ) || ( ( bandwidth == 8 ) && ( datarate == 12 ) ) ) { @@ -301,14 +304,14 @@ this->settings.LoRa.LowDatarateOptimize = 0x00; } - Write( REG_LR_MODEMCONFIG1, + Write( REG_LR_MODEMCONFIG1, ( Read( REG_LR_MODEMCONFIG1 ) & RFLR_MODEMCONFIG1_BW_MASK & RFLR_MODEMCONFIG1_CODINGRATE_MASK & RFLR_MODEMCONFIG1_IMPLICITHEADER_MASK ) | - ( bandwidth << 4 ) | ( coderate << 1 ) | + ( bandwidth << 4 ) | ( coderate << 1 ) | fixLen ); - + Write( REG_LR_MODEMCONFIG2, ( Read( REG_LR_MODEMCONFIG2 ) & RFLR_MODEMCONFIG2_SF_MASK & @@ -317,13 +320,13 @@ ( datarate << 4 ) | ( crcOn << 2 ) | ( ( symbTimeout >> 8 ) & ~RFLR_MODEMCONFIG2_SYMBTIMEOUTMSB_MASK ) ); - Write( REG_LR_MODEMCONFIG3, + Write( REG_LR_MODEMCONFIG3, ( Read( REG_LR_MODEMCONFIG3 ) & RFLR_MODEMCONFIG3_LOWDATARATEOPTIMIZE_MASK ) | ( this->settings.LoRa.LowDatarateOptimize << 3 ) ); Write( REG_LR_SYMBTIMEOUTLSB, ( uint8_t )( symbTimeout & 0xFF ) ); - + Write( REG_LR_PREAMBLEMSB, ( uint8_t )( ( preambleLen >> 8 ) & 0xFF ) ); Write( REG_LR_PREAMBLELSB, ( uint8_t )( preambleLen & 0xFF ) ); @@ -338,9 +341,9 @@ Write( REG_LR_HOPPERIOD, this->settings.LoRa.HopPeriod ); } - if( ( bandwidth == 9 ) && ( RF_MID_BAND_THRESH ) ) + if( ( bandwidth == 9 ) && ( this->settings.Channel > RF_MID_BAND_THRESH ) ) { - // ERRATA 2.1 - Sensitivity Optimization with a 500 kHz Bandwidth + // ERRATA 2.1 - Sensitivity Optimization with a 500 kHz Bandwidth Write( REG_LR_TEST36, 0x02 ); Write( REG_LR_TEST3A, 0x64 ); } @@ -355,14 +358,14 @@ // ERRATA 2.1 - Sensitivity Optimization with a 500 kHz Bandwidth Write( REG_LR_TEST36, 0x03 ); } - + if( datarate == 6 ) { - Write( REG_LR_DETECTOPTIMIZE, + Write( REG_LR_DETECTOPTIMIZE, ( Read( REG_LR_DETECTOPTIMIZE ) & RFLR_DETECTIONOPTIMIZE_MASK ) | RFLR_DETECTIONOPTIMIZE_SF6 ); - Write( REG_LR_DETECTIONTHRESHOLD, + Write( REG_LR_DETECTIONTHRESHOLD, RFLR_DETECTIONTHRESH_SF6 ); } else @@ -371,7 +374,7 @@ ( Read( REG_LR_DETECTOPTIMIZE ) & RFLR_DETECTIONOPTIMIZE_MASK ) | RFLR_DETECTIONOPTIMIZE_SF7_TO_SF12 ); - Write( REG_LR_DETECTIONTHRESHOLD, + Write( REG_LR_DETECTIONTHRESHOLD, RFLR_DETECTIONTHRESH_SF7_TO_SF12 ); } } @@ -379,17 +382,17 @@ } } -void SX1276::SetTxConfig( RadioModems_t modem, int8_t power, uint32_t fdev, +void SX1276::SetTxConfig( RadioModems_t modem, int8_t power, uint32_t fdev, uint32_t bandwidth, uint32_t datarate, uint8_t coderate, uint16_t preambleLen, - bool fixLen, bool crcOn, bool freqHopOn, + bool fixLen, bool crcOn, bool freqHopOn, uint8_t hopPeriod, bool iqInverted, uint32_t timeout ) { uint8_t paConfig = 0; uint8_t paDac = 0; SetModem( modem ); - + paConfig = Read( REG_PACONFIG ); paDac = Read( REG_PADAC ); @@ -459,7 +462,7 @@ this->settings.Fsk.CrcOn = crcOn; this->settings.Fsk.IqInverted = iqInverted; this->settings.Fsk.TxTimeout = timeout; - + fdev = ( uint16_t )( ( double )fdev / ( double )FREQ_STEP ); Write( REG_FDEVMSB, ( uint8_t )( fdev >> 8 ) ); Write( REG_FDEVLSB, ( uint8_t )( fdev & 0xFF ) ); @@ -472,12 +475,12 @@ Write( REG_PREAMBLELSB, preambleLen & 0xFF ); Write( REG_PACKETCONFIG1, - ( Read( REG_PACKETCONFIG1 ) & + ( Read( REG_PACKETCONFIG1 ) & RF_PACKETCONFIG1_CRC_MASK & RF_PACKETCONFIG1_PACKETFORMAT_MASK ) | ( ( fixLen == 1 ) ? RF_PACKETCONFIG1_PACKETFORMAT_FIXED : RF_PACKETCONFIG1_PACKETFORMAT_VARIABLE ) | ( crcOn << 4 ) ); - + } break; case MODEM_LORA: @@ -524,12 +527,12 @@ Write( REG_LR_HOPPERIOD, this->settings.LoRa.HopPeriod ); } - Write( REG_LR_MODEMCONFIG1, + Write( REG_LR_MODEMCONFIG1, ( Read( REG_LR_MODEMCONFIG1 ) & RFLR_MODEMCONFIG1_BW_MASK & RFLR_MODEMCONFIG1_CODINGRATE_MASK & RFLR_MODEMCONFIG1_IMPLICITHEADER_MASK ) | - ( bandwidth << 4 ) | ( coderate << 1 ) | + ( bandwidth << 4 ) | ( coderate << 1 ) | fixLen ); Write( REG_LR_MODEMCONFIG2, @@ -538,21 +541,21 @@ RFLR_MODEMCONFIG2_RXPAYLOADCRC_MASK ) | ( datarate << 4 ) | ( crcOn << 2 ) ); - Write( REG_LR_MODEMCONFIG3, + Write( REG_LR_MODEMCONFIG3, ( Read( REG_LR_MODEMCONFIG3 ) & RFLR_MODEMCONFIG3_LOWDATARATEOPTIMIZE_MASK ) | ( this->settings.LoRa.LowDatarateOptimize << 3 ) ); - + Write( REG_LR_PREAMBLEMSB, ( preambleLen >> 8 ) & 0x00FF ); Write( REG_LR_PREAMBLELSB, preambleLen & 0xFF ); - + if( datarate == 6 ) { - Write( REG_LR_DETECTOPTIMIZE, + Write( REG_LR_DETECTOPTIMIZE, ( Read( REG_LR_DETECTOPTIMIZE ) & RFLR_DETECTIONOPTIMIZE_MASK ) | RFLR_DETECTIONOPTIMIZE_SF6 ); - Write( REG_LR_DETECTIONTHRESHOLD, + Write( REG_LR_DETECTIONTHRESHOLD, RFLR_DETECTIONTHRESH_SF6 ); } else @@ -561,7 +564,7 @@ ( Read( REG_LR_DETECTOPTIMIZE ) & RFLR_DETECTIONOPTIMIZE_MASK ) | RFLR_DETECTIONOPTIMIZE_SF7_TO_SF12 ); - Write( REG_LR_DETECTIONTHRESHOLD, + Write( REG_LR_DETECTIONTHRESHOLD, RFLR_DETECTIONTHRESH_SF7_TO_SF12 ); } } @@ -638,7 +641,7 @@ ( this->settings.LoRa.Coderate + 4 ); double nPayload = 8 + ( ( tmp > 0 ) ? tmp : 0 ); double tPayload = nPayload * ts; - // Time on air + // Time on air double tOnAir = tPreamble + tPayload; // return us secs airTime = floor( tOnAir * 1e6 + 0.999 ); @@ -666,14 +669,15 @@ else { Write( REG_PAYLOADLENGTH, size ); - } - + } + if( ( size > 0 ) && ( size <= 64 ) ) { this->settings.FskPacketHandler.ChunkSize = size; } else { + memcpy( rxtxBuffer, buffer, size ); this->settings.FskPacketHandler.ChunkSize = 32; } @@ -694,14 +698,14 @@ { Write( REG_LR_INVERTIQ, ( ( Read( REG_LR_INVERTIQ ) & RFLR_INVERTIQ_TX_MASK & RFLR_INVERTIQ_RX_MASK ) | RFLR_INVERTIQ_RX_OFF | RFLR_INVERTIQ_TX_OFF ) ); Write( REG_LR_INVERTIQ2, RFLR_INVERTIQ2_OFF ); - } - + } + this->settings.LoRaPacketHandler.Size = size; // Initializes the payload size Write( REG_LR_PAYLOADLENGTH, size ); - // Full buffer used for Tx + // Full buffer used for Tx Write( REG_LR_FIFOTXBASEADDR, 0 ); Write( REG_LR_FIFOADDRPTR, 0 ); @@ -748,7 +752,7 @@ case MODEM_FSK: { rxContinuous = this->settings.Fsk.RxContinuous; - + // DIO0=PayloadReady // DIO1=FifoLevel // DIO2=SyncAddr @@ -756,17 +760,21 @@ // DIO4=Preamble // DIO5=ModeReady Write( REG_DIOMAPPING1, ( Read( REG_DIOMAPPING1 ) & RF_DIOMAPPING1_DIO0_MASK & + RF_DIOMAPPING1_DIO1_MASK & RF_DIOMAPPING1_DIO2_MASK ) | RF_DIOMAPPING1_DIO0_00 | + RF_DIOMAPPING1_DIO1_00 | RF_DIOMAPPING1_DIO2_11 ); - + Write( REG_DIOMAPPING2, ( Read( REG_DIOMAPPING2 ) & RF_DIOMAPPING2_DIO4_MASK & - RF_DIOMAPPING2_MAP_MASK ) | + RF_DIOMAPPING2_MAP_MASK ) | RF_DIOMAPPING2_DIO4_11 | RF_DIOMAPPING2_MAP_PREAMBLEDETECT ); - + this->settings.FskPacketHandler.FifoThresh = Read( REG_FIFOTHRESH ) & 0x3F; - + + Write( REG_RXCONFIG, RF_RXCONFIG_AFCAUTO_ON | RF_RXCONFIG_AGCAUTO_ON | RF_RXCONFIG_RXTRIGER_PREAMBLEDETECT ); + this->settings.FskPacketHandler.PreambleDetected = false; this->settings.FskPacketHandler.SyncWordDetected = false; this->settings.FskPacketHandler.NbBytes = 0; @@ -784,8 +792,7 @@ { Write( REG_LR_INVERTIQ, ( ( Read( REG_LR_INVERTIQ ) & RFLR_INVERTIQ_TX_MASK & RFLR_INVERTIQ_RX_MASK ) | RFLR_INVERTIQ_RX_OFF | RFLR_INVERTIQ_TX_OFF ) ); Write( REG_LR_INVERTIQ2, RFLR_INVERTIQ2_OFF ); - } - + } // ERRATA 2.3 - Receiver Spurious Reception of a LoRa Signal if( this->settings.LoRa.Bandwidth < 9 ) @@ -835,7 +842,7 @@ } rxContinuous = this->settings.LoRa.RxContinuous; - + if( this->settings.LoRa.FreqHopOn == true ) { Write( REG_LR_IRQFLAGSMASK, //RFLR_IRQFLAGS_RXTIMEOUT | @@ -846,7 +853,7 @@ RFLR_IRQFLAGS_CADDONE | //RFLR_IRQFLAGS_FHSSCHANGEDCHANNEL | RFLR_IRQFLAGS_CADDETECTED ); - + // DIO0=RxDone, DIO2=FhssChangeChannel Write( REG_DIOMAPPING1, ( Read( REG_DIOMAPPING1 ) & RFLR_DIOMAPPING1_DIO0_MASK & RFLR_DIOMAPPING1_DIO2_MASK ) | RFLR_DIOMAPPING1_DIO0_00 | RFLR_DIOMAPPING1_DIO2_00 ); } @@ -860,7 +867,7 @@ RFLR_IRQFLAGS_CADDONE | RFLR_IRQFLAGS_FHSSCHANGEDCHANNEL | RFLR_IRQFLAGS_CADDETECTED ); - + // DIO0=RxDone Write( REG_DIOMAPPING1, ( Read( REG_DIOMAPPING1 ) & RFLR_DIOMAPPING1_DIO0_MASK ) | RFLR_DIOMAPPING1_DIO0_00 ); } @@ -870,7 +877,7 @@ break; } - memset( rxBuffer, 0, ( size_t )RX_BUFFER_SIZE ); + memset( rxtxBuffer, 0, ( size_t )RX_BUFFER_SIZE ); this->settings.State = RF_RX_RUNNING; if( timeout != 0 ) @@ -881,14 +888,14 @@ if( this->settings.Modem == MODEM_FSK ) { SetOpMode( RF_OPMODE_RECEIVER ); - + if( rxContinuous == false ) { - rxTimeoutSyncWord.attach_us( this, &SX1276::OnTimeoutIrq, ( 8.0 * ( this->settings.Fsk.PreambleLen + - ( ( Read( REG_SYNCCONFIG ) & - ~RF_SYNCCONFIG_SYNCSIZE_MASK ) + - 1.0 ) + 10.0 ) / - ( double )this->settings.Fsk.Datarate ) * 1e6 ); + rxTimeoutSyncWord.attach_us( this, &SX1276::OnTimeoutIrq, ceil( ( 8.0 * ( this->settings.Fsk.PreambleLen + + ( ( Read( REG_SYNCCONFIG ) & + ~RF_SYNCCONFIG_SYNCSIZE_MASK ) + + 1.0 ) + 10.0 ) / + ( double )this->settings.Fsk.Datarate ) * 1e6 ) + 4000 ); } } else @@ -912,13 +919,15 @@ case MODEM_FSK: { // DIO0=PacketSent - // DIO1=FifoLevel + // DIO1=FifoEmpty // DIO2=FifoFull // DIO3=FifoEmpty // DIO4=LowBat // DIO5=ModeReady Write( REG_DIOMAPPING1, ( Read( REG_DIOMAPPING1 ) & RF_DIOMAPPING1_DIO0_MASK & - RF_DIOMAPPING1_DIO2_MASK ) ); + RF_DIOMAPPING1_DIO1_MASK & + RF_DIOMAPPING1_DIO2_MASK ) | + RF_DIOMAPPING1_DIO1_01 ); Write( REG_DIOMAPPING2, ( Read( REG_DIOMAPPING2 ) & RF_DIOMAPPING2_DIO4_MASK & RF_DIOMAPPING2_MAP_MASK ) ); @@ -937,7 +946,7 @@ RFLR_IRQFLAGS_CADDONE | //RFLR_IRQFLAGS_FHSSCHANGEDCHANNEL | RFLR_IRQFLAGS_CADDETECTED ); - + // DIO0=TxDone, DIO2=FhssChangeChannel Write( REG_DIOMAPPING1, ( Read( REG_DIOMAPPING1 ) & RFLR_DIOMAPPING1_DIO0_MASK & RFLR_DIOMAPPING1_DIO2_MASK ) | RFLR_DIOMAPPING1_DIO0_01 | RFLR_DIOMAPPING1_DIO2_00 ); } @@ -970,7 +979,7 @@ { case MODEM_FSK: { - + } break; case MODEM_LORA: @@ -982,12 +991,12 @@ RFLR_IRQFLAGS_TXDONE | //RFLR_IRQFLAGS_CADDONE | RFLR_IRQFLAGS_FHSSCHANGEDCHANNEL // | - //RFLR_IRQFLAGS_CADDETECTED + //RFLR_IRQFLAGS_CADDETECTED ); - + // DIO3=CADDone Write( REG_DIOMAPPING1, ( Read( REG_DIOMAPPING1 ) & RFLR_DIOMAPPING1_DIO0_MASK ) | RFLR_DIOMAPPING1_DIO0_00 ); - + this->settings.State = RF_CAD; SetOpMode( RFLR_OPMODE_CAD ); } @@ -1025,27 +1034,23 @@ void SX1276::SetOpMode( uint8_t opMode ) { - if( opMode != previousOpMode ) + if( opMode == RF_OPMODE_SLEEP ) { - previousOpMode = opMode; - if( opMode == RF_OPMODE_SLEEP ) + SetAntSwLowPower( true ); + } + else + { + SetAntSwLowPower( false ); + if( opMode == RF_OPMODE_TRANSMITTER ) { - SetAntSwLowPower( true ); + SetAntSw( 1 ); } else { - SetAntSwLowPower( false ); - if( opMode == RF_OPMODE_TRANSMITTER ) - { - SetAntSw( 1 ); - } - else - { - SetAntSw( 0 ); - } + SetAntSw( 0 ); } - Write( REG_OPMODE, ( Read( REG_OPMODE ) & RF_OPMODE_MASK ) | opMode ); } + Write( REG_OPMODE, ( Read( REG_OPMODE ) & RF_OPMODE_MASK ) | opMode ); } void SX1276::SetModem( RadioModems_t modem ) @@ -1107,7 +1112,7 @@ this->settings.FskPacketHandler.Size = 0; // Clear Irqs - Write( REG_IRQFLAGS1, RF_IRQFLAGS1_RSSI | + Write( REG_IRQFLAGS1, RF_IRQFLAGS1_RSSI | RF_IRQFLAGS1_PREAMBLEDETECT | RF_IRQFLAGS1_SYNCADDRESSMATCH ); Write( REG_IRQFLAGS2, RF_IRQFLAGS2_FIFOOVERRUN ); @@ -1116,6 +1121,11 @@ { // Continuous mode restart Rx chain Write( REG_RXCONFIG, Read( REG_RXCONFIG ) | RF_RXCONFIG_RESTARTRXWITHOUTPLLLOCK ); + rxTimeoutSyncWord.attach_us( this, &SX1276::OnTimeoutIrq, ceil( ( 8.0 * ( this->settings.Fsk.PreambleLen + + ( ( Read( REG_SYNCCONFIG ) & + ~RF_SYNCCONFIG_SYNCSIZE_MASK ) + + 1.0 ) + 10.0 ) / + ( double )this->settings.Fsk.Datarate ) * 1e6 ) + 4000 ); } else { @@ -1143,13 +1153,12 @@ void SX1276::OnDio0Irq( void ) { volatile uint8_t irqFlags = 0; - pc.printf("OnDio0Irq:%d\r\n",this->settings.State); + switch( this->settings.State ) - { + { case RF_RX_RUNNING: //TimerStop( &RxTimeoutTimer ); // RxDone interrupt - switch( this->settings.Modem ) { case MODEM_FSK: @@ -1159,27 +1168,30 @@ if( ( irqFlags & RF_IRQFLAGS2_CRCOK ) != RF_IRQFLAGS2_CRCOK ) { // Clear Irqs - Write( REG_IRQFLAGS1, RF_IRQFLAGS1_RSSI | + Write( REG_IRQFLAGS1, RF_IRQFLAGS1_RSSI | RF_IRQFLAGS1_PREAMBLEDETECT | RF_IRQFLAGS1_SYNCADDRESSMATCH ); Write( REG_IRQFLAGS2, RF_IRQFLAGS2_FIFOOVERRUN ); - + + rxTimeoutTimer.detach( ); + if( this->settings.Fsk.RxContinuous == false ) { + rxTimeoutSyncWord.detach( ); this->settings.State = RF_IDLE; - rxTimeoutSyncWord.attach_us( this, &SX1276::OnTimeoutIrq, ( 8.0 * ( this->settings.Fsk.PreambleLen + - ( ( Read( REG_SYNCCONFIG ) & - ~RF_SYNCCONFIG_SYNCSIZE_MASK ) + - 1.0 ) + 10.0 ) / - ( double )this->settings.Fsk.Datarate ) * 1e6 ) ; } else { // Continuous mode restart Rx chain Write( REG_RXCONFIG, Read( REG_RXCONFIG ) | RF_RXCONFIG_RESTARTRXWITHOUTPLLLOCK ); + rxTimeoutSyncWord.attach_us( this, &SX1276::OnTimeoutIrq, ceil( ( 8.0 * ( this->settings.Fsk.PreambleLen + + ( ( Read( REG_SYNCCONFIG ) & + ~RF_SYNCCONFIG_SYNCSIZE_MASK ) + + 1.0 ) + 10.0 ) / + ( double )this->settings.Fsk.Datarate ) * 1e6 ) + 4000 ); } - rxTimeoutTimer.detach( ); - + + if( ( this->RadioEvents != NULL ) && ( this->RadioEvents->RxError != NULL ) ) { this->RadioEvents->RxError( ); @@ -1191,7 +1203,7 @@ break; } } - + // Read received packet size if( ( this->settings.FskPacketHandler.Size == 0 ) && ( this->settings.FskPacketHandler.NbBytes == 0 ) ) { @@ -1203,35 +1215,37 @@ { this->settings.FskPacketHandler.Size = Read( REG_PAYLOADLENGTH ); } - ReadFifo( rxBuffer + this->settings.FskPacketHandler.NbBytes, this->settings.FskPacketHandler.Size - this->settings.FskPacketHandler.NbBytes ); + ReadFifo( rxtxBuffer + this->settings.FskPacketHandler.NbBytes, this->settings.FskPacketHandler.Size - this->settings.FskPacketHandler.NbBytes ); this->settings.FskPacketHandler.NbBytes += ( this->settings.FskPacketHandler.Size - this->settings.FskPacketHandler.NbBytes ); } else { - ReadFifo( rxBuffer + this->settings.FskPacketHandler.NbBytes, this->settings.FskPacketHandler.Size - this->settings.FskPacketHandler.NbBytes ); + ReadFifo( rxtxBuffer + this->settings.FskPacketHandler.NbBytes, this->settings.FskPacketHandler.Size - this->settings.FskPacketHandler.NbBytes ); this->settings.FskPacketHandler.NbBytes += ( this->settings.FskPacketHandler.Size - this->settings.FskPacketHandler.NbBytes ); } + rxTimeoutTimer.detach( ); + if( this->settings.Fsk.RxContinuous == false ) { this->settings.State = RF_IDLE; - rxTimeoutSyncWord.attach_us( this, &SX1276::OnTimeoutIrq, ( 8.0 * ( this->settings.Fsk.PreambleLen + - ( ( Read( REG_SYNCCONFIG ) & - ~RF_SYNCCONFIG_SYNCSIZE_MASK ) + - 1.0 ) + 10.0 ) / - ( double )this->settings.Fsk.Datarate ) * 1e6 ) ; + rxTimeoutSyncWord.detach( ); } else { // Continuous mode restart Rx chain Write( REG_RXCONFIG, Read( REG_RXCONFIG ) | RF_RXCONFIG_RESTARTRXWITHOUTPLLLOCK ); + rxTimeoutSyncWord.attach_us( this, &SX1276::OnTimeoutIrq, ceil( ( 8.0 * ( this->settings.Fsk.PreambleLen + + ( ( Read( REG_SYNCCONFIG ) & + ~RF_SYNCCONFIG_SYNCSIZE_MASK ) + + 1.0 ) + 10.0 ) / + ( double )this->settings.Fsk.Datarate ) * 1e6 ) + 4000 ); } - rxTimeoutTimer.detach( ); if( ( this->RadioEvents != NULL ) && ( this->RadioEvents->RxDone != NULL ) ) { - this->RadioEvents->RxDone( rxBuffer, this->settings.FskPacketHandler.Size, this->settings.FskPacketHandler.RssiValue, 0 ); - } + this->RadioEvents->RxDone( rxtxBuffer, this->settings.FskPacketHandler.Size, this->settings.FskPacketHandler.RssiValue, 0 ); + } this->settings.FskPacketHandler.PreambleDetected = false; this->settings.FskPacketHandler.SyncWordDetected = false; this->settings.FskPacketHandler.NbBytes = 0; @@ -1291,7 +1305,7 @@ } } else - { + { if( this->settings.Channel > RF_MID_BAND_THRESH ) { this->settings.LoRaPacketHandler.RssiValue = RSSI_OFFSET_HF + rssi + ( rssi >> 4 ); @@ -1303,8 +1317,8 @@ } this->settings.LoRaPacketHandler.Size = Read( REG_LR_RXNBBYTES ); - ReadFifo( rxBuffer, this->settings.LoRaPacketHandler.Size ); - + ReadFifo( rxtxBuffer, this->settings.LoRaPacketHandler.Size ); + if( this->settings.LoRa.RxContinuous == false ) { this->settings.State = RF_IDLE; @@ -1313,7 +1327,7 @@ if( ( this->RadioEvents != NULL ) && ( this->RadioEvents->RxDone != NULL ) ) { - this->RadioEvents->RxDone( rxBuffer, this->settings.LoRaPacketHandler.Size, this->settings.LoRaPacketHandler.RssiValue, this->settings.LoRaPacketHandler.SnrValue ); + this->RadioEvents->RxDone( rxtxBuffer, this->settings.LoRaPacketHandler.Size, this->settings.LoRaPacketHandler.RssiValue, this->settings.LoRaPacketHandler.SnrValue ); } } break; @@ -1322,7 +1336,7 @@ } break; case RF_TX_RUNNING: - txTimeoutTimer.detach( ); + txTimeoutTimer.detach( ); // TxDone interrupt switch( this->settings.Modem ) { @@ -1336,7 +1350,7 @@ if( ( this->RadioEvents != NULL ) && ( this->RadioEvents->TxDone != NULL ) ) { this->RadioEvents->TxDone( ); - } + } break; } break; @@ -1348,7 +1362,7 @@ void SX1276::OnDio1Irq( void ) { switch( this->settings.State ) - { + { case RF_RX_RUNNING: switch( this->settings.Modem ) { @@ -1369,12 +1383,12 @@ if( ( this->settings.FskPacketHandler.Size - this->settings.FskPacketHandler.NbBytes ) > this->settings.FskPacketHandler.FifoThresh ) { - ReadFifo( ( rxBuffer + this->settings.FskPacketHandler.NbBytes ), this->settings.FskPacketHandler.FifoThresh ); + ReadFifo( ( rxtxBuffer + this->settings.FskPacketHandler.NbBytes ), this->settings.FskPacketHandler.FifoThresh ); this->settings.FskPacketHandler.NbBytes += this->settings.FskPacketHandler.FifoThresh; } else { - ReadFifo( ( rxBuffer + this->settings.FskPacketHandler.NbBytes ), this->settings.FskPacketHandler.Size - this->settings.FskPacketHandler.NbBytes ); + ReadFifo( ( rxtxBuffer + this->settings.FskPacketHandler.NbBytes ), this->settings.FskPacketHandler.Size - this->settings.FskPacketHandler.NbBytes ); this->settings.FskPacketHandler.NbBytes += ( this->settings.FskPacketHandler.Size - this->settings.FskPacketHandler.NbBytes ); } break; @@ -1395,16 +1409,16 @@ switch( this->settings.Modem ) { case MODEM_FSK: - // FifoLevel interrupt + // FifoEmpty interrupt if( ( this->settings.FskPacketHandler.Size - this->settings.FskPacketHandler.NbBytes ) > this->settings.FskPacketHandler.ChunkSize ) { - WriteFifo( ( rxBuffer + this->settings.FskPacketHandler.NbBytes ), this->settings.FskPacketHandler.ChunkSize ); + WriteFifo( ( rxtxBuffer + this->settings.FskPacketHandler.NbBytes ), this->settings.FskPacketHandler.ChunkSize ); this->settings.FskPacketHandler.NbBytes += this->settings.FskPacketHandler.ChunkSize; } - else + else { // Write the last chunk of data - WriteFifo( rxBuffer + this->settings.FskPacketHandler.NbBytes, this->settings.FskPacketHandler.Size - this->settings.FskPacketHandler.NbBytes ); + WriteFifo( rxtxBuffer + this->settings.FskPacketHandler.NbBytes, this->settings.FskPacketHandler.Size - this->settings.FskPacketHandler.NbBytes ); this->settings.FskPacketHandler.NbBytes += this->settings.FskPacketHandler.Size - this->settings.FskPacketHandler.NbBytes; } break; @@ -1422,7 +1436,7 @@ void SX1276::OnDio2Irq( void ) { switch( this->settings.State ) - { + { case RF_RX_RUNNING: switch( this->settings.Modem ) { @@ -1430,9 +1444,9 @@ if( ( this->settings.FskPacketHandler.PreambleDetected == true ) && ( this->settings.FskPacketHandler.SyncWordDetected == false ) ) { rxTimeoutSyncWord.detach( ); - + this->settings.FskPacketHandler.SyncWordDetected = true; - + this->settings.FskPacketHandler.RssiValue = -( Read( REG_RSSIVALUE ) >> 1 ); this->settings.FskPacketHandler.AfcValue = ( int32_t )( double )( ( ( uint16_t )Read( REG_AFCMSB ) << 8 ) | @@ -1446,7 +1460,7 @@ { // Clear Irq Write( REG_LR_IRQFLAGS, RFLR_IRQFLAGS_FHSSCHANGEDCHANNEL ); - + if( ( this->RadioEvents != NULL ) && ( this->RadioEvents->FhssChangeChannel != NULL ) ) { this->RadioEvents->FhssChangeChannel( ( Read( REG_LR_HOPCHANNEL ) & RFLR_HOPCHANNEL_CHANNEL_MASK ) ); @@ -1467,7 +1481,7 @@ { // Clear Irq Write( REG_LR_IRQFLAGS, RFLR_IRQFLAGS_FHSSCHANGEDCHANNEL ); - + if( ( this->RadioEvents != NULL ) && ( this->RadioEvents->FhssChangeChannel != NULL ) ) { this->RadioEvents->FhssChangeChannel( ( Read( REG_LR_HOPCHANNEL ) & RFLR_HOPCHANNEL_CHANNEL_MASK ) ); @@ -1500,7 +1514,7 @@ } } else - { + { // Clear Irq Write( REG_LR_IRQFLAGS, RFLR_IRQFLAGS_CADDONE ); if( ( this->RadioEvents != NULL ) && ( this->RadioEvents->CadDone != NULL ) ) @@ -1523,7 +1537,7 @@ if( this->settings.FskPacketHandler.PreambleDetected == false ) { this->settings.FskPacketHandler.PreambleDetected = true; - } + } } break; case MODEM_LORA: