From e83aac104f153425d11f95e991666c7fba82efd9 Mon Sep 17 00:00:00 2001 From: OneOfEleven Date: Thu, 30 Nov 2023 13:04:38 +0000 Subject: [PATCH] fixed audio line, MDC etc center line in single VFO mode --- firmware.bin | Bin 60948 -> 60948 bytes firmware.packed.bin | Bin 60966 -> 60966 bytes ui/main.c | 55 +++++++++++++++++++++++++++----------------- 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/firmware.bin b/firmware.bin index 2d54e17ed93e14c87842780f9fc8894944e51258..3d7c5c2c34fc3d00781860118ab51ef82694a3cb 100644 GIT binary patch delta 869 zcmZ9JTS!z<6o%KClg$WOff7iL9qD2hMdzZCFGG+-zKBz;XD6Y|K5A;wa<$5n~{F=-r10` zQJo9fE+flMt4&Xs7Zb6DMLOS#WT?_w+hk$5Znbe=dBXEuhOJ8Loo0M!ROA@!vdbb_ zapN31t}aDR#l=T3!*EqCx$K;l|B>)B{D5LZtff?s_KLhFA19tb7obUBM4}F{8c!PH zAnv9G7g{h&WQIC)rP_2SlUk61WS}K|BKy#l>Gd7-!v|<#{V9Ah#cJVg zHuR9UqWT@Z#Dg#n6A;gp4_Ir54!9l_NygK^dJ(!7?=kp^SH&b%iUTF?-OcpT27~msf;%1&zks{sEA6hEi5qrvK>v^<94aT)6DXpfF7p2rF5v4) zOj1ElOHZnbefl-|`0HVdT6k-}!*JR4cM{!|6qIF|f9JpkecA7^b=`S2-Dpwus?w3% z%FdD!k>!m%j?%$&u|jwaDy_|*>hySWy}3cJ+8TWrSMvn_IlO`QFaV<g)Cs~z^wSjsP`zYuT$ delta 870 zcmZ9JTS!z<6o%KCla2-&r67?bN3tYS(wW5YWuS{urX)DM6v2c_7eo+DGSgm6Eqj>G zU=$Q4VK+%@i;xy5`JfdTH55$-K^a~eDUnF

LB>^zfa3t$**m_S$C!C(Pi4+1plc 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 W_S(V#YQR#uR7e4olL+n{0+4^#!_HFx diff --git a/ui/main.c b/ui/main.c index d26f78d..13f7120 100644 --- a/ui/main.c +++ b/ui/main.c @@ -118,7 +118,11 @@ void draw_bar(uint8_t *line, const int len, const int max_width) if (g_eeprom.config.setting.mic_bar) { - const unsigned int line = 3; + #ifdef ENABLE_SINGLE_VFO_CHAN + const unsigned int line = (single_vfo >= 0 && !pan_enabled) ? 6 : 3; + #else + const unsigned int line = 3; + #endif const unsigned int txt_width = 7 * 3; // 3 text chars const unsigned int bar_x = 2 + txt_width + 4; // X coord of bar graph const unsigned int bar_width = LCD_WIDTH - 1 - bar_x; @@ -513,10 +517,19 @@ void big_freq(const uint32_t frequency, const unsigned int x, const unsigned int #endif void UI_DisplayCenterLine(void) -{ +{ // const bool rx = (g_current_function == FUNCTION_RECEIVE && g_squelch_open) ? true : false; const bool rx = (g_current_function == FUNCTION_RECEIVE) ? true : false; + #ifdef ENABLE_SINGLE_VFO_CHAN + const unsigned int line = (single_vfo >= 0 && !pan_enabled) ? 6 : 3; + #else + const unsigned int line = 3; + #endif + + (void)rx; + (void)line; + if (g_center_line != CENTER_LINE_NONE || g_current_display_screen != DISPLAY_MAIN || g_dtmf_call_state != DTMF_CALL_STATE_NONE) @@ -534,7 +547,7 @@ void UI_DisplayCenterLine(void) } else #endif - + #ifdef ENABLE_MDC1200 if (mdc1200_rx_ready_tick_500ms > 0) { @@ -545,25 +558,25 @@ void UI_DisplayCenterLine(void) sprintf(str, "MDC1200 ID %04X", mdc1200_unit_id); #endif #ifdef ENABLE_SMALL_BOLD - UI_PrintStringSmallBold(str, 2, 0, 3); + UI_PrintStringSmallBold(str, 2, 0, line); #else - UI_PrintStringSmall(str, 2, 0, 3); + UI_PrintStringSmall(str, 2, 0, line); #endif } else #endif - + #if defined(ENABLE_AM_FIX) && defined(ENABLE_AM_FIX_SHOW_DATA) // show the AM-FIX debug data if (rx && g_vfo_info[g_rx_vfo_num].mod_mode != MOD_MODE_FM && g_eeprom.config.setting.am_fix) { g_center_line = CENTER_LINE_AM_FIX_DATA; AM_fix_print_data(g_rx_vfo_num, str); - UI_PrintStringSmall(str, 2, 0, 3); + UI_PrintStringSmall(str, 2, 0, line); } else #endif - + #ifdef ENABLE_RX_SIGNAL_BAR // show the RX RSSI dBm, S-point and signal strength bar graph if (rx && g_eeprom.config.setting.enable_rssi_bar) @@ -574,7 +587,7 @@ void UI_DisplayCenterLine(void) } else #endif - + if (rx || g_current_function == FUNCTION_FOREGROUND || g_current_function == FUNCTION_POWER_SAVE) { #ifdef ENABLE_DTMF_LIVE_DECODER @@ -583,47 +596,47 @@ void UI_DisplayCenterLine(void) { // show live DTMF decode const unsigned int len = strlen(g_dtmf_rx_live); const unsigned int idx = (len > (17 - 5)) ? len - (17 - 5) : 0; // limit to last 'n' chars - + if (g_current_display_screen != DISPLAY_MAIN || g_dtmf_call_state != DTMF_CALL_STATE_NONE) return; - + g_center_line = CENTER_LINE_DTMF_DEC; - + strcpy(str, "DTMF "); strcat(str, g_dtmf_rx_live + idx); - UI_PrintStringSmall(str, 2, 0, 3); + UI_PrintStringSmall(str, 2, 0, line); } #else if (g_eeprom.config.setting.dtmf_live_decoder && g_dtmf_rx_index > 0) { // show live DTMF decode const unsigned int len = g_dtmf_rx_index; const unsigned int idx = (len > (17 - 5)) ? len - (17 - 5) : 0; // limit to last 'n' chars - + if (g_current_display_screen != DISPLAY_MAIN || g_dtmf_call_state != DTMF_CALL_STATE_NONE) return; - + g_center_line = CENTER_LINE_DTMF_DEC; - + strcpy(str, "DTMF "); strcat(str, g_dtmf_rx + idx); - UI_PrintStringSmall(str, 2, 0, 3); + UI_PrintStringSmall(str, 2, 0, line); } #endif #endif - + #ifdef ENABLE_SHOW_CHARGE_LEVEL else if (g_charging_with_type_c) { // show the battery charge state if (g_current_display_screen != DISPLAY_MAIN || g_dtmf_call_state != DTMF_CALL_STATE_NONE) return; - + g_center_line = CENTER_LINE_CHARGE_DATA; - + sprintf(str, "Charge %u.%02uV %u%%", g_battery_voltage_average / 100, g_battery_voltage_average % 100, BATTERY_VoltsToPercent(g_battery_voltage_average)); - UI_PrintStringSmall(str, 2, 0, 3); + UI_PrintStringSmall(str, 2, 0, line); } #endif }