From 0c814b064264616b6d1ef44e78e09a0c1a71ab3d Mon Sep 17 00:00:00 2001 From: Linar Yusupov Date: Mon, 18 Nov 2024 13:00:42 +0300 Subject: [PATCH] [LR1121] misc. fixes of OLED and POST status --- software/firmware/source/SoftRF/src/driver/OLED.cpp | 10 ++++++++-- software/firmware/source/SoftRF/src/platform/ESP32.cpp | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/software/firmware/source/SoftRF/src/driver/OLED.cpp b/software/firmware/source/SoftRF/src/driver/OLED.cpp index 470d29444..8b78f69fe 100644 --- a/software/firmware/source/SoftRF/src/driver/OLED.cpp +++ b/software/firmware/source/SoftRF/src/driver/OLED.cpp @@ -257,6 +257,7 @@ static void OLED_radio() if ((settings->power_save & POWER_SAVE_NORECEIVE) && (hw_info.rf == RF_IC_SX1276 || hw_info.rf == RF_IC_SX1262 || + hw_info.rf == RF_IC_LR1121 || hw_info.rf == RF_IC_SA8X8)) { u8x8->draw2x2String(0, 6, "OFF"); prev_rx_packets_counter = rx_packets_counter; @@ -753,7 +754,9 @@ void OLED_049_func() u8x8->drawString(5, 4, RX_text); if (settings->power_save & POWER_SAVE_NORECEIVE && - (hw_info.rf == RF_IC_SX1276 || hw_info.rf == RF_IC_SX1262)) { + (hw_info.rf == RF_IC_SX1276 || + hw_info.rf == RF_IC_SX1262 || + hw_info.rf == RF_IC_LR1121)) { u8x8->draw2x2String(5, 6, "OFF"); prev_rx_packets_counter = rx_packets_counter; } else { @@ -1157,6 +1160,7 @@ void OLED_Next_Page() (settings->power_save & POWER_SAVE_NORECEIVE) && (hw_info.rf == RF_IC_SX1276 || hw_info.rf == RF_IC_SX1262 || + hw_info.rf == RF_IC_LR1121 || hw_info.rf == RF_IC_SA8X8)) { OLED_current_page = (OLED_current_page + 1) % page_count; } @@ -1182,7 +1186,9 @@ void OLED_Next_Page() if (hw_info.display == DISPLAY_OLED_0_49 && OLED_current_page == OLED_049_PAGE_ACFTS && (settings->power_save & POWER_SAVE_NORECEIVE) && - (hw_info.rf == RF_IC_SX1276 || hw_info.rf == RF_IC_SX1262)) { + (hw_info.rf == RF_IC_SX1276 || + hw_info.rf == RF_IC_SX1262 || + hw_info.rf == RF_IC_LR1121)) { OLED_current_page = (OLED_current_page + 1) % page_count; } #endif /* EXCLUDE_OLED_049 */ diff --git a/software/firmware/source/SoftRF/src/platform/ESP32.cpp b/software/firmware/source/SoftRF/src/platform/ESP32.cpp index b68e1a8d9..9b2a8df63 100644 --- a/software/firmware/source/SoftRF/src/platform/ESP32.cpp +++ b/software/firmware/source/SoftRF/src/platform/ESP32.cpp @@ -1757,7 +1757,8 @@ static void ESP32_post_init() Serial.print(F("RADIO : ")); Serial.println(hw_info.rf == RF_IC_SX1262 || - hw_info.rf == RF_IC_SX1276 ? F("PASS") : F("FAIL")); + hw_info.rf == RF_IC_SX1276 || + hw_info.rf == RF_IC_LR1121 ? F("PASS") : F("FAIL")); Serial.flush(); Serial.print(F("GNSS : ")); Serial.println(hw_info.gnss != GNSS_MODULE_NONE ? F("PASS") : F("FAIL"));