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

Function 4 is RECEIVE.

Browse Source
This commit is contained in:
Dual Tachyon 2023-08-30 12:14:01 +01:00
parent 7a0ac72b83
commit b718ae81a4
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/app.c
View File

@ -240,7 +240,7 @@ void FUN_000051e8(void)
}
}
}
FUN_000069f8(FUNCTION_4);
FUN_000069f8(FUNCTION_RECEIVE);
}
void FUN_0000773c(void)
@ -429,7 +429,7 @@ void FUN_0000510c(void)
case FUNCTION_3:
FUN_000051e8();
break;
case FUNCTION_4:
case FUNCTION_RECEIVE:
FUN_000052f0();
break;
default:
@ -684,7 +684,7 @@ void APP_CheckRadioInterrupts(void)
gDTMF_WriteIndex = 15;
}
gDTMF_Received[gDTMF_WriteIndex++] = DTMF_GetCharacter(BK4819_GetDTMF_5TONE_Code());
if (gCurrentFunction == FUNCTION_4) {
if (gCurrentFunction == FUNCTION_RECEIVE) {
APP_CheckDTMFStuff();
}
}
@ -759,7 +759,7 @@ static void FUN_00008334(void)
g_VOX_Lost = false;
g_200003B8 = 0;
}
if (gCurrentFunction != FUNCTION_4 && gCurrentFunction != FUNCTION_MONITOR && gStepDirection == 0 && g_20000381 == 0 && !gFmRadioMode) {
if (gCurrentFunction != FUNCTION_RECEIVE && gCurrentFunction != FUNCTION_MONITOR && gStepDirection == 0 && g_20000381 == 0 && !gFmRadioMode) {
if (g_200003B4 == 1) {
if (g_VOX_Lost) {
gSystickCountdown11 = 100;
@ -822,7 +822,7 @@ void APP_Update(void)
if (gScreenToDisplay != DISPLAY_SCANNER && gStepDirection && gSystickFlag9 && !gPttIsPressed && gVoiceWriteIndex == 0) {
if (IS_FREQ_CHANNEL(g_20000410)) {
if (gCurrentFunction == FUNCTION_3) {
FUN_000069f8(FUNCTION_4);
FUN_000069f8(FUNCTION_RECEIVE);
} else {
APP_MoreRadioStuff();
}
@ -830,7 +830,7 @@ void APP_Update(void)
if (gCopyOfCodeType != CODE_TYPE_OFF || gCurrentFunction != FUNCTION_3) {
FUN_00007dd4();
} else {
FUN_000069f8(FUNCTION_4);
FUN_000069f8(FUNCTION_RECEIVE);
}
}
gScanPauseMode = 0;
@ -867,7 +867,7 @@ void APP_Update(void)
}
}
if (gFM_Step && gScheduleFM && gCurrentFunction != FUNCTION_MONITOR && gCurrentFunction != FUNCTION_4 && gCurrentFunction != FUNCTION_TRANSMIT) {
if (gFM_Step && gScheduleFM && gCurrentFunction != FUNCTION_MONITOR && gCurrentFunction != FUNCTION_RECEIVE && gCurrentFunction != FUNCTION_TRANSMIT) {
APP_PlayFM();
gScheduleFM = false;
}
@ -1267,7 +1267,7 @@ void APP_TimeSlice500ms(void)
g_200003BB = 0;
gAskToSave = false;
gAskToDelete = false;
if (gFmRadioMode && gCurrentFunction != FUNCTION_4 && gCurrentFunction != FUNCTION_MONITOR && gCurrentFunction != FUNCTION_TRANSMIT) {
if (gFmRadioMode && gCurrentFunction != FUNCTION_RECEIVE && gCurrentFunction != FUNCTION_MONITOR && gCurrentFunction != FUNCTION_TRANSMIT) {
GUI_SelectNextDisplay(DISPLAY_FM);
} else {
GUI_SelectNextDisplay(DISPLAY_MAIN);
@ -1283,7 +1283,7 @@ LAB_00004b08:
g_20000373--;
if (g_20000373 == 0) {
RADIO_SomethingElse(0);
if (gCurrentFunction != FUNCTION_4 && gCurrentFunction != FUNCTION_TRANSMIT && gCurrentFunction != FUNCTION_MONITOR && gFmRadioMode) {
if (gCurrentFunction != FUNCTION_RECEIVE && gCurrentFunction != FUNCTION_TRANSMIT && gCurrentFunction != FUNCTION_MONITOR && gFmRadioMode) {
APP_StartFM();
GUI_SelectNextDisplay(DISPLAY_FM);
}
@ -1329,7 +1329,7 @@ LAB_00004b08:
gUpdateDisplay = true;
}
if (g_200003BC && gCurrentFunction != FUNCTION_TRANSMIT && gCurrentFunction != FUNCTION_4) {
if (g_200003BC && gCurrentFunction != FUNCTION_TRANSMIT && gCurrentFunction != FUNCTION_RECEIVE) {
if (gDTMF_AUTO_RESET_TIME) {
gDTMF_AUTO_RESET_TIME--;
if (gDTMF_AUTO_RESET_TIME == 0) {
@ -1486,7 +1486,7 @@ void APP_CycleOutputPower(void)
void APP_StartScan(bool bFlag)
{
if (gFmRadioMode) {
if (gCurrentFunction != FUNCTION_4 && gCurrentFunction != FUNCTION_MONITOR && gCurrentFunction != FUNCTION_TRANSMIT) {
if (gCurrentFunction != FUNCTION_RECEIVE && gCurrentFunction != FUNCTION_MONITOR && gCurrentFunction != FUNCTION_TRANSMIT) {
uint16_t Frequency;
GUI_SelectNextDisplay(DISPLAY_FM);

8
audio.c
View File

@ -72,7 +72,7 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
if (gScreenToDisplay == DISPLAY_AIRCOPY) {
return;
}
if (gCurrentFunction == FUNCTION_4) {
if (gCurrentFunction == FUNCTION_RECEIVE) {
return;
}
if (gCurrentFunction == FUNCTION_MONITOR) {
@ -193,7 +193,7 @@ void AUDIO_PlaySingleVoice(bool bFlag)
VoiceID += VOICE_ID_ENG_BASE;
}
if (gCurrentFunction == FUNCTION_4 || gCurrentFunction == FUNCTION_MONITOR) {
if (gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR) {
BK4819_SetAF(BK4819_AF_MUTE);
}
if (gFmRadioMode) {
@ -208,7 +208,7 @@ void AUDIO_PlaySingleVoice(bool bFlag)
}
if (bFlag) {
SYSTEM_DelayMs(Delay * 10);
if (gCurrentFunction == FUNCTION_4 || gCurrentFunction == FUNCTION_MONITOR) {
if (gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR) {
if (gRxInfo->IsAM) {
BK4819_SetAF(BK4819_AF_AM);
} else {
@ -323,7 +323,7 @@ void AUDIO_PlayQueuedVoice(void)
}
}
if (gCurrentFunction == FUNCTION_4 || gCurrentFunction == FUNCTION_MONITOR) {
if (gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR) {
if (gRxInfo->IsAM) {
BK4819_SetAF(BK4819_AF_AM);
} else {

2
functions.c
View File

@ -112,7 +112,7 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
return;
}
if (Function == FUNCTION_MONITOR || Function == FUNCTION_3 || Function == FUNCTION_4) {
if (Function == FUNCTION_MONITOR || Function == FUNCTION_3 || Function == FUNCTION_RECEIVE) {
gBatterySaveCountdown = 1000;
gSchedulePowerSave = false;
g_2000038E = 0;

2
functions.h
View File

@ -24,7 +24,7 @@ enum FUNCTION_Type_t {
FUNCTION_TRANSMIT = 1U,
FUNCTION_MONITOR = 2U,
FUNCTION_3 = 3U,
FUNCTION_4 = 4U,
FUNCTION_RECEIVE = 4U,
FUNCTION_POWER_SAVE = 5U,
};

2
radio.c
View File

@ -721,7 +721,7 @@ void RADIO_SomethingWithTransmit(void)
uint8_t Value;
if (!FREQUENCY_Check(gCrossTxRadioInfo)) {
if (gCrossTxRadioInfo->BUSY_CHANNEL_LOCK && gCurrentFunction == FUNCTION_4) {
if (gCrossTxRadioInfo->BUSY_CHANNEL_LOCK && gCurrentFunction == FUNCTION_RECEIVE) {
Value = 1;
} else if (gBatteryDisplayLevel == 0) {
Value = 2;

6
scheduler.c
View File

@ -63,7 +63,7 @@ void SystickHandler(void)
}
if (gStepDirection == 0 && g_20000381 == 0 && gEeprom.DUAL_WATCH != DUAL_WATCH_OFF) {
if (gCurrentFunction != FUNCTION_MONITOR && gCurrentFunction != FUNCTION_TRANSMIT) {
if (gCurrentFunction != FUNCTION_4) {
if (gCurrentFunction != FUNCTION_RECEIVE) {
if (g_2000033A) {
g_2000033A--;
if (g_2000033A == 0) {
@ -76,7 +76,7 @@ void SystickHandler(void)
if (gStepDirection == 0 && g_20000381 == 0 && gEeprom.DUAL_WATCH == DUAL_WATCH_OFF) {
if (gIsNoaaMode && gCurrentFunction != FUNCTION_MONITOR && gCurrentFunction != FUNCTION_TRANSMIT) {
if (gCurrentFunction != FUNCTION_4) {
if (gCurrentFunction != FUNCTION_RECEIVE) {
if (g_20000356) {
g_20000356--;
if (g_20000356 == 0) {
@ -113,7 +113,7 @@ void SystickHandler(void)
}
if (gFM_Step && gCurrentFunction != FUNCTION_MONITOR) {
if (gCurrentFunction != FUNCTION_TRANSMIT && gCurrentFunction != FUNCTION_4) {
if (gCurrentFunction != FUNCTION_TRANSMIT && gCurrentFunction != FUNCTION_RECEIVE) {
if (gFmPlayCountdown) {
gFmPlayCountdown--;
if (gFmPlayCountdown == 0) {

2
ui/main.c
View File

@ -142,7 +142,7 @@ void UI_DisplayMain(void)
}
} else {
SomeValue = 2;
if ((gCurrentFunction == FUNCTION_4 || gCurrentFunction == FUNCTION_MONITOR) && gEeprom.RX_CHANNEL == i) {
if ((gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR) && gEeprom.RX_CHANNEL == i) {
memcpy(pLine0 + 14, BITMAP_RX, sizeof(BITMAP_RX));
}
}