Added and fixed some variables.

This commit is contained in:
Dual Tachyon 2023-08-27 19:52:32 +01:00
parent 00512d7382
commit 7395d1f0ee
6 changed files with 27 additions and 19 deletions

14
app.c
View File

@ -1587,13 +1587,13 @@ static void APP_ProcessKey(KEY_Code_t CurrentKey, bool bKeyPressed, bool bKeyHel
FUNCTION_Select(FUNCTION_0);
}
g_2000032E = 1000;
if (gEeprom.AUTO_KEYPAD_LOCK == true) {
if (gEeprom.AUTO_KEYPAD_LOCK) {
gKeyLockCountdown = 30;
}
if (bKeyPressed == false) {
if (g_200003A5 != 0) {
if (!bKeyPressed) {
if (gFlagSaveVfo) {
SETTINGS_SaveVfoIndices();
g_200003A5 = 0;
gFlagSaveVfo = false;
}
if (gFlagSaveSettings) {
SETTINGS_SaveSettings();
@ -1603,13 +1603,13 @@ static void APP_ProcessKey(KEY_Code_t CurrentKey, bool bKeyPressed, bool bKeyHel
SETTINGS_SaveFM();
gFlagSaveFM = false;
}
if (g_200003A7 != 0) {
if (gFlagSaveChannel) {
SETTINGS_SaveChannel(
gTxRadioInfo->CHANNEL_SAVE,
gEeprom.TX_CHANNEL,
gTxRadioInfo,
g_200003A7);
g_200003A7 = 0;
gFlagSaveChannel);
gFlagSaveChannel = false;
RADIO_ConfigureChannel(gEeprom.TX_CHANNEL, 1);
RADIO_SetupRegisters(true);
GUI_SelectNextDisplay(DISPLAY_MAIN);

View File

@ -957,12 +957,12 @@ void MENU_Key_MENU(bool bKeyPressed, bool bKeyHeld)
MENU_AcceptSetting();
overlay_FLASH_RebootToBootloader();
}
g_200003A3 = 1;
gFlagAcceptSetting = true;
g_200003C6 = 0;
gAskForConfirmation = 0;
}
} else {
g_200003A3 = 1;
gFlagAcceptSetting = true;
g_200003C6 = 0;
}
g_20000381 = 0;

2
gui.c
View File

@ -1366,7 +1366,7 @@ void GUI_SelectNextDisplay(GUI_DisplayType_t Display)
gAskForConfirmation = 0;
g_200003BA = 0;
g_200003BB = 0;
gF_LOCK = 0;
gF_LOCK = false;
gAskToSave = false;
gAskToDelete = false;
if (gWasFKeyPressed) {

View File

@ -65,7 +65,7 @@ void HELPER_CheckBootKey(uint8_t KeyType)
gSubMenuSelection = gSetting_350TX;
GUI_SelectNextDisplay(DISPLAY_MENU);
gMenuListCount = 57;
gF_LOCK = 1;
gF_LOCK = true;
} else if (KeyType == 2) {
gEeprom.DUAL_WATCH = DUAL_WATCH_OFF;
gEeprom.BATTERY_SAVE = 0;

12
misc.c
View File

@ -74,21 +74,25 @@ uint16_t g_2000038E;
volatile int8_t g_20000390;
uint8_t g_20000393;
bool g_20000394;
uint8_t g_20000395;
uint8_t gKeypadLocked;
uint8_t g_20000395;
uint8_t g_20000396;
uint8_t g_20000398;
uint8_t g_2000039A;
uint8_t g_2000039B;
uint8_t g_2000039C;
uint8_t g_2000039D;
uint8_t g_2000039E;
uint8_t g_2000039F;
uint8_t g_200003A0;
uint8_t g_200003A1;
uint8_t g_200003A2;
uint8_t g_200003A3;
bool gFlagAcceptSetting;
uint8_t g_200003A4;
bool g_200003A5;
bool gFlagSaveVfo;
bool gFlagSaveSettings;
bool g_200003A7;
bool gFlagSaveChannel;
bool gFlagSaveFM;
uint8_t g_200003AA;
bool g_CDCSS_Lost;
@ -162,7 +166,7 @@ uint8_t gFmRadioCountdown;
uint8_t gA_Scan_Channel;
uint8_t gDebounceCounter;
uint8_t gDTMF_AUTO_RESET_TIME;
uint8_t gF_LOCK;
bool gF_LOCK;
char gNumberForPrintf[8];
uint8_t gNumberOffset;
uint8_t gScanChannel;

12
misc.h
View File

@ -84,20 +84,24 @@ extern volatile int8_t g_20000390;
extern uint8_t g_20000393;
extern bool g_20000394;
extern uint8_t g_20000395;
extern uint8_t g_20000395;
extern uint8_t g_20000396;
extern uint8_t g_20000398;
extern uint8_t g_2000039A;
extern uint8_t g_2000039B;
extern uint8_t g_2000039C;
extern uint8_t g_2000039D;
extern uint8_t g_2000039E;
extern uint8_t g_2000039F;
extern uint8_t gKeypadLocked;
extern uint8_t g_200003A0;
extern uint8_t g_200003A1;
extern uint8_t g_200003A2;
extern uint8_t g_200003A3;
extern bool gFlagAcceptSetting;
extern uint8_t g_200003A4;
extern bool g_200003A5;
extern bool gFlagSaveVfo;
extern bool gFlagSaveSettings;
extern bool g_200003A7;
extern bool gFlagSaveChannel;
extern bool gFlagSaveFM;
extern uint8_t g_200003AA;
extern bool g_CDCSS_Lost;
@ -171,7 +175,7 @@ extern uint8_t gFmRadioCountdown;
extern uint8_t gA_Scan_Channel;
extern uint8_t gDebounceCounter;
extern uint8_t gDTMF_AUTO_RESET_TIME;
extern uint8_t gF_LOCK;
extern bool gF_LOCK;
extern char gNumberForPrintf[8];
extern uint8_t gNumberOffset;
extern uint8_t gScanChannel;