From 96348de1459c22c874dd82d01fdf05add71d5c3e Mon Sep 17 00:00:00 2001 From: karamo Date: Thu, 13 Jan 2022 22:18:18 +0100 Subject: [PATCH] minor changes warning: comparison is always true due to limited range of data type and add parentheses --- RNode_Firmware.ino | 10 +++++----- Utilities.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/RNode_Firmware.ino b/RNode_Firmware.ino index 6c03019..8d0386b 100644 --- a/RNode_Firmware.ino +++ b/RNode_Firmware.ino @@ -422,7 +422,7 @@ void serialCallback(uint8_t sbyte) { if (!fifo16_isfull(&packet_starts) && queued_bytes < CONFIG_QUEUE_SIZE) { uint16_t s = current_packet_start; - uint16_t e = queue_cursor-1; if (e == -1) e = CONFIG_QUEUE_SIZE-1; + int e = queue_cursor-1; if (e == -1) e = CONFIG_QUEUE_SIZE-1; uint16_t l; if (s != e) { @@ -631,9 +631,9 @@ void serialCallback(uint8_t sbyte) { void updateModemStatus() { uint8_t status = LoRa.modemStatus(); last_status_update = millis(); - if (status & SIG_DETECT == SIG_DETECT) { stat_signal_detected = true; } else { stat_signal_detected = false; } - if (status & SIG_SYNCED == SIG_SYNCED) { stat_signal_synced = true; } else { stat_signal_synced = false; } - if (status & RX_ONGOING == RX_ONGOING) { stat_rx_ongoing = true; } else { stat_rx_ongoing = false; } + if (status & (SIG_DETECT == SIG_DETECT)) { stat_signal_detected = true; } else { stat_signal_detected = false; } + if (status & (SIG_SYNCED == SIG_SYNCED)) { stat_signal_synced = true; } else { stat_signal_synced = false; } + if (status & (RX_ONGOING == RX_ONGOING)) { stat_rx_ongoing = true; } else { stat_rx_ongoing = false; } if (stat_signal_detected || stat_signal_synced || stat_rx_ongoing) { if (dcd_count < dcd_threshold) { @@ -849,4 +849,4 @@ void serial_interrupt_init() { ISR(TIMER3_CAPT_vect) { buffer_serial(); } -#endif \ No newline at end of file +#endif diff --git a/Utilities.h b/Utilities.h index fa45296..5be1ccf 100644 --- a/Utilities.h +++ b/Utilities.h @@ -512,9 +512,9 @@ void eeprom_update(int mapped_addr, uint8_t byte) { } -void eeprom_write(uint8_t addr, uint8_t byte) { - if (!eeprom_info_locked() && addr >= 0 && addr < EEPROM_RESERVED) { - eeprom_update(eeprom_addr(addr), byte); +void eeprom_write(int addr, uint8_t vbyte) { + if (!eeprom_info_locked() && (addr >= 0) && (addr < EEPROM_RESERVED)) { + eeprom_update(eeprom_addr(addr), vbyte); } else { kiss_indicate_error(ERROR_EEPROM_LOCKED); }