jacob.eva/opencom_xl_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor changes

Browse Source 
warning: comparison is always true due to limited range of data type
and add parentheses
This commit is contained in:
karamo 2022-01-13 22:18:18 +01:00
parent a0af475c31
commit 96348de145
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
RNode_Firmware.ino
View File

@ -422,7 +422,7 @@ void serialCallback(uint8_t sbyte) {
if (!fifo16_isfull(&packet_starts) && queued_bytes < CONFIG_QUEUE_SIZE) { if (!fifo16_isfull(&packet_starts) && queued_bytes < CONFIG_QUEUE_SIZE) {
uint16_t s = current_packet_start; 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; uint16_t l;
if (s != e) { if (s != e) {
@ -631,9 +631,9 @@ void serialCallback(uint8_t sbyte) {
void updateModemStatus() { void updateModemStatus() {
uint8_t status = LoRa.modemStatus(); uint8_t status = LoRa.modemStatus();
last_status_update = millis(); last_status_update = millis();
if (status & SIG_DETECT == SIG_DETECT) { stat_signal_detected = true; } else { stat_signal_detected = 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 & (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 & (RX_ONGOING == RX_ONGOING)) { stat_rx_ongoing = true; } else { stat_rx_ongoing = false; }
if (stat_signal_detected || stat_signal_synced || stat_rx_ongoing) { if (stat_signal_detected || stat_signal_synced || stat_rx_ongoing) {
if (dcd_count < dcd_threshold) { if (dcd_count < dcd_threshold) {
@ -849,4 +849,4 @@ void serial_interrupt_init() {
ISR(TIMER3_CAPT_vect) { ISR(TIMER3_CAPT_vect) {
buffer_serial(); buffer_serial();
} }
#endif #endif

6
Utilities.h
View File

@ -512,9 +512,9 @@ void eeprom_update(int mapped_addr, uint8_t byte) {
} }
void eeprom_write(uint8_t addr, uint8_t byte) { void eeprom_write(int addr, uint8_t vbyte) {
if (!eeprom_info_locked() && addr >= 0 && addr < EEPROM_RESERVED) { if (!eeprom_info_locked() && (addr >= 0) && (addr < EEPROM_RESERVED)) {
eeprom_update(eeprom_addr(addr), byte); eeprom_update(eeprom_addr(addr), vbyte);
} else { } else {
kiss_indicate_error(ERROR_EEPROM_LOCKED); kiss_indicate_error(ERROR_EEPROM_LOCKED);
} }