Skip to content

Commit ad7fc42

Browse files
author
Antti Kauppila
authored
Merge pull request #12 from ARMmbed/fix_iar_compiler_warnings
Fix IAR compiler warnings
2 parents 94b11be + 87335ab commit ad7fc42

File tree

2 files changed

+25
-26
lines changed

2 files changed

+25
-26
lines changed

‎SX1272/SX1272_LoRaRadio.cpp

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -913,8 +913,8 @@ void SX1272_LoRaRadio::receive(uint32_t timeout)
913913
RF_RXCONFIG_AGCAUTO_ON |
914914
RF_RXCONFIG_RXTRIGER_PREAMBLEDETECT);
915915

916-
_rf_settings.fsk_packet_handler.preamble_detected = false;
917-
_rf_settings.fsk_packet_handler.sync_word_detected = false;
916+
_rf_settings.fsk_packet_handler.preamble_detected = 0;
917+
_rf_settings.fsk_packet_handler.sync_word_detected = 0;
918918
_rf_settings.fsk_packet_handler.nb_bytes = 0;
919919
_rf_settings.fsk_packet_handler.size = 0;
920920

@@ -1754,8 +1754,8 @@ void SX1272_LoRaRadio::handle_dio0_irq()
17541754
&& (_radio_events->rx_error)) {
17551755
_radio_events->rx_error();
17561756
}
1757-
_rf_settings.fsk_packet_handler.preamble_detected = false;
1758-
_rf_settings.fsk_packet_handler.sync_word_detected = false;
1757+
_rf_settings.fsk_packet_handler.preamble_detected = 0;
1758+
_rf_settings.fsk_packet_handler.sync_word_detected = 0;
17591759
_rf_settings.fsk_packet_handler.nb_bytes = 0;
17601760
_rf_settings.fsk_packet_handler.size = 0;
17611761
// break from here, a CRC error happened, RX_ERROR
@@ -1800,8 +1800,8 @@ void SX1272_LoRaRadio::handle_dio0_irq()
18001800
_rf_settings.fsk_packet_handler.size,
18011801
_rf_settings.fsk_packet_handler.rssi_value, 0);
18021802
}
1803-
_rf_settings.fsk_packet_handler.preamble_detected = false;
1804-
_rf_settings.fsk_packet_handler.sync_word_detected = false;
1803+
_rf_settings.fsk_packet_handler.preamble_detected = 0;
1804+
_rf_settings.fsk_packet_handler.sync_word_detected = 0;
18051805
_rf_settings.fsk_packet_handler.nb_bytes = 0;
18061806
_rf_settings.fsk_packet_handler.size = 0;
18071807
break;
@@ -1978,13 +1978,13 @@ void SX1272_LoRaRadio::handle_dio2_irq(void)
19781978
case MODEM_FSK:
19791979

19801980
// DIO4 must have been asserted to set preamble_detected to true
1981-
if( ( _rf_settings.fsk_packet_handler.preamble_detected == true ) && ( _rf_settings.fsk_packet_handler.sync_word_detected == false ) )
1981+
if( ( _rf_settings.fsk_packet_handler.preamble_detected == 1 ) && ( _rf_settings.fsk_packet_handler.sync_word_detected == 0 ) )
19821982
{
19831983
if (_rf_settings.fsk.rx_continuous == false) {
19841984
rx_timeout_sync_word.detach( );
19851985
}
19861986

1987-
_rf_settings.fsk_packet_handler.sync_word_detected = true;
1987+
_rf_settings.fsk_packet_handler.sync_word_detected = 1;
19881988

19891989
_rf_settings.fsk_packet_handler.rssi_value = -( read_register( REG_RSSIVALUE ) >> 1 );
19901990

@@ -2072,9 +2072,8 @@ void SX1272_LoRaRadio::handle_dio4_irq(void)
20722072
// is asserted when a preamble is detected (FSK modem only)
20732073
switch (_rf_settings.modem) {
20742074
case MODEM_FSK: {
2075-
if (_rf_settings.fsk_packet_handler.preamble_detected
2076-
== false) {
2077-
_rf_settings.fsk_packet_handler.preamble_detected = true;
2075+
if (_rf_settings.fsk_packet_handler.preamble_detected == 0) {
2076+
_rf_settings.fsk_packet_handler.preamble_detected = 1;
20782077
}
20792078
}
20802079
break;
@@ -2105,8 +2104,8 @@ void SX1272_LoRaRadio::handle_timeout_irq()
21052104
{
21062105
case RF_RX_RUNNING:
21072106
if( _rf_settings.modem == MODEM_FSK ) {
2108-
_rf_settings.fsk_packet_handler.preamble_detected = false;
2109-
_rf_settings.fsk_packet_handler.sync_word_detected = false;
2107+
_rf_settings.fsk_packet_handler.preamble_detected = 0;
2108+
_rf_settings.fsk_packet_handler.sync_word_detected = 0;
21102109
_rf_settings.fsk_packet_handler.nb_bytes = 0;
21112110
_rf_settings.fsk_packet_handler.size = 0;
21122111

‎SX1276/SX1276_LoRaRadio.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -896,8 +896,8 @@ void SX1276_LoRaRadio::receive(uint32_t timeout)
896896
| RF_RXCONFIG_AGCAUTO_ON
897897
| RF_RXCONFIG_RXTRIGER_PREAMBLEDETECT);
898898

899-
_rf_settings.fsk_packet_handler.preamble_detected = false;
900-
_rf_settings.fsk_packet_handler.sync_word_detected = false;
899+
_rf_settings.fsk_packet_handler.preamble_detected = 0;
900+
_rf_settings.fsk_packet_handler.sync_word_detected = 0;
901901
_rf_settings.fsk_packet_handler.nb_bytes = 0;
902902
_rf_settings.fsk_packet_handler.size = 0;
903903

@@ -1887,8 +1887,8 @@ void SX1276_LoRaRadio::handle_dio0_irq()
18871887
&& (_radio_events->rx_error)) {
18881888
_radio_events->rx_error();
18891889
}
1890-
_rf_settings.fsk_packet_handler.preamble_detected = false;
1891-
_rf_settings.fsk_packet_handler.sync_word_detected = false;
1890+
_rf_settings.fsk_packet_handler.preamble_detected = 0;
1891+
_rf_settings.fsk_packet_handler.sync_word_detected = 0;
18921892
_rf_settings.fsk_packet_handler.nb_bytes = 0;
18931893
_rf_settings.fsk_packet_handler.size = 0;
18941894
// break from here, a CRC error happened, RX_ERROR
@@ -1933,8 +1933,8 @@ void SX1276_LoRaRadio::handle_dio0_irq()
19331933
_rf_settings.fsk_packet_handler.size,
19341934
_rf_settings.fsk_packet_handler.rssi_value, 0);
19351935
}
1936-
_rf_settings.fsk_packet_handler.preamble_detected = false;
1937-
_rf_settings.fsk_packet_handler.sync_word_detected = false;
1936+
_rf_settings.fsk_packet_handler.preamble_detected = 0;
1937+
_rf_settings.fsk_packet_handler.sync_word_detected = 0;
19381938
_rf_settings.fsk_packet_handler.nb_bytes = 0;
19391939
_rf_settings.fsk_packet_handler.size = 0;
19401940
break;
@@ -2133,13 +2133,13 @@ void SX1276_LoRaRadio::handle_dio2_irq(void)
21332133
switch (_rf_settings.modem) {
21342134
case MODEM_FSK:
21352135
// DIO4 must have been asserted to set preamble_detected to true
2136-
if ((_rf_settings.fsk_packet_handler.preamble_detected == true)
2137-
&& (_rf_settings.fsk_packet_handler.sync_word_detected == false)) {
2136+
if ((_rf_settings.fsk_packet_handler.preamble_detected == 1)
2137+
&& (_rf_settings.fsk_packet_handler.sync_word_detected == 0)) {
21382138
if (_rf_settings.fsk.rx_continuous == false) {
21392139
rx_timeout_sync_word.detach();
21402140
}
21412141

2142-
_rf_settings.fsk_packet_handler.sync_word_detected = true;
2142+
_rf_settings.fsk_packet_handler.sync_word_detected = 1;
21432143

21442144
_rf_settings.fsk_packet_handler.rssi_value =
21452145
-(read_register(REG_RSSIVALUE) >> 1);
@@ -2238,8 +2238,8 @@ void SX1276_LoRaRadio::handle_dio4_irq(void)
22382238
// is asserted when a preamble is detected (FSK modem only)
22392239
switch (_rf_settings.modem) {
22402240
case MODEM_FSK: {
2241-
if (_rf_settings.fsk_packet_handler.preamble_detected == false) {
2242-
_rf_settings.fsk_packet_handler.preamble_detected = true;
2241+
if (_rf_settings.fsk_packet_handler.preamble_detected == 0) {
2242+
_rf_settings.fsk_packet_handler.preamble_detected = 1;
22432243
}
22442244
}
22452245
break;
@@ -2268,8 +2268,8 @@ void SX1276_LoRaRadio::handle_timeout_irq()
22682268
switch (_rf_settings.state) {
22692269
case RF_RX_RUNNING:
22702270
if (_rf_settings.modem == MODEM_FSK) {
2271-
_rf_settings.fsk_packet_handler.preamble_detected = false;
2272-
_rf_settings.fsk_packet_handler.sync_word_detected = false;
2271+
_rf_settings.fsk_packet_handler.preamble_detected = 0;
2272+
_rf_settings.fsk_packet_handler.sync_word_detected = 0;
22732273
_rf_settings.fsk_packet_handler.nb_bytes = 0;
22742274
_rf_settings.fsk_packet_handler.size = 0;
22752275

0 commit comments

Comments
 (0)