mirror/uv-k5-firmware
2
0
Fork 1
mirror of https://github.com/DualTachyon/uv-k5-firmware.git synced 2025-02-23 18:00:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed alarm variables.

Browse Source
This commit is contained in:
Dual Tachyon 2023-09-02 23:45:11 +01:00
parent f0ef85e904
commit ba14e42dad
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/action.c
View File

@ -146,7 +146,7 @@ static void ACTION_AlarmOr1750(bool b1750)
} else {
gAlarmState = ALARM_STATE_TXALARM;
}
g_20000422 = 0;
gAlarmRunningCounter = 0;
g_200003A0 = 1;
gRequestDisplayScreen = DISPLAY_MAIN;
}

22
app/app.c
View File

@ -853,19 +853,19 @@ void APP_TimeSlice10ms(void)
}
if (gCurrentFunction == FUNCTION_TRANSMIT) {
if (gAlarmState == ALARM_STATE_TXALARM || gAlarmState == ALARM_STATE_ALARM) {
uint16_t Value;
uint16_t Tone;
g_20000422++;
g_20000420++;
gAlarmRunningCounter++;
gAlarmToneCounter++;
Value = 500 + (g_20000420 * 25);
if (Value > 1500) {
Value = 500;
g_20000420 = 0;
Tone = 500 + (gAlarmToneCounter * 25);
if (Tone > 1500) {
Tone = 500;
gAlarmToneCounter = 0;
}
BK4819_SetScrambleFrequencyControlWord(Value);
if (gEeprom.ALARM_MODE == ALARM_MODE_TONE && g_20000422 == 512) {
g_20000422 = 0;
BK4819_SetScrambleFrequencyControlWord(Tone);
if (gEeprom.ALARM_MODE == ALARM_MODE_TONE && gAlarmRunningCounter == 512) {
gAlarmRunningCounter = 0;
if (gAlarmState == ALARM_STATE_TXALARM) {
gAlarmState = ALARM_STATE_ALARM;
RADIO_EnableCxCSS();
@ -883,7 +883,7 @@ void APP_TimeSlice10ms(void)
SYSTEM_DelayMs(2);
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
gEnableSpeaker = true;
g_20000420 = 0;
gAlarmToneCounter = 0;
}
}
}

4
functions.c
View File

@ -150,7 +150,7 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
gBatterySaveCountdown = 1000;
gSchedulePowerSave = false;
g_2000038E = 0;
g_20000420 = 0;
gAlarmToneCounter = 0;
return;
}
@ -168,7 +168,7 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
}
SYSTEM_DelayMs(2);
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
g_20000420 = 0;
gAlarmToneCounter = 0;
g_2000038E = 0;
gEnableSpeaker = true;
gSchedulePowerSave = false;

4
misc.c
View File

@ -117,8 +117,8 @@ uint8_t g_20000415;
uint8_t g_20000416;
uint32_t g_20000418;
uint8_t g_2000041F;
uint8_t g_20000420;
uint16_t g_20000422;
uint8_t gAlarmToneCounter;
uint16_t gAlarmRunningCounter;
bool gKeyBeingHeld;
bool gPttIsPressed;
uint8_t gPttDebounceCounter;

4
misc.h
View File

@ -151,8 +151,8 @@ extern uint8_t g_20000415;
extern uint8_t g_20000416;
extern uint32_t g_20000418;
extern uint8_t g_2000041F;
extern uint8_t g_20000420;
extern uint16_t g_20000422;
extern uint8_t gAlarmToneCounter;
extern uint16_t gAlarmRunningCounter;
extern bool gKeyBeingHeld;
extern bool gPttIsPressed;
extern uint8_t gPttDebounceCounter;