Add missing tab

This commit is contained in:
Armel FAUVEAU
2024-08-16 02:13:49 +02:00
parent 17d6b44327
commit 9b4e59f776
3 changed files with 1303 additions and 1049 deletions

View File

@@ -344,14 +344,14 @@ void SCANNER_Start(bool singleFreq)
gScanDelay_10ms = scan_delay_10ms; gScanDelay_10ms = scan_delay_10ms;
gScanCssResultCode = 0xFF; gScanCssResultCode = 0xFF;
gScanCssResultType = 0xFF; gScanCssResultType = 0xFF;
scanHitCount = 0; scanHitCount = 0;
gScanUseCssResult = false; gScanUseCssResult = false;
g_CxCSS_TAIL_Found = false; g_CxCSS_TAIL_Found = false;
g_CDCSS_Lost = false; g_CDCSS_Lost = false;
gCDCSSCodeType = 0; gCDCSSCodeType = 0;
g_CTCSS_Lost = false; g_CTCSS_Lost = false;
#ifdef ENABLE_VOX #ifdef ENABLE_VOX
g_VOX_Lost = false; g_VOX_Lost = false;
#endif #endif
g_SquelchLost = false; g_SquelchLost = false;
gScannerSaveState = SCAN_SAVE_NO_PROMPT; gScannerSaveState = SCAN_SAVE_NO_PROMPT;
@@ -365,8 +365,8 @@ void SCANNER_Stop(void)
gVfoConfigureMode = VFO_CONFIGURE_RELOAD; gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
gFlagResetVfos = true; gFlagResetVfos = true;
gUpdateStatus = true; gUpdateStatus = true;
gCssBackgroundScan = false; gCssBackgroundScan = false;
gScanUseCssResult = false; gScanUseCssResult = false;
#ifdef ENABLE_VOICE #ifdef ENABLE_VOICE
gAnotherVoiceID = VOICE_ID_CANCEL; gAnotherVoiceID = VOICE_ID_CANCEL;
#endif #endif
@@ -414,7 +414,7 @@ void SCANNER_TimeSlice10ms(void)
BK4819_SetScanFrequency(gScanFrequency); BK4819_SetScanFrequency(gScanFrequency);
gScanCssResultCode = 0xFF; gScanCssResultCode = 0xFF;
gScanCssResultType = 0xFF; gScanCssResultType = 0xFF;
scanHitCount = 0; scanHitCount = 0;
gScanUseCssResult = false; gScanUseCssResult = false;
gScanProgressIndicator = 0; gScanProgressIndicator = 0;
gScanCssState = SCAN_CSS_STATE_SCANNING; gScanCssState = SCAN_CSS_STATE_SCANNING;

File diff suppressed because it is too large Load Diff

View File

@@ -41,12 +41,34 @@
static const uint8_t DrawingEndY = 40; static const uint8_t DrawingEndY = 40;
static const uint8_t U8RssiMap[] = { static const uint8_t U8RssiMap[] = {
121, 115, 109, 103, 97, 91, 85, 79, 73, 63, 121,
115,
109,
103,
97,
91,
85,
79,
73,
63,
}; };
static const uint16_t scanStepValues[] = { static const uint16_t scanStepValues[] = {
1, 10, 50, 100, 250, 500, 625, 833, 1,
1000, 1250, 1500, 2000, 2500, 5000, 10000, 10,
50,
100,
250,
500,
625,
833,
1000,
1250,
1500,
2000,
2500,
5000,
10000,
}; };
static const uint16_t scanStepBWRegValues[] = { static const uint16_t scanStepBWRegValues[] = {
@@ -84,71 +106,78 @@ static const uint16_t listenBWRegValues[] = {
0b0100100001011000, // 6.25 0b0100100001011000, // 6.25
}; };
typedef enum State { typedef enum State
SPECTRUM, {
FREQ_INPUT, SPECTRUM,
STILL, FREQ_INPUT,
STILL,
} State; } State;
typedef enum StepsCount { typedef enum StepsCount
STEPS_128, {
STEPS_64, STEPS_128,
STEPS_32, STEPS_64,
STEPS_16, STEPS_32,
STEPS_16,
} StepsCount; } StepsCount;
typedef enum ScanStep { typedef enum ScanStep
S_STEP_0_01kHz, {
S_STEP_0_1kHz, S_STEP_0_01kHz,
S_STEP_0_5kHz, S_STEP_0_1kHz,
S_STEP_1_0kHz, S_STEP_0_5kHz,
S_STEP_1_0kHz,
S_STEP_2_5kHz, S_STEP_2_5kHz,
S_STEP_5_0kHz, S_STEP_5_0kHz,
S_STEP_6_25kHz, S_STEP_6_25kHz,
S_STEP_8_33kHz, S_STEP_8_33kHz,
S_STEP_10_0kHz, S_STEP_10_0kHz,
S_STEP_12_5kHz, S_STEP_12_5kHz,
S_STEP_15_0kHz, S_STEP_15_0kHz,
S_STEP_20_0kHz, S_STEP_20_0kHz,
S_STEP_25_0kHz, S_STEP_25_0kHz,
S_STEP_50_0kHz, S_STEP_50_0kHz,
S_STEP_100_0kHz, S_STEP_100_0kHz,
} ScanStep; } ScanStep;
typedef struct SpectrumSettings { typedef struct SpectrumSettings
uint32_t frequencyChangeStep; {
StepsCount stepsCount; uint32_t frequencyChangeStep;
ScanStep scanStepIndex; StepsCount stepsCount;
uint16_t scanDelay; ScanStep scanStepIndex;
uint16_t rssiTriggerLevel; uint16_t scanDelay;
BK4819_FilterBandwidth_t bw; uint16_t rssiTriggerLevel;
BK4819_FilterBandwidth_t listenBw; BK4819_FilterBandwidth_t bw;
int dbMin; BK4819_FilterBandwidth_t listenBw;
int dbMax; int dbMin;
ModulationMode_t modulationType; int dbMax;
bool backlightState; ModulationMode_t modulationType;
bool backlightState;
} SpectrumSettings; } SpectrumSettings;
typedef struct KeyboardState { typedef struct KeyboardState
KEY_Code_t current; {
KEY_Code_t prev; KEY_Code_t current;
uint8_t counter; KEY_Code_t prev;
uint8_t counter;
} KeyboardState; } KeyboardState;
typedef struct ScanInfo { typedef struct ScanInfo
uint16_t rssi, rssiMin, rssiMax; {
uint16_t i, iPeak; uint16_t rssi, rssiMin, rssiMax;
uint32_t f, fPeak; uint16_t i, iPeak;
uint16_t scanStep; uint32_t f, fPeak;
uint16_t measurementsCount; uint16_t scanStep;
uint16_t measurementsCount;
} ScanInfo; } ScanInfo;
typedef struct PeakInfo { typedef struct PeakInfo
uint16_t t; {
uint16_t rssi; uint16_t t;
uint32_t f; uint16_t rssi;
uint16_t i; uint32_t f;
uint16_t i;
} PeakInfo; } PeakInfo;
void APP_RunSpectrum(void); void APP_RunSpectrum(void);