From a52817ac33ed40cbbfdcbfacd1a49fa40e928341 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 17 四月 2025 16:19:13 +0800
Subject: [PATCH] 兼容4g手环跟4g工卡两种硬件升级
---
dualboots_Gai_youhua/keil/customboot/Objects/customboot.build_log.htm | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/dualboots_Gai_youhua/keil/customboot/Objects/customboot.build_log.htm b/dualboots_Gai_youhua/keil/customboot/Objects/customboot.build_log.htm
index d6b33c0..c726337 100644
--- a/dualboots_Gai_youhua/keil/customboot/Objects/customboot.build_log.htm
+++ b/dualboots_Gai_youhua/keil/customboot/Objects/customboot.build_log.htm
@@ -22,83 +22,89 @@
<h2>Project:</h2>
C:\git-mk8000\ChinaUWBProject - 4G工卡BOOT\dualboots_Gai_youhua\keil\customboot\customboot.uvprojx
-Project File Date: 03/31/2025
+Project File Date: 04/16/2025
<h2>Output:</h2>
*** Using Compiler 'V6.14', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin'
Rebuild target 'MK8000 Release'
compiling startup_MK800X.c...
-compiling mk_calib.c...
compiling system_MK800X.c...
-compiling mk_sleep_timer.c...
-compiling mk_dual_timer.c...
compiling mk_clock.c...
-compiling mk_io.c...
+compiling mk_sleep_timer.c...
compiling mk_reset.c...
-compiling mk_wdt.c...
-compiling mk_misc.c...
-compiling mk_gpio.c...
compiling aes.c...
-compiling mk_power.c...
+compiling mk_calib.c...
compiling mk_dma.c...
+compiling mk_dual_timer.c...
+compiling mk_gpio.c...
+compiling mk_io.c...
+compiling mk_misc.c...
+compiling mk_wdt.c...
+compiling mk_power.c...
compiling mk_uart.c...
compiling menu.c...
compiling mk_flash.c...
compiling ymodem.c...
compiling pin_config.c...
compiling board.c...
-../../src/customboot/customboot.c(184): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
- SerialPutString("MK8000-BootLoader-V1.1<C6><F4><B6><AF>\r\n");
- ^~~~~~~~~~~~~~~~
+../../src/customboot/customboot.c(194): warning: implicit declaration of function 'delay_ms' is invalid in C99 [-Wimplicit-function-declaration]
+ delay_ms(200);
+ ^
+../../src/customboot/customboot.c(250): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+ SerialPutString("MK8000-BootLoader-V1.1<C6><F4><B6><AF>\r\n");
+ ^~~~~~~~~~~~~~~~
./include/drivers/mk_uart.h(69): note: expanded from macro 'SerialPutString'
#define SerialPutString(x) Serial_PutString((uint8_t*)(x))
^
-../../src/customboot/customboot.c(186): warning: implicit declaration of function 'delay_ms' is invalid in C99 [-Wimplicit-function-declaration]
- delay_ms(200);
- ^
-../../src/customboot/customboot.c(203): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+../../src/customboot/customboot.c(267): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
SerialPutString("<B4><AE><BF><DA><C9><FD><BC><B6><C6><F4><B6><AF>\r\n");
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./include/drivers/mk_uart.h(69): note: expanded from macro 'SerialPutString'
#define SerialPutString(x) Serial_PutString((uint8_t*)(x))
^
-../../src/customboot/customboot.c(215): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+../../src/customboot/customboot.c(279): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
SerialPutString("OTA<CD><EA><B3><C9>,<BD><E2><C3><DC><CE>募<FE><C6><F4><B6><AF>\r\n");
^~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~
./include/drivers/mk_uart.h(69): note: expanded from macro 'SerialPutString'
#define SerialPutString(x) Serial_PutString((uint8_t*)(x))
^
-../../src/customboot/customboot.c(216): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+../../src/customboot/customboot.c(280): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
SerialPutString("OTA<B9>碳<FE><BD><E2>压\r\n");
^~~~~~~~~~~~~~~~
./include/drivers/mk_uart.h(69): note: expanded from macro 'SerialPutString'
#define SerialPutString(x) Serial_PutString((uint8_t*)(x))
^
-../../src/customboot/customboot.c(232): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+../../src/customboot/customboot.c(296): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
SerialPutString("<B2><C1><B3><FD><B1><EA>注位<B3>晒<A6>\r\n");
^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~ ~~~~
./include/drivers/mk_uart.h(69): note: expanded from macro 'SerialPutString'
#define SerialPutString(x) Serial_PutString((uint8_t*)(x))
^
-../../src/customboot/customboot.c(253): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+../../src/customboot/customboot.c(319): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
SerialPutString("OTA<BD><E2><C3>艹晒<A6><A3><AC><U+05FC><B1><B8><D6><D8><C6><F4>\r\n");
^~~~~~~~~~~~ ~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~
./include/drivers/mk_uart.h(69): note: expanded from macro 'SerialPutString'
#define SerialPutString(x) Serial_PutString((uint8_t*)(x))
^
-../../src/customboot/customboot.c(262): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+../../src/customboot/customboot.c(328): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
SerialPutString("<BD><F8><C8><EB>OTA,<C9><FD><BC><B6><C6><F4><B6><AF>\r\n");
^~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./include/drivers/mk_uart.h(69): note: expanded from macro 'SerialPutString'
#define SerialPutString(x) Serial_PutString((uint8_t*)(x))
^
-8 warnings generated.
+../../src/customboot/customboot.c(346): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+ SerialPutString("<U+05FC><B1><B8><CC><F8>转app\r\n");
+ ^~~~~~~~~~~~~~~~
+./include/drivers/mk_uart.h(69): note: expanded from macro 'SerialPutString'
+#define SerialPutString(x) Serial_PutString((uint8_t*)(x))
+ ^
+9 warnings generated.
compiling customboot.c...
linking...
-Program Size: Code=10860 RO-data=908 RW-data=500 ZI-data=4000
+Program Size: Code=12028 RO-data=892 RW-data=532 ZI-data=4024
FromELF: creating hex file...
After Build - User command #1: fromelf.exe --bincombined -o "Output\customboot.bin" "C:\git-mk8000\ChinaUWBProject - 4G工卡BOOT\dualboots_Gai_youhua\keil\customboot\Objects\customboot.axf"
-".\Objects\customboot.axf" - 0 Error(s), 8 Warning(s).
+".\Objects\customboot.axf" - 0 Error(s), 9 Warning(s).
<h2>Software Packages used:</h2>
--
Gitblit v1.9.3