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

Replace ENABLE_FEAT_F4HWN_MENU_LOCK with ENABLE_FEAT_F4HWN_RESCUE_OPS

Browse Source
This commit is contained in:
Armel FAUVEAU
2024-11-21 02:33:03 +01:00
parent ca09b2f7ba
commit 52e7701ba4
24 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -49,7 +49,7 @@ ENABLE_FEAT_F4HWN_SLEEP ?= 1
ENABLE_FEAT_F4HWN_RESTORE_SCAN ?= 1 ENABLE_FEAT_F4HWN_RESTORE_SCAN ?= 1
ENABLE_FEAT_F4HWN_NARROWER ?= 1 ENABLE_FEAT_F4HWN_NARROWER ?= 1
ENABLE_FEAT_F4HWN_CONTRAST ?= 1 ENABLE_FEAT_F4HWN_CONTRAST ?= 1
ENABLE_FEAT_F4HWN_MENU_LOCK ?= 0 ENABLE_FEAT_F4HWN_RESCUE_OPS ?= 0
ENABLE_FEAT_F4HWN_VOL ?= 0 ENABLE_FEAT_F4HWN_VOL ?= 0
ENABLE_FEAT_F4HWN_RESET_CHANNEL ?= 0 ENABLE_FEAT_F4HWN_RESET_CHANNEL ?= 0
ENABLE_FEAT_F4HWN_PMR ?= 0 ENABLE_FEAT_F4HWN_PMR ?= 0
@@ -443,8 +443,8 @@ endif
ifeq ($(ENABLE_FEAT_F4HWN_CONTRAST),1) ifeq ($(ENABLE_FEAT_F4HWN_CONTRAST),1)
CFLAGS += -DENABLE_FEAT_F4HWN_CONTRAST CFLAGS += -DENABLE_FEAT_F4HWN_CONTRAST
endif endif
ifneq ($(filter $(ENABLE_FEAT_F4HWN_MENU_LOCK),1 2),) ifneq ($(filter $(ENABLE_FEAT_F4HWN_RESCUE_OPS),1 2),)
CFLAGS += -DENABLE_FEAT_F4HWN_MENU_LOCK=$(ENABLE_FEAT_F4HWN_MENU_LOCK) CFLAGS += -DENABLE_FEAT_F4HWN_RESCUE_OPS=$(ENABLE_FEAT_F4HWN_RESCUE_OPS)
endif endif
ifeq ($(ENABLE_FEAT_F4HWN_VOL),1) ifeq ($(ENABLE_FEAT_F4HWN_VOL),1)
CFLAGS += -DENABLE_FEAT_F4HWN_VOL CFLAGS += -DENABLE_FEAT_F4HWN_VOL

4
app/action.c
View File

@@ -110,7 +110,7 @@ void (*action_opt_table[])(void) = {
[ACTION_OPT_MAINONLY] = &ACTION_MainOnly, [ACTION_OPT_MAINONLY] = &ACTION_MainOnly,
[ACTION_OPT_PTT] = &ACTION_Ptt, [ACTION_OPT_PTT] = &ACTION_Ptt,
[ACTION_OPT_WN] = &ACTION_Wn, [ACTION_OPT_WN] = &ACTION_Wn,
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
[ACTION_OPT_POWER_HIGH] = &ACTION_Power_High, [ACTION_OPT_POWER_HIGH] = &ACTION_Power_High,
#endif #endif
[ACTION_OPT_BACKLIGHT] = &ACTION_BackLight, [ACTION_OPT_BACKLIGHT] = &ACTION_BackLight,
@@ -617,7 +617,7 @@ void ACTION_BackLightOnDemand(void)
BACKLIGHT_TurnOn(); BACKLIGHT_TurnOn();
} }
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
void ACTION_Power_High(void) void ACTION_Power_High(void)
{ {
if(gEeprom.MENU_LOCK == true) // RO is active if(gEeprom.MENU_LOCK == true) // RO is active

2
app/action.h
View File

@@ -42,7 +42,7 @@ void ACTION_SwitchDemodul(void);
void ACTION_Wn(void); void ACTION_Wn(void);
void ACTION_BackLightOnDemand(void); void ACTION_BackLightOnDemand(void);
void ACTION_BackLight(void); void ACTION_BackLight(void);
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
void ACTION_Power_High(void); void ACTION_Power_High(void);
#endif #endif
#endif #endif

2
app/app.c
View File

@@ -1398,7 +1398,7 @@ void APP_TimeSlice10ms(void)
return; return;
#endif #endif
#if !defined(ENABLE_FEAT_F4HWN) || defined(ENABLE_FEAT_F4HWN_MENU_LOCK) #if !defined(ENABLE_FEAT_F4HWN) || defined(ENABLE_FEAT_F4HWN_RESCUE_OPS)
#ifdef ENABLE_FLASHLIGHT #ifdef ENABLE_FLASHLIGHT
FlashlightTimeSlice(); FlashlightTimeSlice();
#endif #endif

2
app/flashlight.c
View File

@@ -5,7 +5,7 @@
#include "flashlight.h" #include "flashlight.h"
#if !defined(ENABLE_FEAT_F4HWN) || defined(ENABLE_FEAT_F4HWN_MENU_LOCK) #if !defined(ENABLE_FEAT_F4HWN) || defined(ENABLE_FEAT_F4HWN_RESCUE_OPS)
enum FlashlightMode_t gFlashLightState; enum FlashlightMode_t gFlashLightState;
void FlashlightTimeSlice() void FlashlightTimeSlice()

2
app/flashlight.h
View File

@@ -5,7 +5,7 @@
#include <stdint.h> #include <stdint.h>
#if !defined(ENABLE_FEAT_F4HWN) || defined(ENABLE_FEAT_F4HWN_MENU_LOCK) #if !defined(ENABLE_FEAT_F4HWN) || defined(ENABLE_FEAT_F4HWN_RESCUE_OPS)
enum FlashlightMode_t { enum FlashlightMode_t {
FLASHLIGHT_OFF = 0, FLASHLIGHT_OFF = 0,
FLASHLIGHT_ON, FLASHLIGHT_ON,

8
app/main.c
View File

@@ -84,7 +84,7 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
{ {
uint8_t Vfo = gEeprom.TX_VFO; uint8_t Vfo = gEeprom.TX_VFO;
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
if(gEeprom.MENU_LOCK == true) { if(gEeprom.MENU_LOCK == true) {
return; // prevent F function if MENU LOCK is true return; // prevent F function if MENU LOCK is true
} }
@@ -686,7 +686,7 @@ static void MAIN_Key_MENU(bool bKeyPressed, bool bKeyHeld)
return; return;
} }
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
if(gEeprom.MENU_LOCK == false) { if(gEeprom.MENU_LOCK == false) {
#endif #endif
@@ -696,7 +696,7 @@ static void MAIN_Key_MENU(bool bKeyPressed, bool bKeyHeld)
gAnotherVoiceID = VOICE_ID_MENU; gAnotherVoiceID = VOICE_ID_MENU;
#endif #endif
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
} }
#endif #endif
} }
@@ -709,7 +709,7 @@ static void MAIN_Key_MENU(bool bKeyPressed, bool bKeyHeld)
static void MAIN_Key_STAR(bool bKeyPressed, bool bKeyHeld) static void MAIN_Key_STAR(bool bKeyPressed, bool bKeyHeld)
{ {
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
if(gEeprom.MENU_LOCK == true) { if(gEeprom.MENU_LOCK == true) {
return; // prevent F function if MENU LOCK is true return; // prevent F function if MENU LOCK is true
} }

6
app/menu.c
View File

@@ -432,7 +432,7 @@ int MENU_GetLimits(uint8_t menu_id, int32_t *pMin, int32_t *pMax)
*pMax = 63; *pMax = 63;
break; break;
#endif #endif
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
case MENU_SET_KEY: case MENU_SET_KEY:
//*pMin = 0; //*pMin = 0;
*pMax = 4; *pMax = 4;
@@ -951,7 +951,7 @@ void MENU_AcceptSetting(void)
gEeprom.VOLUME_GAIN = gSubMenuSelection; gEeprom.VOLUME_GAIN = gSubMenuSelection;
break; break;
#endif #endif
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
case MENU_SET_KEY: case MENU_SET_KEY:
gEeprom.SET_KEY = gSubMenuSelection; gEeprom.SET_KEY = gSubMenuSelection;
break; break;
@@ -1402,7 +1402,7 @@ void MENU_ShowCurrentSetting(void)
gSubMenuSelection = gEeprom.VOLUME_GAIN; gSubMenuSelection = gEeprom.VOLUME_GAIN;
break; break;
#endif #endif
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
case MENU_SET_KEY: case MENU_SET_KEY:
gSubMenuSelection = gEeprom.SET_KEY; gSubMenuSelection = gEeprom.SET_KEY;
break; break;

2
bitmaps.c
View File

@@ -78,7 +78,7 @@ const uint8_t gFontDWR[3][6] =
{0x00, 0x7f, 0x9, 0x19, 0x29, 0x46}, {0x00, 0x7f, 0x9, 0x19, 0x29, 0x46},
}; };
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
const uint8_t gFontRO[2][6] = const uint8_t gFontRO[2][6] =
{ // "RO" { // "RO"
{0x00, 0x7f, 0x9, 0x19, 0x29, 0x46}, {0x00, 0x7f, 0x9, 0x19, 0x29, 0x46},

2
bitmaps.h
View File

@@ -16,7 +16,7 @@ extern const uint8_t gFontLight[9];
extern const uint8_t gFontXB[2][6]; extern const uint8_t gFontXB[2][6];
extern const uint8_t gFontMO[2][6]; extern const uint8_t gFontMO[2][6];
extern const uint8_t gFontDWR[3][6]; extern const uint8_t gFontDWR[3][6];
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
extern const uint8_t gFontRO[2][6]; extern const uint8_t gFontRO[2][6];
#endif #endif
extern const uint8_t gFontHold[2][5]; extern const uint8_t gFontHold[2][5];

8
compile-with-docker.sh
View File

@@ -31,7 +31,7 @@ bandscope() {
ENABLE_FMRADIO=0 \ ENABLE_FMRADIO=0 \
ENABLE_AIRCOPY=1 \ ENABLE_AIRCOPY=1 \
ENABLE_NOAA=0 \ ENABLE_NOAA=0 \
ENABLE_FEAT_F4HWN_MENU_LOCK=0 \ ENABLE_FEAT_F4HWN_RESCUE_OPS=0 \
EDITION_STRING=Bandscope \ EDITION_STRING=Bandscope \
TARGET=f4hwn.bandscope \ TARGET=f4hwn.bandscope \
&& cp f4hwn.bandscope* compiled-firmware/" && cp f4hwn.bandscope* compiled-firmware/"
@@ -45,7 +45,7 @@ broadcast() {
ENABLE_AIRCOPY=1 \ ENABLE_AIRCOPY=1 \
ENABLE_NOAA=0 \ ENABLE_NOAA=0 \
EDITION_STRING=Broadcast \ EDITION_STRING=Broadcast \
ENABLE_FEAT_F4HWN_MENU_LOCK=0 \ ENABLE_FEAT_F4HWN_RESCUE_OPS=0 \
TARGET=f4hwn.broadcast \ TARGET=f4hwn.broadcast \
&& cp f4hwn.broadcast* compiled-firmware/" && cp f4hwn.broadcast* compiled-firmware/"
} }
@@ -63,7 +63,7 @@ voxless() {
ENABLE_FEAT_F4HWN_RESTORE_SCAN=0 \ ENABLE_FEAT_F4HWN_RESTORE_SCAN=0 \
ENABLE_FEAT_F4HWN_CHARGING_C=0 \ ENABLE_FEAT_F4HWN_CHARGING_C=0 \
ENABLE_FEAT_F4HWN_NARROWER=0 \ ENABLE_FEAT_F4HWN_NARROWER=0 \
ENABLE_FEAT_F4HWN_MENU_LOCK=0 \ ENABLE_FEAT_F4HWN_RESCUE_OPS=0 \
EDITION_STRING=Voxless \ EDITION_STRING=Voxless \
TARGET=f4hwn.voxless \ TARGET=f4hwn.voxless \
&& cp f4hwn.voxless* compiled-firmware/" && cp f4hwn.voxless* compiled-firmware/"
@@ -76,7 +76,7 @@ rescueops() {
ENABLE_FMRADIO=0 \ ENABLE_FMRADIO=0 \
ENABLE_AIRCOPY=1 \ ENABLE_AIRCOPY=1 \
ENABLE_NOAA=1 \ ENABLE_NOAA=1 \
ENABLE_FEAT_F4HWN_MENU_LOCK=1 \ ENABLE_FEAT_F4HWN_RESCUE_OPS=1 \
EDITION_STRING=RescueOps \ EDITION_STRING=RescueOps \
TARGET=f4hwn.rescueops \ TARGET=f4hwn.rescueops \
&& cp f4hwn.rescueops* compiled-firmware/" && cp f4hwn.rescueops* compiled-firmware/"

2
helper/boot.c
View File

@@ -44,7 +44,7 @@ BOOT_Mode_t BOOT_GetMode(void)
SYSTEM_DelayMs(20); SYSTEM_DelayMs(20);
} }
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
if (Keys[0] == (10 + gEeprom.SET_KEY)) if (Keys[0] == (10 + gEeprom.SET_KEY))
{ {
return BOOT_MODE_MENU_LOCK; // Secret KEY pressed return BOOT_MODE_MENU_LOCK; // Secret KEY pressed

2
helper/boot.h
View File

@@ -24,7 +24,7 @@ enum BOOT_Mode_t
{ {
BOOT_MODE_NORMAL = 0, BOOT_MODE_NORMAL = 0,
BOOT_MODE_F_LOCK, BOOT_MODE_F_LOCK,
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
BOOT_MODE_MENU_LOCK, BOOT_MODE_MENU_LOCK,
#endif #endif
#ifdef ENABLE_AIRCOPY #ifdef ENABLE_AIRCOPY

6
main.c
View File

@@ -131,7 +131,7 @@ void Main(void)
BOOT_Mode_t BootMode = BOOT_GetMode(); BOOT_Mode_t BootMode = BOOT_GetMode();
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
if (BootMode == BOOT_MODE_MENU_LOCK) if (BootMode == BOOT_MODE_MENU_LOCK)
{ {
gEeprom.MENU_LOCK = !gEeprom.MENU_LOCK; gEeprom.MENU_LOCK = !gEeprom.MENU_LOCK;
@@ -147,7 +147,7 @@ void Main(void)
} }
#endif #endif
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
if (BootMode == BOOT_MODE_F_LOCK && gEeprom.MENU_LOCK == true) if (BootMode == BOOT_MODE_F_LOCK && gEeprom.MENU_LOCK == true)
{ {
BootMode = BOOT_MODE_NORMAL; BootMode = BOOT_MODE_NORMAL;
@@ -170,7 +170,7 @@ void Main(void)
#ifdef ENABLE_NOAA #ifdef ENABLE_NOAA
gMenuCursor += 1; // move to hidden section, fix me if change... !!! gMenuCursor += 1; // move to hidden section, fix me if change... !!!
#endif #endif
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
gMenuCursor += 1; // move to hidden section, fix me if change... !!! gMenuCursor += 1; // move to hidden section, fix me if change... !!!
#endif #endif
gSubMenuSelection = gSetting_F_LOCK; gSubMenuSelection = gSetting_F_LOCK;

2
misc.c
View File

@@ -137,7 +137,7 @@ enum BacklightOnRxTx_t gSetting_backlight_on_tx_rx;
uint8_t crc[15] = { 0 }; uint8_t crc[15] = { 0 };
uint8_t lErrorsDuringAirCopy = 0; uint8_t lErrorsDuringAirCopy = 0;
uint8_t gAircopyStep = 0; uint8_t gAircopyStep = 0;
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
bool gResetPower = false; bool gResetPower = false;
uint8_t gInitialPower = 0; uint8_t gInitialPower = 0;
#endif #endif

2
misc.h
View File

@@ -190,7 +190,7 @@ extern enum BacklightOnRxTx_t gSetting_backlight_on_tx_rx;
extern uint8_t crc[15]; extern uint8_t crc[15];
extern uint8_t lErrorsDuringAirCopy; extern uint8_t lErrorsDuringAirCopy;
extern uint8_t gAircopyStep; extern uint8_t gAircopyStep;
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
extern bool gResetPower; extern bool gResetPower;
extern uint8_t gInitialPower; extern uint8_t gInitialPower;
#endif #endif

4
radio.c
View File

@@ -160,7 +160,7 @@ void RADIO_InitInfo(VFO_Info_t *pInfo, const uint8_t ChannelSave, const uint32_t
void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure) void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure)
{ {
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
if(configure == VFO_CONFIGURE_RELOAD) if(configure == VFO_CONFIGURE_RELOAD)
{ {
gResetPower = true; gResetPower = true;
@@ -437,7 +437,7 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
RADIO_ConfigureSquelchAndOutputPower(pVfo); RADIO_ConfigureSquelchAndOutputPower(pVfo);
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
if(gEeprom.MENU_LOCK && gResetPower) // RO is active if(gEeprom.MENU_LOCK && gResetPower) // RO is active
{ {
gInitialPower = pVfo->OUTPUT_POWER; gInitialPower = pVfo->OUTPUT_POWER;

6
settings.c
View File

@@ -51,7 +51,7 @@ void SETTINGS_InitEEPROM(void)
#ifdef ENABLE_NOAA #ifdef ENABLE_NOAA
gEeprom.NOAA_AUTO_SCAN = (Data[3] < 2) ? Data[3] : false; gEeprom.NOAA_AUTO_SCAN = (Data[3] < 2) ? Data[3] : false;
#endif #endif
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
gEeprom.KEY_LOCK = (Data[4] & 0x01) != 0; gEeprom.KEY_LOCK = (Data[4] & 0x01) != 0;
gEeprom.MENU_LOCK = (Data[4] & 0x02) != 0; gEeprom.MENU_LOCK = (Data[4] & 0x02) != 0;
gEeprom.SET_KEY = ((Data[4] >> 2) & 0x0F) > 4 ? 0 : (Data[4] >> 2) & 0x0F; gEeprom.SET_KEY = ((Data[4] >> 2) & 0x0F) > 4 ? 0 : (Data[4] >> 2) & 0x0F;
@@ -597,7 +597,7 @@ void SETTINGS_SaveSettings(void)
State[3] = false; State[3] = false;
#endif #endif
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
State[4] = (gEeprom.KEY_LOCK ? 0x01 : 0) | (gEeprom.MENU_LOCK ? 0x02 :0) | ((gEeprom.SET_KEY & 0x0F) << 2); State[4] = (gEeprom.KEY_LOCK ? 0x01 : 0) | (gEeprom.MENU_LOCK ? 0x02 :0) | ((gEeprom.SET_KEY & 0x0F) << 2);
#else #else
State[4] = gEeprom.KEY_LOCK; State[4] = gEeprom.KEY_LOCK;
@@ -999,7 +999,7 @@ State[1] = 0
#ifdef ENABLE_SPECTRUM #ifdef ENABLE_SPECTRUM
| (1 << 5) | (1 << 5)
#endif #endif
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
| (1 << 6) | (1 << 6)
#endif #endif
; ;

4
settings.h
View File

@@ -117,7 +117,7 @@ enum ACTION_OPT_t {
ACTION_OPT_PTT, ACTION_OPT_PTT,
ACTION_OPT_WN, ACTION_OPT_WN,
ACTION_OPT_BACKLIGHT, ACTION_OPT_BACKLIGHT,
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
ACTION_OPT_POWER_HIGH, ACTION_OPT_POWER_HIGH,
#endif #endif
#endif #endif
@@ -189,7 +189,7 @@ typedef struct {
#ifdef ENABLE_FEAT_F4HWN #ifdef ENABLE_FEAT_F4HWN
bool KEY_LOCK_PTT; bool KEY_LOCK_PTT;
#endif #endif
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
bool MENU_LOCK; bool MENU_LOCK;
uint8_t SET_KEY; uint8_t SET_KEY;
#endif #endif

8
ui/main.c
View File

@@ -892,7 +892,7 @@ void UI_DisplayMain(void)
if (IS_MR_CHANNEL(gEeprom.ScreenChannel[vfo_num])) if (IS_MR_CHANNEL(gEeprom.ScreenChannel[vfo_num]))
{ // it's a channel { // it's a channel
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
if(gEeprom.MENU_LOCK == false) { if(gEeprom.MENU_LOCK == false) {
#endif #endif
uint8_t countList = 0; uint8_t countList = 0;
@@ -934,7 +934,7 @@ void UI_DisplayMain(void)
memcpy(p_line0 + 127 - (1 * 6), BITMAP_ScanListE, sizeof(BITMAP_ScanListE)); memcpy(p_line0 + 127 - (1 * 6), BITMAP_ScanListE, sizeof(BITMAP_ScanListE));
} }
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
{ {
} }
} }
@@ -1457,7 +1457,7 @@ void UI_DisplayMain(void)
} }
#ifdef ENABLE_FEAT_F4HWN #ifdef ENABLE_FEAT_F4HWN
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
if(gEeprom.MENU_LOCK == false) if(gEeprom.MENU_LOCK == false)
{ {
#endif #endif
@@ -1470,7 +1470,7 @@ void UI_DisplayMain(void)
gFrameBuffer[6][i] ^= 0x7F; gFrameBuffer[6][i] ^= 0x7F;
} }
} }
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
} }
#endif #endif
#endif #endif

10
ui/menu.c
View File

@@ -158,7 +158,7 @@ const t_menu_item MenuList[] =
#ifdef ENABLE_FEAT_F4HWN_VOL #ifdef ENABLE_FEAT_F4HWN_VOL
{"SetVol", MENU_SET_VOL }, {"SetVol", MENU_SET_VOL },
#endif #endif
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
{"SetKey", MENU_SET_KEY }, {"SetKey", MENU_SET_KEY },
#endif #endif
#endif #endif
@@ -401,7 +401,7 @@ const char gSubMenu_SCRAMBLER[][7] =
}; };
#endif #endif
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
const char gSubMenu_SET_KEY[][9] = const char gSubMenu_SET_KEY[][9] =
{ {
"KEY_MENU", "KEY_MENU",
@@ -446,7 +446,7 @@ const t_sidefunction gSubMenu_SIDEFUNCTIONS[] =
{"MAIN ONLY", ACTION_OPT_MAINONLY}, {"MAIN ONLY", ACTION_OPT_MAINONLY},
{"PTT", ACTION_OPT_PTT}, {"PTT", ACTION_OPT_PTT},
{"WIDE\nNARROW", ACTION_OPT_WN}, {"WIDE\nNARROW", ACTION_OPT_WN},
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
{"POWER\nHIGH", ACTION_OPT_POWER_HIGH}, {"POWER\nHIGH", ACTION_OPT_POWER_HIGH},
#endif #endif
#endif #endif
@@ -1083,7 +1083,7 @@ void UI_DisplayMenu(void)
break; break;
#endif #endif
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
case MENU_SET_KEY: case MENU_SET_KEY:
strcpy(String, gSubMenu_SET_KEY[gSubMenuSelection]); strcpy(String, gSubMenu_SET_KEY[gSubMenuSelection]);
break; break;
@@ -1141,7 +1141,7 @@ void UI_DisplayMenu(void)
UI_PrintStringSmallNormal("Bandscope", 54, 127, 6); UI_PrintStringSmallNormal("Bandscope", 54, 127, 6);
#elif defined(ENABLE_FMRADIO) #elif defined(ENABLE_FMRADIO)
UI_PrintStringSmallNormal("Broadcast", 54, 127, 6); UI_PrintStringSmallNormal("Broadcast", 54, 127, 6);
#elif defined(ENABLE_FEAT_F4HWN_MENU_LOCK) #elif defined(ENABLE_FEAT_F4HWN_RESCUE_OPS)
UI_PrintStringSmallNormal("RescueOps", 54, 127, 6); UI_PrintStringSmallNormal("RescueOps", 54, 127, 6);
#endif #endif

4
ui/menu.h
View File

@@ -147,7 +147,7 @@ enum
#ifdef ENABLE_FEAT_F4HWN_VOL #ifdef ENABLE_FEAT_F4HWN_VOL
MENU_SET_VOL, MENU_SET_VOL,
#endif #endif
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
MENU_SET_KEY, MENU_SET_KEY,
#endif #endif
#endif #endif
@@ -190,7 +190,7 @@ extern const char gSubMenu_D_RSP[4][11];
#ifdef ENABLE_FEAT_F4HWN_NARROWER #ifdef ENABLE_FEAT_F4HWN_NARROWER
extern const char gSubMenu_SET_NFM[2][9]; extern const char gSubMenu_SET_NFM[2][9];
#endif #endif
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
extern const char gSubMenu_SET_KEY[][9]; extern const char gSubMenu_SET_KEY[][9];
#endif #endif
#endif #endif

6
ui/status.c
View File

@@ -154,7 +154,7 @@ void UI_DisplayStatus()
else else
#endif #endif
{ {
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
if(gEeprom.MENU_LOCK == true) { if(gEeprom.MENU_LOCK == true) {
memcpy(line + x + 2, gFontRO, sizeof(gFontRO)); memcpy(line + x + 2, gFontRO, sizeof(gFontRO));
} }
@@ -175,7 +175,7 @@ void UI_DisplayStatus()
{ {
memcpy(line + x + 2, gFontMO, sizeof(gFontMO)); memcpy(line + x + 2, gFontMO, sizeof(gFontMO));
} }
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
} }
#endif #endif
} }
@@ -213,7 +213,7 @@ void UI_DisplayStatus()
memcpy(line + x + 1, gFontKeyLock, sizeof(gFontKeyLock)); memcpy(line + x + 1, gFontKeyLock, sizeof(gFontKeyLock));
} }
else if (gWasFKeyPressed) { else if (gWasFKeyPressed) {
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
if(gEeprom.MENU_LOCK == false) { if(gEeprom.MENU_LOCK == false) {
memcpy(line + x + 1, gFontF, sizeof(gFontF)); memcpy(line + x + 1, gFontF, sizeof(gFontF));
} }

10
ui/welcome.c
View File

@@ -134,8 +134,8 @@ void UI_DisplayWelcome(void)
UI_PrintStringSmallNormal(WelcomeString3, 0, 127, 6); UI_PrintStringSmallNormal(WelcomeString3, 0, 127, 6);
/* /*
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
#if ENABLE_FEAT_F4HWN_MENU_LOCK > 1 #if ENABLE_FEAT_F4HWN_RESCUE_OPS > 1
UI_PrintStringSmallNormal(Edition, 18, 0, 6); UI_PrintStringSmallNormal(Edition, 18, 0, 6);
if(gEeprom.MENU_LOCK == true) { if(gEeprom.MENU_LOCK == true) {
memcpy(gFrameBuffer[6] + 103, BITMAP_Ready, sizeof(BITMAP_Ready)); memcpy(gFrameBuffer[6] + 103, BITMAP_Ready, sizeof(BITMAP_Ready));
@@ -148,7 +148,7 @@ void UI_DisplayWelcome(void)
UI_PrintStringSmallNormal(Edition, 18, 0, 5); UI_PrintStringSmallNormal(Edition, 18, 0, 5);
memcpy(gFrameBuffer[5] + 103, BITMAP_Ready, sizeof(BITMAP_Ready)); memcpy(gFrameBuffer[5] + 103, BITMAP_Ready, sizeof(BITMAP_Ready));
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
UI_PrintStringSmallNormal("RescueOps", 18, 0, 6); UI_PrintStringSmallNormal("RescueOps", 18, 0, 6);
if(gEeprom.MENU_LOCK == true) { if(gEeprom.MENU_LOCK == true) {
memcpy(gFrameBuffer[6] + 103, BITMAP_Ready, sizeof(BITMAP_Ready)); memcpy(gFrameBuffer[6] + 103, BITMAP_Ready, sizeof(BITMAP_Ready));
@@ -174,7 +174,7 @@ void UI_DisplayWelcome(void)
UI_PrintStringSmallNormal("Bandscope ", 0, 127, 5); UI_PrintStringSmallNormal("Bandscope ", 0, 127, 5);
memcpy(gFrameBuffer[5] + 95, BITMAP_Ready, sizeof(BITMAP_Ready)); memcpy(gFrameBuffer[5] + 95, BITMAP_Ready, sizeof(BITMAP_Ready));
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
UI_PrintStringSmallNormal("RescueOps ", 0, 127, 6); UI_PrintStringSmallNormal("RescueOps ", 0, 127, 6);
if(gEeprom.MENU_LOCK == true) { if(gEeprom.MENU_LOCK == true) {
memcpy(gFrameBuffer[6] + 95, BITMAP_Ready, sizeof(BITMAP_Ready)); memcpy(gFrameBuffer[6] + 95, BITMAP_Ready, sizeof(BITMAP_Ready));
@@ -184,7 +184,7 @@ void UI_DisplayWelcome(void)
#endif #endif
#endif #endif
#else #else
#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
UI_PrintStringSmallNormal("RescueOps ", 0, 127, 5); UI_PrintStringSmallNormal("RescueOps ", 0, 127, 5);
if(gEeprom.MENU_LOCK == true) { if(gEeprom.MENU_LOCK == true) {
memcpy(gFrameBuffer[5] + 95, BITMAP_Ready, sizeof(BITMAP_Ready)); memcpy(gFrameBuffer[5] + 95, BITMAP_Ready, sizeof(BITMAP_Ready));