ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix IAR compiler warnings 

preamble_detected and sync_word_detected are uint8_t integer type variables so those should not be compared to (boolean) true/false values.

Fixed to use 1 and 0 values instead.
pull/12741/head
Kimmo Vaisanen 2018-03-08 14:11:22 +02:00
parent 94b11beea5
commit 87335ab5e7
2 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
SX1272/SX1272_LoRaRadio.cpp
View File

@ -913,8 +913,8 @@ void SX1272_LoRaRadio::receive(uint32_t timeout)
RF_RXCONFIG_AGCAUTO_ON | RF_RXCONFIG_AGCAUTO_ON |
RF_RXCONFIG_RXTRIGER_PREAMBLEDETECT); RF_RXCONFIG_RXTRIGER_PREAMBLEDETECT);
_rf_settings.fsk_packet_handler.preamble_detected = false; _rf_settings.fsk_packet_handler.preamble_detected = 0;
_rf_settings.fsk_packet_handler.sync_word_detected = false; _rf_settings.fsk_packet_handler.sync_word_detected = 0;
_rf_settings.fsk_packet_handler.nb_bytes = 0; _rf_settings.fsk_packet_handler.nb_bytes = 0;
_rf_settings.fsk_packet_handler.size = 0; _rf_settings.fsk_packet_handler.size = 0;
@ -1754,8 +1754,8 @@ void SX1272_LoRaRadio::handle_dio0_irq()
&& (_radio_events->rx_error)) { && (_radio_events->rx_error)) {
_radio_events->rx_error(); _radio_events->rx_error();
} }
_rf_settings.fsk_packet_handler.preamble_detected = false; _rf_settings.fsk_packet_handler.preamble_detected = 0;
_rf_settings.fsk_packet_handler.sync_word_detected = false; _rf_settings.fsk_packet_handler.sync_word_detected = 0;
_rf_settings.fsk_packet_handler.nb_bytes = 0; _rf_settings.fsk_packet_handler.nb_bytes = 0;
_rf_settings.fsk_packet_handler.size = 0; _rf_settings.fsk_packet_handler.size = 0;
// break from here, a CRC error happened, RX_ERROR // break from here, a CRC error happened, RX_ERROR
@ -1800,8 +1800,8 @@ void SX1272_LoRaRadio::handle_dio0_irq()
_rf_settings.fsk_packet_handler.size, _rf_settings.fsk_packet_handler.size,
_rf_settings.fsk_packet_handler.rssi_value, 0); _rf_settings.fsk_packet_handler.rssi_value, 0);
} }
_rf_settings.fsk_packet_handler.preamble_detected = false; _rf_settings.fsk_packet_handler.preamble_detected = 0;
_rf_settings.fsk_packet_handler.sync_word_detected = false; _rf_settings.fsk_packet_handler.sync_word_detected = 0;
_rf_settings.fsk_packet_handler.nb_bytes = 0; _rf_settings.fsk_packet_handler.nb_bytes = 0;
_rf_settings.fsk_packet_handler.size = 0; _rf_settings.fsk_packet_handler.size = 0;
break; break;
@ -1978,13 +1978,13 @@ void SX1272_LoRaRadio::handle_dio2_irq(void)
case MODEM_FSK: case MODEM_FSK:
// DIO4 must have been asserted to set preamble_detected to true // DIO4 must have been asserted to set preamble_detected to true
if( ( _rf_settings.fsk_packet_handler.preamble_detected == true ) && ( _rf_settings.fsk_packet_handler.sync_word_detected == false ) ) if( ( _rf_settings.fsk_packet_handler.preamble_detected == 1 ) && ( _rf_settings.fsk_packet_handler.sync_word_detected == 0 ) )
{ {
if (_rf_settings.fsk.rx_continuous == false) { if (_rf_settings.fsk.rx_continuous == false) {
rx_timeout_sync_word.detach( ); rx_timeout_sync_word.detach( );
} }
_rf_settings.fsk_packet_handler.sync_word_detected = true; _rf_settings.fsk_packet_handler.sync_word_detected = 1;
_rf_settings.fsk_packet_handler.rssi_value = -( read_register( REG_RSSIVALUE ) >> 1 ); _rf_settings.fsk_packet_handler.rssi_value = -( read_register( REG_RSSIVALUE ) >> 1 );
@ -2072,9 +2072,8 @@ void SX1272_LoRaRadio::handle_dio4_irq(void)
// is asserted when a preamble is detected (FSK modem only) // is asserted when a preamble is detected (FSK modem only)
switch (_rf_settings.modem) { switch (_rf_settings.modem) {
case MODEM_FSK: { case MODEM_FSK: {
if (_rf_settings.fsk_packet_handler.preamble_detected if (_rf_settings.fsk_packet_handler.preamble_detected == 0) {
== false) { _rf_settings.fsk_packet_handler.preamble_detected = 1;
_rf_settings.fsk_packet_handler.preamble_detected = true;
} }
} }
break; break;
@ -2105,8 +2104,8 @@ void SX1272_LoRaRadio::handle_timeout_irq()
{ {
case RF_RX_RUNNING: case RF_RX_RUNNING:
if( _rf_settings.modem == MODEM_FSK ) { if( _rf_settings.modem == MODEM_FSK ) {
_rf_settings.fsk_packet_handler.preamble_detected = false; _rf_settings.fsk_packet_handler.preamble_detected = 0;
_rf_settings.fsk_packet_handler.sync_word_detected = false; _rf_settings.fsk_packet_handler.sync_word_detected = 0;
_rf_settings.fsk_packet_handler.nb_bytes = 0; _rf_settings.fsk_packet_handler.nb_bytes = 0;
_rf_settings.fsk_packet_handler.size = 0; _rf_settings.fsk_packet_handler.size = 0;

26
SX1276/SX1276_LoRaRadio.cpp
View File

@ -896,8 +896,8 @@ void SX1276_LoRaRadio::receive(uint32_t timeout)
| RF_RXCONFIG_AGCAUTO_ON | RF_RXCONFIG_AGCAUTO_ON
| RF_RXCONFIG_RXTRIGER_PREAMBLEDETECT); | RF_RXCONFIG_RXTRIGER_PREAMBLEDETECT);
_rf_settings.fsk_packet_handler.preamble_detected = false; _rf_settings.fsk_packet_handler.preamble_detected = 0;
_rf_settings.fsk_packet_handler.sync_word_detected = false; _rf_settings.fsk_packet_handler.sync_word_detected = 0;
_rf_settings.fsk_packet_handler.nb_bytes = 0; _rf_settings.fsk_packet_handler.nb_bytes = 0;
_rf_settings.fsk_packet_handler.size = 0; _rf_settings.fsk_packet_handler.size = 0;
@ -1887,8 +1887,8 @@ void SX1276_LoRaRadio::handle_dio0_irq()
&& (_radio_events->rx_error)) { && (_radio_events->rx_error)) {
_radio_events->rx_error(); _radio_events->rx_error();
} }
_rf_settings.fsk_packet_handler.preamble_detected = false; _rf_settings.fsk_packet_handler.preamble_detected = 0;
_rf_settings.fsk_packet_handler.sync_word_detected = false; _rf_settings.fsk_packet_handler.sync_word_detected = 0;
_rf_settings.fsk_packet_handler.nb_bytes = 0; _rf_settings.fsk_packet_handler.nb_bytes = 0;
_rf_settings.fsk_packet_handler.size = 0; _rf_settings.fsk_packet_handler.size = 0;
// break from here, a CRC error happened, RX_ERROR // break from here, a CRC error happened, RX_ERROR
@ -1933,8 +1933,8 @@ void SX1276_LoRaRadio::handle_dio0_irq()
_rf_settings.fsk_packet_handler.size, _rf_settings.fsk_packet_handler.size,
_rf_settings.fsk_packet_handler.rssi_value, 0); _rf_settings.fsk_packet_handler.rssi_value, 0);
} }
_rf_settings.fsk_packet_handler.preamble_detected = false; _rf_settings.fsk_packet_handler.preamble_detected = 0;
_rf_settings.fsk_packet_handler.sync_word_detected = false; _rf_settings.fsk_packet_handler.sync_word_detected = 0;
_rf_settings.fsk_packet_handler.nb_bytes = 0; _rf_settings.fsk_packet_handler.nb_bytes = 0;
_rf_settings.fsk_packet_handler.size = 0; _rf_settings.fsk_packet_handler.size = 0;
break; break;
@ -2133,13 +2133,13 @@ void SX1276_LoRaRadio::handle_dio2_irq(void)
switch (_rf_settings.modem) { switch (_rf_settings.modem) {
case MODEM_FSK: case MODEM_FSK:
// DIO4 must have been asserted to set preamble_detected to true // DIO4 must have been asserted to set preamble_detected to true
if ((_rf_settings.fsk_packet_handler.preamble_detected == true) if ((_rf_settings.fsk_packet_handler.preamble_detected == 1)
&& (_rf_settings.fsk_packet_handler.sync_word_detected == false)) { && (_rf_settings.fsk_packet_handler.sync_word_detected == 0)) {
if (_rf_settings.fsk.rx_continuous == false) { if (_rf_settings.fsk.rx_continuous == false) {
rx_timeout_sync_word.detach(); rx_timeout_sync_word.detach();
} }
_rf_settings.fsk_packet_handler.sync_word_detected = true; _rf_settings.fsk_packet_handler.sync_word_detected = 1;
_rf_settings.fsk_packet_handler.rssi_value = _rf_settings.fsk_packet_handler.rssi_value =
-(read_register(REG_RSSIVALUE) >> 1); -(read_register(REG_RSSIVALUE) >> 1);
@ -2238,8 +2238,8 @@ void SX1276_LoRaRadio::handle_dio4_irq(void)
// is asserted when a preamble is detected (FSK modem only) // is asserted when a preamble is detected (FSK modem only)
switch (_rf_settings.modem) { switch (_rf_settings.modem) {
case MODEM_FSK: { case MODEM_FSK: {
if (_rf_settings.fsk_packet_handler.preamble_detected == false) { if (_rf_settings.fsk_packet_handler.preamble_detected == 0) {
_rf_settings.fsk_packet_handler.preamble_detected = true; _rf_settings.fsk_packet_handler.preamble_detected = 1;
} }
} }
break; break;
@ -2268,8 +2268,8 @@ void SX1276_LoRaRadio::handle_timeout_irq()
switch (_rf_settings.state) { switch (_rf_settings.state) {
case RF_RX_RUNNING: case RF_RX_RUNNING:
if (_rf_settings.modem == MODEM_FSK) { if (_rf_settings.modem == MODEM_FSK) {
_rf_settings.fsk_packet_handler.preamble_detected = false; _rf_settings.fsk_packet_handler.preamble_detected = 0;
_rf_settings.fsk_packet_handler.sync_word_detected = false; _rf_settings.fsk_packet_handler.sync_word_detected = 0;
_rf_settings.fsk_packet_handler.nb_bytes = 0; _rf_settings.fsk_packet_handler.nb_bytes = 0;
_rf_settings.fsk_packet_handler.size = 0; _rf_settings.fsk_packet_handler.size = 0;