From 8b868b30a8979ac643983cdb4b891a8b3b6c78aa Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期五, 23 五月 2025 18:08:25 +0800
Subject: [PATCH] V1.23 修改uint8 步数
---
keil/Objects/uwb_simple_example.htm | 2 +-
keil/include/src/TCPClient.c | 2 +-
keil/include/main/main.c | 2 +-
keil/Objects/uwb_simple_example_MK8000 Release.dep | 4 ++--
keil/Objects/uwb_simple_example.build_log.htm | 3 ++-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/keil/Objects/uwb_simple_example.build_log.htm b/keil/Objects/uwb_simple_example.build_log.htm
index 4af9ab9..50b62c3 100644
--- a/keil/Objects/uwb_simple_example.build_log.htm
+++ b/keil/Objects/uwb_simple_example.build_log.htm
@@ -29,6 +29,7 @@
Build target 'MK8000 Release'
Note: source file '.\include\drivers\lis3dh_driver.c' - object file renamed from '.\Objects\lis3dh_driver.o' to '.\Objects\lis3dh_driver_1.o'.
Note: source file '.\include\drivers\lis3dh_driver.c' - object file renamed from '.\Objects\lis3dh_driver.o' to '.\Objects\lis3dh_driver_1.o'.
+compiling main.c...
compiling lis3dh_driver.c...
compiling lis3dh_driver.c...
linking...
@@ -52,7 +53,7 @@
D:\keil\pack\MKSEMI\MK800X_DFP\1.0.3\Device\Include
<h2>Collection of Component Files used:</h2>
-Build Time Elapsed: 00:00:02
+Build Time Elapsed: 00:00:01
</pre>
</body>
</html>
diff --git a/keil/Objects/uwb_simple_example.htm b/keil/Objects/uwb_simple_example.htm
index 6890fb6..a2a8583 100644
--- a/keil/Objects/uwb_simple_example.htm
+++ b/keil/Objects/uwb_simple_example.htm
@@ -3,7 +3,7 @@
<title>Static Call Graph - [.\Objects\uwb_simple_example.axf]</title></head>
<body><HR>
<H1>Static Call Graph for image .\Objects\uwb_simple_example.axf</H1><HR>
-<BR><P>#<CALLGRAPH># ARM Linker, 6140002: Last Updated: Fri May 23 17:55:12 2025
+<BR><P>#<CALLGRAPH># ARM Linker, 6140002: Last Updated: Fri May 23 18:07:49 2025
<BR><P>
<H3>Maximum Stack Usage = 1604 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
Call chain for Maximum Stack Depth:</H3>
diff --git a/keil/Objects/uwb_simple_example_MK8000 Release.dep b/keil/Objects/uwb_simple_example_MK8000 Release.dep
index 265acec..4b1fa96 100644
--- a/keil/Objects/uwb_simple_example_MK8000 Release.dep
+++ b/keil/Objects/uwb_simple_example_MK8000 Release.dep
@@ -771,7 +771,7 @@
I (include\drivers\mk_gpio.h)(0x67DCD5B6)
I (include\drivers\Usart.h)(0x67DCD5B6)
I (include\drivers\global_param.h)(0x682FD8A9)
-F (.\include\main\main.c)(0x68302CD4)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c
-fno-rtti -funsigned-char
-D__MICROLIB -gdwarf-3 -O3 -ffunction-sections -w -I ./include/board -I ../keil -I .. -I ./include/board -I ./include/CMSIS/Include -I ./include/components/algo/inc -I ./include/components/crc -I ./include/components/libc -I ./include/components/wsf/include -I ./include/components/wsf/include/platform -I ./include/devices/MK800X/Include -I ./include/drivers -I ./include/components/hido/Include -I ./include/components/internet/inc -I ./include/components/hal -I ../keil -I ./include/src -I ./include/components/internet/src -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter
-I./RTE/_MK8000_Release
-ID:/keil/pack/MKSEMI/MK800X_DFP/1.0.3/Device/Include
-ID:/keil/ARM/CMSIS/Include
-D__UVISION_VERSION="530" -D_RTE_ -DUWB_EN -DSTD_LIBC
-o ./objects/main.o -MD)
+F (.\include\main\main.c)(0x683048F4)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c
-fno-rtti -funsigned-char
-D__MICROLIB -gdwarf-3 -O3 -ffunction-sections -w -I ./include/board -I ../keil -I .. -I ./include/board -I ./include/CMSIS/Include -I ./include/components/algo/inc -I ./include/components/crc -I ./include/components/libc -I ./include/components/wsf/include -I ./include/components/wsf/include/platform -I ./include/devices/MK800X/Include -I ./include/drivers -I ./include/components/hido/Include -I ./include/components/internet/inc -I ./include/components/hal -I ../keil -I ./include/src -I ./include/components/internet/src -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter
-I./RTE/_MK8000_Release
-ID:/keil/pack/MKSEMI/MK800X_DFP/1.0.3/Device/Include
-ID:/keil/ARM/CMSIS/Include
-D__UVISION_VERSION="530" -D_RTE_ -DUWB_EN -DSTD_LIBC
-o ./objects/main.o -MD)
I (include\drivers\mk_trace.h)(0x67DCD5B6)
I (include\drivers\mk_common.h)(0x67DCD5B6)
I (D:\keil\ARM\ARMCLANG\include\stddef.h)(0x5DDFFD72)
@@ -893,7 +893,7 @@
I (include\drivers\mk_gpio.h)(0x67DCD5B6)
I (include\drivers\mk_io.h)(0x67DCD5B6)
I (include\drivers\mk_calib.h)(0x67DCD5B6)
-F (.\include\src\TCPClient.c)(0x68303C83)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c
-fno-rtti -funsigned-char
-D__MICROLIB -gdwarf-3 -O3 -ffunction-sections -w -I ./include/board -I ../keil -I .. -I ./include/board -I ./include/CMSIS/Include -I ./include/components/algo/inc -I ./include/components/crc -I ./include/components/libc -I ./include/components/wsf/include -I ./include/components/wsf/include/platform -I ./include/devices/MK800X/Include -I ./include/drivers -I ./include/components/hido/Include -I ./include/components/internet/inc -I ./include/components/hal -I ../keil -I ./include/src -I ./include/components/internet/src -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter
-I./RTE/_MK8000_Release
-ID:/keil/pack/MKSEMI/MK800X_DFP/1.0.3/Device/Include
-ID:/keil/ARM/CMSIS/Include
-D__UVISION_VERSION="530" -D_RTE_ -DUWB_EN -DSTD_LIBC
-o ./objects/tcpclient.o -MD)
+F (.\include\src\TCPClient.c)(0x683048AF)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c
-fno-rtti -funsigned-char
-D__MICROLIB -gdwarf-3 -O3 -ffunction-sections -w -I ./include/board -I ../keil -I .. -I ./include/board -I ./include/CMSIS/Include -I ./include/components/algo/inc -I ./include/components/crc -I ./include/components/libc -I ./include/components/wsf/include -I ./include/components/wsf/include/platform -I ./include/devices/MK800X/Include -I ./include/drivers -I ./include/components/hido/Include -I ./include/components/internet/inc -I ./include/components/hal -I ../keil -I ./include/src -I ./include/components/internet/src -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter
-I./RTE/_MK8000_Release
-ID:/keil/pack/MKSEMI/MK800X_DFP/1.0.3/Device/Include
-ID:/keil/ARM/CMSIS/Include
-D__UVISION_VERSION="530" -D_RTE_ -DUWB_EN -DSTD_LIBC
-o ./objects/tcpclient.o -MD)
I (include\src\TCPClient.h)(0x6825C506)
I (include\components\hido\Include\HIDO_TYpeDef.h)(0x67DCD5B6)
I (include\components\internet\inc\Socket.h)(0x67DCD5B6)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 0b5a648..939a167 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -586,7 +586,7 @@
// }
g_com_map[MODBUS_MODE] = 0;
log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
- g_com_map[VERSION] = (1<<8)|22;
+ g_com_map[VERSION] = (1<<8)|23;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index e5762d7..8ab5c48 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -525,7 +525,7 @@
#ifdef JIBU_XIUMIAN
HIDO_UINT32 u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "%s,%X,%02x,%x,%d,%d,%d%\r\n",
- _pcGGA, g_com_map[DEV_ID], bat_percent,ave_sp,0,step_count,exercise_state);
+ _pcGGA, g_com_map[DEV_ID], bat_percent,ave_sp,0,(uint8_t)(step_count),exercise_state);
#else
HIDO_UINT32 u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "%s,%X,%02x,%x,%d,%d,%d%\r\n",
_pcGGA, g_com_map[DEV_ID], bat_percent,ave_sp,0,0,0);
--
Gitblit v1.9.3