From fc27806d996281581a6f0980397d844c2fb331a3 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 25 九月 2024 16:57:52 +0800
Subject: [PATCH] 修改版本号为V1.2，与非车载标签分开
---
keil/Objects/uwb_simple_example.htm | 2
keil/include/main/main.c | 2
keil/Objects/uwb_simple_example_MK8000 Release.dep | 2
keil/Objects/uwb_simple_example.build_log.htm | 110 ++++++++++++++++++++++++++++++++++++
keil/Objects/uwb_simple_example.hex | 2
keil/uwb_simple_example.uvguix.xookk | 20 +++---
6 files changed, 122 insertions(+), 16 deletions(-)
diff --git a/keil/Objects/uwb_simple_example.build_log.htm b/keil/Objects/uwb_simple_example.build_log.htm
index 3c71489..fc28ee5 100644
--- a/keil/Objects/uwb_simple_example.build_log.htm
+++ b/keil/Objects/uwb_simple_example.build_log.htm
@@ -27,8 +27,114 @@
<h2>Output:</h2>
*** Using Compiler 'V6.14', folder: 'd:\Keil_v5\ARM\ARMCLANG\Bin'
Build target 'MK8000 Release'
+include/main/main.c(57): warning: no previous extern declaration for non-static variable 'trx_buf' [-Wmissing-variable-declarations]
+uint8_t trx_buf[10] = {0};
+ ^
+include/main/main.c(57): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+uint8_t trx_buf[10] = {0};
+^
+include/main/main.c(67): warning: no previous extern declaration for non-static variable 'test_uart_cfg' [-Wmissing-variable-declarations]
+struct UART_CFG_T test_uart_cfg =
+ ^
+include/main/main.c(67): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+struct UART_CFG_T test_uart_cfg =
+^
+include/main/main.c(106): warning: no previous extern declaration for non-static variable 'state5v' [-Wmissing-variable-declarations]
+uint8_t state5v = 1;
+ ^
+include/main/main.c(106): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+uint8_t state5v = 1;
+^
+include/main/main.c(107): warning: no previous extern declaration for non-static variable 'bat_percent' [-Wmissing-variable-declarations]
+uint8_t bat_percent=0,g_start_send_flag=1;
+ ^
+include/main/main.c(107): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+uint8_t bat_percent=0,g_start_send_flag=1;
+^
+include/main/main.c(107): warning: no previous extern declaration for non-static variable 'g_start_send_flag' [-Wmissing-variable-declarations]
+uint8_t bat_percent=0,g_start_send_flag=1;
+ ^
+include/main/main.c(107): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+uint8_t bat_percent=0,g_start_send_flag=1;
+^
+include/main/main.c(165): warning: implicit conversion loses integer precision: 'int' to 'uint8_t' (aka 'unsigned char') [-Wimplicit-int-conversion]
+ bat_percent = ((fVoltage_mv - 3300) /8);
+ ~ ~~~~~~~~~~~~~~~~~~~~~^~
+include/main/main.c(178): warning: implicit conversion loses integer precision: 'uint16_t' (aka 'unsigned short') to 'uint8_t' (aka 'unsigned char') [-Wimplicit-int-conversion]
+group_id=g_com_map[GROUP_ID];
+ ~^~~~~~~~~~~~~~~~~~~
+include/main/main.c(180): warning: implicit conversion loses integer precision: 'int' to 'uint8_t' (aka 'unsigned char') [-Wimplicit-int-conversion]
+tag_frequence=1000/g_com_map[COM_INTERVAL];
+ ~~~~~^~~~~~~~~~~~~~~~~~~~~~~~
+include/main/main.c(182): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+LOG_INFO(TRACE_MODULE_APP,"<C9>璞窱D: %x .\r\n",dev_id);
+ ^~~~
+./include/drivers\mk_trace.h(170): note: expanded from macro 'LOG_INFO'
+#define LOG_INFO(LOG_MODULE, str, ...) TRACE(LOG_MODULE, TRACE_LEVEL_INFO, str, ##__VA_ARGS__)
+ ^~~
+./include/drivers\mk_trace.h(132): note: expanded from macro 'TRACE'
+#define TRACE(module, level, str, ...) trace_printf((module), (level), (str), ##__VA_ARGS__)
+ ^~~
+include/main/main.c(183): warning: illegal character encoding in string literal [-Winvalid-source-encoding]
+LOG_INFO(TRACE_MODULE_APP,"<B9>碳<FE><B0>姹�:UWB-<B1><EA>签 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+ ^~~~~~~~~~~~ ~~~~~~~~
+./include/drivers\mk_trace.h(170): note: expanded from macro 'LOG_INFO'
+#define LOG_INFO(LOG_MODULE, str, ...) TRACE(LOG_MODULE, TRACE_LEVEL_INFO, str, ##__VA_ARGS__)
+ ^~~
+./include/drivers\mk_trace.h(132): note: expanded from macro 'TRACE'
+#define TRACE(module, level, str, ...) trace_printf((module), (level), (str), ##__VA_ARGS__)
+ ^~~
+include/main/main.c(226): warning: implicit declaration of function 'reset_cause_get' is invalid in C99 [-Wimplicit-function-declaration]
+ reset_cause_get();
+ ^
+include/main/main.c(227): warning: implicit declaration of function 'reset_cause_clear' is invalid in C99 [-Wimplicit-function-declaration]
+ reset_cause_clear();
+ ^
+include/main/main.c(65): warning: no previous extern declaration for non-static variable 'enable_sleep_count' [-Wmissing-variable-declarations]
+uint8_t enable_sleep_count,sleep_flag;
+ ^
+include/main/main.c(65): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+uint8_t enable_sleep_count,sleep_flag;
+^
+include/main/main.c(65): warning: no previous extern declaration for non-static variable 'sleep_flag' [-Wmissing-variable-declarations]
+uint8_t enable_sleep_count,sleep_flag;
+ ^
+include/main/main.c(65): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+uint8_t enable_sleep_count,sleep_flag;
+^
+include/main/main.c(108): warning: no previous extern declaration for non-static variable 'fVoltage_mv' [-Wmissing-variable-declarations]
+int16_t fVoltage_mv;
+ ^
+include/main/main.c(108): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+int16_t fVoltage_mv;
+^
+include/main/main.c(112): warning: no previous extern declaration for non-static variable 'tag_frequence' [-Wmissing-variable-declarations]
+uint8_t tag_frequence;
+ ^
+include/main/main.c(112): note: declare 'static' if the variable is not intended to be used outside of this translation unit
+uint8_t tag_frequence;
+^
+include/main/main.c(91): warning: unused variable 'sample' [-Wunused-variable]
+static uint32_t sample[NUM_SAMPLES] = {0};
+ ^
+include/main/main.c(92): warning: unused variable 'usr_adc_cfg' [-Wunused-variable]
+static struct ADC_CFG_T usr_adc_cfg = {
+ ^
+include/main/main.c(146): warning: unused function 'adc_callback' [-Wunused-function]
+static void adc_callback(void *data, uint32_t number)
+ ^
+include/main/main.c(170): warning: unused function 'voltage_input_handler' [-Wunused-function]
+static void voltage_input_handler(enum IO_PIN_T pin)
+ ^
+20 warnings generated.
+compiling main.c...
+linking...
+.\include\devices\MK800X\Source\ARM\MK800X_ac6_copy.sct(25): warning: L6314W: No section matches pattern *(.XIP_SECTION).
+Program Size: Code=47104 RO-data=7260 RW-data=1272 ZI-data=25020
+Finished: 0 information, 1 warning and 0 error messages.
+FromELF: creating hex file...
After Build - User command #1: fromelf.exe --bincombined -o "Output\uwb_simple_example.bin" "D:\project chen\ChinaUWBProject_tag_URT\keil\Objects\uwb_simple_example.axf"
-".\Objects\uwb_simple_example.axf" - 0 Error(s), 0 Warning(s).
+".\Objects\uwb_simple_example.axf" - 0 Error(s), 21 Warning(s).
<h2>Software Packages used:</h2>
@@ -42,7 +148,7 @@
d:\Users\xookk\AppData\Local\Arm\Packs\MKSEMI\MK800X_DFP\1.0.3\Device\Include
<h2>Collection of Component Files used:</h2>
-Build Time Elapsed: 00:00:01
+Build Time Elapsed: 00:00:02
</pre>
</body>
</html>
diff --git a/keil/Objects/uwb_simple_example.hex b/keil/Objects/uwb_simple_example.hex
index 0c6145f..c81cc9d 100644
--- a/keil/Objects/uwb_simple_example.hex
+++ b/keil/Objects/uwb_simple_example.hex
@@ -1839,7 +1839,7 @@
:1072D000FCF782FE06E0FCF787FCFCF795FE002039
:1072E000FDF7A6FDFCF73AFF0025284604F08EFACC
:1072F000FFF722F830483149016000F087F86C4F01
-:10730000B8882F4E3080FF2008307880B87A2D4919
+:10730000B8882F4E3080812040007880B87A2D498F
:1073100008707D20C000F988F8F7DCFE2A49087063
:1073200033680326294A3046314603F025F9788828
:10733000C1B20091030A264A3046314603F01CF9D7
diff --git a/keil/Objects/uwb_simple_example.htm b/keil/Objects/uwb_simple_example.htm
index cfbca65..8468994 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: Wed Sep 25 16:39:53 2024
+<BR><P>#<CALLGRAPH># ARM Linker, 6140002: Last Updated: Wed Sep 25 16:56:29 2024
<BR><P>
<H3>Maximum Stack Usage = 1572 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 27c7d2b..6080e5b 100644
--- a/keil/Objects/uwb_simple_example_MK8000 Release.dep
+++ b/keil/Objects/uwb_simple_example_MK8000 Release.dep
@@ -617,7 +617,7 @@
I (include\drivers\mk_dma.h)(0x66A1A50C)
I (d:\Keil_v5\ARM\ARMCLANG\include\stdarg.h)(0x5DDFFD72)
I (include\drivers\mk_gpio.h)(0x668D7165)
-F (.\include\main\main.c)(0x66F3CBCE)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c
-fno-rtti -funsigned-char
-D__MICROLIB -gdwarf-3 -O3 -ffunction-sections -Weverything -Wno-packed -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I .. -I ./include/board -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/CMSIS/Include -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:/Users/xookk/AppData/Local/Arm/Packs/MKSEMI/MK800X_DFP/1.0.3/Device/Include
-Id:/Keil_v5/ARM/CMSIS/Include
-D__UVISION_VERSION="530" -D_RTE_ -DUWB_EN
-o ./objects/main.o -MD)
+F (.\include\main\main.c)(0x66F3D037)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c
-fno-rtti -funsigned-char
-D__MICROLIB -gdwarf-3 -O3 -ffunction-sections -Weverything -Wno-packed -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I .. -I ./include/board -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/CMSIS/Include -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:/Users/xookk/AppData/Local/Arm/Packs/MKSEMI/MK800X_DFP/1.0.3/Device/Include
-Id:/Keil_v5/ARM/CMSIS/Include
-D__UVISION_VERSION="530" -D_RTE_ -DUWB_EN
-o ./objects/main.o -MD)
I (include\drivers\mk_trace.h)(0x668D7165)
I (include\drivers\mk_common.h)(0x668D7165)
I (d:\Keil_v5\ARM\ARMCLANG\include\stddef.h)(0x5DDFFD72)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 6c11a48..123f295 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -178,7 +178,7 @@
group_id=g_com_map[GROUP_ID];
memcpy(&dev_id ,&g_com_map[DEV_ID],2);
tag_frequence=1000/g_com_map[COM_INTERVAL];
-g_com_map[VERSION] = (1<<8)|7;
+g_com_map[VERSION] = (1<<8)|2;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
LOG_INFO(TRACE_MODULE_APP,"固件版本:UWB-标签 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
}
diff --git a/keil/uwb_simple_example.uvguix.xookk b/keil/uwb_simple_example.uvguix.xookk
index 45d351b..2c0f62b 100644
--- a/keil/uwb_simple_example.uvguix.xookk
+++ b/keil/uwb_simple_example.uvguix.xookk
@@ -111,7 +111,7 @@
<RegID>0</RegID>
<MDITabState>
<Len>1359</Len>
- <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000C000000010000000100000037443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C6B65696C5C7577625F7461675F2E63000000000A7577625F7461675F2E63000000005FC3CF00FFFFFFFF35443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C6B65696C5C64775F6170702E63000000000864775F6170702E6300000000FFDC7800FFFFFFFF59443A5C70726F6A656374206368656E5C7577625F4D4B383030305F6578616D706C655F73735F7477725F7169616E675F5461675F6761695F5552545C6B65696C5C696E636C7564655C647269766572735C6D6B5F646D612E6300000000086D6B5F646D612E6300000000BECEA100FFFFFFFF40443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C6B65696C5C696E636C7564655C6D61696E5C6D61696E2E6300000000066D61696E2E6300000000F0A0A100FFFFFFFF58443A5C70726F6A656374206368656E5C7577625F4D4B383030305F6578616D706C655F73735F7477725F7169616E675F5461675F6761695F5552545C6B65696C5C696E636C7564655C647269766572735C55736172742E63000000000755736172742E6300000000BCA8E100FFFFFFFF6F443A5C70726F6A656374206368656E5C7577625F4D4B383030305F6578616D706C655F73735F7477725F7169616E675F5461675F6761695F5552545C6B65696C5C696E636C7564655C646576696365735C4D4B383030585C536F757263655C737461727475705F4D4B383030582E630000000010737461727475705F4D4B383030582E63000000009CC1B600FFFFFFFF34443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C70696E5F636F6E6669672E63000000000C70696E5F636F6E6669672E6300000000F7B88600FFFFFFFF35443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C757365725F636F6E6669672E68000000000D757365725F636F6E6669672E6800000000D9ADC200FFFFFFFF42443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C6B65696C5C696E636C7564655C626F6172645C626F6172642E630000000007626F6172642E6300000000A5C2D700FFFFFFFF44443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C6B65696C5C696E636C7564655C647269766572735C55736172742E63000000000755736172742E6300000000B3A6BE00FFFFFFFF4B443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C6B65696C5C696E636C7564655C647269766572735C676C6F62616C5F706172616D2E63000000000E676C6F62616C5F706172616D2E6300000000EAD6A300FFFFFFFF4B443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C6B65696C5C696E636C7564655C647269766572735C676C6F62616C5F706172616D2E68000000000E676C6F62616C5F706172616D2E6800000000F6FA7D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000D5030000AE000000D3070000E8020000</Data>
+ <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000C000000030000000100000037443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C6B65696C5C7577625F7461675F2E63000000000A7577625F7461675F2E63000000005FC3CF00FFFFFFFF35443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C6B65696C5C64775F6170702E63000000000864775F6170702E6300000000FFDC7800FFFFFFFF59443A5C70726F6A656374206368656E5C7577625F4D4B383030305F6578616D706C655F73735F7477725F7169616E675F5461675F6761695F5552545C6B65696C5C696E636C7564655C647269766572735C6D6B5F646D612E6300000000086D6B5F646D612E6300000000BECEA100FFFFFFFF40443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C6B65696C5C696E636C7564655C6D61696E5C6D61696E2E6300000000066D61696E2E6300000000F0A0A100FFFFFFFF58443A5C70726F6A656374206368656E5C7577625F4D4B383030305F6578616D706C655F73735F7477725F7169616E675F5461675F6761695F5552545C6B65696C5C696E636C7564655C647269766572735C55736172742E63000000000755736172742E6300000000BCA8E100FFFFFFFF6F443A5C70726F6A656374206368656E5C7577625F4D4B383030305F6578616D706C655F73735F7477725F7169616E675F5461675F6761695F5552545C6B65696C5C696E636C7564655C646576696365735C4D4B383030585C536F757263655C737461727475705F4D4B383030582E630000000010737461727475705F4D4B383030582E63000000009CC1B600FFFFFFFF34443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C70696E5F636F6E6669672E63000000000C70696E5F636F6E6669672E6300000000F7B88600FFFFFFFF35443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C757365725F636F6E6669672E68000000000D757365725F636F6E6669672E6800000000D9ADC200FFFFFFFF42443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C6B65696C5C696E636C7564655C626F6172645C626F6172642E630000000007626F6172642E6300000000A5C2D700FFFFFFFF44443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C6B65696C5C696E636C7564655C647269766572735C55736172742E63000000000755736172742E6300000000B3A6BE00FFFFFFFF4B443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C6B65696C5C696E636C7564655C647269766572735C676C6F62616C5F706172616D2E63000000000E676C6F62616C5F706172616D2E6300000000EAD6A300FFFFFFFF4B443A5C70726F6A656374206368656E5C4368696E6155574250726F6A6563745F7461675F5552545C6B65696C5C696E636C7564655C647269766572735C676C6F62616C5F706172616D2E68000000000E676C6F62616C5F706172616D2E6800000000F6FA7D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000D5030000AE000000D3070000E8020000</Data>
</MDITabState>
</MDIClientArea>
<ViewEx>
@@ -3603,21 +3603,21 @@
<ActiveMDIGroup>0</ActiveMDIGroup>
<MDIGroup>
<Size>100</Size>
- <ActiveTab>1</ActiveTab>
+ <ActiveTab>3</ActiveTab>
<Doc>
<Name>.\uwb_tag_.c</Name>
- <ColumnNumber>16</ColumnNumber>
- <TopLine>449</TopLine>
- <CurrentLine>476</CurrentLine>
+ <ColumnNumber>58</ColumnNumber>
+ <TopLine>344</TopLine>
+ <CurrentLine>404</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>.\dw_app.c</Name>
- <ColumnNumber>59</ColumnNumber>
- <TopLine>109</TopLine>
- <CurrentLine>126</CurrentLine>
+ <ColumnNumber>9</ColumnNumber>
+ <TopLine>1</TopLine>
+ <CurrentLine>122</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
@@ -3634,8 +3634,8 @@
<Doc>
<Name>.\include\main\main.c</Name>
<ColumnNumber>30</ColumnNumber>
- <TopLine>160</TopLine>
- <CurrentLine>181</CurrentLine>
+ <TopLine>157</TopLine>
+ <CurrentLine>182</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
--
Gitblit v1.9.3