mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-04-28 22:31:25 +03:00
Code Issues Releases Activity

Fix 1750 compile warning

Browse Source
This commit is contained in:
OneOfEleven 2023-10-10 10:42:22 +01:00
parent d212d44ab5
commit 47357fb113
6 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -11,8 +11,8 @@ ENABLE_UART := 1
ENABLE_UART_DEBUG := 1 ENABLE_UART_DEBUG := 1
ENABLE_AIRCOPY := 1 ENABLE_AIRCOPY := 1
ENABLE_FMRADIO := 1 ENABLE_FMRADIO := 1
ENABLE_NOAA := 1 ENABLE_NOAA := 0
ENABLE_VOICE := 0 ENABLE_VOICE := 1
ENABLE_VOX := 1 ENABLE_VOX := 1
ENABLE_ALARM := 1 ENABLE_ALARM := 1
ENABLE_TX1750 := 1 ENABLE_TX1750 := 1
@ -25,7 +25,7 @@ ENABLE_1250HZ_STEP := 1
ENABLE_TX_WHEN_AM := 0 ENABLE_TX_WHEN_AM := 0
ENABLE_F_CAL_MENU := 0 ENABLE_F_CAL_MENU := 0
ENABLE_CTCSS_TAIL_PHASE_SHIFT := 1 ENABLE_CTCSS_TAIL_PHASE_SHIFT := 1
ENABLE_BOOT_BEEPS := 1 ENABLE_BOOT_BEEPS := 0
ENABLE_SHOW_CHARGE_LEVEL := 0 ENABLE_SHOW_CHARGE_LEVEL := 0
ENABLE_REVERSE_BAT_SYMBOL := 1 ENABLE_REVERSE_BAT_SYMBOL := 1
ENABLE_CODE_SCAN_TIMEOUT := 0 ENABLE_CODE_SCAN_TIMEOUT := 0
@ -64,6 +64,11 @@ ifeq ($(ENABLE_SHOW_TX_TIMEOUT),1)
ENABLE_AUDIO_BAR := 0 ENABLE_AUDIO_BAR := 0
endif endif
ifeq ($(ENABLE_VOICE),1)
# no need for beeps
ENABLE_BOOT_BEEPS := 0
endif
BSP_DEFINITIONS := $(wildcard hardware/*/*.def) BSP_DEFINITIONS := $(wildcard hardware/*/*.def)
BSP_HEADERS := $(patsubst hardware/%,bsp/%,$(BSP_DEFINITIONS)) BSP_HEADERS := $(patsubst hardware/%,bsp/%,$(BSP_DEFINITIONS))
BSP_HEADERS := $(patsubst %.def,%.h,$(BSP_HEADERS)) BSP_HEADERS := $(patsubst %.def,%.h,$(BSP_HEADERS))

2
app/action.c
View File

@ -276,6 +276,8 @@ void ACTION_Scan(bool bRestart)
{ {
g_input_box_index = 0; g_input_box_index = 0;
(void)b1750; // stop unused compile warning
#if defined(ENABLE_ALARM) && defined(ENABLE_TX1750) #if defined(ENABLE_ALARM) && defined(ENABLE_TX1750)
g_alarm_state = b1750 ? ALARM_STATE_TX1750 : ALARM_STATE_TXALARM; g_alarm_state = b1750 ? ALARM_STATE_TX1750 : ALARM_STATE_TXALARM;
g_alarm_running_counter = 0; g_alarm_running_counter = 0;

2
app/app.c
View File

@ -1246,7 +1246,7 @@ void APP_Update(void)
if (g_rx_idle_mode) if (g_rx_idle_mode)
{ {
#if defined(ENABLE_UART) && defined(ENABLE_UART_DEBUG) #if defined(ENABLE_UART) && defined(ENABLE_UART_DEBUG)
UART_SendText("ps wake up\r\n"); //UART_SendText("ps wake up\r\n");
#endif #endif
BK4819_Conditional_RX_TurnOn_and_GPIO6_Enable(); BK4819_Conditional_RX_TurnOn_and_GPIO6_Enable();

BIN
firmware.bin
View File

Binary file not shown.

BIN
firmware.packed.bin
View File

Binary file not shown.

11
main.c
View File

@ -151,12 +151,17 @@ void Main(void)
backlight_turn_on(); backlight_turn_on();
#ifdef ENABLE_VOICE
AUDIO_SetVoiceID(0, VOICE_ID_WELCOME);
AUDIO_PlaySingleVoice(0);
#endif
if (g_eeprom.pwr_on_display_mode != PWR_ON_DISPLAY_MODE_NONE) if (g_eeprom.pwr_on_display_mode != PWR_ON_DISPLAY_MODE_NONE)
{ // 2.55 second boot-up screen { // 2.55 second boot-up screen
while (g_boot_counter_10ms > 0) while (g_boot_counter_10ms > 0)
{ {
if (KEYBOARD_Poll() != KEY_INVALID) if (KEYBOARD_Poll() != KEY_INVALID)
{ // halt boot beeps { // halt boot beeps and cancel boot screen
g_boot_counter_10ms = 0; g_boot_counter_10ms = 0;
break; break;
} }
@ -186,7 +191,7 @@ void Main(void)
{ {
uint8_t Channel; uint8_t Channel;
AUDIO_SetVoiceID(0, VOICE_ID_WELCOME); // AUDIO_SetVoiceID(0, VOICE_ID_WELCOME);
Channel = g_eeprom.screen_channel[g_eeprom.tx_vfo]; Channel = g_eeprom.screen_channel[g_eeprom.tx_vfo];
if (IS_USER_CHANNEL(Channel)) if (IS_USER_CHANNEL(Channel))
@ -197,8 +202,6 @@ void Main(void)
else else
if (IS_FREQ_CHANNEL(Channel)) if (IS_FREQ_CHANNEL(Channel))
AUDIO_SetVoiceID(1, VOICE_ID_FREQUENCY_MODE); AUDIO_SetVoiceID(1, VOICE_ID_FREQUENCY_MODE);
AUDIO_PlaySingleVoice(0);
} }
#endif #endif