ALARM option now removable

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

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;