jacob.eva/RNode_Firmware_CE
1
0
Fork 0
mirror of https://github.com/liberatedsystems/RNode_Firmware_CE.git synced 2024-07-02 14:34:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes, courtesy of @atterman.

Browse Source
This commit is contained in:
Mark Qvist 2023-12-10 22:40:06 +01:00
parent df4632f399
commit 56780d44d5
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bluetooth.h
View File

@ -119,7 +119,7 @@ char bt_devname[11];
} else { return false; } } else { return false; }
} else { return false; } } else { return false; }
} else { return false; } } else { return false; }
} } else { return false; }
} }
bool bt_init() { bool bt_init() {

22
LoRa.cpp
View File

@ -515,15 +515,15 @@ long LoRaClass::getSignalBandwidth()
byte bw = (readRegister(REG_MODEM_CONFIG_1) >> 4); byte bw = (readRegister(REG_MODEM_CONFIG_1) >> 4);
switch (bw) { switch (bw) {
case 0: return 7.8E3; case 0: return 7.8E3;
case 1: return 10.4E3; case 1: return 10.4E3;
case 2: return 15.6E3; case 2: return 15.6E3;
case 3: return 20.8E3; case 3: return 20.8E3;
case 4: return 31.25E3; case 4: return 31.25E3;
case 5: return 41.7E3; case 5: return 41.7E3;
case 6: return 62.5E3; case 6: return 62.5E3;
case 7: return 125E3; case 7: return 125E3;
case 8: return 250E3; case 8: return 250E3;
case 9: return 500E3; case 9: return 500E3;
} }
return 0; return 0;
@ -545,10 +545,10 @@ void LoRaClass::optimizeModemSensitivity(){
byte bw = (readRegister(REG_MODEM_CONFIG_1) >> 4); byte bw = (readRegister(REG_MODEM_CONFIG_1) >> 4);
uint32_t freq = getFrequency(); uint32_t freq = getFrequency();
if (bw == 9 && 410E6 <= freq <= 525E6) { if (bw == 9 && (410E6 <= freq) && (freq <= 525E6)) {
writeRegister(REG_HIGH_BW_OPTIMIZE_1, 0x02); writeRegister(REG_HIGH_BW_OPTIMIZE_1, 0x02);
writeRegister(REG_HIGH_BW_OPTIMIZE_2, 0x7f); writeRegister(REG_HIGH_BW_OPTIMIZE_2, 0x7f);
} else if (bw == 9 && 862E6 <= freq <= 1020E6) { } else if (bw == 9 && (820E6 <= freq) && (freq <= 1020E6)) {
writeRegister(REG_HIGH_BW_OPTIMIZE_1, 0x02); writeRegister(REG_HIGH_BW_OPTIMIZE_1, 0x02);
writeRegister(REG_HIGH_BW_OPTIMIZE_2, 0x64); writeRegister(REG_HIGH_BW_OPTIMIZE_2, 0x64);
} else { } else {

13
RNode_Firmware.ino
View File

@ -426,7 +426,7 @@ void add_airtime(uint16_t written) {
void update_airtime() { void update_airtime() {
#if MCU_VARIANT == MCU_ESP32 #if MCU_VARIANT == MCU_ESP32
uint16_t cb = current_airtime_bin(); uint16_t cb = current_airtime_bin();
uint16_t pb = cb-1; if (pb < 0) { pb = AIRTIME_BINS-1; } uint16_t pb = cb-1; if (cb-1 < 0) { pb = AIRTIME_BINS-1; }
uint16_t nb = cb+1; if (nb == AIRTIME_BINS) { nb = 0; } uint16_t nb = cb+1; if (nb == AIRTIME_BINS) { nb = 0; }
airtime_bins[nb] = 0; airtime_bins[nb] = 0;
airtime = (float)(airtime_bins[cb]+airtime_bins[pb])/(2.0*AIRTIME_BINLEN_MS); airtime = (float)(airtime_bins[cb]+airtime_bins[pb])/(2.0*AIRTIME_BINLEN_MS);
@ -868,7 +868,7 @@ void serialCallback(uint8_t sbyte) {
} }
if (frame_len == DEV_HASH_LEN) { if (frame_len == DEV_HASH_LEN) {
memcpy(dev_firmware_hash_target, cmdbuf, DEV_SIG_LEN); memcpy(dev_firmware_hash_target, cmdbuf, DEV_HASH_LEN);
device_save_firmware_hash(); device_save_firmware_hash();
} }
#endif #endif
@ -935,11 +935,12 @@ void updateModemStatus() {
portEXIT_CRITICAL(&update_lock); portEXIT_CRITICAL(&update_lock);
#endif #endif
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 (stat_signal_detected || stat_signal_synced) {
if (stat_rx_ongoing) { if (stat_rx_ongoing) {
if (dcd_count < dcd_threshold) { if (dcd_count < dcd_threshold) {
dcd_count++; dcd_count++;