Renamed a variable.

This commit is contained in:
Dual Tachyon 2023-08-30 00:19:12 +01:00
parent e2843f1aee
commit 2228180ae1
13 changed files with 33 additions and 33 deletions

View File

@ -124,7 +124,7 @@ void APP_CheckDTMFStuff(void)
}
g_200003BC = 0;
gUpdateDisplay = true;
g_2000036F = true;
gUpdateStatus = true;
return;
} else {
sprintf(String, "%s%c%s", gEeprom.ANI_DTMF_ID, gEeprom.DTMF_SEPARATE_CODE, gEeprom.REVIVE_CODE);
@ -134,7 +134,7 @@ void APP_CheckDTMFStuff(void)
g_200003BE = 2;
g_200003BC = 0;
gUpdateDisplay = true;
g_2000036F = true;
gUpdateStatus = true;
return;
}
}
@ -659,7 +659,7 @@ void APP_StartFM(void)
BK1080_Init(gEeprom.FM_FrequencyToPlay, true);
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
g_2000036B = 1;
g_2000036F = 1;
gUpdateStatus = true;
}
void APP_CheckRadioInterrupts(void)
@ -1007,9 +1007,9 @@ void APP_TimeSlice10ms(void)
}
if (gCurrentFunction != FUNCTION_TRANSMIT) {
if (g_2000036F == 1) {
if (gUpdateStatus) {
UI_DisplayStatus();
g_2000036F = 0;
gUpdateStatus = false;
}
if (gUpdateDisplay) {
GUI_DisplayScreen();
@ -1246,7 +1246,7 @@ void APP_TimeSlice500ms(void)
if (gKeyLockCountdown == 0) {
gEeprom.KEY_LOCK = true;
}
g_2000036F = 1;
gUpdateStatus = true;
}
if (g_20000393 != 0) {
g_20000393--;
@ -1261,7 +1261,7 @@ void APP_TimeSlice500ms(void)
RADIO_SetupRegisters(true);
}
gWasFKeyPressed = false;
g_2000036F = 1;
gUpdateStatus = true;
gInputBoxIndex = 0;
g_200003BA = 0;
g_200003BB = 0;
@ -1469,7 +1469,7 @@ void APP_FlipVoxSwitch(void)
gRequestSaveSettings = true;
g_20000398 = 1;
gAnotherVoiceID = VOICE_ID_VOX;
g_2000036F = 1;
gUpdateStatus = true;
}
void APP_CycleOutputPower(void)
@ -1974,7 +1974,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
if (gWasFKeyPressed && KEY_9 < Key && Key != KEY_F && Key != KEY_STAR) {
gWasFKeyPressed = false;
g_2000036F = 1;
gUpdateStatus = true;
}
if (gF_LOCK) {
@ -2092,7 +2092,7 @@ Skip:
gFlagSaveSettings = 1;
}
gRequestSaveSettings = false;
g_2000036F = 1;
gUpdateStatus = true;
}
if (gRequestSaveFM) {
if (!bKeyHeld) {

View File

@ -86,7 +86,7 @@ void FM_TurnOff(void)
GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
g_2000036B = 0;
BK1080_Init(0, false);
g_2000036F = 1;
gUpdateStatus = true;
}
void FM_EraseChannels(void)
@ -272,7 +272,7 @@ void FM_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
}
gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
gWasFKeyPressed = false;
g_2000036F = 1;
gUpdateStatus = true;
gRequestDisplayScreen = DISPLAY_FM;
switch (Key) {
case KEY_0:

View File

@ -61,7 +61,7 @@ void GENERIC_Key_F(bool bKeyPressed, bool bKeyHeld)
if (!gWasFKeyPressed) {
gAnotherVoiceID = VOICE_ID_CANCEL;
}
g_2000036F = true;
gUpdateStatus = true;
}
} else {
if (gScreenToDisplay != DISPLAY_FM) {
@ -155,7 +155,7 @@ void GENERIC_Key_PTT(bool bKeyPressed)
}
gRequestDisplayScreen = DISPLAY_MAIN;
gEeprom.CROSS_BAND_RX_TX = gBackupCROSS_BAND_RX_TX;
g_2000036F = 1;
gUpdateStatus = true;
gFlagStopScan = true;
g_2000039A = 2;
g_2000039B = 1;

View File

@ -135,7 +135,7 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
return;
}
gWasFKeyPressed = false;
g_2000036F = 1;
gUpdateStatus = true;
switch (Key) {
case KEY_0:
APP_SwitchToFM();
@ -144,7 +144,7 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
case KEY_1:
if (!IS_FREQ_CHANNEL(gTxInfo->CHANNEL_SAVE)) {
gWasFKeyPressed = false;
g_2000036F = 1;
gUpdateStatus = true;
gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
return;
}
@ -210,7 +210,7 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
case KEY_4:
gWasFKeyPressed = false;
g_2000036F = 1;
gUpdateStatus = true;
gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
gFlagStartScan = true;
g_20000458 = 0;
@ -258,7 +258,7 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
default:
gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
g_2000036F = 1;
gUpdateStatus = true;
gWasFKeyPressed = false;
break;
}
@ -340,7 +340,7 @@ void MAIN_Key_STAR(bool bKeyPressed, bool bKeyHeld)
return;
}
gWasFKeyPressed = false;
g_2000036F = 1;
gUpdateStatus = true;
if (IS_NOT_NOAA_CHANNEL(gTxInfo->CHANNEL_SAVE)) {
gFlagStartScan = true;
g_20000458 = 1;

View File

@ -309,7 +309,7 @@ void MENU_AcceptSetting(void)
BOARD_EEPROM_LoadMoreSettings();
g_20000398 = 1;
gRequestSaveSettings = true;
g_2000036F = 1;
gUpdateStatus = true;
return;
case MENU_ABR:
@ -325,7 +325,7 @@ void MENU_AcceptSetting(void)
gEeprom.DUAL_WATCH = gSubMenuSelection;
g_20000398 = 1;
gRequestSaveSettings = true;
g_2000036F = 1;
gUpdateStatus = true;
return;
case MENU_WX:
@ -338,7 +338,7 @@ void MENU_AcceptSetting(void)
gEeprom.CROSS_BAND_RX_TX = gSubMenuSelection;
g_20000398 = 1;
gRequestSaveSettings = true;
g_2000036F = 1;
gUpdateStatus = true;
return;
case MENU_BEEP:
@ -352,7 +352,7 @@ void MENU_AcceptSetting(void)
case MENU_VOICE:
gEeprom.VOICE_PROMPT = gSubMenuSelection;
gRequestSaveSettings = true;
g_2000036F = 1;
gUpdateStatus = true;
return;
case MENU_SC_REV:

View File

@ -58,7 +58,7 @@ void SCANNER_Key_EXIT(bool bKeyPressed, bool bKeyHeld)
case 0:
gRequestDisplayScreen = DISPLAY_MAIN;
gEeprom.CROSS_BAND_RX_TX = gBackupCROSS_BAND_RX_TX;
g_2000036F = 1;
gUpdateStatus = true;
gFlagStopScan = true;
g_2000039A = 2;
g_2000039B = 1;

View File

@ -126,7 +126,7 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
BK4819_Sleep();
BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2, false);
gBatterySaveCountdownExpired = false;
g_2000036F = 1;
gUpdateStatus = true;
GUI_SelectNextDisplay(DISPLAY_MAIN);
return;
}

View File

@ -67,12 +67,12 @@ void BATTERY_GetReadings(bool bDisplayBatteryLevel)
}
if (gBatteryCurrent < 501) {
if (gChargingWithTypeC) {
g_2000036F = 1;
gUpdateStatus = true;
}
gChargingWithTypeC = 0;
} else {
if (gChargingWithTypeC == false) {
g_2000036F = 1;
gUpdateStatus = true;
BACKLIGHT_TurnOn();
}
gChargingWithTypeC = 1;

2
main.c
View File

@ -120,7 +120,7 @@ void Main(void)
BOOT_ProcessMode(BootMode);
GPIO_ClearBit(&GPIOA->DATA, GPIOA_PIN_VOICE_0);
g_2000036F = 1;
gUpdateStatus = true;
AUDIO_SetVoiceID(0, VOICE_ID_WELCOME);
Channel = gEeprom.ScreenChannel[gEeprom.TX_CHANNEL];
if (IS_MR_CHANNEL(Channel)) {

2
misc.c
View File

@ -57,7 +57,7 @@ uint8_t g_2000036B;
uint8_t gKeyLockCountdown;
uint8_t gRTTECountdown;
uint8_t g_2000036E;
uint8_t g_2000036F;
uint8_t gUpdateStatus;
uint8_t g_20000370;
uint8_t g_20000371[2];
uint8_t g_20000373;

2
misc.h
View File

@ -81,7 +81,7 @@ extern uint8_t g_2000036B;
extern uint8_t gKeyLockCountdown;
extern uint8_t gRTTECountdown;
extern uint8_t g_2000036E;
extern uint8_t g_2000036F;
extern uint8_t gUpdateStatus;
extern uint8_t g_20000370;
extern uint8_t g_20000371[2];
extern uint8_t g_20000373;

View File

@ -154,7 +154,7 @@ void RADIO_ConfigureChannel(uint8_t VFO, uint32_t Arg)
if (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) {
return;
}
g_2000036F = 1;
gUpdateStatus = true;
gEeprom.CROSS_BAND_RX_TX = CROSS_BAND_OFF;
return;
}
@ -604,7 +604,7 @@ void RADIO_ConfigureNOAA(void)
{
uint8_t ChanAB;
g_2000036F = 1;
gUpdateStatus = true;
if (gEeprom.NOAA_AUTO_SCAN) {
if (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF) {
if (IS_NOT_NOAA_CHANNEL(gEeprom.ScreenChannel[0])) {

View File

@ -72,7 +72,7 @@ void GUI_SelectNextDisplay(GUI_DisplayType_t Display)
gAskToDelete = false;
if (gWasFKeyPressed) {
gWasFKeyPressed = false;
g_2000036F = 1;
gUpdateStatus = true;
}
}
gUpdateDisplay = true;