@@ -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 ce36160..2e48d11 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 a10c5dc..7d7f862 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,29 +3,29 @@
Vision Build Log
Tool Versions:
-IDE-Version: Vision V5.37.0.0
-Copyright (C) 2022 ARM Ltd and ARM Germany GmbH. All rights reserved.
+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/08/2022
+C:\Users\kevin\Desktop\morse_code_trainer\f103c8t6_keil\MDK-ARM\f103c8t6_KEIL.uvprojx
+Project File Date: 08/11/2022
Output:
-*** Using Compiler 'V6.18', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin'
+*** Using Compiler 'V6.16', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin'
Build target 'f103c8t6_KEIL'
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);
@@ -33,24 +33,27 @@ MYDEIVERS/mymain.c(100): warning: passing 'const char *' to parameter of type 'c
./MYDEIVERS/oled.h(33): 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(102): 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(102): note: include the header or explicitly provide a declaration for 'sprintf'
-2 warnings generated.
+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(259): warning: incompatible pointer types assigning to 'char *' from 'char (*)[32]' [-Wincompatible-pointer-types]
+ buzzer_setting.r_sw_list=&str;
+ ^~~~~
+3 warnings generated.
compiling mymain.c...
linking...
-Program Size: Code=14748 RO-data=4012 RW-data=64 ZI-data=4200
+Program Size: Code=15508 RO-data=4024 RW-data=64 ZI-data=4216
FromELF: creating hex file...
-"f103c8t6_KEIL\f103c8t6_KEIL.axf" - 0 Error(s), 2 Warning(s).
+"f103c8t6_KEIL\f103c8t6_KEIL.axf" - 0 Error(s), 3 Warning(s).
Software Packages used:
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
@@ -58,14 +61,14 @@ Package Vendor: Keil
STMicroelectronics STM32F1 Series Device Support, Drivers and Examples
Collection of Component include folders:
- ./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
Collection of Component Files used:
- * 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:01