mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-06-19 14:48:03 +03:00
Code Issues Releases Activity

Fix F+3 and F+* search freq step size when saving result

Browse Source
This commit is contained in:
OneOfEleven
2023-10-13 15:12:32 +01:00
parent bc416c7433
commit 7f7c9490eb
30 changed files with 652 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ui/main.c
View File

@ -599,12 +599,12 @@ void UI_DisplayMain(void)
}
else
{
uint32_t frequency = g_eeprom.vfo_info[vfo_num].pRX->frequency;
uint32_t frequency = g_eeprom.vfo_info[vfo_num].p_rx->frequency;
if (g_current_function == FUNCTION_TRANSMIT)
{ // transmitting
channel = (g_eeprom.cross_vfo_rx_tx == CROSS_BAND_OFF) ? g_eeprom.rx_vfo : g_eeprom.tx_vfo;
if (channel == vfo_num)
frequency = g_eeprom.vfo_info[vfo_num].pTX->frequency;
frequency = g_eeprom.vfo_info[vfo_num].p_tx->frequency;
}
if (g_eeprom.screen_channel[vfo_num] <= USER_CHANNEL_LAST)
@ -741,7 +741,7 @@ void UI_DisplayMain(void)
}
else
{ // or show the CTCSS/DCS symbol
const freq_config_t *pConfig = (mode == 1) ? g_eeprom.vfo_info[vfo_num].pTX : g_eeprom.vfo_info[vfo_num].pRX;
const freq_config_t *pConfig = (mode == 1) ? g_eeprom.vfo_info[vfo_num].p_tx : g_eeprom.vfo_info[vfo_num].p_rx;
const unsigned int code_type = pConfig->code_type;
const char *code_list[] = {"", "CT", "DCS", "DCR"};
if (code_type < ARRAY_SIZE(code_list))

70
ui/scanner.c
View File

@ -29,12 +29,12 @@
#include "ui/scanner.h"
#include "ui/ui.h"
void UI_DisplayScanner(void)
void UI_DisplaySearch(void)
{
char String[17];
bool text_centered = false;
if (g_screen_to_display != DISPLAY_SCANNER)
if (g_screen_to_display != DISPLAY_SEARCH)
return;
// clear display buffer
@ -46,27 +46,27 @@ void UI_DisplayScanner(void)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough="
switch (g_scan_css_state)
switch (g_search_css_state)
{
default:
case SCAN_CSS_STATE_OFF:
if (!g_scan_single_frequency)
case SEARCH_CSS_STATE_OFF:
if (!g_search_single_frequency)
{
strcpy(String, "FREQ scanning");
break;
}
case SCAN_CSS_STATE_SCANNING:
case SCAN_CSS_STATE_FOUND:
case SCAN_CSS_STATE_FAILED:
case SCAN_CSS_STATE_REPEAT:
case SEARCH_CSS_STATE_SCANNING:
case SEARCH_CSS_STATE_FOUND:
case SEARCH_CSS_STATE_FAILED:
case SEARCH_CSS_STATE_REPEAT:
{
const uint32_t freq = g_scan_frequency;
const uint32_t freq = g_search_frequency;
sprintf(String, "FREQ %u.%05u", freq / 100000, freq % 100000);
}
break;
case SCAN_CSS_STATE_FREQ_FAILED:
case SEARCH_CSS_STATE_FREQ_FAILED:
strcpy(String, "FREQ none found");
break;
}
@ -80,37 +80,37 @@ void UI_DisplayScanner(void)
memset(String, 0, sizeof(String));
switch (g_scan_css_state)
switch (g_search_css_state)
{
default:
case SCAN_CSS_STATE_OFF:
case SEARCH_CSS_STATE_OFF:
strcpy(String, "CODE");
break;
case SCAN_CSS_STATE_SCANNING:
case SEARCH_CSS_STATE_SCANNING:
strcpy(String, "CODE scanning");
break;
case SCAN_CSS_STATE_FOUND:
case SCAN_CSS_STATE_REPEAT:
case SEARCH_CSS_STATE_FOUND:
case SEARCH_CSS_STATE_REPEAT:
switch (g_scan_css_result_type)
switch (g_search_css_result_type)
{
default:
case CODE_TYPE_NONE:
strcpy(String, "CODE none found");
break;
case CODE_TYPE_CONTINUOUS_TONE:
sprintf(String, "CTCSS %u.%uHz", CTCSS_OPTIONS[g_scan_css_result_code] / 10, CTCSS_OPTIONS[g_scan_css_result_code] % 10);
sprintf(String, "CTCSS %u.%uHz", CTCSS_OPTIONS[g_search_css_result_code] / 10, CTCSS_OPTIONS[g_search_css_result_code] % 10);
break;
case CODE_TYPE_DIGITAL:
case CODE_TYPE_REVERSE_DIGITAL:
sprintf(String, "CDCSS D%03oN", DCS_OPTIONS[g_scan_css_result_code]);
sprintf(String, "CDCSS D%03oN", DCS_OPTIONS[g_search_css_result_code]);
break;
}
break;
case SCAN_CSS_STATE_FAILED:
case SEARCH_CSS_STATE_FAILED:
strcpy(String, "CODE none found");
break;
}
@ -125,36 +125,36 @@ void UI_DisplayScanner(void)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough="
switch (g_scanner_edit_state)
switch (g_search_edit_state)
{
default:
case SCAN_EDIT_STATE_NONE:
case SEARCH_EDIT_STATE_NONE:
switch (g_scan_css_state)
switch (g_search_css_state)
{
default:
case SCAN_CSS_STATE_OFF:
case SCAN_CSS_STATE_SCANNING: // rolling indicator
case SEARCH_CSS_STATE_OFF:
case SEARCH_CSS_STATE_SCANNING: // rolling indicator
memset(String, 0, sizeof(String));
memset(String, '.', 15);
String[(g_scan_freq_css_timer_10ms / 32) % 15] = '#';
String[(g_search_freq_css_timer_10ms / 32) % 15] = '#';
break;
case SCAN_CSS_STATE_FOUND:
case SEARCH_CSS_STATE_FOUND:
strcpy(String, "* repeat M save");
text_centered = true;
break;
case SCAN_CSS_STATE_FAILED:
if (!g_scan_single_frequency)
case SEARCH_CSS_STATE_FAILED:
if (!g_search_single_frequency)
{
strcpy(String, "* repeat M save");
text_centered = true;
break;
}
case SCAN_CSS_STATE_FREQ_FAILED:
case SCAN_CSS_STATE_REPEAT:
case SEARCH_CSS_STATE_FREQ_FAILED:
case SEARCH_CSS_STATE_REPEAT:
strcpy(String, "* repeat");
text_centered = true;
break;
@ -162,18 +162,18 @@ void UI_DisplayScanner(void)
break;
case SCAN_EDIT_STATE_SAVE_CHAN:
case SEARCH_EDIT_STATE_SAVE_CHAN:
strcpy(String, "SAVE ");
{
char s[11];
BOARD_fetchChannelName(s, g_scan_channel);
BOARD_fetchChannelName(s, g_search_channel);
if (s[0] == 0)
UI_GenerateChannelStringEx(s, g_show_chan_prefix ? "CH-" : "", g_scan_channel);
UI_GenerateChannelStringEx(s, g_search_show_chan_prefix ? "CH-" : "", g_search_channel);
strcat(String, s);
}
break;
case SCAN_EDIT_STATE_SAVE_CONFIRM:
case SEARCH_EDIT_STATE_SAVE_CONFIRM:
strcpy(String, "* repeat Save ?");
text_centered = true;
break;

2
ui/scanner.h
View File

@ -17,7 +17,7 @@
#ifndef UI_SCANNER_H
#define UI_SCANNER_H
void UI_DisplayScanner(void);
void UI_DisplaySearch(void);
#endif

4
ui/status.c
View File

@ -95,9 +95,9 @@ void UI_DisplayStatus(const bool test_display)
else
#endif
// SCAN indicator
if (g_scan_state_dir != SCAN_OFF || g_screen_to_display == DISPLAY_SCANNER || test_display)
if (g_scan_state_dir != SCAN_STATE_DIR_OFF || g_screen_to_display == DISPLAY_SEARCH || test_display)
{
if (g_next_channel <= USER_CHANNEL_LAST)
if (g_scan_next_channel <= USER_CHANNEL_LAST)
{ // channel mode
if (g_eeprom.scan_list_default == 0)
UI_PrintStringSmallBuffer("1", line + x);

6
ui/ui.c
View File

@ -61,8 +61,8 @@ void GUI_DisplayScreen(void)
UI_DisplayMenu();
break;
case DISPLAY_SCANNER:
UI_DisplayScanner();
case DISPLAY_SEARCH:
UI_DisplaySearch();
break;
#ifdef ENABLE_AIRCOPY
@ -88,7 +88,7 @@ void GUI_SelectNextDisplay(gui_display_type_t Display)
g_input_box_index = 0;
g_is_in_sub_menu = false;
g_css_scan_mode = CSS_SCAN_MODE_OFF;
g_scan_state_dir = SCAN_OFF;
g_scan_state_dir = SCAN_STATE_DIR_OFF;
#ifdef ENABLE_FMRADIO
g_fm_scan_state = FM_SCAN_OFF;
#endif

2
ui/ui.h
View File

@ -25,7 +25,7 @@ enum gui_display_type_e
DISPLAY_MAIN = 0,
DISPLAY_FM,
DISPLAY_MENU,
DISPLAY_SCANNER,
DISPLAY_SEARCH,
DISPLAY_AIRCOPY,
DISPLAY_INVALID // 0xff
};