This commit is contained in:
wu58430 2023-12-25 17:18:14 +08:00
parent dea2114fd3
commit f6382bc9e6
3 changed files with 14 additions and 22 deletions

View file

@ -23,12 +23,7 @@
<list default="true" id="cea36e80-e289-4d69-9030-7186d540ac0e" name="更改" comment="fix show">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Makefile" beforeDir="false" afterPath="$PROJECT_DIR$/Makefile" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.25.2/CMakeCCompiler.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.25.2/CMakeCCompiler.cmake" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.25.2/CMakeCXXCompiler.cmake" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.25.2/CMakeDetermineCompilerABI_C.bin" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.25.2/CMakeSystem.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.25.2/CMakeSystem.cmake" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeOutput.log" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeOutput.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-environment.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-environment.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ui/welcome.c" beforeDir="false" afterPath="$PROJECT_DIR$/ui/welcome.c" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -103,12 +98,7 @@
<recent name="C:\Users\RUPC\Desktop\UV-K6\uv-k5-firmware-chinese" />
</key>
</component>
<component name="RunManager" selected="Shell Script.win">
<configuration default="true" type="CLionExternalRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true">
<method v="2">
<option name="CLION.EXTERNAL.BUILD" enabled="true" />
</method>
</configuration>
<component name="RunManager" selected="Shell Script.win docker">
<configuration name="clean" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile" temporary="true">
<makefile filename="$PROJECT_DIR$/Makefile" target="clean" workingDirectory="" arguments="">
<envs />
@ -251,13 +241,8 @@
<workItem from="1703380739516" duration="6230000" />
<workItem from="1703411329993" duration="17361000" />
<workItem from="1703483110193" duration="1734000" />
</task>
<task id="LOCAL-00051" summary="写频">
<created>1701737616363</created>
<option name="number" value="00051" />
<option name="presentableId" value="LOCAL-00051" />
<option name="project" value="LOCAL" />
<updated>1701737616364</updated>
<workItem from="1703485862300" duration="4764000" />
<workItem from="1703495854650" duration="1000" />
</task>
<task id="LOCAL-00052" summary="写频">
<created>1701738044160</created>
@ -595,7 +580,14 @@
<option name="project" value="LOCAL" />
<updated>1703484154788</updated>
</task>
<option name="localTasksCounter" value="100" />
<task id="LOCAL-00100" summary="fix show">
<created>1703494863487</created>
<option name="number" value="00100" />
<option name="presentableId" value="LOCAL-00100" />
<option name="project" value="LOCAL" />
<updated>1703494863488</updated>
</task>
<option name="localTasksCounter" value="101" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">

View file

@ -48,7 +48,7 @@ ENABLE_MDC1200 ?= 1
ENABLE_MDC1200_SHOW_OP_ARG ?= 1
ENABLE_MDC1200_SIDE_BEEP ?= 0
ENABLE_MDC1200_CONTACT ?= 1
ENABLE_CHINESE_FULL = 4
ENABLE_CHINESE_FULL = 0

View file

@ -50,7 +50,6 @@ void UI_DisplayWelcome(void) {
memset(gStatusLine, 0, sizeof(gStatusLine));
memset(gFrameBuffer, 0, sizeof(gFrameBuffer));
BACKLIGHT_TurnOn();
#if ENABLE_CHINESE_FULL == 4
@ -80,6 +79,7 @@ void UI_DisplayWelcome(void) {
ST7565_BlitStatusLine(); // blank status line
ST7565_BlitFullScreen();
BACKLIGHT_TurnOn();
}