@@ -186,7 +186,6 @@
0
0
0
- 0
0
0
8
diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/buzzer.o b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/buzzer.o
index 18f4081..c7b84d8 100644
Binary files a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/buzzer.o and b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/buzzer.o differ
diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/encode.o b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/encode.o
index f4330d0..dd451fc 100644
Binary files a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/encode.o and b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/encode.o differ
diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.axf b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.axf
index 751453b..92d8d99 100644
Binary files a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.axf and b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.axf differ
diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.build_log.htm b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.build_log.htm
index f5795b0..16fdad2 100644
--- a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.build_log.htm
+++ b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.build_log.htm
@@ -3,97 +3,122 @@
礦ision Build Log
Tool Versions:
-IDE-Version: 礦ision 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
Project:
-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
Output:
-*** 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]
+ ""
+ ^~~~~~~~
+MYDEIVERS/mymain.c(52): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+ ""
+ ^~~~~~~~
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 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]
+ "页\n模式\n\n示\n\n",5,
+ ^~~~~~~~
+MYDEIVERS/mymain.c(185): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+ "页\n模式\n\n示\n\n",5,
+ ^~~~~~~~~~~~~~~~
+MYDEIVERS/mymain.c(185): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+ "页\n模式\n\n示\n\n",5,
+ ^~~~~~~~~~~~~~~~~~~~~~~~
+MYDEIVERS/mymain.c(185): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+ "页\n模式\n\n示\n\n",5,
+ ^~~~~~~~
+MYDEIVERS/mymain.c(185): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+ "页\n模式\n\n示\n\n",5,
+ ^~~~~~~~~~~~~~~~
+MYDEIVERS/mymain.c(185): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+ "页\n模式\n\n示\n\n",5,
+ ^~~~~~~~~~~~~~~~
+MYDEIVERS/mymain.c(198): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+ "\n\n\n选谢",3,NULL
+ ^~~~~~~~~~~~~~~~
+MYDEIVERS/mymain.c(198): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+ "\n\n\n选谢",3,NULL
+ ^~~~~~~~~~~~~~~~
+MYDEIVERS/mymain.c(198): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+ "\n\n\n选谢",3,NULL
+ ^~~~~~~~~~~~~~~~
+MYDEIVERS/mymain.c(198): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+ "\n\n\n选谢",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]
+ "\n\n转",2,NULL
+ ^~~~~~~~~~~~~~~~
+MYDEIVERS/mymain.c(253): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+ "\n\n转",2,NULL
+ ^~~~~~~~~~~~~~~~
+MYDEIVERS/mymain.c(253): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+ "\n\n转",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",
+ ^~~~~~~~~~~~~~~~
+MYDEIVERS/mymain.c(302): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+ "\nEnglish\n",2,NULL
+ ^~~~~~~~~~~~~~~~
+MYDEIVERS/mymain.c(302): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+ "\nEnglish\n