增加定时器

修改音量条样式、添加编译选项
信道名非中文时显示整体下移
This commit is contained in:
wu58430 2024-01-09 17:17:26 +08:00
parent b8553a05d4
commit a98452f06d
22 changed files with 387 additions and 6595 deletions

View File

@ -21,13 +21,24 @@
</component>
<component name="ChangeListManager">
<list default="true" id="cea36e80-e289-4d69-9030-7186d540ac0e" name="更改" comment="修正MDC联系人地址">
<change afterPath="$PROJECT_DIR$/bsp/dp32g030/timer.h" afterDir="false" />
<change afterPath="$PROJECT_DIR$/driver/timer.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/MDC_WRITE/MDC.txt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/MDC_WRITE/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/MDC_WRITE/main.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ui/menu.c" beforeDir="false" afterPath="$PROJECT_DIR$/ui/menu.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ui/menu.h" beforeDir="false" afterPath="$PROJECT_DIR$/ui/menu.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ui/welcome.c" beforeDir="false" afterPath="$PROJECT_DIR$/ui/welcome.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/version.c" beforeDir="false" afterPath="$PROJECT_DIR$/version.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Makefile" beforeDir="false" afterPath="$PROJECT_DIR$/Makefile" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-caa285142236f184f75e.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/.cmake/api/v1/reply/index-2024-01-04T12-24-34-0342.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/.cmake/api/v1/reply/target-uv_k5_firmware_custom_0_17-Debug-793164c62e57d652e20e.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/uv_k5_firmware_custom_0_17.dir/DependInfo.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/uv_k5_firmware_custom_0_17.dir/DependInfo.cmake" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/uv_k5_firmware_custom_0_17.dir/build.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/uv_k5_firmware_custom_0_17.dir/build.make" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/uv_k5_firmware_custom_0_17.dir/cmake_clean.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/uv_k5_firmware_custom_0_17.dir/cmake_clean.cmake" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/uv_k5_firmware_custom_0_17.dir/objects1" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/uv_k5_firmware_custom_0_17.dir/objects1" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/uv_k5_firmware_custom_0_17.dir/progress.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/uv_k5_firmware_custom_0_17.dir/progress.make" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/Makefile" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/Makefile" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/uv_k5_firmware_custom_0_17.cbp" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/uv_k5_firmware_custom_0_17.cbp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/main.c" beforeDir="false" afterPath="$PROJECT_DIR$/main.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/start.S" beforeDir="false" afterPath="$PROJECT_DIR$/start.S" afterDir="false" />
<change beforePath="$PROJECT_DIR$/写频脚本/picture.py" beforeDir="false" afterPath="$PROJECT_DIR$/写频脚本/picture.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -106,7 +117,12 @@
<recent name="C:\Users\RUPC\Desktop\UV-K6\uv-k5-firmware-chinese\app" />
</key>
</component>
<component name="RunManager" selected="Makefile 目标.flash">
<component name="RunManager" selected="Makefile 目标.build">
<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>
<configuration name="all" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile" temporary="true">
<makefile filename="$PROJECT_DIR$/Makefile" target="all" workingDirectory="" arguments="">
<envs />
@ -194,9 +210,9 @@
</list>
<recent_temporary>
<list>
<item itemvalue="Makefile 目标.build" />
<item itemvalue="Makefile 目标.flash" />
<item itemvalue="Makefile 目标.all" />
<item itemvalue="Makefile 目标.build" />
<item itemvalue="Makefile 目标.clean" />
<item itemvalue="Makefile 目标.debug" />
</list>
@ -271,6 +287,7 @@
<workItem from="1704636744423" duration="1043000" />
<workItem from="1704681883948" duration="331000" />
<workItem from="1704682476299" duration="8000" />
<workItem from="1704716322305" duration="3309000" />
</task>
<task id="LOCAL-00059" summary="写频">
<created>1701739409050</created>

View File

@ -816,4 +816,4 @@ add_executable(uv_k5_firmware_custom_0_17
sram-overlay.c
sram-overlay.h
version.c
version.h chinese.h app/mdc1200.c app/mdc1200.c app/mdc1200.c app/mdc1200.c app/mdc1200.c app/mdc1200.c)
version.h chinese.h app/mdc1200.c app/mdc1200.c app/mdc1200.c app/mdc1200.c app/mdc1200.c app/mdc1200.c driver/timer.c bsp/dp32g030/timer.h)

View File

@ -49,11 +49,12 @@ ENABLE_MDC1200_SIDE_BEEP ?= 0
ENABLE_MDC1200_CONTACT ?= 1
ENABLE_CHINESE_FULL = 4
ENABLE_UART_RW_BK_REGS ?= 0
ENABLE_AUDIO_BAR_DEFAULT ?=0
# ---- DEBUGGING ----
ENABLE_AM_FIX_SHOW_DATA ?= 0
ENABLE_AGC_SHOW_DATA ?= 0
ENABLE_TIMER ?= 0
#############################################################
OPENOCD = openocd-win/bin/openocd.exe
@ -81,10 +82,12 @@ ifeq ($(ENABLE_OVERLAY),1)
OBJS += sram-overlay.o
endif
OBJS += external/printf/printf.o
ifeq ($(ENABLE_TIMER),1)
OBJS += driver/timer.o
endif
ifeq ($(ENABLE_MDC1200),1)
OBJS += app/mdc1200.o
endif
# Drivers
OBJS += driver/adc.o
ifeq ($(ENABLE_UART),1)
@ -264,12 +267,16 @@ endif
ifeq ($(ENABLE_MDC1200),1)
CFLAGS += -DENABLE_MDC1200
endif
ifeq ($(ENABLE_TIMER),1)
CFLAGS += -DENABLE_TIMER
endif
ifeq ($(ENABLE_MDC1200_CONTACT),1)
CFLAGS += -DENABLE_MDC1200_CONTACT
endif
CFLAGS += -DENABLE_CHINESE_FULL=$(ENABLE_CHINESE_FULL)
ifeq ($(ENABLE_AUDIO_BAR_DEFAULT),1)
CFLAGS += -DENABLE_AUDIO_BAR_DEFAULT
endif
ifeq ($(ENABLE_MDC1200_SHOW_OP_ARG),1)
CFLAGS += -DENABLE_MDC1200_SHOW_OP_ARG

48
bsp/dp32g030/timer.h Normal file
View File

@ -0,0 +1,48 @@
//
// Created by RUPC on 2024/1/8.
//
#ifndef HARDWARE_DP32G030_TIMER_H
#define HARDWARE_DP32G030_TIMER_H
#include <stdint.h>
#define TIMERBASE0_ADD 0x40064000
#define TIMERBASE1_ADD 0x40064800
//TIMER0
#define TIMERBASE0_EN_ADD (0X00+TIMERBASE0_ADD)
#define TIMERBASE0_DIV_ADD (0X04+TIMERBASE0_ADD)
#define TIMERBASE0_IE_ADD (0X10+TIMERBASE0_ADD)
#define TIMERBASE0_IF_ADD (0X14+TIMERBASE0_ADD)
#define TIMERBASE0_HIGH_LOAD_ADD (0X20+TIMERBASE0_ADD)
#define TIMERBASE0_HIGH_CNT_ADD (0X24+TIMERBASE0_ADD)
#define TIMERBASE0_LOW_LOAD_ADD (0X30+TIMERBASE0_ADD)
#define TIMERBASE0_LOW_CNT_ADD (0X34+TIMERBASE0_ADD)
#define TIMERBASE0_EN (*(volatile uint32_t *)TIMERBASE0_EN_ADD)
#define TIMERBASE0_DIV (*(volatile uint32_t *)TIMERBASE0_DIV_ADD)
#define TIMERBASE0_IE (*(volatile uint32_t *)TIMERBASE0_IE_ADD)
#define TIMERBASE0_IF (*(volatile uint32_t *)TIMERBASE0_IF_ADD)
#define TIMERBASE0_HIGH_LOAD (*(volatile uint32_t *)TIMERBASE0_HIGH_LOAD_ADD)
#define TIMERBASE0_HIGH_CNT (*(volatile uint32_t *)TIMERBASE0_HIGH_CNT_ADD)
#define TIMERBASE0_LOW_LOAD (*(volatile uint32_t *)TIMERBASE0_LOW_LOAD_ADD)
#define TIMERBASE0_LOW_CNT (*(volatile uint32_t *)TIMERBASE0_LOW_CNT_ADD)
//TIMER1
#define TIMERBASE1_EN_ADD 0X00+TIMERBASE1_ADD
#define TIMERBASE1_DIV_ADD 0X04+TIMERBASE1_ADD
#define TIMERBASE1_IE_ADD 0X10+TIMERBASE1_ADD
#define TIMERBASE1_IF_ADD 0X14+TIMERBASE1_ADD
#define TIMERBASE1_HIGH_LOAD_ADD 0X20+TIMERBASE1_ADD
#define TIMERBASE1_HIGH_CNT_ADD 0X24+TIMERBASE1_ADD
#define TIMERBASE1_LOW_LOAD_ADD 0X30+TIMERBASE1_ADD
#define TIMERBASE1_LOW_CNT_ADD 0X34+TIMERBASE1_ADD
extern uint8_t TIM0_CNT;
void TIM0_INIT();
void TIM0_SET_ARR(uint16_t Arr) ;
void TIM0_SET_PSC(uint16_t prescaler) ;
#endif //UV_K5_FIRMWARE_CUSTOM_0_17_TIMER_H

View File

@ -1,60 +0,0 @@
{
"configurations" :
[
{
"directories" :
[
{
"build" : ".",
"jsonFile" : "directory-.-Debug-d0094a50bb2071803777.json",
"minimumCMakeVersion" :
{
"string" : "3.25"
},
"projectIndex" : 0,
"source" : ".",
"targetIndexes" :
[
0
]
}
],
"name" : "Debug",
"projects" :
[
{
"directoryIndexes" :
[
0
],
"name" : "uv_k5_firmware_custom_0_17",
"targetIndexes" :
[
0
]
}
],
"targets" :
[
{
"directoryIndex" : 0,
"id" : "uv_k5_firmware_custom_0_17::@6890427a1f51a3e7e1df",
"jsonFile" : "target-uv_k5_firmware_custom_0_17-Debug-793164c62e57d652e20e.json",
"name" : "uv_k5_firmware_custom_0_17",
"projectIndex" : 0
}
]
}
],
"kind" : "codemodel",
"paths" :
{
"build" : "C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/cmake-build-debug",
"source" : "C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese"
},
"version" :
{
"major" : 2,
"minor" : 4
}
}

View File

@ -1,108 +0,0 @@
{
"cmake" :
{
"generator" :
{
"multiConfig" : false,
"name" : "MinGW Makefiles"
},
"paths" :
{
"cmake" : "C:/Program Files/JetBrains/CLion 2023.1.1/bin/cmake/win/x64/bin/cmake.exe",
"cpack" : "C:/Program Files/JetBrains/CLion 2023.1.1/bin/cmake/win/x64/bin/cpack.exe",
"ctest" : "C:/Program Files/JetBrains/CLion 2023.1.1/bin/cmake/win/x64/bin/ctest.exe",
"root" : "C:/Program Files/JetBrains/CLion 2023.1.1/bin/cmake/win/x64/share/cmake-3.25"
},
"version" :
{
"isDirty" : false,
"major" : 3,
"minor" : 25,
"patch" : 2,
"string" : "3.25.2",
"suffix" : ""
}
},
"objects" :
[
{
"jsonFile" : "codemodel-v2-caa285142236f184f75e.json",
"kind" : "codemodel",
"version" :
{
"major" : 2,
"minor" : 4
}
},
{
"jsonFile" : "cache-v2-abad8e9e75b89fd9ab68.json",
"kind" : "cache",
"version" :
{
"major" : 2,
"minor" : 0
}
},
{
"jsonFile" : "cmakeFiles-v1-a1d428cb3603927cf3d1.json",
"kind" : "cmakeFiles",
"version" :
{
"major" : 1,
"minor" : 0
}
},
{
"jsonFile" : "toolchains-v1-f12fb5aa62960d650cce.json",
"kind" : "toolchains",
"version" :
{
"major" : 1,
"minor" : 0
}
}
],
"reply" :
{
"cache-v2" :
{
"jsonFile" : "cache-v2-abad8e9e75b89fd9ab68.json",
"kind" : "cache",
"version" :
{
"major" : 2,
"minor" : 0
}
},
"cmakeFiles-v1" :
{
"jsonFile" : "cmakeFiles-v1-a1d428cb3603927cf3d1.json",
"kind" : "cmakeFiles",
"version" :
{
"major" : 1,
"minor" : 0
}
},
"codemodel-v2" :
{
"jsonFile" : "codemodel-v2-caa285142236f184f75e.json",
"kind" : "codemodel",
"version" :
{
"major" : 2,
"minor" : 4
}
},
"toolchains-v1" :
{
"jsonFile" : "toolchains-v1-f12fb5aa62960d650cce.json",
"kind" : "toolchains",
"version" :
{
"major" : 1,
"minor" : 0
}
}
}
}

View File

@ -42,6 +42,7 @@ set(CMAKE_DEPENDS_DEPENDENCY_FILES
"C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/driver/st7565.c" "CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/st7565.c.obj" "gcc" "CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/st7565.c.obj.d"
"C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/driver/system.c" "CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/system.c.obj" "gcc" "CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/system.c.obj.d"
"C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/driver/systick.c" "CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/systick.c.obj" "gcc" "CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/systick.c.obj.d"
"C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/driver/timer.c" "CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.obj" "gcc" "CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.obj.d"
"C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/driver/uart.c" "CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/uart.c.obj" "gcc" "CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/uart.c.obj.d"
"C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/external/CMSIS_5/CMSIS/Core/Template/ARMv8-M/main_s.c" "CMakeFiles/uv_k5_firmware_custom_0_17.dir/external/CMSIS_5/CMSIS/Core/Template/ARMv8-M/main_s.c.obj" "gcc" "CMakeFiles/uv_k5_firmware_custom_0_17.dir/external/CMSIS_5/CMSIS/Core/Template/ARMv8-M/main_s.c.obj.d"
"C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/external/CMSIS_5/CMSIS/Core/Template/ARMv8-M/tz_context.c" "CMakeFiles/uv_k5_firmware_custom_0_17.dir/external/CMSIS_5/CMSIS/Core/Template/ARMv8-M/tz_context.c.obj" "gcc" "CMakeFiles/uv_k5_firmware_custom_0_17.dir/external/CMSIS_5/CMSIS/Core/Template/ARMv8-M/tz_context.c.obj.d"

View File

@ -5243,6 +5243,21 @@ CMakeFiles/uv_k5_firmware_custom_0_17.dir/app/mdc1200.c.s: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/uv_k5_firmware_custom_0_17.dir/app/mdc1200.c.s"
C:\Qt\Qt5.14.2\Tools\mingw730_64\bin\gcc.exe $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S C:\Users\RUPC\Desktop\UV-K6\uv-k5-firmware-chinese\app\mdc1200.c -o CMakeFiles\uv_k5_firmware_custom_0_17.dir\app\mdc1200.c.s
CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.obj: CMakeFiles/uv_k5_firmware_custom_0_17.dir/flags.make
CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.obj: CMakeFiles/uv_k5_firmware_custom_0_17.dir/includes_C.rsp
CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.obj: C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/driver/timer.c
CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.obj: CMakeFiles/uv_k5_firmware_custom_0_17.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=C:\Users\RUPC\Desktop\UV-K6\uv-k5-firmware-chinese\cmake-build-debug\CMakeFiles --progress-num=$(CMAKE_PROGRESS_346) "Building C object CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.obj"
C:\Qt\Qt5.14.2\Tools\mingw730_64\bin\gcc.exe $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.obj -MF CMakeFiles\uv_k5_firmware_custom_0_17.dir\driver\timer.c.obj.d -o CMakeFiles\uv_k5_firmware_custom_0_17.dir\driver\timer.c.obj -c C:\Users\RUPC\Desktop\UV-K6\uv-k5-firmware-chinese\driver\timer.c
CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.i: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing C source to CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.i"
C:\Qt\Qt5.14.2\Tools\mingw730_64\bin\gcc.exe $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E C:\Users\RUPC\Desktop\UV-K6\uv-k5-firmware-chinese\driver\timer.c > CMakeFiles\uv_k5_firmware_custom_0_17.dir\driver\timer.c.i
CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.s: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.s"
C:\Qt\Qt5.14.2\Tools\mingw730_64\bin\gcc.exe $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S C:\Users\RUPC\Desktop\UV-K6\uv-k5-firmware-chinese\driver\timer.c -o CMakeFiles\uv_k5_firmware_custom_0_17.dir\driver\timer.c.s
# Object files for target uv_k5_firmware_custom_0_17
uv_k5_firmware_custom_0_17_OBJECTS = \
"CMakeFiles/uv_k5_firmware_custom_0_17.dir/app/action.c.obj" \
@ -5589,7 +5604,8 @@ uv_k5_firmware_custom_0_17_OBJECTS = \
"CMakeFiles/uv_k5_firmware_custom_0_17.dir/settings.c.obj" \
"CMakeFiles/uv_k5_firmware_custom_0_17.dir/sram-overlay.c.obj" \
"CMakeFiles/uv_k5_firmware_custom_0_17.dir/version.c.obj" \
"CMakeFiles/uv_k5_firmware_custom_0_17.dir/app/mdc1200.c.obj"
"CMakeFiles/uv_k5_firmware_custom_0_17.dir/app/mdc1200.c.obj" \
"CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.obj"
# External object files for target uv_k5_firmware_custom_0_17
uv_k5_firmware_custom_0_17_EXTERNAL_OBJECTS =
@ -5939,11 +5955,12 @@ uv_k5_firmware_custom_0_17.exe: CMakeFiles/uv_k5_firmware_custom_0_17.dir/settin
uv_k5_firmware_custom_0_17.exe: CMakeFiles/uv_k5_firmware_custom_0_17.dir/sram-overlay.c.obj
uv_k5_firmware_custom_0_17.exe: CMakeFiles/uv_k5_firmware_custom_0_17.dir/version.c.obj
uv_k5_firmware_custom_0_17.exe: CMakeFiles/uv_k5_firmware_custom_0_17.dir/app/mdc1200.c.obj
uv_k5_firmware_custom_0_17.exe: CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.obj
uv_k5_firmware_custom_0_17.exe: CMakeFiles/uv_k5_firmware_custom_0_17.dir/build.make
uv_k5_firmware_custom_0_17.exe: CMakeFiles/uv_k5_firmware_custom_0_17.dir/linkLibs.rsp
uv_k5_firmware_custom_0_17.exe: CMakeFiles/uv_k5_firmware_custom_0_17.dir/objects1
uv_k5_firmware_custom_0_17.exe: CMakeFiles/uv_k5_firmware_custom_0_17.dir/link.txt
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=C:\Users\RUPC\Desktop\UV-K6\uv-k5-firmware-chinese\cmake-build-debug\CMakeFiles --progress-num=$(CMAKE_PROGRESS_346) "Linking CXX executable uv_k5_firmware_custom_0_17.exe"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=C:\Users\RUPC\Desktop\UV-K6\uv-k5-firmware-chinese\cmake-build-debug\CMakeFiles --progress-num=$(CMAKE_PROGRESS_347) "Linking CXX executable uv_k5_firmware_custom_0_17.exe"
$(CMAKE_COMMAND) -E cmake_link_script CMakeFiles\uv_k5_firmware_custom_0_17.dir\link.txt --verbose=$(VERBOSE)
# Rule to build all files generated by this target.

View File

@ -67,6 +67,8 @@ file(REMOVE_RECURSE
"CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/system.c.obj.d"
"CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/systick.c.obj"
"CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/systick.c.obj.d"
"CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.obj"
"CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.obj.d"
"CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/uart.c.obj"
"CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/uart.c.obj.d"
"CMakeFiles/uv_k5_firmware_custom_0_17.dir/external/CMSIS_5/CMSIS/Core/Template/ARMv8-M/main_s.c.obj"

File diff suppressed because one or more lines are too long

View File

@ -42,15 +42,15 @@ CMAKE_PROGRESS_41 =
CMAKE_PROGRESS_42 = 12
CMAKE_PROGRESS_43 =
CMAKE_PROGRESS_44 =
CMAKE_PROGRESS_45 = 13
CMAKE_PROGRESS_46 =
CMAKE_PROGRESS_45 =
CMAKE_PROGRESS_46 = 13
CMAKE_PROGRESS_47 =
CMAKE_PROGRESS_48 =
CMAKE_PROGRESS_49 = 14
CMAKE_PROGRESS_50 =
CMAKE_PROGRESS_51 =
CMAKE_PROGRESS_52 = 15
CMAKE_PROGRESS_53 =
CMAKE_PROGRESS_52 =
CMAKE_PROGRESS_53 = 15
CMAKE_PROGRESS_54 =
CMAKE_PROGRESS_55 =
CMAKE_PROGRESS_56 = 16
@ -87,29 +87,29 @@ CMAKE_PROGRESS_86 =
CMAKE_PROGRESS_87 = 25
CMAKE_PROGRESS_88 =
CMAKE_PROGRESS_89 =
CMAKE_PROGRESS_90 = 26
CMAKE_PROGRESS_91 =
CMAKE_PROGRESS_90 =
CMAKE_PROGRESS_91 = 26
CMAKE_PROGRESS_92 =
CMAKE_PROGRESS_93 =
CMAKE_PROGRESS_94 = 27
CMAKE_PROGRESS_95 =
CMAKE_PROGRESS_96 =
CMAKE_PROGRESS_97 = 28
CMAKE_PROGRESS_98 =
CMAKE_PROGRESS_97 =
CMAKE_PROGRESS_98 = 28
CMAKE_PROGRESS_99 =
CMAKE_PROGRESS_100 =
CMAKE_PROGRESS_101 = 29
CMAKE_PROGRESS_102 =
CMAKE_PROGRESS_103 =
CMAKE_PROGRESS_104 = 30
CMAKE_PROGRESS_105 =
CMAKE_PROGRESS_104 =
CMAKE_PROGRESS_105 = 30
CMAKE_PROGRESS_106 =
CMAKE_PROGRESS_107 =
CMAKE_PROGRESS_108 = 31
CMAKE_PROGRESS_109 =
CMAKE_PROGRESS_110 =
CMAKE_PROGRESS_111 = 32
CMAKE_PROGRESS_112 =
CMAKE_PROGRESS_111 =
CMAKE_PROGRESS_112 = 32
CMAKE_PROGRESS_113 =
CMAKE_PROGRESS_114 =
CMAKE_PROGRESS_115 = 33
@ -132,216 +132,217 @@ CMAKE_PROGRESS_131 =
CMAKE_PROGRESS_132 = 38
CMAKE_PROGRESS_133 =
CMAKE_PROGRESS_134 =
CMAKE_PROGRESS_135 = 39
CMAKE_PROGRESS_136 =
CMAKE_PROGRESS_135 =
CMAKE_PROGRESS_136 = 39
CMAKE_PROGRESS_137 =
CMAKE_PROGRESS_138 =
CMAKE_PROGRESS_139 = 40
CMAKE_PROGRESS_140 =
CMAKE_PROGRESS_141 =
CMAKE_PROGRESS_142 = 41
CMAKE_PROGRESS_143 =
CMAKE_PROGRESS_142 =
CMAKE_PROGRESS_143 = 41
CMAKE_PROGRESS_144 =
CMAKE_PROGRESS_145 =
CMAKE_PROGRESS_146 = 42
CMAKE_PROGRESS_147 =
CMAKE_PROGRESS_148 =
CMAKE_PROGRESS_149 = 43
CMAKE_PROGRESS_150 =
CMAKE_PROGRESS_149 =
CMAKE_PROGRESS_150 = 43
CMAKE_PROGRESS_151 =
CMAKE_PROGRESS_152 =
CMAKE_PROGRESS_153 = 44
CMAKE_PROGRESS_154 =
CMAKE_PROGRESS_155 =
CMAKE_PROGRESS_156 = 45
CMAKE_PROGRESS_157 =
CMAKE_PROGRESS_156 =
CMAKE_PROGRESS_157 = 45
CMAKE_PROGRESS_158 =
CMAKE_PROGRESS_159 =
CMAKE_PROGRESS_160 = 46
CMAKE_PROGRESS_161 =
CMAKE_PROGRESS_162 =
CMAKE_PROGRESS_163 = 47
CMAKE_PROGRESS_164 =
CMAKE_PROGRESS_163 =
CMAKE_PROGRESS_164 = 47
CMAKE_PROGRESS_165 =
CMAKE_PROGRESS_166 =
CMAKE_PROGRESS_167 = 48
CMAKE_PROGRESS_168 =
CMAKE_PROGRESS_169 =
CMAKE_PROGRESS_170 = 49
CMAKE_PROGRESS_171 =
CMAKE_PROGRESS_170 =
CMAKE_PROGRESS_171 = 49
CMAKE_PROGRESS_172 =
CMAKE_PROGRESS_173 = 50
CMAKE_PROGRESS_174 =
CMAKE_PROGRESS_173 =
CMAKE_PROGRESS_174 = 50
CMAKE_PROGRESS_175 =
CMAKE_PROGRESS_176 =
CMAKE_PROGRESS_177 = 51
CMAKE_PROGRESS_178 =
CMAKE_PROGRESS_179 =
CMAKE_PROGRESS_180 = 52
CMAKE_PROGRESS_181 =
CMAKE_PROGRESS_180 =
CMAKE_PROGRESS_181 = 52
CMAKE_PROGRESS_182 =
CMAKE_PROGRESS_183 =
CMAKE_PROGRESS_184 = 53
CMAKE_PROGRESS_185 =
CMAKE_PROGRESS_186 =
CMAKE_PROGRESS_187 = 54
CMAKE_PROGRESS_188 =
CMAKE_PROGRESS_187 =
CMAKE_PROGRESS_188 = 54
CMAKE_PROGRESS_189 =
CMAKE_PROGRESS_190 =
CMAKE_PROGRESS_191 = 55
CMAKE_PROGRESS_192 =
CMAKE_PROGRESS_193 =
CMAKE_PROGRESS_194 = 56
CMAKE_PROGRESS_195 =
CMAKE_PROGRESS_194 =
CMAKE_PROGRESS_195 = 56
CMAKE_PROGRESS_196 =
CMAKE_PROGRESS_197 =
CMAKE_PROGRESS_198 = 57
CMAKE_PROGRESS_199 =
CMAKE_PROGRESS_200 =
CMAKE_PROGRESS_201 = 58
CMAKE_PROGRESS_202 =
CMAKE_PROGRESS_201 =
CMAKE_PROGRESS_202 = 58
CMAKE_PROGRESS_203 =
CMAKE_PROGRESS_204 =
CMAKE_PROGRESS_205 = 59
CMAKE_PROGRESS_206 =
CMAKE_PROGRESS_207 =
CMAKE_PROGRESS_208 = 60
CMAKE_PROGRESS_209 =
CMAKE_PROGRESS_208 =
CMAKE_PROGRESS_209 = 60
CMAKE_PROGRESS_210 =
CMAKE_PROGRESS_211 =
CMAKE_PROGRESS_212 = 61
CMAKE_PROGRESS_213 =
CMAKE_PROGRESS_214 =
CMAKE_PROGRESS_215 = 62
CMAKE_PROGRESS_216 =
CMAKE_PROGRESS_215 =
CMAKE_PROGRESS_216 = 62
CMAKE_PROGRESS_217 =
CMAKE_PROGRESS_218 = 63
CMAKE_PROGRESS_219 =
CMAKE_PROGRESS_218 =
CMAKE_PROGRESS_219 = 63
CMAKE_PROGRESS_220 =
CMAKE_PROGRESS_221 =
CMAKE_PROGRESS_222 = 64
CMAKE_PROGRESS_223 =
CMAKE_PROGRESS_222 =
CMAKE_PROGRESS_223 = 64
CMAKE_PROGRESS_224 =
CMAKE_PROGRESS_225 = 65
CMAKE_PROGRESS_226 =
CMAKE_PROGRESS_225 =
CMAKE_PROGRESS_226 = 65
CMAKE_PROGRESS_227 =
CMAKE_PROGRESS_228 =
CMAKE_PROGRESS_229 = 66
CMAKE_PROGRESS_230 =
CMAKE_PROGRESS_229 =
CMAKE_PROGRESS_230 = 66
CMAKE_PROGRESS_231 =
CMAKE_PROGRESS_232 = 67
CMAKE_PROGRESS_233 =
CMAKE_PROGRESS_232 =
CMAKE_PROGRESS_233 = 67
CMAKE_PROGRESS_234 =
CMAKE_PROGRESS_235 =
CMAKE_PROGRESS_236 = 68
CMAKE_PROGRESS_237 =
CMAKE_PROGRESS_238 =
CMAKE_PROGRESS_239 = 69
CMAKE_PROGRESS_240 =
CMAKE_PROGRESS_239 =
CMAKE_PROGRESS_240 = 69
CMAKE_PROGRESS_241 =
CMAKE_PROGRESS_242 =
CMAKE_PROGRESS_243 = 70
CMAKE_PROGRESS_244 =
CMAKE_PROGRESS_245 =
CMAKE_PROGRESS_246 = 71
CMAKE_PROGRESS_247 =
CMAKE_PROGRESS_246 =
CMAKE_PROGRESS_247 = 71
CMAKE_PROGRESS_248 =
CMAKE_PROGRESS_249 =
CMAKE_PROGRESS_250 = 72
CMAKE_PROGRESS_251 =
CMAKE_PROGRESS_252 =
CMAKE_PROGRESS_253 = 73
CMAKE_PROGRESS_254 =
CMAKE_PROGRESS_253 =
CMAKE_PROGRESS_254 = 73
CMAKE_PROGRESS_255 =
CMAKE_PROGRESS_256 =
CMAKE_PROGRESS_257 = 74
CMAKE_PROGRESS_258 =
CMAKE_PROGRESS_259 =
CMAKE_PROGRESS_260 = 75
CMAKE_PROGRESS_261 =
CMAKE_PROGRESS_260 =
CMAKE_PROGRESS_261 = 75
CMAKE_PROGRESS_262 =
CMAKE_PROGRESS_263 = 76
CMAKE_PROGRESS_264 =
CMAKE_PROGRESS_263 =
CMAKE_PROGRESS_264 = 76
CMAKE_PROGRESS_265 =
CMAKE_PROGRESS_266 =
CMAKE_PROGRESS_267 = 77
CMAKE_PROGRESS_268 =
CMAKE_PROGRESS_267 =
CMAKE_PROGRESS_268 = 77
CMAKE_PROGRESS_269 =
CMAKE_PROGRESS_270 = 78
CMAKE_PROGRESS_271 =
CMAKE_PROGRESS_270 =
CMAKE_PROGRESS_271 = 78
CMAKE_PROGRESS_272 =
CMAKE_PROGRESS_273 =
CMAKE_PROGRESS_274 = 79
CMAKE_PROGRESS_275 =
CMAKE_PROGRESS_274 =
CMAKE_PROGRESS_275 = 79
CMAKE_PROGRESS_276 =
CMAKE_PROGRESS_277 = 80
CMAKE_PROGRESS_278 =
CMAKE_PROGRESS_277 =
CMAKE_PROGRESS_278 = 80
CMAKE_PROGRESS_279 =
CMAKE_PROGRESS_280 =
CMAKE_PROGRESS_281 = 81
CMAKE_PROGRESS_282 =
CMAKE_PROGRESS_281 =
CMAKE_PROGRESS_282 = 81
CMAKE_PROGRESS_283 =
CMAKE_PROGRESS_284 = 82
CMAKE_PROGRESS_285 =
CMAKE_PROGRESS_284 =
CMAKE_PROGRESS_285 = 82
CMAKE_PROGRESS_286 =
CMAKE_PROGRESS_287 =
CMAKE_PROGRESS_288 = 83
CMAKE_PROGRESS_289 =
CMAKE_PROGRESS_288 =
CMAKE_PROGRESS_289 = 83
CMAKE_PROGRESS_290 =
CMAKE_PROGRESS_291 = 84
CMAKE_PROGRESS_292 =
CMAKE_PROGRESS_291 =
CMAKE_PROGRESS_292 = 84
CMAKE_PROGRESS_293 =
CMAKE_PROGRESS_294 =
CMAKE_PROGRESS_295 = 85
CMAKE_PROGRESS_296 =
CMAKE_PROGRESS_297 =
CMAKE_PROGRESS_298 = 86
CMAKE_PROGRESS_299 =
CMAKE_PROGRESS_298 =
CMAKE_PROGRESS_299 = 86
CMAKE_PROGRESS_300 =
CMAKE_PROGRESS_301 =
CMAKE_PROGRESS_302 = 87
CMAKE_PROGRESS_303 =
CMAKE_PROGRESS_304 =
CMAKE_PROGRESS_305 = 88
CMAKE_PROGRESS_306 =
CMAKE_PROGRESS_305 =
CMAKE_PROGRESS_306 = 88
CMAKE_PROGRESS_307 =
CMAKE_PROGRESS_308 = 89
CMAKE_PROGRESS_309 =
CMAKE_PROGRESS_308 =
CMAKE_PROGRESS_309 = 89
CMAKE_PROGRESS_310 =
CMAKE_PROGRESS_311 =
CMAKE_PROGRESS_312 = 90
CMAKE_PROGRESS_313 =
CMAKE_PROGRESS_312 =
CMAKE_PROGRESS_313 = 90
CMAKE_PROGRESS_314 =
CMAKE_PROGRESS_315 = 91
CMAKE_PROGRESS_316 =
CMAKE_PROGRESS_315 =
CMAKE_PROGRESS_316 = 91
CMAKE_PROGRESS_317 =
CMAKE_PROGRESS_318 =
CMAKE_PROGRESS_319 = 92
CMAKE_PROGRESS_320 =
CMAKE_PROGRESS_319 =
CMAKE_PROGRESS_320 = 92
CMAKE_PROGRESS_321 =
CMAKE_PROGRESS_322 = 93
CMAKE_PROGRESS_323 =
CMAKE_PROGRESS_322 =
CMAKE_PROGRESS_323 = 93
CMAKE_PROGRESS_324 =
CMAKE_PROGRESS_325 =
CMAKE_PROGRESS_326 = 94
CMAKE_PROGRESS_327 =
CMAKE_PROGRESS_326 =
CMAKE_PROGRESS_327 = 94
CMAKE_PROGRESS_328 =
CMAKE_PROGRESS_329 = 95
CMAKE_PROGRESS_330 =
CMAKE_PROGRESS_329 =
CMAKE_PROGRESS_330 = 95
CMAKE_PROGRESS_331 =
CMAKE_PROGRESS_332 =
CMAKE_PROGRESS_333 = 96
CMAKE_PROGRESS_334 =
CMAKE_PROGRESS_333 =
CMAKE_PROGRESS_334 = 96
CMAKE_PROGRESS_335 =
CMAKE_PROGRESS_336 = 97
CMAKE_PROGRESS_337 =
CMAKE_PROGRESS_336 =
CMAKE_PROGRESS_337 = 97
CMAKE_PROGRESS_338 =
CMAKE_PROGRESS_339 =
CMAKE_PROGRESS_340 = 98
CMAKE_PROGRESS_341 =
CMAKE_PROGRESS_340 =
CMAKE_PROGRESS_341 = 98
CMAKE_PROGRESS_342 =
CMAKE_PROGRESS_343 = 99
CMAKE_PROGRESS_344 =
CMAKE_PROGRESS_343 =
CMAKE_PROGRESS_344 = 99
CMAKE_PROGRESS_345 =
CMAKE_PROGRESS_346 = 100
CMAKE_PROGRESS_346 =
CMAKE_PROGRESS_347 = 100

View File

@ -944,6 +944,30 @@ driver/systick.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles\uv_k5_firmware_custom_0_17.dir\build.make CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/systick.c.s
.PHONY : driver/systick.c.s
driver/timer.obj: driver/timer.c.obj
.PHONY : driver/timer.obj
# target to build an object file
driver/timer.c.obj:
$(MAKE) $(MAKESILENT) -f CMakeFiles\uv_k5_firmware_custom_0_17.dir\build.make CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.obj
.PHONY : driver/timer.c.obj
driver/timer.i: driver/timer.c.i
.PHONY : driver/timer.i
# target to preprocess a source file
driver/timer.c.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles\uv_k5_firmware_custom_0_17.dir\build.make CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.i
.PHONY : driver/timer.c.i
driver/timer.s: driver/timer.c.s
.PHONY : driver/timer.s
# target to generate assembly for a file
driver/timer.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles\uv_k5_firmware_custom_0_17.dir\build.make CMakeFiles/uv_k5_firmware_custom_0_17.dir/driver/timer.c.s
.PHONY : driver/timer.c.s
driver/uart.obj: driver/uart.c.obj
.PHONY : driver/uart.obj
@ -8519,6 +8543,9 @@ help:
@echo ... driver/systick.obj
@echo ... driver/systick.i
@echo ... driver/systick.s
@echo ... driver/timer.obj
@echo ... driver/timer.i
@echo ... driver/timer.s
@echo ... driver/uart.obj
@echo ... driver/uart.i
@echo ... driver/uart.s

View File

@ -454,6 +454,9 @@
<Unit filename="C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/bsp/dp32g030/syscon.h">
<Option target="uv_k5_firmware_custom_0_17"/>
</Unit>
<Unit filename="C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/bsp/dp32g030/timer.h">
<Option target="uv_k5_firmware_custom_0_17"/>
</Unit>
<Unit filename="C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/bsp/dp32g030/uart.h">
<Option target="uv_k5_firmware_custom_0_17"/>
</Unit>
@ -565,6 +568,9 @@
<Unit filename="C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/driver/systick.h">
<Option target="uv_k5_firmware_custom_0_17"/>
</Unit>
<Unit filename="C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/driver/timer.c">
<Option target="uv_k5_firmware_custom_0_17"/>
</Unit>
<Unit filename="C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/driver/uart.c">
<Option target="uv_k5_firmware_custom_0_17"/>
</Unit>

67
driver/timer.c Normal file
View File

@ -0,0 +1,67 @@
//
// Created by RUPC on 2024/1/8.
//
#include "bsp/dp32g030/timer.h"
#include "ARMCM0.h"
uint8_t TIM0_CNT=0;
void TIM0_ISR()
{
TIM0_CNT++;
TIMERBASE0_IF |= (1 << 0); // 写1清零 清除定时器中断状态
}
void TIM0_SET_PSC(uint16_t prescaler) {
// 确保传入的分频系数在合法范围内0 到 0xFFFF
if (prescaler <= 0xFFFF) {
// 清除 DIV 位域
TIMERBASE0_DIV &= ~(0xFFFF); // 通过与操作清除 DIV 位域的内容
// 设置 DIV 位域为传入的分频系数
TIMERBASE0_DIV |= prescaler;
}
}
void TIM0_SET_ARR(uint16_t Arr) {
// 确保传入的分频系数在合法范围内0 到 0xFFFF
if (Arr <= 0xFFFF) {
// 清除 DIV 位域
TIMERBASE0_LOW_LOAD &= ~(0xFFFF); // 通过与操作清除 DIV 位域的内容
// 设置 DIV 位域为传入的分频系数
TIMERBASE0_LOW_LOAD |= Arr;
}
}
void TIM0_INIT()
{
// Define TIMERBASE0 base address
#define TIMERBASE0_BASE 0x40064000
#define TIMERBASE_EN_OFFSET 0x00
#define TIMERBASE_IE_OFFSET 0x10
#define TIMERBASE_IF_OFFSET 0x14
// Enable TIMERBASE0
*((volatile unsigned int *)(TIMERBASE0_BASE + TIMERBASE_EN_OFFSET)) |= 0x1; // Enable LOW_EN
// Enable Timer0 interrupt
*((volatile unsigned int *)(TIMERBASE0_BASE + TIMERBASE_IE_OFFSET)) |= 0x1; // Enable LOW_IE
// Enable global interrupts (assuming your MCU supports this)
__enable_irq(); // Function to enable interrupts
//
// TIM0_SET_PSC(480-1);//48000000/480/100=1000
// TIM0_SET_ARR(1000);//10ms
// TIMERBASE0_IF |= (1 << 1) | (1 << 0); // 写1清零 清除定时器中断状态
// TIMERBASE0_IE |= (1 << 1) | (1 << 0); // 1高 0低 使能定时器中断
// TIMERBASE0_EN |=(1 << 1) | (1 << 0);//1高 0低 使能定时器
//
// __enable_irq();
}

2
font.c
View File

@ -15,7 +15,7 @@
*/
#include "font.h"
bool menu_set_flag=false;
bool show_move_flag=false;
#if ENABLE_CHINESE_FULL ==4
bool audio_keep_flag=false;
#endif

2
font.h
View File

@ -29,7 +29,7 @@ extern bool audio_keep_flag;
#else
#define MAX_EDIT_INDEX 10
#endif
extern bool menu_set_flag;
extern bool show_move_flag;
extern const uint8_t gFontBigDigits[11][20/*20*/];
extern const uint8_t gFont3x5[96][3];

27
main.c
View File

@ -17,6 +17,7 @@
#include "string.h"
#include <stdio.h>
#include "ui/helper.h"
#include <string.h>
#include "ui/ui.h"
#include <stdint.h>
@ -30,7 +31,9 @@
#ifdef ENABLE_AM_FIX
#include "am_fix.h"
#endif
#ifdef ENABLE_TIMER
#include "bsp/dp32g030/timer.h"
#endif
#include "audio.h"
#include "board.h"
#include "misc.h"
@ -313,9 +316,25 @@ void Main(void) {
gDebounceCounter = 0;
// }
// TIM0_INIT();
//
// memset(gStatusLine, 0, sizeof(gStatusLine));
// UI_DisplayClear();
// ST7565_BlitStatusLine(); // blank status line
// ST7565_BlitFullScreen();
// char str[20]={0}; // 分配一个足够大的字符串数组来存储转换后的字符串
//
// while(1)
//{
//
// str[0]=TIMERBASE0_LOW_CNT/100+'0';
// str[1]=TIMERBASE0_LOW_CNT/10%10+'0';
// str[2]=TIMERBASE0_LOW_CNT%10+'0';
// UI_PrintStringSmall(str, 0, 127, 3);
// ST7565_BlitFullScreen();
//
//
//}
UI_DisplayWelcome();
boot_counter_10ms = 250;

View File

@ -119,7 +119,7 @@ void UI_PrintStringSmall(const char *pString, uint8_t Start, uint8_t End, uint8_
uint8_t Length = strlen(pString);
if (menu_set_flag) {
if (show_move_flag) {
#if ENABLE_CHINESE_FULL == 0
Length = Length > 7 ? 7 : Length;
#else
@ -127,7 +127,7 @@ void UI_PrintStringSmall(const char *pString, uint8_t Start, uint8_t End, uint8_
#endif
flag_move = 1;
menu_set_flag = 0;
show_move_flag = 0;
}
uint8_t sum_pixel = 0;

View File

@ -87,16 +87,34 @@ static void DrawLevelBar(uint8_t xpos, uint8_t line, uint8_t level)
uint8_t *p_line = gFrameBuffer[line];
level = MIN(level, 13);
#ifndef ENABLE_AUDIO_BAR_DEFAULT
if(xpos==35) {
for(uint8_t i = 0; i < level; i++) {
if(i < 9) {
for(uint8_t j = 0; j < 4; j++)
p_line[xpos + i * 5 + j] = (~(0x7F >> (i+1))) & 0x7F;
p_line[xpos] = 0x3E;
for (uint8_t i = 0; i < 91; i++) {
if (i < level * 7) {
p_line[xpos + i + 1] = 0x3E;
} else {
p_line[xpos + i + 1] = 0X22;
}
}
else {
memcpy(p_line + (xpos + i * 5), &hollowBar, ARRAY_SIZE(hollowBar));
p_line[xpos + 91 + 1] = 0x3E;
}else {
#endif
for (uint8_t i = 0; i < level; i++) {
if (i < 9) {
for (uint8_t j = 0; j < 4; j++)
p_line[xpos + i * 5 + j] = (~(0x7F >> (i + 1))) & 0x7F;
} else {
memcpy(p_line + (xpos + i * 5), &hollowBar, ARRAY_SIZE(hollowBar));
}
}
#ifndef ENABLE_AUDIO_BAR_DEFAULT
}
#endif
}
//#endif
@ -153,15 +171,26 @@ void UI_DisplayAudioBar(void)
if(audio_keep_flag)
{
// audio_keep_flag=false;
#ifndef ENABLE_AUDIO_BAR_DEFAULT
memset(p_line+35, 0, LCD_WIDTH-35);
#else
memset(p_line+62, 0, LCD_WIDTH-62);
#endif
}else
#endif
memset(p_line, 0, LCD_WIDTH);
#ifndef ENABLE_AUDIO_BAR_DEFAULT
DrawLevelBar(62, line, bars);
DrawLevelBar(35, line, bars);
#else
DrawLevelBar(62, line, bars);
#endif
if (gCurrentFunction == FUNCTION_TRANSMIT)
ST7565_BlitFullScreen();
@ -622,8 +651,10 @@ if (!gDTMF_InputMode) {
}
if (gEeprom.CHANNEL_DISPLAY_MODE == MDF_NAME) {
show_move_flag=1;
UI_PrintStringSmall(String, 32, 0, line);
} else {
show_move_flag=1;
UI_PrintStringSmall(String, 32 + 4, 0, line);

View File

@ -726,6 +726,8 @@ void UI_DisplayMenu(void) {
UI_PrintStringSmall(String, menu_item_x1 - 12, menu_item_x2, 5);
}
SETTINGS_FetchChannelName(String, gSubMenuSelection);
show_move_flag=1;
UI_PrintStringSmall(String[0] ? String : "--", menu_item_x1 - 12, menu_item_x2, 3);
already_printed = true;
break;
@ -779,6 +781,7 @@ void UI_DisplayMenu(void) {
if (!gIsInSubMenu || edit_index < 0) { // show the channel name
SETTINGS_FetchChannelName(String, gSubMenuSelection);
char *pPrintStr = String[0] ? String : "--";
show_move_flag=1;
UI_PrintStringSmall(pPrintStr, menu_item_x1 - 12, menu_item_x2, 3);
} else if (!CHINESE_JUDGE(tmp_name, strlen(tmp_name))) { // show the channel name being edited
UI_PrintStringSmall(edit, menu_item_x1 - 12, 0, 3);
@ -1069,6 +1072,7 @@ void UI_DisplayMenu(void) {
// channel number
UI_PrintStringSmall(pPrintStr, menu_item_x1 - 12, menu_item_x2, 2);
show_move_flag=1;
SETTINGS_FetchChannelName(String, gSubMenuSelection);
pPrintStr = String[0] ? String : "--";
@ -1169,7 +1173,7 @@ void UI_ShowChineseMenu() {
}
}
menu_set_flag = 1;
show_move_flag = 1;
UI_PrintStringSmall(MenuList[gMenuCursor].name, size_menu < 48 ? (48 - size_menu) / 2 : 0, 0, 0);

View File

@ -156,13 +156,13 @@ class MainWindow(QMainWindow):
def on_radio_button3_toggled(self):
global turn_color
turn_color = 1 - turn_color
if self.radioButton1.isChecked():
binarized_image = self.binarize_image1(resized_image)
else:
binarized_image = self.binarize_image2(resized_image)
compress_pixels = self.qimage_to_gray_list(binarized_image)
self.show_img(binarized_image)
if self.process_button.isEnabled():
if self.radioButton1.isChecked():
binarized_image = self.binarize_image1(resized_image)
else:
binarized_image = self.binarize_image2(resized_image)
compress_pixels = self.qimage_to_gray_list(binarized_image)
self.show_img(binarized_image)
def open_image(self):
global resized_image