BRNSystems/brnQuanFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #137 from armel/feature_update

Browse Source 
Feature update
This commit is contained in:
Armel FAUVEAU
2024-06-16 16:26:36 +02:00
committed by GitHub
parent b3ce5a23b3 19536088da
commit 345b441215
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -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 ?= v2.8 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)

4
app/app.c
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;

2
ui/status.c
View File

@@ -212,10 +212,12 @@ 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;