zhangyuheng/custom-uv-k5-firmware
1
0
Fork 0
forked from mirror/uv-k5-firmware
Code Pull Requests Activity

Renamed and moved another variable.

Browse Source
This commit is contained in:
Dual Tachyon 2023-09-05 15:20:48 +01:00
parent 519fb6c1ed
commit 4dc1627c31
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/app.c
View File

@ -306,7 +306,7 @@ void APP_StartListening(FUNCTION_Type_t Function)
gScheduleScanListen = false;
break;
}
g_20000413 = true;
bScanKeepFrequency = true;
}
if (IS_NOAA_CHANNEL(gRxVfo->CHANNEL_SAVE) && gIsNoaaMode) {
gRxVfo->CHANNEL_SAVE = gNoaaChannel + NOAA_CHANNEL_FIRST;
@ -371,7 +371,7 @@ static void FREQ_NextChannel(void)
RADIO_SetupRegisters(true);
gUpdateDisplay = true;
ScanPauseDelayIn10msec = 10;
g_20000413 = false;
bScanKeepFrequency = false;
}
static void MR_NextChannel(void)
@ -422,7 +422,7 @@ Skip:
gUpdateDisplay = true;
}
ScanPauseDelayIn10msec = 20;
g_20000413 = false;
bScanKeepFrequency = false;
if (bEnabled) {
gCurrentScanList++;
if (gCurrentScanList >= 2) {
@ -1208,7 +1208,7 @@ void CHANNEL_Next(bool bFlag, int8_t Direction)
gScheduleScanListen = false;
gRxReceptionMode = RX_MODE_NONE;
gScanPauseMode = false;
g_20000413 = false;
bScanKeepFrequency = false;
}
static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)

3
app/scanner.c
View File

@ -41,6 +41,7 @@ uint8_t gScanProgressIndicator;
uint8_t gScanHitCount;
bool gScanUseCssResult;
uint8_t gScanState;
bool bScanKeepFrequency;
static void SCANNER_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
{
@ -341,7 +342,7 @@ void SCANNER_Stop(void)
Previous = gRestoreMrChannel;
gScanState = SCAN_OFF;
if (!g_20000413) {
if (!bScanKeepFrequency) {
if (IS_MR_CHANNEL(gNextMrChannel)) {
gEeprom.MrChannel[gEeprom.RX_CHANNEL] = gRestoreMrChannel;
gEeprom.ScreenChannel[gEeprom.RX_CHANNEL] = Previous;

1
app/scanner.h
View File

@ -49,6 +49,7 @@ extern uint8_t gScanProgressIndicator;
extern uint8_t gScanHitCount;
extern bool gScanUseCssResult;
extern uint8_t gScanState;
extern bool bScanKeepFrequency;
void SCANNER_ProcessKeys(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld);
void SCANNER_Start(void);

1
misc.c
View File

@ -107,7 +107,6 @@ bool gFlagEndTransmission;
uint16_t gLowBatteryCountdown;
uint8_t gNextMrChannel;
ReceptionMode_t gRxReceptionMode;
bool g_20000413;
uint8_t gRestoreMrChannel;
uint8_t gCurrentScanList;
uint8_t gPreviousMrChannel;

1
misc.h
View File

@ -158,7 +158,6 @@ extern bool gFlagEndTransmission;
extern uint16_t gLowBatteryCountdown;
extern uint8_t gNextMrChannel;
extern ReceptionMode_t gRxReceptionMode;
extern bool g_20000413;
extern uint8_t gRestoreMrChannel;
extern uint8_t gCurrentScanList;
extern uint8_t gPreviousMrChannel;