mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-06-19 06:39:49 +03:00
Code Issues Releases Activity

ALARM option now removable

Browse Source
This commit is contained in:
OneOfEleven
2023-09-09 09:01:52 +01:00
parent 43e61bf0a1
commit 5b260e2ee0
21 changed files with 314 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ui/main.c
View File

@ -153,11 +153,13 @@ void UI_DisplayMain(void)
if (gCurrentFunction == FUNCTION_TRANSMIT)
{
if (gAlarmState == ALARM_STATE_ALARM)
{
SomeValue = 2;
}
else
#ifndef DISABLE_ALARM
if (gAlarmState == ALARM_STATE_ALARM)
{
SomeValue = 2;
}
else
#endif
{
if (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF)
Channel = gEeprom.RX_CHANNEL;
@ -214,16 +216,19 @@ void UI_DisplayMain(void)
// 0x8FEC
uint8_t State = VfoState[i];
if (gCurrentFunction == FUNCTION_TRANSMIT && gAlarmState == ALARM_STATE_ALARM)
{
if (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF)
Channel = gEeprom.RX_CHANNEL;
else
Channel = gEeprom.TX_CHANNEL;
if (Channel == i)
State = VFO_STATE_ALARM;
}
#ifndef DISABLE_ALARM
if (gCurrentFunction == FUNCTION_TRANSMIT && gAlarmState == ALARM_STATE_ALARM)
{
if (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF)
Channel = gEeprom.RX_CHANNEL;
else
Channel = gEeprom.TX_CHANNEL;
if (Channel == i)
State = VFO_STATE_ALARM;
}
#endif
if (State)
{
uint8_t Width = 10;

26
ui/menu.c
View File

@ -72,7 +72,9 @@ static const char MenuList[][7] =
"SLIST1",
// 32
"SLIST2",
"AL-MOD",
#ifndef DISABLE_ALARM
"AL-MOD",
#endif
"ANI-ID",
"UPCODE",
"DWCODE",
@ -195,11 +197,13 @@ static const char gSubMenu_MDF[3][5] =
"NAME",
};
static const char gSubMenu_AL_MOD[2][5] =
{
"SITE",
"TONE",
};
#ifndef DISABLE_ALARM
static const char gSubMenu_AL_MOD[2][5] =
{
"SITE",
"TONE",
};
#endif
static const char gSubMenu_D_RSP[4][6] =
{
@ -441,10 +445,12 @@ void UI_DisplayMenu(void)
sprintf(String, "LIST%d", gSubMenuSelection);
break;
case MENU_AL_MOD:
sprintf(String, gSubMenu_AL_MOD[gSubMenuSelection]);
break;
#ifndef DISABLE_ALARM
case MENU_AL_MOD:
sprintf(String, gSubMenu_AL_MOD[gSubMenuSelection]);
break;
#endif
case MENU_ANI_ID:
strcpy(String, gEeprom.ANI_DTMF_ID);
break;

4
ui/menu.h
View File

@ -57,7 +57,9 @@ enum
MENU_S_LIST,
MENU_SLIST1,
MENU_SLIST2,
MENU_AL_MOD,
#ifndef DISABLE_ALARM
MENU_AL_MOD,
#endif
MENU_ANI_ID,
MENU_UPCODE,
MENU_DWCODE,