yang/uv-k5-firmware-chinese-lts
1
0
Fork 0
mirror of https://github.com/silenty4ng/uv-k5-firmware-chinese-lts synced 2025-01-15 14:54:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

MDC RX

Browse source
This commit is contained in:
wu58430 2023-12-04 15:32:57 +08:00
parent dac9c39e7f
commit 939a51e166
4 changed files with 46 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
.idea/workspace.xml
View file

@ -20,10 +20,10 @@
</configurations> </configurations>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="cea36e80-e289-4d69-9030-7186d540ac0e" name="更改" comment="reduce flash"> <list default="true" id="cea36e80-e289-4d69-9030-7186d540ac0e" name="更改" comment="rebuild chinese">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/app.c" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/chinese.h" beforeDir="false" afterPath="$PROJECT_DIR$/chinese.h" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ui/main.c" beforeDir="false" afterPath="$PROJECT_DIR$/ui/main.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/版本说明.txt" beforeDir="false" afterPath="$PROJECT_DIR$/版本说明.txt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ui/main.h" beforeDir="false" afterPath="$PROJECT_DIR$/ui/main.h" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -134,7 +134,7 @@
<workItem from="1701325367312" duration="22657000" /> <workItem from="1701325367312" duration="22657000" />
<workItem from="1701413653518" duration="3544000" /> <workItem from="1701413653518" duration="3544000" />
<workItem from="1701430185864" duration="10115000" /> <workItem from="1701430185864" duration="10115000" />
<workItem from="1701559895523" duration="19045000" /> <workItem from="1701559895523" duration="21426000" />
</task> </task>
<task id="LOCAL-00001" summary="bug fix"> <task id="LOCAL-00001" summary="bug fix">
<created>1701136012311</created> <created>1701136012311</created>
@ -304,7 +304,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1701670725835</updated> <updated>1701670725835</updated>
</task> </task>
<option name="localTasksCounter" value="25" /> <task id="LOCAL-00025" summary="rebuild chinese">
<created>1701674241852</created>
<option name="number" value="00025" />
<option name="presentableId" value="LOCAL-00025" />
<option name="project" value="LOCAL" />
<updated>1701674241852</updated>
</task>
<option name="localTasksCounter" value="26" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -323,7 +330,6 @@
<MESSAGE value="lite create" /> <MESSAGE value="lite create" />
<MESSAGE value="lite aim" /> <MESSAGE value="lite aim" />
<MESSAGE value="create" /> <MESSAGE value="create" />
<MESSAGE value="rebuild chinese" />
<MESSAGE value="fix bug" /> <MESSAGE value="fix bug" />
<MESSAGE value="掃描下翻譯" /> <MESSAGE value="掃描下翻譯" />
<MESSAGE value="fix https://github.com/losehu/uv-k5-firmware-chinese/issues/4" /> <MESSAGE value="fix https://github.com/losehu/uv-k5-firmware-chinese/issues/4" />
@ -332,6 +338,7 @@
<MESSAGE value="mdc tx end test" /> <MESSAGE value="mdc tx end test" />
<MESSAGE value="test create" /> <MESSAGE value="test create" />
<MESSAGE value="reduce flash" /> <MESSAGE value="reduce flash" />
<option name="LAST_COMMIT_MESSAGE" value="reduce flash" /> <MESSAGE value="rebuild chinese" />
<option name="LAST_COMMIT_MESSAGE" value="rebuild chinese" />
</component> </component>
</project> </project>

12
app/app.c
View file

@ -1399,7 +1399,17 @@ void APP_TimeSlice500ms(void)
if (--gDTMF_RX_timeout == 0) if (--gDTMF_RX_timeout == 0)
DTMF_clear_RX(); DTMF_clear_RX();
#endif #endif
#ifdef ENABLE_MDC1200
if (mdc1200_rx_ready_tick_500ms > 0)
{
if (--mdc1200_rx_ready_tick_500ms == 0)
{
if (center_line == CENTER_LINE_MDC1200)
center_line = CENTER_LINE_NONE;
gUpdateDisplay = true;
}
}
#endif
// Skipped authentic device check // Skipped authentic device check
#ifdef ENABLE_FMRADIO #ifdef ENABLE_FMRADIO

19
ui/main.c
View file

@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
#include "app/mdc1200.h"
#include "chinese.h" #include "chinese.h"
#include <string.h> #include <string.h>
#include <stdlib.h> // abs() #include <stdlib.h> // abs()
@ -708,7 +709,23 @@ void UI_DisplayMain(void)
const bool rx = (gCurrentFunction == FUNCTION_RECEIVE || const bool rx = (gCurrentFunction == FUNCTION_RECEIVE ||
gCurrentFunction == FUNCTION_MONITOR || gCurrentFunction == FUNCTION_MONITOR ||
gCurrentFunction == FUNCTION_INCOMING); gCurrentFunction == FUNCTION_INCOMING);
#ifdef ENABLE_MDC1200
if (mdc1200_rx_ready_tick_500ms > 0)
{
center_line = CENTER_LINE_MDC1200;
#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
#ifdef ENABLE_SMALL_BOLD
UI_PrintStringSmallBold(String, 2, 0, 3);
#else
UI_PrintStringSmall(String, 2, 0, 3);
#endif
}
else
#endif
#ifdef ENABLE_AUDIO_BAR #ifdef ENABLE_AUDIO_BAR
if (gCurrentFunction == FUNCTION_TRANSMIT) { if (gCurrentFunction == FUNCTION_TRANSMIT) {
center_line = CENTER_LINE_AUDIO_BAR; center_line = CENTER_LINE_AUDIO_BAR;

3
ui/main.h
View file

@ -24,7 +24,8 @@ enum center_line_t {
CENTER_LINE_RSSI, CENTER_LINE_RSSI,
CENTER_LINE_AM_FIX_DATA, CENTER_LINE_AM_FIX_DATA,
CENTER_LINE_DTMF_DEC, CENTER_LINE_DTMF_DEC,
CENTER_LINE_CHARGE_DATA CENTER_LINE_CHARGE_DATA,
CENTER_LINE_MDC1200
}; };
typedef enum center_line_t center_line_t; typedef enum center_line_t center_line_t;