Fix display bug on ScanRange
This commit is contained in:
6
Makefile
6
Makefile
@@ -55,7 +55,11 @@ ENABLE_LTO ?= 1
|
||||
|
||||
#############################################################
|
||||
|
||||
ifeq ($(ENABLE_FEAT_F4HWN),1)
|
||||
TARGET = f4hwn
|
||||
else
|
||||
TARGET = firmware
|
||||
endif
|
||||
|
||||
ifeq ($(ENABLE_CLANG),1)
|
||||
# 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
|
||||
|
||||
AUTHOR_STRING_2 ?= F4HWN
|
||||
VERSION_STRING_2 ?= v2.2
|
||||
VERSION_STRING_2 ?= v2.3
|
||||
|
||||
AUTHOR_STRING ?= $(AUTHOR_STRING_1)+$(AUTHOR_STRING_2)
|
||||
VERSION_STRING ?= $(VERSION_STRING_2)
|
||||
|
@@ -3,4 +3,4 @@
|
||||
IMAGE_NAME="uvk5"
|
||||
|
||||
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/"
|
@@ -646,6 +646,9 @@ void UI_DisplayMain(void)
|
||||
if(gScanRangeStart) {
|
||||
|
||||
#ifdef ENABLE_FEAT_F4HWN
|
||||
//if(IS_FREQ_CHANNEL(gEeprom.ScreenChannel[0]) && IS_FREQ_CHANNEL(gEeprom.ScreenChannel[1])) {
|
||||
if(IS_FREQ_CHANNEL(gEeprom.ScreenChannel[activeTxVFO])) {
|
||||
|
||||
uint8_t shift = 0;
|
||||
|
||||
if (isMainOnly(false))
|
||||
@@ -661,6 +664,11 @@ void UI_DisplayMain(void)
|
||||
|
||||
if (!isMainOnly(false))
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
gScanRangeStart = 0;
|
||||
}
|
||||
#else
|
||||
UI_PrintString("ScnRng", 5, 0, line, 8);
|
||||
sprintf(String, "%3u.%05u", gScanRangeStart / 100000, gScanRangeStart % 100000);
|
||||
|
Reference in New Issue
Block a user