From 1994d68cc5e1df36706bffca6050c6bbd1bf7a44 Mon Sep 17 00:00:00 2001 From: Dual Tachyon Date: Tue, 5 Sep 2023 16:45:58 +0100 Subject: [PATCH] More variables renamed. --- app/app.c | 22 +++++++++++----------- app/scanner.c | 2 +- misc.c | 8 ++++---- misc.h | 8 ++++---- radio.c | 4 ++-- ui/main.c | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app/app.c b/app/app.c index 765ebb1..8118531 100644 --- a/app/app.c +++ b/app/app.c @@ -320,13 +320,13 @@ void APP_StartListening(FUNCTION_Type_t Function) gCssScanMode = CSS_SCAN_MODE_FOUND; } if (gScanState == SCAN_OFF && gCssScanMode == CSS_SCAN_MODE_OFF && gEeprom.DUAL_WATCH != DUAL_WATCH_OFF) { - g_2000041F = 1; + gRxVfoIsActive = true; gDualWatchCountdown = 360; gScheduleDualWatch = false; } if (gRxVfo->IsAM) { BK4819_WriteRegister(BK4819_REG_48, 0xB3A8); - g_20000474 = 0; + gNeverUsed = 0; } else { BK4819_WriteRegister(BK4819_REG_48, 0xB000 | (gEeprom.VOLUME_GAIN << 4) @@ -659,10 +659,10 @@ void APP_Update(void) if (gScanState == SCAN_OFF && gCssScanMode == CSS_SCAN_MODE_OFF) { if (!gPttIsPressed && !gFmRadioMode && gDTMF_CallState == DTMF_CALL_STATE_NONE && gCurrentFunction != FUNCTION_POWER_SAVE) { DUALWATCH_Alternate(); - if (g_2000041F == 1 && gScreenToDisplay == DISPLAY_MAIN) { + if (gRxVfoIsActive && gScreenToDisplay == DISPLAY_MAIN) { GUI_SelectNextDisplay(DISPLAY_MAIN); } - g_2000041F = 0; + gRxVfoIsActive = false; gScanPauseMode = false; gRxReceptionMode = RX_MODE_NONE; gScheduleDualWatch = false; @@ -701,12 +701,12 @@ void APP_Update(void) } if (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF && gScanState == SCAN_OFF && gCssScanMode == CSS_SCAN_MODE_OFF) { DUALWATCH_Alternate(); - g_20000382 = false; + gUpdateRSSI = false; } FUNCTION_Init(); gBatterySave = 10; gRxIdleMode = false; - } else if (gEeprom.DUAL_WATCH == DUAL_WATCH_OFF || gScanState != SCAN_OFF || gCssScanMode != CSS_SCAN_MODE_OFF || g_20000382) { + } else if (gEeprom.DUAL_WATCH == DUAL_WATCH_OFF || gScanState != SCAN_OFF || gCssScanMode != CSS_SCAN_MODE_OFF || gUpdateRSSI) { gCurrentRSSI = BK4819_GetRSSI(); UI_UpdateRSSI(gCurrentRSSI); gBatterySave = gEeprom.BATTERY_SAVE * 10; @@ -717,7 +717,7 @@ void APP_Update(void) // Authentic device checked removed } else { DUALWATCH_Alternate(); - g_20000382 = true; + gUpdateRSSI = true; gBatterySave = 10; } gBatterySaveCountdownExpired = false; @@ -895,8 +895,8 @@ void APP_TimeSlice10ms(void) BK4819_CssScanResult_t ScanResult; uint16_t CtcssFreq; - if (g_2000045D) { - g_2000045D--; + if (gScanDelay) { + gScanDelay--; APP_CheckKeys(); return; } @@ -934,7 +934,7 @@ void APP_TimeSlice10ms(void) gScanCssState = SCAN_CSS_STATE_SCANNING; GUI_SelectNextDisplay(DISPLAY_SCANNER); } - g_2000045D = 21; + gScanDelay = 21; break; case SCAN_CSS_STATE_SCANNING: @@ -973,7 +973,7 @@ void APP_TimeSlice10ms(void) } if (gScanCssState < SCAN_CSS_STATE_FOUND) { BK4819_SetScanFrequency(gScanFrequency); - g_2000045D = 21; + gScanDelay = 21; break; } GUI_SelectNextDisplay(DISPLAY_SCANNER); diff --git a/app/scanner.c b/app/scanner.c index 73a3735..2658079 100644 --- a/app/scanner.c +++ b/app/scanner.c @@ -319,7 +319,7 @@ void SCANNER_Start(void) BK4819_PickRXFilterPathBasedOnFrequency(0xFFFFFFFF); BK4819_EnableFrequencyScan(); } - g_2000045D = 21; + gScanDelay = 21; gScanCssResultIndex = 0xFF; gScanCssResultType = 0xFF; gScanHitCount = 0; diff --git a/misc.c b/misc.c index a736165..fce7cdb 100644 --- a/misc.c +++ b/misc.c @@ -70,7 +70,7 @@ uint8_t gVFO_RSSI_Level[2]; uint8_t gReducedService; uint8_t gBatteryVoltageIndex; CssScanMode_t gCssScanMode; -bool g_20000382; +bool gUpdateRSSI; AlarmState_t gAlarmState; uint16_t g_2000038E; uint8_t g_20000393; @@ -111,7 +111,7 @@ uint8_t gRestoreMrChannel; uint8_t gCurrentScanList; uint8_t gPreviousMrChannel; uint32_t gRestoreFrequency; -uint8_t g_2000041F; +uint8_t gRxVfoIsActive; uint8_t gAlarmToneCounter; uint16_t gAlarmRunningCounter; bool gKeyBeingHeld; @@ -119,10 +119,10 @@ bool gPttIsPressed; uint8_t gPttDebounceCounter; uint8_t gMenuListCount; uint8_t gBackupCROSS_BAND_RX_TX; -uint8_t g_2000045D; +uint8_t gScanDelay; uint8_t gAircopySendCountdown; uint8_t gFSKWriteIndex; -uint8_t g_20000474; +uint8_t gNeverUsed; bool gIsNoaaMode; volatile bool gNextTimeslice; diff --git a/misc.h b/misc.h index 1ab6be9..47c5b07 100644 --- a/misc.h +++ b/misc.h @@ -121,7 +121,7 @@ extern uint8_t gVFO_RSSI_Level[2]; extern uint8_t gReducedService; extern uint8_t gBatteryVoltageIndex; extern CssScanMode_t gCssScanMode; -extern bool g_20000382; +extern bool gUpdateRSSI; extern AlarmState_t gAlarmState; extern uint16_t g_2000038E; extern uint8_t g_20000393; @@ -162,7 +162,7 @@ extern uint8_t gRestoreMrChannel; extern uint8_t gCurrentScanList; extern uint8_t gPreviousMrChannel; extern uint32_t gRestoreFrequency; -extern uint8_t g_2000041F; +extern uint8_t gRxVfoIsActive; extern uint8_t gAlarmToneCounter; extern uint16_t gAlarmRunningCounter; extern bool gKeyBeingHeld; @@ -170,10 +170,10 @@ extern bool gPttIsPressed; extern uint8_t gPttDebounceCounter; extern uint8_t gMenuListCount; extern uint8_t gBackupCROSS_BAND_RX_TX; -extern uint8_t g_2000045D; +extern uint8_t gScanDelay; extern uint8_t gAircopySendCountdown; extern uint8_t gFSKWriteIndex; -extern uint8_t g_20000474; +extern uint8_t gNeverUsed; extern bool gIsNoaaMode; extern volatile bool gNextTimeslice; diff --git a/radio.c b/radio.c index 31a900f..88130c4 100644 --- a/radio.c +++ b/radio.c @@ -715,11 +715,11 @@ void RADIO_PrepareTX(void) if (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF) { gDualWatchCountdown = 360; gScheduleDualWatch = false; - if (g_2000041F == 0) { + if (!gRxVfoIsActive) { gEeprom.RX_CHANNEL = gEeprom.TX_CHANNEL; gRxVfo = &gEeprom.VfoInfo[gEeprom.TX_CHANNEL]; } - g_2000041F = 1; + gRxVfoIsActive = true; } RADIO_SelectCurrentVfo(); if (gAlarmState == ALARM_STATE_OFF || gAlarmState == ALARM_STATE_TX1750 || (gAlarmState == ALARM_STATE_ALARM && gEeprom.ALARM_MODE == ALARM_MODE_TONE)) { diff --git a/ui/main.c b/ui/main.c index b65159f..fa93313 100644 --- a/ui/main.c +++ b/ui/main.c @@ -60,7 +60,7 @@ void UI_DisplayMain(void) Channel = gEeprom.TX_CHANNEL; bIsSameVfo = !!(Channel == i); - if (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF && g_2000041F == 1) { + if (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF && gRxVfoIsActive) { Channel = gEeprom.RX_CHANNEL; }