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

Fix display bug on ScanRange

Browse Source
This commit is contained in:
Armel FAUVEAU
2024-03-09 02:21:50 +01:00
parent 0f604b1e8a
commit f31e8c319e
3 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -55,7 +55,11 @@ ENABLE_LTO ?= 1
############################################################# #############################################################
TARGET = firmware ifeq ($(ENABLE_FEAT_F4HWN),1)
TARGET = f4hwn
else
TARGET = firmware
endif
ifeq ($(ENABLE_CLANG),1) ifeq ($(ENABLE_CLANG),1)
# GCC's linker, ld, doesn't understand LLVM's generated bytecode # GCC's linker, ld, doesn't understand LLVM's generated bytecode
@@ -206,7 +210,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.2 VERSION_STRING_2 ?= v2.3
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)

2
compile-with-docker.sh
View File

@@ -3,4 +3,4 @@
IMAGE_NAME="uvk5" IMAGE_NAME="uvk5"
docker build -t $IMAGE_NAME . docker build -t $IMAGE_NAME .
docker run --rm -v "${PWD}/compiled-firmware:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "cd /app && make && cp firmware* compiled-firmware/" docker run --rm -v "${PWD}/compiled-firmware:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "cd /app && make && cp f4hwn* compiled-firmware/"

34
ui/main.c
View File

@@ -646,21 +646,29 @@ void UI_DisplayMain(void)
if(gScanRangeStart) { if(gScanRangeStart) {
#ifdef ENABLE_FEAT_F4HWN #ifdef ENABLE_FEAT_F4HWN
uint8_t shift = 0; //if(IS_FREQ_CHANNEL(gEeprom.ScreenChannel[0]) && IS_FREQ_CHANNEL(gEeprom.ScreenChannel[1])) {
if(IS_FREQ_CHANNEL(gEeprom.ScreenChannel[activeTxVFO])) {
if (isMainOnly(false)) uint8_t shift = 0;
{
shift = 3; if (isMainOnly(false))
{
shift = 3;
}
UI_PrintString("ScnRng", 5, 0, line + shift, 8);
sprintf(String, "%3u.%05u", gScanRangeStart / 100000, gScanRangeStart % 100000);
UI_PrintStringSmallNormal(String, 56, 0, line + shift);
sprintf(String, "%3u.%05u", gScanRangeStop / 100000, gScanRangeStop % 100000);
UI_PrintStringSmallNormal(String, 56, 0, line + shift + 1);
if (!isMainOnly(false))
continue;
}
else
{
gScanRangeStart = 0;
} }
UI_PrintString("ScnRng", 5, 0, line + shift, 8);
sprintf(String, "%3u.%05u", gScanRangeStart / 100000, gScanRangeStart % 100000);
UI_PrintStringSmallNormal(String, 56, 0, line + shift);
sprintf(String, "%3u.%05u", gScanRangeStop / 100000, gScanRangeStop % 100000);
UI_PrintStringSmallNormal(String, 56, 0, line + shift + 1);
if (!isMainOnly(false))
continue;
#else #else
UI_PrintString("ScnRng", 5, 0, line, 8); UI_PrintString("ScnRng", 5, 0, line, 8);
sprintf(String, "%3u.%05u", gScanRangeStart / 100000, gScanRangeStart % 100000); sprintf(String, "%3u.%05u", gScanRangeStart / 100000, gScanRangeStart % 100000);