mirror of
https://github.com/silenty4ng/uv-k5-firmware-chinese-lts
synced 2025-01-15 14:54:40 +00:00
110
This commit is contained in:
wu58430
parent
41acaf7bd0
commit
e50e8f9c51
4 changed files with 30 additions and 28 deletions
|
|
@ -20,7 +20,12 @@
|
|||
</configurations>
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="cea36e80-e289-4d69-9030-7186d540ac0e" name="更改" comment="MDC PY" />
|
||||
<list default="true" id="cea36e80-e289-4d69-9030-7186d540ac0e" name="更改" comment="赞助">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/functions.c" beforeDir="false" afterPath="$PROJECT_DIR$/functions.c" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ui/main.c" beforeDir="false" afterPath="$PROJECT_DIR$/ui/main.c" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/version.c" beforeDir="false" afterPath="$PROJECT_DIR$/version.c" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
|
|
@ -215,14 +220,7 @@
|
|||
<workItem from="1702173911297" duration="1180000" />
|
||||
<workItem from="1702175521208" duration="2000" />
|
||||
<workItem from="1702774207484" duration="5418000" />
|
||||
<workItem from="1702793061935" duration="1000" />
|
||||
</task>
|
||||
<task id="LOCAL-00037" summary="MDC RX">
|
||||
<created>1701689801897</created>
|
||||
<option name="number" value="00037" />
|
||||
<option name="presentableId" value="LOCAL-00037" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1701689801897</updated>
|
||||
<workItem from="1702793061935" duration="4131000" />
|
||||
</task>
|
||||
<task id="LOCAL-00038" summary="MDC RX">
|
||||
<created>1701690210457</created>
|
||||
|
|
@ -560,7 +558,14 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1702141605728</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="86" />
|
||||
<task id="LOCAL-00086" summary="赞助">
|
||||
<created>1702793183140</created>
|
||||
<option name="number" value="00086" />
|
||||
<option name="presentableId" value="LOCAL-00086" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1702793183141</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="87" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
|
|
@ -587,7 +592,6 @@
|
|||
</option>
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="掃描下翻譯" />
|
||||
<MESSAGE value="fix https://github.com/losehu/uv-k5-firmware-chinese/issues/4" />
|
||||
<MESSAGE value="修复切换调制模式时亚音消失问题" />
|
||||
<MESSAGE value="按键锁定改回以前逻辑" />
|
||||
|
|
@ -612,6 +616,7 @@
|
|||
<MESSAGE value="开机音修复" />
|
||||
<MESSAGE value="MDC联系人" />
|
||||
<MESSAGE value="MDC PY" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="MDC PY" />
|
||||
<MESSAGE value="赞助" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="赞助" />
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -143,6 +143,9 @@ void FUNCTION_PowerSave() {
|
|||
|
||||
void FUNCTION_Transmit() {
|
||||
// if DTMF is enabled when TX'ing, it changes the TX audio filtering !! .. 1of11
|
||||
#ifdef ENABLE_MDC1200
|
||||
BK4819_enable_mdc1200_rx(false);
|
||||
#endif
|
||||
BK4819_DisableDTMF();
|
||||
|
||||
#ifdef ENABLE_DTMF_CALLING
|
||||
|
|
|
|||
26
ui/main.c
26
ui/main.c
|
|
@ -735,11 +735,9 @@ void UI_DisplayMain(void) {
|
|||
#ifdef ENABLE_MDC1200
|
||||
|
||||
if (mdc1200_rx_ready_tick_500ms > 0) {
|
||||
center_line = CENTER_LINE_MDC1200;
|
||||
#ifdef ENABLE_MDC1200_CONTACT
|
||||
uint8_t print_col = 0;
|
||||
char mdc1200_contact[14];
|
||||
|
||||
center_line = CENTER_LINE_MDC1200;
|
||||
uint8_t print_col = 0;
|
||||
if (mdc1200_contact_find(mdc1200_unit_id, mdc1200_contact))//
|
||||
{
|
||||
|
||||
|
|
@ -750,22 +748,18 @@ void UI_DisplayMain(void) {
|
|||
sprintf(String, "ID %04X", mdc1200_unit_id);
|
||||
print_col = 40;
|
||||
}
|
||||
|
||||
//#ifdef ENABLE_MDC1200_SHOW_OP_ARG
|
||||
// sprintf(String, "MDC1200 %02X %02X %04X", mdc1200_op, mdc1200_arg, mdc1200_unit_id);
|
||||
//#else
|
||||
// sprintf(String, "MDC1200 ID %04X", mdc1200_unit_id);
|
||||
//#endif
|
||||
|
||||
UI_PrintStringSmallBold(String, print_col, 0, 3);
|
||||
|
||||
#elifdef ENABLE_MDC1200_SHOW_OP_ARG
|
||||
sprintf(String, "MDC1200 %02X %02X %04X", mdc1200_op, mdc1200_arg, mdc1200_unit_id);
|
||||
UI_PrintStringSmallBold(String, 4, 0, 3);
|
||||
|
||||
#else
|
||||
sprintf(String, "MDC1200 ID %04X", mdc1200_unit_id);
|
||||
UI_PrintStringSmallBold(String, 4, 0, 3);
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
} else
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_AUDIO_BAR
|
||||
if (gCurrentFunction == FUNCTION_TRANSMIT) {
|
||||
center_line = CENTER_LINE_AUDIO_BAR;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#ifdef GIT_HASH
|
||||
#define VER GIT_HASH
|
||||
#else
|
||||
#define VER "109"
|
||||
#define VER "110"
|
||||
#endif
|
||||
|
||||
#ifndef ONE_OF_ELEVEN_VER
|
||||
|
|
|
|||
Loading…
Reference in a new issue