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

Fixed intermittent init failure on AVR

Browse Source
This commit is contained in:
Mark Qvist 2023-02-18 12:14:15 +01:00
parent 7211a3423c
commit 2b37fa7454
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Config.h
View File

@ -19,7 +19,7 @@
#define CONFIG_H
#define MAJ_VERS 0x01
#define MIN_VERS 0x39
#define MIN_VERS 0x3A
#define PLATFORM_AVR 0x90
#define PLATFORM_ESP32 0x80

42
RNode_Firmware.ino
View File

@ -88,25 +88,33 @@ void setup() {
// pins for the LoRa module
LoRa.setPins(pin_cs, pin_reset, pin_dio);
if (LoRa.preInit()) {
sx1276_installed = true;
uint32_t lfr = LoRa.getFrequency();
if (lfr == 0) {
// Normal boot
} else if (lfr == M_FRQ_R) {
// Quick reboot
#if HAS_CONSOLE
if (rtc_get_reset_reason(0) == POWERON_RESET) {
console_active = true;
}
#endif
#if MCU_VARIANT == MCU_ESP32
// Check installed transceiver chip and
// probe boot parameters.
if (LoRa.preInit()) {
sx1276_installed = true;
uint32_t lfr = LoRa.getFrequency();
if (lfr == 0) {
// Normal boot
} else if (lfr == M_FRQ_R) {
// Quick reboot
#if HAS_CONSOLE
if (rtc_get_reset_reason(0) == POWERON_RESET) {
console_active = true;
}
#endif
} else {
// Unknown boot
}
LoRa.setFrequency(M_FRQ_S);
} else {
// Unknown boot
sx1276_installed = false;
}
LoRa.setFrequency(M_FRQ_S);
} else {
sx1276_installed = false;
}
#else
// Older variants only came with SX1276/78 chips,
// so assume that to be the case for now.
sx1276_installed = true;
#endif
#if HAS_DISPLAY
disp_ready = display_init();