From b2e3f70d4b5af893459aca98219a6f2a12942f2e Mon Sep 17 00:00:00 2001 From: Armel FAUVEAU Date: Tue, 12 Mar 2024 22:37:42 +0100 Subject: [PATCH] Fix possible SQL issue --- app/main.c | 8 ++++++-- bitmaps.c | 6 ++---- bitmaps.h | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/main.c b/app/main.c index 5dfe287..8f9a9e1 100644 --- a/app/main.c +++ b/app/main.c @@ -161,15 +161,19 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep) break; case KEY_2: + #ifdef ENABLE_FEAT_F4HWN + gVfoConfigureMode = VFO_CONFIGURE; + #endif COMMON_SwitchVFOs(); - if (beep) gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL; break; case KEY_3: + #ifdef ENABLE_FEAT_F4HWN + gVfoConfigureMode = VFO_CONFIGURE; + #endif COMMON_SwitchVFOMode(); - if (beep) gBeepToPlay = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL; diff --git a/bitmaps.c b/bitmaps.c index 13adc09..e9f9e17 100644 --- a/bitmaps.c +++ b/bitmaps.c @@ -44,9 +44,8 @@ const uint8_t gFontKeyLock[1][8] = {0x7c, 0x46, 0x45, 0x45, 0x45, 0x45, 0x46, 0x7c} }; -const uint8_t gFontScanAll[10] = +const uint8_t gFontScanAll[9] = { - 0b00000000, 0b00111110, 0b01000001, 0b01000001, @@ -58,7 +57,7 @@ const uint8_t gFontScanAll[10] = 0b00111110 }; -const uint8_t gFontLight[10] = +const uint8_t gFontLight[9] = { 0b00001100, 0b00010010, @@ -69,7 +68,6 @@ const uint8_t gFontLight[10] = 0b00100001, 0b00010010, 0b00001100, - 0b00000000, }; const uint8_t gFontXB[2][6] = diff --git a/bitmaps.h b/bitmaps.h index 5a07e61..667823a 100644 --- a/bitmaps.h +++ b/bitmaps.h @@ -11,8 +11,8 @@ extern const uint8_t gFontPttOnePush[2][6]; extern const uint8_t gFontPttClassic[2][6]; extern const uint8_t gFontFM[2][6]; extern const uint8_t gFontKeyLock[1][8]; -extern const uint8_t gFontScanAll[10]; -extern const uint8_t gFontLight[10]; +extern const uint8_t gFontScanAll[9]; +extern const uint8_t gFontLight[9]; extern const uint8_t gFontXB[2][6]; extern const uint8_t gFontMO[2][6];