增加中文切换功能

Signed-off-by: kevin <kevin@lmve.net>
This commit is contained in:
2022-08-18 18:01:08 +08:00
parent 423048d098
commit ef5d3d2850
41 changed files with 4026 additions and 3786 deletions
Binary file not shown.
Binary file not shown.
@@ -3,97 +3,122 @@
<pre>
<h1>µVision Build Log</h1>
<h2>Tool Versions:</h2>
IDE-Version: µVision V5.37.0.0
Copyright (C) 2022 ARM Ltd and ARM Germany GmbH. All rights reserved.
License Information: kevin ng, lmve.net, LIC=----
IDE-Version: ¦ÌVision V5.36.0.0
Copyright (C) 2021 ARM Ltd and ARM Germany GmbH. All rights reserved.
License Information: 1 1, 1, LIC=----
Tool Versions:
Toolchain: MDK-Lite Version: 5.37.0.0
Toolchain: MDK-Lite Version: 5.36.0.0
Toolchain Path: C:\Keil_v5\ARM\ARMCLANG\Bin
C Compiler: ArmClang.exe V6.18
Assembler: Armasm.exe V6.18
Linker/Locator: ArmLink.exe V6.18
Library Manager: ArmAr.exe V6.18
Hex Converter: FromElf.exe V6.18
CPU DLL: SARMCM3.DLL V5.37.0.0
Dialog DLL: DCM.DLL V1.17.5.0
C Compiler: ArmClang.exe V6.16
Assembler: Armasm.exe V6.16
Linker/Locator: ArmLink.exe V6.16
Library Manager: ArmAr.exe V6.16
Hex Converter: FromElf.exe V6.16
CPU DLL: SARMCM3.DLL V5.36.0.0
Dialog DLL: DCM.DLL V1.17.3.0
Target DLL: STLink\ST-LINKIII-KEIL_SWO.dll V3.0.9.0
Dialog DLL: TCM.DLL V1.56.1.0
Dialog DLL: TCM.DLL V1.53.0.0
<h2>Project:</h2>
C:\Users\wuwen\morse_code_trainer\f103c8t6_keil\MDK-ARM\f103c8t6_KEIL.uvprojx
Project File Date: 08/15/2022
C:\Users\kevin\Desktop\morse_code_trainer\f103c8t6_keil\MDK-ARM\f103c8t6_KEIL.uvprojx
Project File Date: 08/18/2022
<h2>Output:</h2>
*** Using Compiler 'V6.18', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin'
Rebuild target 'f103c8t6_KEIL'
assembling startup_stm32f103xb.s...
compiling stm32f1xx_it.c...
compiling stm32f1xx_hal_gpio_ex.c...
compiling stm32f1xx_hal_msp.c...
compiling stm32f1xx_hal.c...
*** Using Compiler 'V6.16', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin'
Build target 'f103c8t6_KEIL'
compiling main.c...
compiling stm32f1xx_hal_rcc_ex.c...
compiling stm32f1xx_hal_gpio.c...
compiling stm32f1xx_hal_cortex.c...
compiling stm32f1xx_hal_rcc.c...
compiling stm32f1xx_hal_pwr.c...
compiling stm32f1xx_hal_dma.c...
compiling stm32f1xx_hal_flash.c...
compiling stm32f1xx_hal_exti.c...
compiling system_stm32f1xx.c...
compiling stm32f1xx_hal_flash_ex.c...
compiling hread_interface.c...
compiling fonts.c...
MYDEIVERS/mymain.c(46): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"<BF><AA>"
^~~~~~~~
MYDEIVERS/mymain.c(52): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"<B9><D8>"
^~~~~~~~
MYDEIVERS/mymain.c(67): warning: non-void function does not return a value in all control paths [-Wreturn-type]
}
^
MYDEIVERS/mymain.c(100): warning: passing 'const char *' to parameter of type 'char *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
OLED_Str_list(0,0,16,list,m->list_dis_top,4,1);
^~~~
./MYDEIVERS/oled.h(35): note: passing argument to parameter 'str' here
./MYDEIVERS/oled.h(36): note: passing argument to parameter 'str' here
void OLED_Str_list(unsigned char x,unsigned char y,unsigned char size,char *str,unsigned char lenstard,unsigned char lenconst,unsigned char type);
^
MYDEIVERS/mymain.c(109): warning: implicitly declaring library function 'sprintf' with type 'int (char *, const char *, ...)' [-Wimplicit-function-declaration]
sprintf(temp,"%d/%d",m->sele,m->list_const);
^
MYDEIVERS/mymain.c(109): note: include the header <stdio.h> or explicitly provide a declaration for 'sprintf'
MYDEIVERS/mymain.c(218): warning: incompatible pointer types assigning to 'char *' from 'char (*)[32]' [-Wincompatible-pointer-types]
MYDEIVERS/mymain.c(185): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"<D6><F7>ҳ\n<CA><E4><C8><EB>ģʽ\n<B7><E4><C3><F9><C6><F7>\n<CF><D4>ʾ\n<D3><EF><D1><D4>\n<B9><D8><D3><DA>",5,
^~~~~~~~
MYDEIVERS/mymain.c(185): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"<D6><F7>ҳ\n<CA><E4><C8><EB>ģʽ\n<B7><E4><C3><F9><C6><F7>\n<CF><D4>ʾ\n<D3><EF><D1><D4>\n<B9><D8><D3><DA>",5,
^~~~~~~~~~~~~~~~
MYDEIVERS/mymain.c(185): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"<D6><F7>ҳ\n<CA><E4><C8><EB>ģʽ\n<B7><E4><C3><F9><C6><F7>\n<CF><D4>ʾ\n<D3><EF><D1><D4>\n<B9><D8><D3><DA>",5,
^~~~~~~~~~~~~~~~~~~~~~~~
MYDEIVERS/mymain.c(185): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"<D6><F7>ҳ\n<CA><E4><C8><EB>ģʽ\n<B7><E4><C3><F9><C6><F7>\n<CF><D4>ʾ\n<D3><EF><D1><D4>\n<B9><D8><D3><DA>",5,
^~~~~~~~
MYDEIVERS/mymain.c(185): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"<D6><F7>ҳ\n<CA><E4><C8><EB>ģʽ\n<B7><E4><C3><F9><C6><F7>\n<CF><D4>ʾ\n<D3><EF><D1><D4>\n<B9><D8><D3><DA>",5,
^~~~~~~~~~~~~~~~
MYDEIVERS/mymain.c(185): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"<D6><F7>ҳ\n<CA><E4><C8><EB>ģʽ\n<B7><E4><C3><F9><C6><F7>\n<CF><D4>ʾ\n<D3><EF><D1><D4>\n<B9><D8><D3><DA>",5,
^~~~~~~~~~~~~~~~
MYDEIVERS/mymain.c(198): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"<B7><B5><BB><D8>\n<B5><E3><BB><F7>\n<B3><A4><B0><B4>\nѡ<D4><F1><C7>л<BB>",3,NULL
^~~~~~~~~~~~~~~~
MYDEIVERS/mymain.c(198): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"<B7><B5><BB><D8>\n<B5><E3><BB><F7>\n<B3><A4><B0><B4>\nѡ<D4><F1><C7>л<BB>",3,NULL
^~~~~~~~~~~~~~~~
MYDEIVERS/mymain.c(198): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"<B7><B5><BB><D8>\n<B5><E3><BB><F7>\n<B3><A4><B0><B4>\nѡ<D4><F1><C7>л<BB>",3,NULL
^~~~~~~~~~~~~~~~
MYDEIVERS/mymain.c(198): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"<B7><B5><BB><D8>\n<B5><E3><BB><F7>\n<B3><A4><B0><B4>\nѡ<D4><F1><C7>л<BB>",3,NULL
^~~~~~~~~~~~ ~~~~
MYDEIVERS/mymain.c(203): warning: incompatible pointer types assigning to 'char *' from 'char (*)[32]' [-Wincompatible-pointer-types]
buzzer_setting.r_sw_list=&str;
^~~~~
MYDEIVERS/mymain.c(272): warning: incompatible pointer types assigning to 'char *' from 'char (*)[32]' [-Wincompatible-pointer-types]
MYDEIVERS/mymain.c(253): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"<B7><B5><BB><D8>\n<C1><C1><B6><C8>\n<D0><FD>ת",2,NULL
^~~~~~~~~~~~~~~~
MYDEIVERS/mymain.c(253): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"<B7><B5><BB><D8>\n<C1><C1><B6><C8>\n<D0><FD>ת",2,NULL
^~~~~~~~~~~~~~~~
MYDEIVERS/mymain.c(253): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"<B7><B5><BB><D8>\n<C1><C1><B6><C8>\n<D0><FD>ת",2,NULL
^~~~~~~~
MYDEIVERS/mymain.c(257): warning: incompatible pointer types assigning to 'char *' from 'char (*)[32]' [-Wincompatible-pointer-types]
display_setting.r_sw_list=&str;
^~~~~
5 warnings generated.
MYDEIVERS/mymain.c(301): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"Back\nEnglish\n<D6><D0><CE><C4>",
^~~~~~~~~~~~~~~~
MYDEIVERS/mymain.c(302): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"<B7><B5><BB><D8>\nEnglish\n<D6><D0><CE><C4>",2,NULL
^~~~~~~~~~~~~~~~
MYDEIVERS/mymain.c(302): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
"<B7><B5><BB><D8>\nEnglish\n<D6><D0><CE><C4>",2,NULL
^~~~~~~~~~~~~~~~
MYDEIVERS/mymain.c(305): warning: incompatible pointer types assigning to 'char *' from 'char (*)[32]' [-Wincompatible-pointer-types]
display_setting.r_sw_list=&str;
^~~~~
24 warnings generated.
compiling mymain.c...
compiling stm32f1xx_hal_tim_ex.c...
MYDEIVERS/buzzer.c(24): warning: implicitly declaring library function 'malloc' with type 'void *(unsigned int)' [-Wimplicit-function-declaration]
buff =(note*)malloc(sizeof(note));
^
MYDEIVERS/buzzer.c(24): note: include the header <stdlib.h> or explicitly provide a declaration for 'malloc'
MYDEIVERS/buzzer.c(63): warning: implicitly declaring library function 'free' with type 'void (void *)' [-Wimplicit-function-declaration]
free(buzzer_play_buff.head);
^
MYDEIVERS/buzzer.c(63): note: include the header <stdlib.h> or explicitly provide a declaration for 'free'
2 warnings generated.
compiling buzzer.c...
compiling encode.c...
compiling oled.c...
compiling morsr.c...
compiling stm32f1xx_hal_tim.c...
compiling stm32f1xx_hal_i2c.c...
linking...
Program Size: Code=16772 RO-data=4088 RW-data=108 ZI-data=4188
Program Size: Code=16996 RO-data=5208 RW-data=132 ZI-data=4188
FromELF: creating hex file...
"f103c8t6_KEIL\f103c8t6_KEIL.axf" - 0 Error(s), 7 Warning(s).
"f103c8t6_KEIL\f103c8t6_KEIL.axf" - 0 Error(s), 24 Warning(s).
<h2>Software Packages used:</h2>
Package Vendor: ARM
http://www.keil.com/pack/ARM.CMSIS.5.9.0.pack
ARM.CMSIS.5.9.0
http://www.keil.com/pack/ARM.CMSIS.5.8.0.pack
ARM.CMSIS.5.8.0
CMSIS (Common Microcontroller Software Interface Standard)
* Component: CORE Version: 5.6.0
* Component: CORE Version: 5.5.0
Package Vendor: Keil
http://www.keil.com/pack/Keil.STM32F1xx_DFP.2.4.0.pack
@@ -101,14 +126,14 @@ Package Vendor: Keil
STMicroelectronics STM32F1 Series Device Support, Drivers and Examples
<h2>Collection of Component include folders:</h2>
./RTE/_f103c8t6_KEIL
C:/Users/wuwen/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include
C:/Users/wuwen/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include
.\RTE\_f103c8t6_KEIL
C:\Users\kevin\AppData\Local\Arm\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Include
C:\Users\kevin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include
<h2>Collection of Component Files used:</h2>
* Component: ARM::CMSIS:CORE:5.6.0
Include file: CMSIS/Core/Include/tz_context.h
* Component: ARM::CMSIS:CORE:5.5.0
Include file: CMSIS\Core\Include\tz_context.h
Build Time Elapsed: 00:00:02
</pre>
</body>
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+30 -1
View File
@@ -1 +1,30 @@
f103c8t6_keil/fonts.o: MYDEIVERS\fonts.c
f103c8t6_keil/fonts.o: MYDEIVERS\fonts.c MYDEIVERS\fonts.h \
..\Core\Inc\main.h ..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal.h \
..\Core\Inc\stm32f1xx_hal_conf.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_rcc.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_def.h \
..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\stm32f1xx.h \
..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\stm32f103xb.h \
..\Drivers\CMSIS\Include\core_cm3.h \
C:\Keil_v5\ARM\ARMCLANG\Bin\..\include\stdint.h \
..\Drivers\CMSIS\Include\cmsis_version.h \
..\Drivers\CMSIS\Include\cmsis_compiler.h \
..\Drivers\CMSIS\Include\cmsis_armclang.h \
C:\Keil_v5\ARM\ARMCLANG\Bin\..\include\arm_compat.h \
C:\Keil_v5\ARM\ARMCLANG\Bin\..\include\arm_acle.h \
..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\system_stm32f1xx.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\Legacy\stm32_hal_legacy.h \
C:\Keil_v5\ARM\ARMCLANG\Bin\..\include\stddef.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_rcc_ex.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_gpio.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_gpio_ex.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_exti.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_dma.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_dma_ex.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_cortex.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_flash.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_flash_ex.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_i2c.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_pwr.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim_ex.h
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1 -1
View File
@@ -28,4 +28,4 @@ f103c8t6_keil/oled.o: MYDEIVERS\oled.c MYDEIVERS\oled.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_pwr.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h \
..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim_ex.h \
MYDEIVERS\hread_interface.h
MYDEIVERS\hread_interface.h MYDEIVERS\fonts.h
Binary file not shown.
Binary file not shown.
Binary file not shown.