Renamed RX/TX variables.

This commit is contained in:
Dual Tachyon 2023-08-30 00:01:30 +01:00
parent f1b0bf3941
commit 1c30115593
12 changed files with 170 additions and 170 deletions

View File

@ -103,7 +103,7 @@ void APP_CheckDTMFStuff(void)
return;
}
if (!gInfoCHAN_A->DTMF_DECODING_ENABLE && !gSetting_KILLED) {
if (!gRxInfo->DTMF_DECODING_ENABLE && !gSetting_KILLED) {
return;
}
@ -210,7 +210,7 @@ void FUN_000051e8(void)
}
bFlag = (gStepDirection == 0 || gCopyOfCodeType == CODE_TYPE_OFF);
if (gInfoCHAN_A->CHANNEL_SAVE >= NOAA_CHANNEL_FIRST && gSystickCountdown2) {
if (gRxInfo->CHANNEL_SAVE >= NOAA_CHANNEL_FIRST && gSystickCountdown2) {
bFlag = true;
gSystickCountdown2 = 0;
}
@ -229,7 +229,7 @@ void FUN_000051e8(void)
}
APP_CheckDTMFStuff();
if (gStepDirection == 0 && g_20000381 == 0) {
if (gInfoCHAN_A->DTMF_DECODING_ENABLE || gSetting_KILLED) {
if (gRxInfo->DTMF_DECODING_ENABLE || gSetting_KILLED) {
if (g_200003BC == 0) {
if (g_20000411 == 0x01) {
g_2000033A = 500;
@ -256,19 +256,19 @@ void FUN_0000773c(void)
gEeprom.ScreenChannel[gEeprom.RX_CHANNEL] = Previous;
RADIO_ConfigureChannel(gEeprom.RX_CHANNEL, 2);
} else {
gInfoCHAN_A->DCS[0].Frequency = g_20000418;
RADIO_ApplyOffset(gInfoCHAN_A);
RADIO_ConfigureSquelchAndOutputPower(gInfoCHAN_A);
gRxInfo->DCS[0].Frequency = g_20000418;
RADIO_ApplyOffset(gRxInfo);
RADIO_ConfigureSquelchAndOutputPower(gRxInfo);
}
RADIO_SetupRegisters(true);
gUpdateDisplay = true;
return;
}
if (!IS_MR_CHANNEL(gInfoCHAN_A->CHANNEL_SAVE)) {
RADIO_ApplyOffset(gInfoCHAN_A);
RADIO_ConfigureSquelchAndOutputPower(gInfoCHAN_A);
SETTINGS_SaveChannel(gInfoCHAN_A->CHANNEL_SAVE, gEeprom.RX_CHANNEL, gInfoCHAN_A, 1);
if (!IS_MR_CHANNEL(gRxInfo->CHANNEL_SAVE)) {
RADIO_ApplyOffset(gRxInfo);
RADIO_ConfigureSquelchAndOutputPower(gRxInfo);
SETTINGS_SaveChannel(gRxInfo->CHANNEL_SAVE, gEeprom.RX_CHANNEL, gRxInfo, 1);
return;
}
@ -319,7 +319,7 @@ void FUN_000052f0(void)
break;
}
if (g_SquelchLost) {
if (g_20000377 == 0 && IS_NOT_NOAA_CHANNEL(gInfoCHAN_A->CHANNEL_SAVE)) {
if (g_20000377 == 0 && IS_NOT_NOAA_CHANNEL(gRxInfo->CHANNEL_SAVE)) {
switch (gCopyOfCodeType) {
case CODE_TYPE_CONTINUOUS_TONE:
if (g_CTCSS_Lost) {
@ -383,7 +383,7 @@ LAB_0000544c:
switch (Value) {
case 1:
RADIO_SetupRegisters(true);
if (206 < gInfoCHAN_A->CHANNEL_SAVE) {
if (206 < gRxInfo->CHANNEL_SAVE) {
gSystickCountdown2 = 300;
}
gUpdateDisplay = true;
@ -464,11 +464,11 @@ void FUN_000069f8(FUNCTION_Type_t Function)
}
g_20000413 = 1;
}
if (206 < gInfoCHAN_A->CHANNEL_SAVE && gIsNoaaMode) {
gInfoCHAN_A->CHANNEL_SAVE = gNoaaChannel + NOAA_CHANNEL_FIRST;
gInfoCHAN_A->pDCS_Current->Frequency = NoaaFrequencyTable[gNoaaChannel];
gInfoCHAN_A->pDCS_Reverse->Frequency = NoaaFrequencyTable[gNoaaChannel];
gEeprom.ScreenChannel[gEeprom.RX_CHANNEL] = gInfoCHAN_A->CHANNEL_SAVE;
if (206 < gRxInfo->CHANNEL_SAVE && gIsNoaaMode) {
gRxInfo->CHANNEL_SAVE = gNoaaChannel + NOAA_CHANNEL_FIRST;
gRxInfo->pDCS_Current->Frequency = NoaaFrequencyTable[gNoaaChannel];
gRxInfo->pDCS_Reverse->Frequency = NoaaFrequencyTable[gNoaaChannel];
gEeprom.ScreenChannel[gEeprom.RX_CHANNEL] = gRxInfo->CHANNEL_SAVE;
g_20000356 = 500;
gSystickFlag8 = false;
}
@ -480,7 +480,7 @@ void FUN_000069f8(FUNCTION_Type_t Function)
g_2000033A = 360;
gSystickFlag7 = false;
}
if (gInfoCHAN_A->IsAM) {
if (gRxInfo->IsAM) {
BK4819_WriteRegister(BK4819_REG_48, 0xB3A8);
g_20000474 = 0;
} else {
@ -490,7 +490,7 @@ void FUN_000069f8(FUNCTION_Type_t Function)
);
}
if (gVoiceWriteIndex == 0) {
if (gInfoCHAN_A->IsAM) {
if (gRxInfo->IsAM) {
BK4819_SetAF(BK4819_AF_AM);
} else {
BK4819_SetAF(BK4819_AF_OPEN);
@ -521,9 +521,9 @@ void APP_SetFrequencyByStep(VFO_Info_t *pInfo, int8_t Step)
void APP_MoreRadioStuff(void)
{
APP_SetFrequencyByStep(gInfoCHAN_A, gStepDirection);
RADIO_ApplyOffset(gInfoCHAN_A);
RADIO_ConfigureSquelchAndOutputPower(gInfoCHAN_A);
APP_SetFrequencyByStep(gRxInfo, gStepDirection);
RADIO_ApplyOffset(gRxInfo);
RADIO_ConfigureSquelchAndOutputPower(gRxInfo);
RADIO_SetupRegisters(true);
gUpdateDisplay = true;
ScanPauseDelayIn10msec = 10;
@ -599,13 +599,13 @@ void FUN_00007f4c(void)
} else {
gEeprom.RX_CHANNEL = 0;
}
gInfoCHAN_A = &gEeprom.VfoInfo[gEeprom.RX_CHANNEL];
gRxInfo = &gEeprom.VfoInfo[gEeprom.RX_CHANNEL];
if (gEeprom.VfoInfo[0].CHANNEL_SAVE >= NOAA_CHANNEL_FIRST) {
NOAA_IncreaseChannel();
}
} else {
gEeprom.RX_CHANNEL = gEeprom.RX_CHANNEL == 0;
gInfoCHAN_A = &gEeprom.VfoInfo[gEeprom.RX_CHANNEL];
gRxInfo = &gEeprom.VfoInfo[gEeprom.RX_CHANNEL];
}
RADIO_SetupRegisters(false);
if (gIsNoaaMode) {
@ -1399,22 +1399,22 @@ void FUN_000075b0(void)
BK4819_StopScan();
RADIO_ConfigureTX();
if (206 < gInfoCHAN_A->CHANNEL_SAVE) {
gInfoCHAN_A->CHANNEL_SAVE = 205;
if (206 < gRxInfo->CHANNEL_SAVE) {
gRxInfo->CHANNEL_SAVE = 205;
}
StepSetting = gInfoCHAN_A->STEP_SETTING;
StepFrequency = gInfoCHAN_A->StepFrequency;
RADIO_InitInfo(gInfoCHAN_A, gInfoCHAN_A->CHANNEL_SAVE, gInfoCHAN_A->Band, gInfoCHAN_A->pDCS_Current->Frequency);
StepSetting = gRxInfo->STEP_SETTING;
StepFrequency = gRxInfo->StepFrequency;
RADIO_InitInfo(gRxInfo, gRxInfo->CHANNEL_SAVE, gRxInfo->Band, gRxInfo->pDCS_Current->Frequency);
gInfoCHAN_A->STEP_SETTING = StepSetting;
gInfoCHAN_A->StepFrequency = StepFrequency;
gRxInfo->STEP_SETTING = StepSetting;
gRxInfo->StepFrequency = StepFrequency;
RADIO_SetupRegisters(true);
gIsNoaaMode = false;
if (g_20000458 == 1) {
gScanState = 1;
gScanFrequency = gInfoCHAN_A->pDCS_Current->Frequency;
gStepSetting = gInfoCHAN_A->STEP_SETTING;
gScanFrequency = gRxInfo->pDCS_Current->Frequency;
gStepSetting = gRxInfo->STEP_SETTING;
BK4819_PickRXFilterPathBasedOnFrequency(gScanFrequency);
BK4819_SetScanFrequency(gScanFrequency);
} else {
@ -1442,7 +1442,7 @@ void FUN_000075b0(void)
void APP_ChangeStepDirectionMaybe(bool bFlag, int8_t Direction)
{
RADIO_ConfigureTX();
g_20000410 = gInfoCHAN_A->CHANNEL_SAVE;
g_20000410 = gRxInfo->CHANNEL_SAVE;
g_20000415 = 0;
gStepDirection = Direction;
if (IS_MR_CHANNEL(g_20000410)) {
@ -1452,7 +1452,7 @@ void APP_ChangeStepDirectionMaybe(bool bFlag, int8_t Direction)
FUN_00007dd4();
} else {
if (bFlag) {
g_20000418 = gInfoCHAN_A->DCS[0].Frequency;
g_20000418 = gRxInfo->DCS[0].Frequency;
}
APP_MoreRadioStuff();
}
@ -1474,8 +1474,8 @@ void APP_FlipVoxSwitch(void)
void APP_CycleOutputPower(void)
{
if (++gTxRadioInfo->OUTPUT_POWER > OUTPUT_POWER_HIGH) {
gTxRadioInfo->OUTPUT_POWER = OUTPUT_POWER_LOW;
if (++gTxInfo->OUTPUT_POWER > OUTPUT_POWER_HIGH) {
gTxInfo->OUTPUT_POWER = OUTPUT_POWER_LOW;
}
gRequestSaveChannel = 1;
@ -1512,7 +1512,7 @@ void APP_StartScan(bool bFlag)
}
} else if (gScreenToDisplay != DISPLAY_SCANNER) {
RADIO_ConfigureTX();
if (IS_NOT_NOAA_CHANNEL(gInfoCHAN_A->CHANNEL_SAVE)) {
if (IS_NOT_NOAA_CHANNEL(gRxInfo->CHANNEL_SAVE)) {
GUI_SelectNextDisplay(DISPLAY_MAIN);
if (gStepDirection) {
FUN_0000773c();
@ -1530,8 +1530,8 @@ void FUN_00005770(void)
{
if (gCurrentFunction != FUNCTION_MONITOR) {
RADIO_ConfigureTX();
if (gInfoCHAN_A->CHANNEL_SAVE >= NOAA_CHANNEL_FIRST && gIsNoaaMode) {
gNoaaChannel = gInfoCHAN_A->CHANNEL_SAVE - NOAA_CHANNEL_FIRST;
if (gRxInfo->CHANNEL_SAVE >= NOAA_CHANNEL_FIRST && gIsNoaaMode) {
gNoaaChannel = gRxInfo->CHANNEL_SAVE - NOAA_CHANNEL_FIRST;
}
RADIO_SetupRegisters(true);
FUN_000069f8(FUNCTION_MONITOR);
@ -1888,9 +1888,9 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
}
if (gFlagSaveChannel) {
SETTINGS_SaveChannel(
gTxRadioInfo->CHANNEL_SAVE,
gTxInfo->CHANNEL_SAVE,
gEeprom.TX_CHANNEL,
gTxRadioInfo,
gTxInfo,
gFlagSaveChannel);
gFlagSaveChannel = false;
RADIO_ConfigureChannel(gEeprom.TX_CHANNEL, 1);
@ -2112,7 +2112,7 @@ Skip:
}
if (gRequestSaveChannel) {
if (!bKeyHeld) {
SETTINGS_SaveChannel(gTxRadioInfo->CHANNEL_SAVE, gEeprom.TX_CHANNEL, gTxRadioInfo, gRequestSaveChannel);
SETTINGS_SaveChannel(gTxInfo->CHANNEL_SAVE, gEeprom.TX_CHANNEL, gTxInfo, gRequestSaveChannel);
if (gScreenToDisplay != DISPLAY_SCANNER) {
g_2000039A = 1;
}

View File

@ -53,7 +53,7 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
if (!gWasFKeyPressed) {
INPUTBOX_Append(Key);
gRequestDisplayScreen = DISPLAY_MAIN;
if (IS_MR_CHANNEL(gTxRadioInfo->CHANNEL_SAVE)) {
if (IS_MR_CHANNEL(gTxInfo->CHANNEL_SAVE)) {
uint16_t Channel;
if (gInputBoxIndex != 3) {
@ -74,7 +74,7 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
g_2000039A = 2;
return;
}
if (IS_NOT_NOAA_CHANNEL(gTxRadioInfo->CHANNEL_SAVE)) {
if (IS_NOT_NOAA_CHANNEL(gTxInfo->CHANNEL_SAVE)) {
uint32_t Frequency;
if (gInputBoxIndex < 6) {
@ -90,18 +90,18 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
if (Frequency <= gUpperLimitFrequencyBandTable[i] && (gLowerLimitFrequencyBandTable[i] <= Frequency)) {
if (i < 7) {
gAnotherVoiceID = (VOICE_ID_t)Key;
if (gTxRadioInfo->Band != i) {
gTxRadioInfo->Band = i;
if (gTxInfo->Band != i) {
gTxInfo->Band = i;
gEeprom.ScreenChannel[Vfo] = i + FREQ_CHANNEL_FIRST;
gEeprom.FreqChannel[Vfo] = i + FREQ_CHANNEL_FIRST;
SETTINGS_SaveVfoIndices();
RADIO_ConfigureChannel(Vfo, 2);
}
Frequency += 75;
gTxRadioInfo->DCS[0].Frequency = FREQUENCY_FloorToStep(
gTxInfo->DCS[0].Frequency = FREQUENCY_FloorToStep(
Frequency,
gTxRadioInfo->StepFrequency,
gLowerLimitFrequencyBandTable[gTxRadioInfo->Band]
gTxInfo->StepFrequency,
gLowerLimitFrequencyBandTable[gTxInfo->Band]
);
gRequestSaveChannel = 1;
return;
@ -142,13 +142,13 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
break;
case KEY_1:
if (!IS_FREQ_CHANNEL(gTxRadioInfo->CHANNEL_SAVE)) {
if (!IS_FREQ_CHANNEL(gTxInfo->CHANNEL_SAVE)) {
gWasFKeyPressed = false;
g_2000036F = 1;
gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
return;
}
Band = gTxRadioInfo->Band + 1;
Band = gTxInfo->Band + 1;
if (gSetting_350EN || Band != BAND5_350MHz) {
if (BAND7_470MHz < Band) {
Band = BAND1_50MHz;
@ -156,7 +156,7 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
} else {
Band = BAND6_400MHz;
}
gTxRadioInfo->Band = Band;
gTxInfo->Band = Band;
gEeprom.ScreenChannel[Vfo] = FREQ_CHANNEL_FIRST + Band;
gEeprom.FreqChannel[Vfo] = FREQ_CHANNEL_FIRST + Band;
gRequestSaveVFO = true;
@ -184,10 +184,10 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
break;
case KEY_3:
if (gEeprom.VFO_OPEN && IS_NOT_NOAA_CHANNEL(gTxRadioInfo->CHANNEL_SAVE)) {
if (gEeprom.VFO_OPEN && IS_NOT_NOAA_CHANNEL(gTxInfo->CHANNEL_SAVE)) {
uint8_t Channel;
if (IS_MR_CHANNEL(gTxRadioInfo->CHANNEL_SAVE)) {
if (IS_MR_CHANNEL(gTxInfo->CHANNEL_SAVE)) {
gEeprom.ScreenChannel[Vfo] = gEeprom.FreqChannel[gEeprom.TX_CHANNEL];
gAnotherVoiceID = VOICE_ID_FREQUENCY_MODE;
gRequestSaveVFO = true;
@ -219,7 +219,7 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
break;
case KEY_5:
if (IS_NOT_NOAA_CHANNEL(gTxRadioInfo->CHANNEL_SAVE)) {
if (IS_NOT_NOAA_CHANNEL(gTxInfo->CHANNEL_SAVE)) {
gEeprom.ScreenChannel[Vfo] = gEeprom.NoaaChannel[gEeprom.TX_CHANNEL];
} else {
gEeprom.ScreenChannel[Vfo] = gEeprom.FreqChannel[gEeprom.TX_CHANNEL];
@ -238,7 +238,7 @@ void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
break;
case KEY_8:
gTxRadioInfo->FrequencyReverse = gTxRadioInfo->FrequencyReverse == false;
gTxInfo->FrequencyReverse = gTxInfo->FrequencyReverse == false;
gRequestSaveChannel = 1;
break;
@ -326,7 +326,7 @@ void MAIN_Key_STAR(bool bKeyPressed, bool bKeyHeld)
APP_StartScan(false);
return;
}
if (gStepDirection == 0 && IS_NOT_NOAA_CHANNEL(gTxRadioInfo->CHANNEL_SAVE)) {
if (gStepDirection == 0 && IS_NOT_NOAA_CHANNEL(gTxInfo->CHANNEL_SAVE)) {
g_200003BA = 1;
memcpy(g_20000D1C, gDTMF_String, 15);
g_200003BB = 0;
@ -341,7 +341,7 @@ void MAIN_Key_STAR(bool bKeyPressed, bool bKeyHeld)
}
gWasFKeyPressed = false;
g_2000036F = 1;
if (IS_NOT_NOAA_CHANNEL(gTxRadioInfo->CHANNEL_SAVE)) {
if (IS_NOT_NOAA_CHANNEL(gTxInfo->CHANNEL_SAVE)) {
gFlagStartScan = true;
g_20000458 = 1;
gBackupCROSS_BAND_RX_TX = gEeprom.CROSS_BAND_RX_TX;
@ -369,7 +369,7 @@ void MAIN_Key_UP_DOWN(bool bKeyPressed, bool bKeyHeld, int8_t Direction)
if (199 < Channel) {
return;
}
AUDIO_SetDigitVoice(0, gTxRadioInfo->CHANNEL_SAVE + 1);
AUDIO_SetDigitVoice(0, gTxInfo->CHANNEL_SAVE + 1);
gAnotherVoiceID = (VOICE_ID_t)0xFE;
return;
}
@ -386,7 +386,7 @@ void MAIN_Key_UP_DOWN(bool bKeyPressed, bool bKeyHeld, int8_t Direction)
uint8_t Next;
if (199 < Channel) {
APP_SetFrequencyByStep(gTxRadioInfo, Direction);
APP_SetFrequencyByStep(gTxInfo, Direction);
gRequestSaveChannel = 1;
return;
}

View File

@ -108,7 +108,7 @@ int MENU_GetLimits(uint8_t Cursor, uint8_t *pMin, uint8_t *pMax)
*pMax = 9;
break;
case MENU_STEP:
if (gTxRadioInfo->Band == BAND2_108MHz) {
if (gTxInfo->Band == BAND2_108MHz) {
*pMin = 0;
*pMax = 6;
break;
@ -212,16 +212,16 @@ void MENU_AcceptSetting(void)
return;
case MENU_STEP:
if (IS_FREQ_CHANNEL(gTxRadioInfo->CHANNEL_SAVE)) {
gTxRadioInfo->STEP_SETTING = gSubMenuSelection;
if (IS_FREQ_CHANNEL(gTxInfo->CHANNEL_SAVE)) {
gTxInfo->STEP_SETTING = gSubMenuSelection;
gRequestSaveChannel = 1;
return;
}
gSubMenuSelection = gTxRadioInfo->STEP_SETTING;
gSubMenuSelection = gTxInfo->STEP_SETTING;
return;
case MENU_TXP:
gTxRadioInfo->OUTPUT_POWER = gSubMenuSelection;
gTxInfo->OUTPUT_POWER = gSubMenuSelection;
gRequestSaveChannel = 1;
return;
@ -230,20 +230,20 @@ void MENU_AcceptSetting(void)
// Fallthrough
case MENU_R_DCS:
if (gSubMenuSelection == 0) {
if (gTxRadioInfo->DCS[Sel].CodeType != CODE_TYPE_DIGITAL && gTxRadioInfo->DCS[Sel].CodeType != CODE_TYPE_REVERSE_DIGITAL) {
if (gTxInfo->DCS[Sel].CodeType != CODE_TYPE_DIGITAL && gTxInfo->DCS[Sel].CodeType != CODE_TYPE_REVERSE_DIGITAL) {
gRequestSaveChannel = 1;
return;
}
Code = 0;
gTxRadioInfo->DCS[Sel].CodeType = CODE_TYPE_OFF;
gTxInfo->DCS[Sel].CodeType = CODE_TYPE_OFF;
} else if (gSubMenuSelection < 105) {
gTxRadioInfo->DCS[Sel].CodeType = CODE_TYPE_DIGITAL;
gTxInfo->DCS[Sel].CodeType = CODE_TYPE_DIGITAL;
Code = gSubMenuSelection - 1;
} else {
gTxRadioInfo->DCS[Sel].CodeType = CODE_TYPE_REVERSE_DIGITAL;
gTxInfo->DCS[Sel].CodeType = CODE_TYPE_REVERSE_DIGITAL;
Code = gSubMenuSelection - 105;
}
gTxRadioInfo->DCS[Sel].RX_TX_Code = Code;
gTxInfo->DCS[Sel].RX_TX_Code = Code;
gRequestSaveChannel = 1;
return;
@ -252,47 +252,47 @@ void MENU_AcceptSetting(void)
// Fallthrough
case MENU_R_CTCS:
if (gSubMenuSelection == 0) {
if (gTxRadioInfo->DCS[Sel].CodeType != CODE_TYPE_CONTINUOUS_TONE) {
if (gTxInfo->DCS[Sel].CodeType != CODE_TYPE_CONTINUOUS_TONE) {
gRequestSaveChannel = 1;
return;
}
Code = 0;
gTxRadioInfo->DCS[Sel].CodeType = CODE_TYPE_OFF;
gTxInfo->DCS[Sel].CodeType = CODE_TYPE_OFF;
} else {
gTxRadioInfo->DCS[Sel].CodeType = CODE_TYPE_CONTINUOUS_TONE;
gTxInfo->DCS[Sel].CodeType = CODE_TYPE_CONTINUOUS_TONE;
Code = gSubMenuSelection - 1;
}
gTxRadioInfo->DCS[Sel].RX_TX_Code = Code;
gTxInfo->DCS[Sel].RX_TX_Code = Code;
gRequestSaveChannel = 1;
return;
case MENU_SFT_D:
gTxRadioInfo->FREQUENCY_DEVIATION_SETTING = gSubMenuSelection;
gTxInfo->FREQUENCY_DEVIATION_SETTING = gSubMenuSelection;
gRequestSaveChannel = 1;
return;
case MENU_OFFSET:
gTxRadioInfo->FREQUENCY_OF_DEVIATION = gSubMenuSelection;
gTxInfo->FREQUENCY_OF_DEVIATION = gSubMenuSelection;
gRequestSaveChannel = 1;
return;
case MENU_W_N:
gTxRadioInfo->CHANNEL_BANDWIDTH = gSubMenuSelection;
gTxInfo->CHANNEL_BANDWIDTH = gSubMenuSelection;
gRequestSaveChannel = 1;
return;
case MENU_SCR:
gTxRadioInfo->SCRAMBLING_TYPE = gSubMenuSelection;
gTxInfo->SCRAMBLING_TYPE = gSubMenuSelection;
gRequestSaveChannel = 1;
return;
case MENU_BCL:
gTxRadioInfo->BUSY_CHANNEL_LOCK = gSubMenuSelection;
gTxInfo->BUSY_CHANNEL_LOCK = gSubMenuSelection;
gRequestSaveChannel = 1;
return;
case MENU_MEM_CH:
gTxRadioInfo->CHANNEL_SAVE = gSubMenuSelection;
gTxInfo->CHANNEL_SAVE = gSubMenuSelection;
gRequestSaveChannel = 2;
gEeprom.MrChannel[0] = gSubMenuSelection;
return;
@ -369,15 +369,15 @@ void MENU_AcceptSetting(void)
break;
case MENU_S_ADD1:
gTxRadioInfo->SCANLIST1_PARTICIPATION = gSubMenuSelection;
SETTINGS_UpdateChannel(gTxRadioInfo->CHANNEL_SAVE, gTxRadioInfo, true);
gTxInfo->SCANLIST1_PARTICIPATION = gSubMenuSelection;
SETTINGS_UpdateChannel(gTxInfo->CHANNEL_SAVE, gTxInfo, true);
g_2000039A = 1;
g_2000039B = 1;
return;
case MENU_S_ADD2:
gTxRadioInfo->SCANLIST2_PARTICIPATION = gSubMenuSelection;
SETTINGS_UpdateChannel(gTxRadioInfo->CHANNEL_SAVE, gTxRadioInfo, true);
gTxInfo->SCANLIST2_PARTICIPATION = gSubMenuSelection;
SETTINGS_UpdateChannel(gTxInfo->CHANNEL_SAVE, gTxInfo, true);
g_2000039A = 1;
g_2000039B = 1;
return;
@ -426,12 +426,12 @@ void MENU_AcceptSetting(void)
break;
case MENU_PTT_ID:
gTxRadioInfo->DTMF_PTT_ID_TX_MODE = gSubMenuSelection;
gTxInfo->DTMF_PTT_ID_TX_MODE = gSubMenuSelection;
gRequestSaveChannel = 1;
return;
case MENU_D_DCD:
gTxRadioInfo->DTMF_DECODING_ENABLE = gSubMenuSelection;
gTxInfo->DTMF_DECODING_ENABLE = gSubMenuSelection;
gRequestSaveChannel = 1;
return;
@ -455,7 +455,7 @@ void MENU_AcceptSetting(void)
break;
case MENU_AM:
gTxRadioInfo->AM_CHANNEL_MODE = gSubMenuSelection;
gTxInfo->AM_CHANNEL_MODE = gSubMenuSelection;
gRequestSaveChannel = 1;
return;
@ -573,20 +573,20 @@ void MENU_ShowCurrentSetting(void)
break;
case MENU_STEP:
gSubMenuSelection = gTxRadioInfo->STEP_SETTING;
gSubMenuSelection = gTxInfo->STEP_SETTING;
break;
case MENU_TXP:
gSubMenuSelection = gTxRadioInfo->OUTPUT_POWER;
gSubMenuSelection = gTxInfo->OUTPUT_POWER;
break;
case MENU_R_DCS:
switch (gTxRadioInfo->DCS[0].CodeType) {
switch (gTxInfo->DCS[0].CodeType) {
case CODE_TYPE_DIGITAL:
gSubMenuSelection = gTxRadioInfo->DCS[0].RX_TX_Code + 1;
gSubMenuSelection = gTxInfo->DCS[0].RX_TX_Code + 1;
break;
case CODE_TYPE_REVERSE_DIGITAL:
gSubMenuSelection = gTxRadioInfo->DCS[0].RX_TX_Code + 105;
gSubMenuSelection = gTxInfo->DCS[0].RX_TX_Code + 105;
break;
default:
gSubMenuSelection = 0;
@ -599,20 +599,20 @@ void MENU_ShowCurrentSetting(void)
break;
case MENU_R_CTCS:
if (gTxRadioInfo->DCS[0].CodeType == CODE_TYPE_CONTINUOUS_TONE) {
gSubMenuSelection = gTxRadioInfo->DCS[0].RX_TX_Code + 1;
if (gTxInfo->DCS[0].CodeType == CODE_TYPE_CONTINUOUS_TONE) {
gSubMenuSelection = gTxInfo->DCS[0].RX_TX_Code + 1;
} else {
gSubMenuSelection = 0;
}
break;
case MENU_T_DCS:
switch (gTxRadioInfo->DCS[1].CodeType) {
switch (gTxInfo->DCS[1].CodeType) {
case CODE_TYPE_DIGITAL:
gSubMenuSelection = gTxRadioInfo->DCS[1].RX_TX_Code + 1;
gSubMenuSelection = gTxInfo->DCS[1].RX_TX_Code + 1;
break;
case CODE_TYPE_REVERSE_DIGITAL:
gSubMenuSelection = gTxRadioInfo->DCS[1].RX_TX_Code + 105;
gSubMenuSelection = gTxInfo->DCS[1].RX_TX_Code + 105;
break;
default:
gSubMenuSelection = 0;
@ -621,31 +621,31 @@ void MENU_ShowCurrentSetting(void)
break;
case MENU_T_CTCS:
if (gTxRadioInfo->DCS[1].CodeType == CODE_TYPE_CONTINUOUS_TONE) {
gSubMenuSelection = gTxRadioInfo->DCS[1].RX_TX_Code + 1;
if (gTxInfo->DCS[1].CodeType == CODE_TYPE_CONTINUOUS_TONE) {
gSubMenuSelection = gTxInfo->DCS[1].RX_TX_Code + 1;
} else {
gSubMenuSelection = 0;
}
break;
case MENU_SFT_D:
gSubMenuSelection = gTxRadioInfo->FREQUENCY_DEVIATION_SETTING;
gSubMenuSelection = gTxInfo->FREQUENCY_DEVIATION_SETTING;
break;
case MENU_OFFSET:
gSubMenuSelection = gTxRadioInfo->FREQUENCY_OF_DEVIATION;
gSubMenuSelection = gTxInfo->FREQUENCY_OF_DEVIATION;
break;
case MENU_W_N:
gSubMenuSelection = gTxRadioInfo->CHANNEL_BANDWIDTH;
gSubMenuSelection = gTxInfo->CHANNEL_BANDWIDTH;
break;
case MENU_SCR:
gSubMenuSelection = gTxRadioInfo->SCRAMBLING_TYPE;
gSubMenuSelection = gTxInfo->SCRAMBLING_TYPE;
break;
case MENU_BCL:
gSubMenuSelection = gTxRadioInfo->BUSY_CHANNEL_LOCK;
gSubMenuSelection = gTxInfo->BUSY_CHANNEL_LOCK;
break;
case MENU_MEM_CH:
@ -701,11 +701,11 @@ void MENU_ShowCurrentSetting(void)
break;
case MENU_S_ADD1:
gSubMenuSelection = gTxRadioInfo->SCANLIST1_PARTICIPATION;
gSubMenuSelection = gTxInfo->SCANLIST1_PARTICIPATION;
break;
case MENU_S_ADD2:
gSubMenuSelection = gTxRadioInfo->SCANLIST2_PARTICIPATION;
gSubMenuSelection = gTxInfo->SCANLIST2_PARTICIPATION;
break;
case MENU_STE:
@ -757,11 +757,11 @@ void MENU_ShowCurrentSetting(void)
break;
case MENU_PTT_ID:
gSubMenuSelection = gTxRadioInfo->DTMF_PTT_ID_TX_MODE;
gSubMenuSelection = gTxInfo->DTMF_PTT_ID_TX_MODE;
break;
case MENU_D_DCD:
gSubMenuSelection = gTxRadioInfo->DTMF_DECODING_ENABLE;
gSubMenuSelection = gTxInfo->DTMF_DECODING_ENABLE;
break;
case MENU_D_LIST:
@ -777,7 +777,7 @@ void MENU_ShowCurrentSetting(void)
break;
case MENU_AM:
gSubMenuSelection = gTxRadioInfo->AM_CHANNEL_MODE;
gSubMenuSelection = gTxInfo->AM_CHANNEL_MODE;
break;
case MENU_NOAA_S:
@ -863,7 +863,7 @@ void MENU_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
NUMBER_Get(gInputBox, &Frequency);
Frequency += 75;
gAnotherVoiceID = (VOICE_ID_t)Key;
gSubMenuSelection = FREQUENCY_FloorToStep(Frequency, gTxRadioInfo->StepFrequency, 0);
gSubMenuSelection = FREQUENCY_FloorToStep(Frequency, gTxInfo->StepFrequency, 0);
return;
}
if (gMenuCursor == MENU_MEM_CH || gMenuCursor == MENU_DEL_CH || gMenuCursor == MENU_1_CALL) {
@ -1003,7 +1003,7 @@ void MENU_Key_STAR(bool bKeyPressed, bool bKeyHeld)
if (!bKeyHeld && bKeyPressed) {
g_20000396 = 1;
RADIO_ConfigureTX();
if (IS_NOT_NOAA_CHANNEL(gInfoCHAN_A->CHANNEL_SAVE) && !gInfoCHAN_A->IsAM) {
if (IS_NOT_NOAA_CHANNEL(gRxInfo->CHANNEL_SAVE) && !gRxInfo->IsAM) {
if (gMenuCursor == MENU_R_CTCS || gMenuCursor == MENU_R_DCS) {
if (g_20000381 == 0) {
FUN_000074f8(1);
@ -1056,7 +1056,7 @@ void MENU_Key_UP_DOWN(bool bKeyPressed, bool bKeyHeld, int8_t Direction)
if (gMenuCursor == MENU_OFFSET) {
int32_t Offset;
Offset = (Direction * gTxRadioInfo->StepFrequency) + gSubMenuSelection;
Offset = (Direction * gTxInfo->StepFrequency) + gSubMenuSelection;
if (Offset < 99999990) {
if (Offset < 0) {
Offset = 99999990;
@ -1064,7 +1064,7 @@ void MENU_Key_UP_DOWN(bool bKeyPressed, bool bKeyHeld, int8_t Direction)
} else {
Offset = 0;
}
gSubMenuSelection = FREQUENCY_FloorToStep(Offset, gTxRadioInfo->StepFrequency, 0);
gSubMenuSelection = FREQUENCY_FloorToStep(Offset, gTxInfo->StepFrequency, 0);
gRequestDisplayScreen = DISPLAY_MENU;
return;
}

View File

@ -140,10 +140,10 @@ void SCANNER_Key_MENU(bool bKeyPressed, bool bKeyHeld)
gScanFrequency = Freq250;
}
}
if (IS_MR_CHANNEL(gTxRadioInfo->CHANNEL_SAVE)) {
if (IS_MR_CHANNEL(gTxInfo->CHANNEL_SAVE)) {
gScannerEditState = 1;
gScanChannel = gTxRadioInfo->CHANNEL_SAVE;
gShowChPrefix = RADIO_CheckValidChannel(gTxRadioInfo->CHANNEL_SAVE, false, 0);
gScanChannel = gTxInfo->CHANNEL_SAVE;
gShowChPrefix = RADIO_CheckValidChannel(gTxInfo->CHANNEL_SAVE, false, 0);
} else {
gScannerEditState = 2;
}
@ -162,30 +162,30 @@ void SCANNER_Key_MENU(bool bKeyPressed, bool bKeyHeld)
case 2:
if (g_20000458 == 0) {
RADIO_InitInfo(gTxRadioInfo, gTxRadioInfo->CHANNEL_SAVE, FREQUENCY_GetBand(gScanFrequency), gScanFrequency);
RADIO_InitInfo(gTxInfo, gTxInfo->CHANNEL_SAVE, FREQUENCY_GetBand(gScanFrequency), gScanFrequency);
if (g_2000045C == 1) {
gTxRadioInfo->DCS[0].CodeType = g_CxCSS_Type;
gTxRadioInfo->DCS[0].RX_TX_Code = g_CxCSS_Index;
gTxInfo->DCS[0].CodeType = g_CxCSS_Type;
gTxInfo->DCS[0].RX_TX_Code = g_CxCSS_Index;
}
gTxRadioInfo->DCS[1] = gTxRadioInfo->DCS[0];
gTxRadioInfo->STEP_SETTING = gStepSetting;
gTxInfo->DCS[1] = gTxInfo->DCS[0];
gTxInfo->STEP_SETTING = gStepSetting;
} else {
RADIO_ConfigureChannel(0, 2);
RADIO_ConfigureChannel(1, 2);
gTxRadioInfo->DCS[0].CodeType = g_CxCSS_Type;
gTxRadioInfo->DCS[0].RX_TX_Code = g_CxCSS_Index;
gTxRadioInfo->DCS[1].CodeType = g_CxCSS_Type;
gTxRadioInfo->DCS[1].RX_TX_Code = g_CxCSS_Index;
gTxInfo->DCS[0].CodeType = g_CxCSS_Type;
gTxInfo->DCS[0].RX_TX_Code = g_CxCSS_Index;
gTxInfo->DCS[1].CodeType = g_CxCSS_Type;
gTxInfo->DCS[1].RX_TX_Code = g_CxCSS_Index;
}
if (IS_MR_CHANNEL(gTxRadioInfo->CHANNEL_SAVE)) {
if (IS_MR_CHANNEL(gTxInfo->CHANNEL_SAVE)) {
Channel = gScanChannel;
gEeprom.MrChannel[gEeprom.TX_CHANNEL] = Channel;
} else {
Channel = gTxRadioInfo->Band + FREQ_CHANNEL_FIRST;
Channel = gTxInfo->Band + FREQ_CHANNEL_FIRST;
gEeprom.FreqChannel[gEeprom.TX_CHANNEL] = Channel;
}
gTxRadioInfo->CHANNEL_SAVE = Channel;
gTxInfo->CHANNEL_SAVE = Channel;
gEeprom.ScreenChannel[gEeprom.TX_CHANNEL] = Channel;
gAnotherVoiceID = VOICE_ID_CONFIRM;
gRequestDisplayScreen = DISPLAY_SCANNER;

View File

@ -209,7 +209,7 @@ void AUDIO_PlaySingleVoice(bool bFlag)
if (bFlag) {
SYSTEM_DelayMs(Delay * 10);
if (gCurrentFunction == FUNCTION_4 || gCurrentFunction == FUNCTION_MONITOR) {
if (gInfoCHAN_A->IsAM == true) {
if (gRxInfo->IsAM) {
BK4819_SetAF(BK4819_AF_AM);
} else {
BK4819_SetAF(BK4819_AF_OPEN);
@ -324,7 +324,7 @@ void AUDIO_PlayQueuedVoice(void)
}
if (gCurrentFunction == FUNCTION_4 || gCurrentFunction == FUNCTION_MONITOR) {
if (gInfoCHAN_A->IsAM == true) {
if (gRxInfo->IsAM) {
BK4819_SetAF(BK4819_AF_AM);
} else {
BK4819_SetAF(BK4819_AF_OPEN);

View File

@ -36,13 +36,13 @@ FUNCTION_Type_t gCurrentFunction;
void FUNCTION_Init(void)
{
if (IS_NOT_NOAA_CHANNEL(gInfoCHAN_A->CHANNEL_SAVE)) {
if (IS_NOT_NOAA_CHANNEL(gRxInfo->CHANNEL_SAVE)) {
gCopyOfCodeType = gCodeType;
if (g_20000381 == 0) {
if (gInfoCHAN_A->IsAM == true) {
if (gRxInfo->IsAM) {
gCopyOfCodeType = CODE_TYPE_OFF;
} else {
gCopyOfCodeType = gInfoCHAN_A->pDCS_Current->CodeType;
gCopyOfCodeType = gRxInfo->pDCS_Current->CodeType;
}
}
} else {
@ -183,7 +183,7 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
}
g_200003BE = 0;
Delay = gEeprom.DTMF_PRELOAD_TIME;
if (gEeprom.DTMF_SIDE_TONE == true) {
if (gEeprom.DTMF_SIDE_TONE) {
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
g_2000036B = 1;
Delay = gEeprom.DTMF_PRELOAD_TIME;

View File

@ -73,11 +73,11 @@ void BOOT_ProcessMode(BOOT_Mode_t Mode)
gEeprom.KEY_2_SHORT_PRESS_ACTION = 0;
gEeprom.KEY_2_LONG_PRESS_ACTION = 0;
RADIO_InitInfo(gInfoCHAN_A, 205, 5, 41002500);
gInfoCHAN_A->CHANNEL_BANDWIDTH = BANDWIDTH_NARROW;
gInfoCHAN_A->OUTPUT_POWER = 0;
RADIO_ConfigureSquelchAndOutputPower(gInfoCHAN_A);
gCrossTxRadioInfo = gInfoCHAN_A;
RADIO_InitInfo(gRxInfo, 205, 5, 41002500);
gRxInfo->CHANNEL_BANDWIDTH = BANDWIDTH_NARROW;
gRxInfo->OUTPUT_POWER = 0;
RADIO_ConfigureSquelchAndOutputPower(gRxInfo);
gCrossTxRadioInfo = gRxInfo;
RADIO_SetupRegisters(true);
BK4819_SetupAircopy();
BK4819_ResetFSK();

42
radio.c
View File

@ -30,8 +30,8 @@
#include "radio.h"
#include "settings.h"
VFO_Info_t *gTxRadioInfo;
VFO_Info_t *gInfoCHAN_A;
VFO_Info_t *gTxInfo;
VFO_Info_t *gRxInfo;
VFO_Info_t *gCrossTxRadioInfo;
DCS_CodeType_t gCodeType;
@ -444,7 +444,7 @@ void RADIO_ConfigureTX(void)
gEeprom.TX_CHANNEL = 0;
}
gTxRadioInfo = &gEeprom.VfoInfo[gEeprom.TX_CHANNEL];
gTxInfo = &gEeprom.VfoInfo[gEeprom.TX_CHANNEL];
gEeprom.RX_CHANNEL = gEeprom.TX_CHANNEL;
if (gEeprom.CROSS_BAND_RX_TX != CROSS_BAND_OFF) {
if (gEeprom.TX_CHANNEL == 0) {
@ -454,13 +454,13 @@ void RADIO_ConfigureTX(void)
}
}
gInfoCHAN_A = &gEeprom.VfoInfo[gEeprom.RX_CHANNEL];
gRxInfo = &gEeprom.VfoInfo[gEeprom.RX_CHANNEL];
RADIO_ConfigureCrossTX();
}
void RADIO_ConfigureCrossTX(void)
{
gCrossTxRadioInfo = gInfoCHAN_A;
gCrossTxRadioInfo = gRxInfo;
if (gEeprom.CROSS_BAND_RX_TX != CROSS_BAND_OFF) {
gCrossTxRadioInfo = &gEeprom.VfoInfo[gEeprom.TX_CHANNEL];
}
@ -477,7 +477,7 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
g_2000036B = 0;
BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28, false);
Bandwidth = gInfoCHAN_A->CHANNEL_BANDWIDTH;
Bandwidth = gRxInfo->CHANNEL_BANDWIDTH;
if (Bandwidth != BK4819_FILTER_BW_WIDE) {
Bandwidth = BK4819_FILTER_BW_NARROW;
}
@ -497,16 +497,16 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
}
BK4819_WriteRegister(BK4819_REG_3F, 0);
BK4819_WriteRegister(BK4819_REG_7D, gEeprom.MIC_SENSITIVITY_TUNING | 0xE940);
if (IS_NOT_NOAA_CHANNEL(gInfoCHAN_A->CHANNEL_SAVE) || !gIsNoaaMode) {
Frequency = gInfoCHAN_A->pDCS_Current->Frequency;
if (IS_NOT_NOAA_CHANNEL(gRxInfo->CHANNEL_SAVE) || !gIsNoaaMode) {
Frequency = gRxInfo->pDCS_Current->Frequency;
} else {
Frequency = NoaaFrequencyTable[gNoaaChannel];
}
BK4819_SetFrequency(Frequency);
BK4819_SetupSquelch(
gInfoCHAN_A->SquelchOpenRSSIThresh, gInfoCHAN_A->SquelchCloseRSSIThresh,
gInfoCHAN_A->SquelchOpenNoiseThresh, gInfoCHAN_A->SquelchCloseNoiseThresh,
gInfoCHAN_A->SquelchCloseGlitchThresh, gInfoCHAN_A->SquelchOpenGlitchThresh);
gRxInfo->SquelchOpenRSSIThresh, gRxInfo->SquelchCloseRSSIThresh,
gRxInfo->SquelchOpenNoiseThresh, gRxInfo->SquelchCloseNoiseThresh,
gRxInfo->SquelchCloseGlitchThresh, gRxInfo->SquelchOpenGlitchThresh);
BK4819_PickRXFilterPathBasedOnFrequency(Frequency);
BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2, true);
BK4819_WriteRegister(BK4819_REG_48, 0xB3A8);
@ -516,16 +516,16 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
| BK4819_REG_3F_SQUELCH_LOST
;
if (IS_NOT_NOAA_CHANNEL(gInfoCHAN_A->CHANNEL_SAVE)) {
if (gInfoCHAN_A->IsAM != true) {
if (IS_NOT_NOAA_CHANNEL(gRxInfo->CHANNEL_SAVE)) {
if (gRxInfo->IsAM != true) {
uint8_t CodeType;
uint8_t CodeWord;
CodeType = gCodeType;
CodeWord = gCode;
if (g_20000381 == 0) {
CodeType = gInfoCHAN_A->pDCS_Current->CodeType;
CodeWord = gInfoCHAN_A->pDCS_Current->RX_TX_Code;
CodeType = gRxInfo->pDCS_Current->CodeType;
CodeWord = gRxInfo->pDCS_Current->RX_TX_Code;
}
switch (CodeType) {
case CODE_TYPE_DIGITAL:
@ -560,10 +560,10 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
;
break;
}
if (gInfoCHAN_A->SCRAMBLING_TYPE == 0 || gSetting_ScrambleEnable == false) {
if (gRxInfo->SCRAMBLING_TYPE == 0 || gSetting_ScrambleEnable == false) {
BK4819_DisableScramble();
} else {
BK4819_EnableScramble(gInfoCHAN_A->SCRAMBLING_TYPE - 1);
BK4819_EnableScramble(gRxInfo->SCRAMBLING_TYPE - 1);
}
}
} else {
@ -585,7 +585,7 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
} else {
BK4819_DisableVox();
}
if (gInfoCHAN_A->IsAM || (!gInfoCHAN_A->DTMF_DECODING_ENABLE && !gSetting_KILLED)) {
if (gRxInfo->IsAM || (!gRxInfo->DTMF_DECODING_ENABLE && !gSetting_KILLED)) {
BK4819_DisableDTMF();
} else {
BK4819_EnableDTMF();
@ -622,9 +622,9 @@ void RADIO_ConfigureNOAA(void)
gIsNoaaMode = true;
return;
}
if (gInfoCHAN_A->CHANNEL_SAVE >= NOAA_CHANNEL_FIRST) {
if (gRxInfo->CHANNEL_SAVE >= NOAA_CHANNEL_FIRST) {
gIsNoaaMode = true;
gNoaaChannel = gInfoCHAN_A->CHANNEL_SAVE - NOAA_CHANNEL_FIRST;
gNoaaChannel = gRxInfo->CHANNEL_SAVE - NOAA_CHANNEL_FIRST;
g_20000356 = 50;
gSystickFlag8 = 0;
}
@ -704,7 +704,7 @@ void RADIO_SomethingWithTransmit(void)
gSystickFlag7 = 0;
if (g_2000041F == 0) {
gEeprom.RX_CHANNEL = gEeprom.TX_CHANNEL;
gInfoCHAN_A = gEeprom.VfoInfo + gEeprom.TX_CHANNEL;
gRxInfo = gEeprom.VfoInfo + gEeprom.TX_CHANNEL;
}
g_2000041F = 1;
}

View File

@ -96,8 +96,8 @@ typedef struct VFO_Info_t {
char Name[16];
} VFO_Info_t;
extern VFO_Info_t *gTxRadioInfo;
extern VFO_Info_t *gInfoCHAN_A;
extern VFO_Info_t *gTxInfo;
extern VFO_Info_t *gRxInfo;
extern VFO_Info_t *gCrossTxRadioInfo;
extern DCS_CodeType_t gCodeType;

View File

@ -40,7 +40,7 @@ void UI_DisplayAircopy(void)
UI_PrintString(String, 2, 127, 0, 8, true);
if (gInputBoxIndex == 0) {
NUMBER_ToDigits(gInfoCHAN_A->DCS[0].Frequency, String);
NUMBER_ToDigits(gRxInfo->DCS[0].Frequency, String);
UI_DisplayFrequency(String, 16, 2, 0, 0);
UI_DisplaySmallDigits(2, String + 6, 97, 3);
} else {

View File

@ -293,9 +293,9 @@ void UI_DisplayMain(void)
uint8_t Level = 0;
if (SomeValue == 1) {
if (gInfoCHAN_A->OUTPUT_POWER == OUTPUT_POWER_LOW) {
if (gRxInfo->OUTPUT_POWER == OUTPUT_POWER_LOW) {
Level = 2;
} else if (gInfoCHAN_A->OUTPUT_POWER == OUTPUT_POWER_MID) {
} else if (gRxInfo->OUTPUT_POWER == OUTPUT_POWER_MID) {
Level = 4;
} else {
Level = 6;

View File

@ -73,13 +73,13 @@ void UI_UpdateRSSI(uint16_t RSSI)
{
uint8_t Level;
if (RSSI >= gEEPROM_RSSI_CALIB[gInfoCHAN_A->Band][3]) {
if (RSSI >= gEEPROM_RSSI_CALIB[gRxInfo->Band][3]) {
Level = 6;
} else if (RSSI >= gEEPROM_RSSI_CALIB[gInfoCHAN_A->Band][2]) {
} else if (RSSI >= gEEPROM_RSSI_CALIB[gRxInfo->Band][2]) {
Level = 4;
} else if (RSSI >= gEEPROM_RSSI_CALIB[gInfoCHAN_A->Band][1]) {
} else if (RSSI >= gEEPROM_RSSI_CALIB[gRxInfo->Band][1]) {
Level = 2;
} else if (RSSI >= gEEPROM_RSSI_CALIB[gInfoCHAN_A->Band][0]) {
} else if (RSSI >= gEEPROM_RSSI_CALIB[gRxInfo->Band][0]) {
Level = 1;
} else {
Level = 0;