zhangyuheng/custom-uv-k5-firmware
1
0
Fork 0
forked from mirror/uv-k5-firmware
Code Pull Requests Activity

More scanner renames.

Browse Source
This commit is contained in:
Dual Tachyon 2023-09-03 00:34:45 +01:00
parent ba14e42dad
commit ae4e3cf4dd
6 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/app.c
View File

@ -930,24 +930,24 @@ void APP_TimeSlice10ms(void)
Delta = -Delta;
}
if (Delta < 100) {
g_2000045F++;
gScanHitCount++;
} else {
g_2000045F = 0;
gScanHitCount = 0;
}
BK4819_DisableFrequencyScan();
if (g_2000045F < 3) {
if (gScanHitCount < 3) {
BK4819_EnableFrequencyScan();
} else {
BK4819_SetScanFrequency(gScanFrequency);
gCS_ScannedIndex = 0xFF;
gCS_ScannedType = 0xFF;
g_2000045F = 0;
g_2000045C = 0;
gScanCssResultIndex = 0xFF;
gScanCssResultType = 0xFF;
gScanHitCount = 0;
gScanUseCssResult = false;
gScanProgressIndicator = 0;
gScanCssState = SCAN_CSS_STATE_SCANNING;
GUI_SelectNextDisplay(DISPLAY_SCANNER);
}
g_2000045D = 0x15;
g_2000045D = 21;
break;
case SCAN_CSS_STATE_SCANNING:
@ -961,32 +961,32 @@ void APP_TimeSlice10ms(void)
Index = DCS_GetCdcssIndex(Result);
if (Index != 0xFF) {
gCS_ScannedIndex = Index;
gCS_ScannedType = CODE_TYPE_DIGITAL;
gScanCssResultIndex = Index;
gScanCssResultType = CODE_TYPE_DIGITAL;
gScanCssState = SCAN_CSS_STATE_FOUND;
g_2000045C = 1;
gScanUseCssResult = true;
}
} else if (ScanResult == BK4819_CSS_RESULT_CTCSS) {
uint8_t Index;
Index = DCS_GetCtcssIndex(CtcssFreq);
if (Index != 0xFF) {
if (Index == gCS_ScannedIndex && gCS_ScannedType == CODE_TYPE_CONTINUOUS_TONE) {
g_2000045F++;
if (1 < g_2000045F) {
if (Index == gScanCssResultIndex && gScanCssResultType == CODE_TYPE_CONTINUOUS_TONE) {
gScanHitCount++;
if (gScanHitCount >= 2) {
gScanCssState = SCAN_CSS_STATE_FOUND;
g_2000045C = 1;
gScanUseCssResult = true;
}
} else {
g_2000045F = 0;
gScanHitCount = 0;
}
gCS_ScannedType = CODE_TYPE_CONTINUOUS_TONE;
gCS_ScannedIndex = Index;
gScanCssResultType = CODE_TYPE_CONTINUOUS_TONE;
gScanCssResultIndex = Index;
}
}
if (gScanCssState < SCAN_CSS_STATE_FOUND) {
BK4819_SetScanFrequency(gScanFrequency);
g_2000045D = 0x15;
g_2000045D = 21;
break;
}
GUI_SelectNextDisplay(DISPLAY_SCANNER);
@ -1233,11 +1233,11 @@ void FUN_000075b0(void)
BK4819_PickRXFilterPathBasedOnFrequency(0xFFFFFFFF);
BK4819_EnableFrequencyScan();
}
g_2000045D = 0x15;
gCS_ScannedIndex = 0xFF;
gCS_ScannedType = 0xFF;
g_2000045F = 0;
g_2000045C = 0;
g_2000045D = 21;
gScanCssResultIndex = 0xFF;
gScanCssResultType = 0xFF;
gScanHitCount = 0;
gScanUseCssResult = false;
gDTMF_RequestPending = false;
g_CxCSS_TAIL_Found = false;
g_CDCSS_Lost = false;

20
app/scanner.c
View File

@ -24,8 +24,8 @@
#include "ui/inputbox.h"
#include "ui/ui.h"
DCS_CodeType_t gCS_ScannedType;
uint8_t gCS_ScannedIndex;
DCS_CodeType_t gScanCssResultType;
uint8_t gScanCssResultIndex;
bool gFlagStartScan;
bool gFlagStopScan;
bool gScanSingleFrequency;
@ -37,6 +37,8 @@ SCAN_CssState_t gScanCssState;
volatile bool gScheduleScanListen;
volatile uint16_t ScanPauseDelayIn10msec;
uint8_t gScanProgressIndicator;
uint8_t gScanHitCount;
bool gScanUseCssResult;
static void SCANNER_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
{
@ -178,19 +180,19 @@ static void SCANNER_Key_MENU(bool bKeyPressed, bool bKeyHeld)
case 2:
if (!gScanSingleFrequency) {
RADIO_InitInfo(gTxInfo, gTxInfo->CHANNEL_SAVE, FREQUENCY_GetBand(gScanFrequency), gScanFrequency);
if (g_2000045C == 1) {
gTxInfo->ConfigRX.CodeType = gCS_ScannedType;
gTxInfo->ConfigRX.Code = gCS_ScannedIndex;
if (gScanUseCssResult) {
gTxInfo->ConfigRX.CodeType = gScanCssResultType;
gTxInfo->ConfigRX.Code = gScanCssResultIndex;
}
gTxInfo->ConfigTX = gTxInfo->ConfigRX;
gTxInfo->STEP_SETTING = gStepSetting;
} else {
RADIO_ConfigureChannel(0, 2);
RADIO_ConfigureChannel(1, 2);
gTxInfo->ConfigRX.CodeType = gCS_ScannedType;
gTxInfo->ConfigRX.Code = gCS_ScannedIndex;
gTxInfo->ConfigTX.CodeType = gCS_ScannedType;
gTxInfo->ConfigTX.Code = gCS_ScannedIndex;
gTxInfo->ConfigRX.CodeType = gScanCssResultType;
gTxInfo->ConfigRX.Code = gScanCssResultIndex;
gTxInfo->ConfigTX.CodeType = gScanCssResultType;
gTxInfo->ConfigTX.Code = gScanCssResultIndex;
}
if (IS_MR_CHANNEL(gTxInfo->CHANNEL_SAVE)) {

6
app/scanner.h
View File

@ -29,8 +29,8 @@ enum SCAN_CssState_t {
typedef enum SCAN_CssState_t SCAN_CssState_t;
extern DCS_CodeType_t gCS_ScannedType;
extern uint8_t gCS_ScannedIndex;
extern DCS_CodeType_t gScanCssResultType;
extern uint8_t gScanCssResultIndex;
extern bool gFlagStartScan;
extern bool gFlagStopScan;
extern bool gScanSingleFrequency;
@ -42,6 +42,8 @@ extern SCAN_CssState_t gScanCssState;
extern volatile bool gScheduleScanListen;
extern volatile uint16_t ScanPauseDelayIn10msec;
extern uint8_t gScanProgressIndicator;
extern uint8_t gScanHitCount;
extern bool gScanUseCssResult;
void SCANNER_ProcessKeys(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld);

2
misc.c
View File

@ -125,9 +125,7 @@ uint8_t gPttDebounceCounter;
bool g_20000439;
uint8_t gMenuListCount;
uint8_t gBackupCROSS_BAND_RX_TX;
uint8_t g_2000045C;
uint8_t g_2000045D;
uint8_t g_2000045F;
uint8_t gAircopySendCountdown;
uint8_t gFSKWriteIndex;
uint8_t g_20000474;

2
misc.h
View File

@ -159,9 +159,7 @@ extern uint8_t gPttDebounceCounter;
extern bool g_20000439;
extern uint8_t gMenuListCount;
extern uint8_t gBackupCROSS_BAND_RX_TX;
extern uint8_t g_2000045C;
extern uint8_t g_2000045D;
extern uint8_t g_2000045F;
extern uint8_t gAircopySendCountdown;
extern uint8_t gFSKWriteIndex;
extern uint8_t g_20000474;

8
ui/scanner.c
View File

@ -41,12 +41,12 @@ void UI_DisplayScanner(void)
UI_PrintString(String, 2, 127, 1, 8, 0);
memset(String, 0, sizeof(String));
if (gScanCssState < SCAN_CSS_STATE_FOUND || g_2000045C != 1) {
if (gScanCssState < SCAN_CSS_STATE_FOUND || !gScanUseCssResult) {
sprintf(String, "CTC:******");
} else if (gCS_ScannedType == CODE_TYPE_CONTINUOUS_TONE) {
sprintf(String, "CTC:%.1fHz", CTCSS_Options[gCS_ScannedIndex] * 0.1);
} else if (gScanCssResultType == CODE_TYPE_CONTINUOUS_TONE) {
sprintf(String, "CTC:%.1fHz", CTCSS_Options[gScanCssResultIndex] * 0.1);
} else {
sprintf(String, "DCS:D%03oN", DCS_Options[gCS_ScannedIndex]);
sprintf(String, "DCS:D%03oN", DCS_Options[gScanCssResultIndex]);
}
UI_PrintString(String, 2, 127, 3, 8, 0);
memset(String, 0, sizeof(String));