From 19536088da80c835f348de3fe2458789e30a6c45 Mon Sep 17 00:00:00 2001 From: Armel FAUVEAU Date: Sun, 16 Jun 2024 15:49:59 +0200 Subject: [PATCH] Fix bug with RX Timer and Monitor Action --- Makefile | 4 ++-- app/app.c | 4 ++++ ui/status.c | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 040095e..d72c3e1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # 1 = enable # ---- STOCK QUANSHENG FERATURES ---- -ENABLE_FMRADIO ?= 0 +ENABLE_FMRADIO ?= 1 ENABLE_UART ?= 1 ENABLE_AIRCOPY ?= 0 ENABLE_NOAA ?= 0 @@ -213,7 +213,7 @@ ifeq ($(ENABLE_FEAT_F4HWN),1) VERSION_STRING_1 ?= v0.22 AUTHOR_STRING_2 ?= F4HWN - VERSION_STRING_2 ?= v3.0 + VERSION_STRING_2 ?= v2.8.1 AUTHOR_STRING ?= $(AUTHOR_STRING_1)+$(AUTHOR_STRING_2) VERSION_STRING ?= $(VERSION_STRING_2) diff --git a/app/app.c b/app/app.c index 978568c..8de5ab0 100644 --- a/app/app.c +++ b/app/app.c @@ -439,6 +439,10 @@ void APP_StartListening(FUNCTION_Type_t function) { const unsigned int vfo = gEeprom.RX_VFO; +#ifdef ENABLE_FEAT_F4HWN + gRxTimerCountdown_500ms = 7200; +#endif + #ifdef ENABLE_DTMF_CALLING if (gSetting_KILLED) return; diff --git a/ui/status.c b/ui/status.c index 7bd5bf0..89c9d88 100644 --- a/ui/status.c +++ b/ui/status.c @@ -212,11 +212,13 @@ void UI_DisplayStatus() { memcpy(line + x + 1, gFontLight, sizeof(gFontLight)); } + /* else if (gChargingWithTypeC) { memcpy(line + x + 1, BITMAP_USB_C, sizeof(BITMAP_USB_C)); } - + */ + // Battery unsigned int x2 = LCD_WIDTH - sizeof(BITMAP_BatteryLevel1) - 0;