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

Renamed a variable.

Browse Source
This commit is contained in:
Dual Tachyon 2023-08-31 13:47:25 +01:00
parent aa8a8354ff
commit b08f7c05b0
7 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/app.c
View File

@ -2084,7 +2084,7 @@ Skip:
if (!bKeyHeld) {
SETTINGS_SaveChannel(gTxInfo->CHANNEL_SAVE, gEeprom.TX_CHANNEL, gTxInfo, gRequestSaveChannel);
if (gScreenToDisplay != DISPLAY_SCANNER) {
g_2000039A = 1;
gVfoConfigureMode = VFO_CONFIGURE_1;
}
} else {
gFlagSaveChannel = gRequestSaveChannel;
@ -2095,22 +2095,22 @@ Skip:
gRequestSaveChannel = 0;
}
if (g_2000039A == 0) {
if (gVfoConfigureMode == VFO_CONFIGURE_0) {
if (g_20000398 == 0) {
goto LAB_00002aae;
}
} else {
if (g_2000039B == 1) {
RADIO_ConfigureChannel(0, g_2000039A);
RADIO_ConfigureChannel(1, g_2000039A);
RADIO_ConfigureChannel(0, gVfoConfigureMode);
RADIO_ConfigureChannel(1, gVfoConfigureMode);
} else {
RADIO_ConfigureChannel(gEeprom.TX_CHANNEL, g_2000039A);
RADIO_ConfigureChannel(gEeprom.TX_CHANNEL, gVfoConfigureMode);
}
if (gRequestDisplayScreen == DISPLAY_INVALID) {
gRequestDisplayScreen = DISPLAY_MAIN;
}
g_20000398 = 1;
g_2000039A = 0;
gVfoConfigureMode = VFO_CONFIGURE_0;
g_2000039B = 0;
}
RADIO_ConfigureTX();

2
app/generic.c
View File

@ -157,7 +157,7 @@ void GENERIC_Key_PTT(bool bKeyPressed)
gEeprom.CROSS_BAND_RX_TX = gBackupCROSS_BAND_RX_TX;
gUpdateStatus = true;
gFlagStopScan = true;
g_2000039A = 2;
gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
g_2000039B = 1;
} else {
RADIO_Whatever();

16
app/main.c
View File

@ -71,7 +71,7 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
gEeprom.MrChannel[Vfo] = (uint8_t)Channel;
gEeprom.ScreenChannel[Vfo] = (uint8_t)Channel;
gRequestSaveVFO = true;
g_2000039A = 2;
gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
return;
}
if (IS_NOT_NOAA_CHANNEL(gTxInfo->CHANNEL_SAVE)) {
@ -126,7 +126,7 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
gEeprom.NoaaChannel[Vfo] = Channel;
gEeprom.ScreenChannel[Vfo] = Channel;
gRequestSaveVFO = true;
g_2000039A = 2;
gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
return;
}
}
@ -160,7 +160,7 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
gEeprom.ScreenChannel[Vfo] = FREQ_CHANNEL_FIRST + Band;
gEeprom.FreqChannel[Vfo] = FREQ_CHANNEL_FIRST + Band;
gRequestSaveVFO = true;
g_2000039A = 2;
gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
gRequestDisplayScreen = DISPLAY_MAIN;
break;
@ -191,7 +191,7 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
gEeprom.ScreenChannel[Vfo] = gEeprom.FreqChannel[gEeprom.TX_CHANNEL];
gAnotherVoiceID = VOICE_ID_FREQUENCY_MODE;
gRequestSaveVFO = true;
g_2000039A = 2;
gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
break;
}
Channel = RADIO_FindNextChannel(gEeprom.MrChannel[gEeprom.TX_CHANNEL], 1, false, 0);
@ -201,7 +201,7 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
AUDIO_SetDigitVoice(1, Channel + 1);
gAnotherVoiceID = (VOICE_ID_t)0xFE;
gRequestSaveVFO = true;
g_2000039A = 2;
gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
break;
}
}
@ -226,7 +226,7 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
gAnotherVoiceID = VOICE_ID_FREQUENCY_MODE;
}
gRequestSaveVFO = true;
g_2000039A = 2;
gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
break;
case KEY_6:
@ -250,7 +250,7 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
AUDIO_SetDigitVoice(1, gEeprom.CHAN_1_CALL + 1);
gAnotherVoiceID = (VOICE_ID_t)0xFE;
gRequestSaveVFO = true;
g_2000039A = 2;
gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
break;
}
gBeepToPlay = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL;
@ -409,7 +409,7 @@ void MAIN_Key_UP_DOWN(bool bKeyPressed, bool bKeyHeld, int8_t Direction)
gEeprom.ScreenChannel[gEeprom.TX_CHANNEL] = Channel;
}
gRequestSaveVFO = true;
g_2000039A = 2;
gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
return;
}
APP_ChangeStepDirectionMaybe(false, Direction);

10
app/menu.c
View File

@ -206,7 +206,7 @@ void MENU_AcceptSetting(void)
case MENU_SQL:
gEeprom.SQUELCH_LEVEL = gSubMenuSelection;
gRequestSaveSettings = true;
g_2000039A = 1;
gVfoConfigureMode = VFO_CONFIGURE_1;
return;
case MENU_STEP:
@ -369,14 +369,14 @@ void MENU_AcceptSetting(void)
case MENU_S_ADD1:
gTxInfo->SCANLIST1_PARTICIPATION = gSubMenuSelection;
SETTINGS_UpdateChannel(gTxInfo->CHANNEL_SAVE, gTxInfo, true);
g_2000039A = 1;
gVfoConfigureMode = VFO_CONFIGURE_1;
g_2000039B = 1;
return;
case MENU_S_ADD2:
gTxInfo->SCANLIST2_PARTICIPATION = gSubMenuSelection;
SETTINGS_UpdateChannel(gTxInfo->CHANNEL_SAVE, gTxInfo, true);
g_2000039A = 1;
gVfoConfigureMode = VFO_CONFIGURE_1;
g_2000039B = 1;
return;
@ -465,7 +465,7 @@ void MENU_AcceptSetting(void)
case MENU_DEL_CH:
SETTINGS_UpdateChannel(gSubMenuSelection, NULL, false);
g_2000039A = 2;
gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
g_2000039B = 1;
return;
@ -492,7 +492,7 @@ void MENU_AcceptSetting(void)
case MENU_350EN:
gSetting_350EN = gSubMenuSelection;
gRequestSaveSettings = true;
g_2000039A = 2;
gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
g_2000039B = 1;
return;

2
app/scanner.c
View File

@ -60,7 +60,7 @@ void SCANNER_Key_EXIT(bool bKeyPressed, bool bKeyHeld)
gEeprom.CROSS_BAND_RX_TX = gBackupCROSS_BAND_RX_TX;
gUpdateStatus = true;
gFlagStopScan = true;
g_2000039A = 2;
gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
g_2000039B = 1;
gAnotherVoiceID = VOICE_ID_CANCEL;
break;

2
misc.c
View File

@ -79,7 +79,7 @@ uint8_t gKeypadLocked;
uint8_t g_20000395;
uint8_t g_20000396;
uint8_t g_20000398;
uint8_t g_2000039A;
uint8_t gVfoConfigureMode;
uint8_t g_2000039B;
bool gRequestSaveVFO;
uint8_t gRequestSaveChannel;

8
misc.h
View File

@ -41,6 +41,12 @@ enum {
FLASHLIGHT_BLINK = 2U,
};
enum {
VFO_CONFIGURE_0 = 0U,
VFO_CONFIGURE_1 = 1U,
VFO_CONFIGURE_RELOAD = 2U,
};
extern const uint32_t *gUpperLimitFrequencyBandTable;
extern const uint32_t *gLowerLimitFrequencyBandTable;
@ -102,7 +108,7 @@ 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 gVfoConfigureMode;
extern uint8_t g_2000039B;
extern bool gRequestSaveVFO;
extern uint8_t gRequestSaveChannel;