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

Updated TX_UNLOCK menu option, renamed scanner files to remove confusion with freq/chan scanner

Browse Source
This commit is contained in:
OneOfEleven
2023-10-14 14:07:05 +01:00
parent c5859c2bf5
commit ca78b7411c
22 changed files with 76 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ui/menu.c
View File

@ -281,15 +281,28 @@ const char g_sub_menu_RESET[2][4] =
"ALL"
};
const char g_sub_menu_freq_lock[6][8] =
{
"OFF",
"FCC",
"CE",
"GB",
"430 MHz",
"438 MHz"
};
#ifdef ENABLE_TX_UNLOCK
const char g_sub_menu_freq_lock[7][9] =
{
"NORMAL",
"FCC",
"CE",
"GB",
"430 MHz",
"438 MHz",
"UNLOCKED"
};
#else
const char g_sub_menu_freq_lock[6][8] =
{
"NORMAL",
"FCC",
"CE",
"GB",
"430 MHz",
"438 MHz"
};
#endif
const char g_sub_menu_backlight[8][7] =
{
@ -1015,14 +1028,7 @@ void UI_DisplayMenu(void)
break;
case MENU_FREQ_LOCK:
#ifdef ENABLE_TX_EVERYWHERE
if (g_sub_menu_selection == FREQ_LOCK_OFF)
strcpy(String, " WARNING!\nTX\nUNLOCKED");
else
strcpy(String, g_sub_menu_freq_lock[g_sub_menu_selection]);
#else
strcpy(String, g_sub_menu_freq_lock[g_sub_menu_selection]);
#endif
strcpy(String, g_sub_menu_freq_lock[g_sub_menu_selection]);
break;
#ifdef ENABLE_F_CAL_MENU

6
ui/menu.h
View File

@ -165,7 +165,11 @@ extern const char g_sub_menu_PTT_ID[5][15];
extern const char g_sub_menu_pwr_on_msg[4][14];
extern const char g_sub_menu_roger_mode[3][16];
extern const char g_sub_menu_RESET[2][4];
extern const char g_sub_menu_freq_lock[6][8];
#ifdef ENABLE_TX_UNLOCK
extern const char g_sub_menu_freq_lock[7][9];
#else
extern const char g_sub_menu_freq_lock[6][8];
#endif
extern const char g_sub_menu_backlight[8][7];
extern const char g_sub_menu_rx_tx[4][6];
#ifdef ENABLE_AM_FIX_TEST1

4
ui/scanner.c → ui/search.c
View File

@ -17,7 +17,7 @@
#include <stdbool.h>
#include <string.h>
#include "app/scanner.h"
#include "app/search.h"
#include "board.h"
#include "dcs.h"
#include "driver/st7565.h"
@ -26,7 +26,7 @@
#include "misc.h"
#include "radio.h"
#include "ui/helper.h"
#include "ui/scanner.h"
#include "ui/search.h"
#include "ui/ui.h"
void UI_DisplaySearch(void)

4
ui/scanner.h → ui/search.h
View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef UI_SCANNER_H
#define UI_SCANNER_H
#ifndef UI_SEARCH_H
#define UI_SEARCH_H
void UI_DisplaySearch(void);

2
ui/status.c
View File

@ -16,7 +16,7 @@
#include <string.h>
#include "app/scanner.h"
#include "app/search.h"
#ifdef ENABLE_FMRADIO
#include "app/fm.h"
#endif

4
ui/ui.c
View File

@ -20,7 +20,7 @@
#ifdef ENABLE_FMRADIO
#include "app/fm.h"
#endif
#include "app/scanner.h"
#include "app/search.h"
#include "driver/keyboard.h"
#include "misc.h"
#ifdef ENABLE_AIRCOPY
@ -32,7 +32,7 @@
#include "ui/inputbox.h"
#include "ui/main.h"
#include "ui/menu.h"
#include "ui/scanner.h"
#include "ui/search.h"
#include "ui/ui.h"
gui_display_type_t g_screen_to_display;