Fix bug with RX Timer and Monitor Action

This commit is contained in:
Armel FAUVEAU
2024-06-16 15:49:59 +02:00
parent bb76890ecc
commit 19536088da
3 changed files with 9 additions and 3 deletions

View File

@@ -4,7 +4,7 @@
# 1 = enable # 1 = enable
# ---- STOCK QUANSHENG FERATURES ---- # ---- STOCK QUANSHENG FERATURES ----
ENABLE_FMRADIO ?= 0 ENABLE_FMRADIO ?= 1
ENABLE_UART ?= 1 ENABLE_UART ?= 1
ENABLE_AIRCOPY ?= 0 ENABLE_AIRCOPY ?= 0
ENABLE_NOAA ?= 0 ENABLE_NOAA ?= 0
@@ -213,7 +213,7 @@ ifeq ($(ENABLE_FEAT_F4HWN),1)
VERSION_STRING_1 ?= v0.22 VERSION_STRING_1 ?= v0.22
AUTHOR_STRING_2 ?= F4HWN AUTHOR_STRING_2 ?= F4HWN
VERSION_STRING_2 ?= v3.0 VERSION_STRING_2 ?= v2.8.1
AUTHOR_STRING ?= $(AUTHOR_STRING_1)+$(AUTHOR_STRING_2) AUTHOR_STRING ?= $(AUTHOR_STRING_1)+$(AUTHOR_STRING_2)
VERSION_STRING ?= $(VERSION_STRING_2) VERSION_STRING ?= $(VERSION_STRING_2)

View File

@@ -439,6 +439,10 @@ void APP_StartListening(FUNCTION_Type_t function)
{ {
const unsigned int vfo = gEeprom.RX_VFO; const unsigned int vfo = gEeprom.RX_VFO;
#ifdef ENABLE_FEAT_F4HWN
gRxTimerCountdown_500ms = 7200;
#endif
#ifdef ENABLE_DTMF_CALLING #ifdef ENABLE_DTMF_CALLING
if (gSetting_KILLED) if (gSetting_KILLED)
return; return;

View File

@@ -212,11 +212,13 @@ void UI_DisplayStatus()
{ {
memcpy(line + x + 1, gFontLight, sizeof(gFontLight)); memcpy(line + x + 1, gFontLight, sizeof(gFontLight));
} }
/*
else if (gChargingWithTypeC) else if (gChargingWithTypeC)
{ {
memcpy(line + x + 1, BITMAP_USB_C, sizeof(BITMAP_USB_C)); memcpy(line + x + 1, BITMAP_USB_C, sizeof(BITMAP_USB_C));
} }
*/
// Battery // Battery
unsigned int x2 = LCD_WIDTH - sizeof(BITMAP_BatteryLevel1) - 0; unsigned int x2 = LCD_WIDTH - sizeof(BITMAP_BatteryLevel1) - 0;