forked from mirror/uv-k5-firmware
Mostly cosmetic changes.
This commit is contained in:
Dual Tachyon
parent
76712d1fb0
commit
8e4cf653e4
39
app/action.c
39
app/action.c
@ -71,7 +71,7 @@ static void ACTION_Monitor(void)
|
||||
if (gStepDirection) {
|
||||
ScanPauseDelayIn10msec = 500;
|
||||
gScheduleScanListen = false;
|
||||
gScanPauseMode = 1;
|
||||
gScanPauseMode = true;
|
||||
}
|
||||
if (gEeprom.DUAL_WATCH == DUAL_WATCH_OFF && gIsNoaaMode) {
|
||||
gNOAA_Countdown = 500;
|
||||
@ -86,7 +86,7 @@ static void ACTION_Monitor(void)
|
||||
}
|
||||
}
|
||||
|
||||
void ACTION_Scan(bool bFlag)
|
||||
void ACTION_Scan(bool bRestart)
|
||||
{
|
||||
if (gFmRadioMode) {
|
||||
if (gCurrentFunction != FUNCTION_RECEIVE && gCurrentFunction != FUNCTION_MONITOR && gCurrentFunction != FUNCTION_TRANSMIT) {
|
||||
@ -96,22 +96,21 @@ void ACTION_Scan(bool bFlag)
|
||||
if (gFM_Step) {
|
||||
FM_PlayAndUpdate();
|
||||
gAnotherVoiceID = VOICE_ID_SCANNING_STOP;
|
||||
return;
|
||||
}
|
||||
if (bFlag) {
|
||||
gFM_AutoScan = true;
|
||||
gFM_ChannelPosition = 0;
|
||||
FM_EraseChannels();
|
||||
Frequency = gEeprom.FM_LowerLimit;
|
||||
} else {
|
||||
gFM_AutoScan = false;
|
||||
gFM_ChannelPosition = 0;
|
||||
Frequency = gEeprom.FM_FrequencyPlaying;
|
||||
if (bRestart) {
|
||||
gFM_AutoScan = true;
|
||||
gFM_ChannelPosition = 0;
|
||||
FM_EraseChannels();
|
||||
Frequency = gEeprom.FM_LowerLimit;
|
||||
} else {
|
||||
gFM_AutoScan = false;
|
||||
gFM_ChannelPosition = 0;
|
||||
Frequency = gEeprom.FM_FrequencyPlaying;
|
||||
}
|
||||
BK1080_GetFrequencyDeviation(Frequency);
|
||||
FM_Tune(Frequency, 1, bRestart);
|
||||
gAnotherVoiceID = VOICE_ID_SCANNING_BEGIN;
|
||||
}
|
||||
BK1080_GetFrequencyDeviation(Frequency);
|
||||
FM_Tune(Frequency, 1, bFlag);
|
||||
gAnotherVoiceID = VOICE_ID_SCANNING_BEGIN;
|
||||
return;
|
||||
}
|
||||
} else if (gScreenToDisplay != DISPLAY_SCANNER) {
|
||||
RADIO_SelectVfos();
|
||||
@ -120,11 +119,11 @@ void ACTION_Scan(bool bFlag)
|
||||
if (gStepDirection) {
|
||||
FUN_0000773c();
|
||||
gAnotherVoiceID = VOICE_ID_SCANNING_STOP;
|
||||
return;
|
||||
} else {
|
||||
APP_SetStepDirection(true, 1);
|
||||
AUDIO_SetVoiceID(0, VOICE_ID_SCANNING_BEGIN);
|
||||
AUDIO_PlaySingleVoice(true);
|
||||
}
|
||||
APP_SetStepDirection(true, 1);
|
||||
AUDIO_SetVoiceID(0, VOICE_ID_SCANNING_BEGIN);
|
||||
AUDIO_PlaySingleVoice(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
12
app/app.c
12
app/app.c
@ -326,10 +326,10 @@ void APP_StartListening(FUNCTION_Type_t Function)
|
||||
if (gStepDirection) {
|
||||
switch (gEeprom.SCAN_RESUME_MODE) {
|
||||
case SCAN_RESUME_TO:
|
||||
if (gScanPauseMode == 0) {
|
||||
if (!gScanPauseMode) {
|
||||
ScanPauseDelayIn10msec = 500;
|
||||
gScheduleScanListen = false;
|
||||
gScanPauseMode = 1;
|
||||
gScanPauseMode = true;
|
||||
}
|
||||
break;
|
||||
case SCAN_RESUME_CO:
|
||||
@ -669,7 +669,7 @@ void APP_Update(void)
|
||||
FUN_00007dd4();
|
||||
}
|
||||
}
|
||||
gScanPauseMode = 0;
|
||||
gScanPauseMode = false;
|
||||
gRxReceptionMode = RX_MODE_NONE;
|
||||
gScheduleScanListen = false;
|
||||
}
|
||||
@ -695,7 +695,7 @@ void APP_Update(void)
|
||||
GUI_SelectNextDisplay(DISPLAY_MAIN);
|
||||
}
|
||||
g_2000041F = 0;
|
||||
gScanPauseMode = 0;
|
||||
gScanPauseMode = false;
|
||||
gRxReceptionMode = RX_MODE_NONE;
|
||||
gScheduleDualWatch = false;
|
||||
}
|
||||
@ -971,7 +971,7 @@ void APP_TimeSlice10ms(void)
|
||||
|
||||
case SCAN_CSS_STATE_SCANNING:
|
||||
ScanResult = BK4819_GetCxCSSScanResult(&Result, &CtcssFreq);
|
||||
if (ScanResult == 0) {
|
||||
if (ScanResult == BK4819_CSS_RESULT_NOT_FOUND) {
|
||||
break;
|
||||
}
|
||||
BK4819_Disable();
|
||||
@ -1287,7 +1287,7 @@ void APP_SetStepDirection(bool bFlag, int8_t Direction)
|
||||
ScanPauseDelayIn10msec = 50;
|
||||
gScheduleScanListen = false;
|
||||
gRxReceptionMode = RX_MODE_NONE;
|
||||
gScanPauseMode = 0;
|
||||
gScanPauseMode = false;
|
||||
g_20000413 = false;
|
||||
}
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ bool gScanSingleFrequency;
|
||||
uint8_t gScannerEditState;
|
||||
uint8_t gScanChannel;
|
||||
uint32_t gScanFrequency;
|
||||
uint8_t gScanPauseMode;
|
||||
bool gScanPauseMode;
|
||||
SCAN_CssState_t gScanCssState;
|
||||
volatile bool gScheduleScanListen = true;
|
||||
volatile uint16_t ScanPauseDelayIn10msec;
|
||||
|
||||
@ -37,7 +37,7 @@ extern bool gScanSingleFrequency;
|
||||
extern uint8_t gScannerEditState;
|
||||
extern uint8_t gScanChannel;
|
||||
extern uint32_t gScanFrequency;
|
||||
extern uint8_t gScanPauseMode;
|
||||
extern bool gScanPauseMode;
|
||||
extern SCAN_CssState_t gScanCssState;
|
||||
extern volatile bool gScheduleScanListen;
|
||||
extern volatile uint16_t ScanPauseDelayIn10msec;
|
||||
|
||||
73
scheduler.c
73
scheduler.c
@ -21,6 +21,15 @@
|
||||
#include "misc.h"
|
||||
#include "settings.h"
|
||||
|
||||
#define DECREMENT_AND_TRIGGER(cnt, flag) \
|
||||
do { \
|
||||
if (cnt) { \
|
||||
if (--cnt == 0) { \
|
||||
flag = true; \
|
||||
} \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
static volatile uint32_t gGlobalSysTickCounter;
|
||||
|
||||
void SystickHandler(void);
|
||||
@ -31,12 +40,7 @@ void SystickHandler(void)
|
||||
gNextTimeslice = true;
|
||||
if ((gGlobalSysTickCounter % 50) == 0) {
|
||||
gNextTimeslice500ms = true;
|
||||
if (gTxTimerCountdown) {
|
||||
gTxTimerCountdown--;
|
||||
if (gTxTimerCountdown == 0) {
|
||||
gTxTimeoutReached = true;
|
||||
}
|
||||
}
|
||||
DECREMENT_AND_TRIGGER(gTxTimerCountdown, gTxTimeoutReached);
|
||||
}
|
||||
if ((gGlobalSysTickCounter & 3) == 0) {
|
||||
gNextTimeslice40ms = true;
|
||||
@ -50,27 +54,17 @@ void SystickHandler(void)
|
||||
if (gFoundCTCSSCountdown) {
|
||||
gFoundCTCSSCountdown--;
|
||||
}
|
||||
if (gCurrentFunction == FUNCTION_0 && gBatterySaveCountdown) {
|
||||
gBatterySaveCountdown--;
|
||||
if (gBatterySaveCountdown == 0) {
|
||||
gSchedulePowerSave = true;
|
||||
}
|
||||
if (gCurrentFunction == FUNCTION_0) {
|
||||
DECREMENT_AND_TRIGGER(gBatterySaveCountdown, gSchedulePowerSave);
|
||||
}
|
||||
if (gCurrentFunction == FUNCTION_POWER_SAVE && gBatterySave) {
|
||||
gBatterySave--;
|
||||
if (gBatterySave == 0) {
|
||||
gBatterySaveCountdownExpired = true;
|
||||
}
|
||||
if (gCurrentFunction == FUNCTION_POWER_SAVE) {
|
||||
DECREMENT_AND_TRIGGER(gBatterySave, gBatterySaveCountdownExpired);
|
||||
}
|
||||
|
||||
if (gStepDirection == 0 && gCssScanMode == CSS_SCAN_MODE_OFF && gEeprom.DUAL_WATCH != DUAL_WATCH_OFF) {
|
||||
if (gCurrentFunction != FUNCTION_MONITOR && gCurrentFunction != FUNCTION_TRANSMIT) {
|
||||
if (gCurrentFunction != FUNCTION_RECEIVE) {
|
||||
if (gDualWatchCountdown) {
|
||||
gDualWatchCountdown--;
|
||||
if (!gDualWatchCountdown) {
|
||||
gScheduleDualWatch = true;
|
||||
}
|
||||
}
|
||||
DECREMENT_AND_TRIGGER(gDualWatchCountdown, gScheduleDualWatch);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -78,49 +72,24 @@ void SystickHandler(void)
|
||||
if (gStepDirection == 0 && gCssScanMode == CSS_SCAN_MODE_OFF && gEeprom.DUAL_WATCH == DUAL_WATCH_OFF) {
|
||||
if (gIsNoaaMode && gCurrentFunction != FUNCTION_MONITOR && gCurrentFunction != FUNCTION_TRANSMIT) {
|
||||
if (gCurrentFunction != FUNCTION_RECEIVE) {
|
||||
if (gNOAA_Countdown) {
|
||||
gNOAA_Countdown--;
|
||||
if (gNOAA_Countdown == 0) {
|
||||
gScheduleNOAA = true;
|
||||
}
|
||||
}
|
||||
DECREMENT_AND_TRIGGER(gNOAA_Countdown, gScheduleNOAA);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (gStepDirection || gCssScanMode == CSS_SCAN_MODE_SCANNING) {
|
||||
if (gCurrentFunction != FUNCTION_MONITOR && gCurrentFunction != FUNCTION_TRANSMIT) {
|
||||
if (ScanPauseDelayIn10msec) {
|
||||
ScanPauseDelayIn10msec--;
|
||||
if (ScanPauseDelayIn10msec == 0) {
|
||||
gScheduleScanListen = true;
|
||||
}
|
||||
}
|
||||
DECREMENT_AND_TRIGGER(ScanPauseDelayIn10msec, gScheduleScanListen);
|
||||
}
|
||||
}
|
||||
|
||||
if (g_20000342) {
|
||||
g_20000342--;
|
||||
if (g_20000342 == 0) {
|
||||
gSystickFlag10 = true;
|
||||
}
|
||||
}
|
||||
DECREMENT_AND_TRIGGER(g_20000342, gSystickFlag10);
|
||||
|
||||
if (gCountdownToPlayNextVoice) {
|
||||
gCountdownToPlayNextVoice--;
|
||||
if (gCountdownToPlayNextVoice == 0) {
|
||||
gFlagPlayQueuedVoice = true;
|
||||
}
|
||||
}
|
||||
DECREMENT_AND_TRIGGER(gCountdownToPlayNextVoice, gFlagPlayQueuedVoice);
|
||||
|
||||
if (gFM_Step && gCurrentFunction != FUNCTION_MONITOR) {
|
||||
if (gCurrentFunction != FUNCTION_TRANSMIT && gCurrentFunction != FUNCTION_RECEIVE) {
|
||||
if (gFmPlayCountdown) {
|
||||
gFmPlayCountdown--;
|
||||
if (gFmPlayCountdown == 0) {
|
||||
gScheduleFM = true;
|
||||
}
|
||||
}
|
||||
DECREMENT_AND_TRIGGER(gFmPlayCountdown, gScheduleFM);
|
||||
}
|
||||
}
|
||||
if (gVoxStopCountdown) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user