LoRa node acquiring analog input and sending to LoRa Server - Working ok
Dependents: DISCO-L072CZ-LRWAN1_LoRa_node EIoT_LoRa_node_1 EIoT_LoRa_node_2 EIoT_LoRa_node_3
Fork of SX1276GenericLib by
Diff: sx1276/sx1276.cpp
- Revision:
- 7:2b555111463f
- Parent:
- 6:e7f02929cd3d
- Child:
- 8:0fe3e0e8007b
diff -r e7f02929cd3d -r 2b555111463f sx1276/sx1276.cpp --- a/sx1276/sx1276.cpp Thu Sep 04 14:03:20 2014 +0000 +++ b/sx1276/sx1276.cpp Fri Sep 19 14:16:35 2014 +0000 @@ -40,11 +40,11 @@ }; -SX1276::SX1276( void ( *txDone )( ), void ( *txTimeout ) ( ), void ( *rxDone ) ( uint8_t *payload, uint16_t size, int8_t rssi, int8_t snr ), - void ( *rxTimeout ) ( ), void ( *rxError ) ( ), void ( *fhssChangeChannel ) ( uint8_t channelIndex ), +SX1276::SX1276( void ( *txDone )( ), void ( *txTimeout ) ( ), void ( *rxDone ) ( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr ), + void ( *rxTimeout ) ( ), void ( *rxError ) ( ), void ( *fhssChangeChannel ) ( uint8_t channelIndex ), void ( *cadDone ) ( ), PinName mosi, PinName miso, PinName sclk, PinName nss, PinName reset, PinName dio0, PinName dio1, PinName dio2, PinName dio3, PinName dio4, PinName dio5 ) - : Radio( txDone, txTimeout, rxDone, rxTimeout, rxError, fhssChangeChannel ), + : Radio( txDone, txTimeout, rxDone, rxTimeout, rxError, fhssChangeChannel, cadDone ), spi( mosi, miso, sclk ), nss( nss ), reset( reset ), @@ -124,7 +124,7 @@ bool SX1276::IsChannelFree( ModemType modem, uint32_t freq, int8_t rssiThresh ) { - int8_t rssi = 0; + int16_t rssi = 0; SetModem( modem ); @@ -138,7 +138,7 @@ Sleep( ); - if( rssi > rssiThresh ) + if( rssi > ( int16_t )rssiThresh ) { return false; } @@ -871,9 +871,41 @@ SetOpMode( RF_OPMODE_TRANSMITTER ); } -int8_t SX1276::GetRssi( ModemType modem ) +void SX1276::StartCad( void ) { - int8_t rssi = 0; + switch( this->settings.Modem ) + { + case MODEM_FSK: + { + + } + break; + case MODEM_LORA: + { + Write( REG_LR_IRQFLAGSMASK, RFLR_IRQFLAGS_RXTIMEOUT | + RFLR_IRQFLAGS_RXDONE | + RFLR_IRQFLAGS_PAYLOADCRCERROR | + RFLR_IRQFLAGS_VALIDHEADER | + RFLR_IRQFLAGS_TXDONE | + //RFLR_IRQFLAGS_CADDONE | + RFLR_IRQFLAGS_FHSSCHANGEDCHANNEL | + RFLR_IRQFLAGS_CADDETECTED ); + + // DIO3=CADDone + Write( REG_DIOMAPPING1, ( Read( REG_DIOMAPPING1 ) & RFLR_DIOMAPPING1_DIO0_MASK ) | RFLR_DIOMAPPING1_DIO0_00 ); + + this->settings.State = CAD; + SetOpMode( RFLR_OPMODE_CAD ); + } + break; + default: + break; + } +} + +int16_t SX1276::GetRssi( ModemType modem ) +{ + int16_t rssi = 0; switch( modem ) { @@ -1126,7 +1158,7 @@ snr = ( this->settings.LoRaPacketHandler.SnrValue & 0xFF ) >> 2; } - int8_t rssi = Read( REG_LR_PKTRSSIVALUE ); + int16_t rssi = Read( REG_LR_PKTRSSIVALUE ); if( this->settings.LoRaPacketHandler.SnrValue < 0 ) { if( this->settings.Channel > RF_MID_BAND_THRESH ) @@ -1340,6 +1372,10 @@ case MODEM_FSK: break; case MODEM_LORA: + if( ( cadDone != NULL ) ) + { + cadDone( ); + } break; default: break;