From be2a42741d1309abd13b63fa4d9baf90b8ee4db8 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期一, 03 三月 2025 14:54:58 +0800
Subject: [PATCH] V1.11换了一下延时函数的顺序解析GGA时，避免两个包上传
---
keil/Objects/uwb_simple_example.htm | 2
keil/Objects/uwb_simple_example_MK8000 Release.dep | 2
keil/Objects/uwb_simple_example.build_log.htm | 54 +++++++++++++-------------
keil/include/drivers/serial_at_cmd_app.c | 3 +
keil/Objects/uwb_simple_example.hex | 6 +-
keil/Listings/uwb_simple_example.map | 10 ++--
keil/uwb_simple_example.uvguix.xookk | 14 +++---
7 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/keil/Listings/uwb_simple_example.map b/keil/Listings/uwb_simple_example.map
index c0556c8..887bf03 100644
--- a/keil/Listings/uwb_simple_example.map
+++ b/keil/Listings/uwb_simple_example.map
@@ -1419,8 +1419,8 @@
serial_at_cmd_app.o(.text.UsartParseDataHandler) refers to printfa.o(i.__0snprintf) for __2snprintf
serial_at_cmd_app.o(.text.UsartParseDataHandler) refers to pin_config.o(.text.Uart1GpsRecDebugSend) for Uart1GpsRecDebugSend
serial_at_cmd_app.o(.text.UsartParseDataHandler) refers to tcpclient.o(.text.UDPClient_UploadGPS_10pack) for UDPClient_UploadGPS_10pack
- serial_at_cmd_app.o(.text.UsartParseDataHandler) refers to mk_misc.o(.text.delay_ms) for delay_ms
serial_at_cmd_app.o(.text.UsartParseDataHandler) refers to sn74hc595.o(.text.update_led_power_state) for update_led_power_state
+ serial_at_cmd_app.o(.text.UsartParseDataHandler) refers to mk_misc.o(.text.delay_ms) for delay_ms
serial_at_cmd_app.o(.text.UsartParseDataHandler) refers to tcpclient.o(.text.UDPClient_UploadGPS) for UDPClient_UploadGPS
serial_at_cmd_app.o(.text.UsartParseDataHandler) refers to gps.o(.text.GPS_ParseGSV) for GPS_ParseGSV
serial_at_cmd_app.o(.text.UsartParseDataHandler) refers to memseta.o(.text) for __aeabi_memclr4
@@ -9746,7 +9746,7 @@
244 24 0 0 270 7218 module.o
136 8 0 0 1 2988 pal_flash.o
298 20 0 0 0 1875 pin_config.o
- 1212 204 99 3 2866 6472 serial_at_cmd_app.o
+ 1212 204 99 3 2866 6467 serial_at_cmd_app.o
1400 140 0 0 2 6427 sn74hc595.o
1376 160 0 0 11556 11392 socket.o
42 8 344 0 0 3003 startup_mk800x.o
@@ -9757,7 +9757,7 @@
184 8 0 0 12 4233 wsf_nvm.o
----------------------------------------------------------------------
- 40608 6100 5890 724 36804 411517 Object Totals
+ 40608 6100 5890 724 36804 411512 Object Totals
0 0 32 0 14336 0 (incl. Generated)
12 0 5 6 41 0 (incl. Padding)
@@ -9867,8 +9867,8 @@
Code (inc. data) RO Data RW Data ZI Data Debug
- 57698 7278 6418 1260 37680 589195 Grand Totals
- 57698 7278 6418 400 37680 589195 ELF Image Totals (compressed)
+ 57698 7278 6418 1260 37680 589190 Grand Totals
+ 57698 7278 6418 400 37680 589190 ELF Image Totals (compressed)
57698 7278 6418 400 0 0 ROM Totals
==============================================================================
diff --git a/keil/Objects/uwb_simple_example.build_log.htm b/keil/Objects/uwb_simple_example.build_log.htm
index 8bdd291..bce5216 100644
--- a/keil/Objects/uwb_simple_example.build_log.htm
+++ b/keil/Objects/uwb_simple_example.build_log.htm
@@ -27,66 +27,66 @@
<h2>Output:</h2>
*** Using Compiler 'V6.14', folder: 'd:\Keil_v5\ARM\ARMCLANG\Bin'
Rebuild target 'MK8000 Release'
-compiling startup_MK800X.c...
-compiling cmp_svec.c...
-compiling mk_power.c...
compiling mk_reset.c...
-compiling system_MK800X.c...
-compiling mk_dual_timer.c...
-compiling mk_io.c...
+compiling cmp_svec.c...
compiling mk_clock.c...
+compiling mk_io.c...
compiling mk_gpio.c...
-compiling mk_dma.c...
+compiling startup_MK800X.c...
+compiling system_MK800X.c...
compiling mk_calib.c...
+compiling mk_dual_timer.c...
+compiling mk_dma.c...
compiling mk_aes.c...
compiling mk_adc.c...
compiling mk_misc.c...
+compiling mk_power.c...
+compiling mk_flash.c...
compiling mk_sleep_timer.c...
compiling mk_rtc.c...
-compiling mk_flash.c...
-compiling mk_wdt.c...
-compiling sn74hc595.c...
compiling mk_uart.c...
-compiling mk_trace.c...
compiling mk_uwb.c...
+compiling mk_trace.c...
+compiling mk_wdt.c...
+compiling dw_app_anchor.c...
compiling Usart1.c...
+compiling sn74hc595.c...
compiling mk_4G.c...
compiling Usart.c...
-compiling dw_app_anchor.c...
-compiling pin_config.c...
-compiling board.c...
compiling global_param.c...
compiling dw_tag.c...
+compiling pin_config.c...
compiling serial_at_cmd_app.c...
-compiling gps.c...
-compiling TCPClient.c...
+compiling board.c...
compiling lis3dh_driver.c...
-compiling uwb_tag.c...
-compiling uwb_app.c...
+compiling TCPClient.c...
+compiling gps.c...
compiling main.c...
+compiling uwb_app.c...
compiling wsf_assert.c...
compiling wsf_msg.c...
compiling wsf_bufio.c...
compiling wsf_buf.c...
compiling wsf_heap.c...
compiling wsf_nvm.c...
+compiling uwb_tag.c...
compiling wsf_os.c...
compiling wsf_queue.c...
compiling wsf_trace.c...
-compiling wsf_timer.c...
compiling crc.c...
-compiling pal_sys.c...
compiling pal_uart.c...
-compiling libc.c...
+compiling pal_sys.c...
compiling pal_flash.c...
-compiling AIR780ECSQ.c...
-compiling AIR780EDriver.c...
-compiling Internet.c...
+compiling wsf_timer.c...
+compiling libc.c...
compiling Module.c...
-compiling AIR780ESocket.c...
+compiling AIR780EDriver.c...
+compiling AIR780ECSQ.c...
+compiling Internet.c...
compiling Socket.c...
-compiling UART.c...
+compiling AIR780ESocket.c...
compiling AIR780EFSM.c...
+compiling UART.c...
linking...
.\include\devices\MK800X\Source\ARM\MK800X_ac6_copy.sct(25): warning: L6314W: No section matches pattern *(.XIP_SECTION).
Program Size: Code=57698 RO-data=6418 RW-data=1260 ZI-data=37680
@@ -107,7 +107,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:06
+Build Time Elapsed: 00:00:05
</pre>
</body>
</html>
diff --git a/keil/Objects/uwb_simple_example.hex b/keil/Objects/uwb_simple_example.hex
index 7c3803b..86a1b6b 100644
--- a/keil/Objects/uwb_simple_example.hex
+++ b/keil/Objects/uwb_simple_example.hex
@@ -1714,9 +1714,9 @@
:106B0000C9B2FF2900D083E0012857D002287FD1E5
:106B10001E2D00D083E0FFF7CBFC0120F08355B0A1
:106B2000F0BD1646FFF7A4FC32463869002817D09E
-:106B30001078002813D05E48007800280FD17D20FF
-:106B4000C00001F0BAF95B4805704E4805705A481C
-:106B500005805A48057006F095FDFFF707FC3D617A
+:106B30001078002813D05E48007800280FD15D48F7
+:106B40000570504805705C4805805C48057006F08B
+:106B500099FD7D20C00001F0B0F9FFF707FC3D6111
:106B600057A105222046F9F722FB002810D13E4C00
:106B70002046F9F707FB821E534D28462146F9F7B8
:106B8000D3FA2846F9F7FEFA01462846FCF760FBDF
diff --git a/keil/Objects/uwb_simple_example.htm b/keil/Objects/uwb_simple_example.htm
index 7575731..f1f7338 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: Mon Mar 3 14:51:00 2025
+<BR><P>#<CALLGRAPH># ARM Linker, 6140002: Last Updated: Mon Mar 3 14:53:50 2025
<BR><P>
<H3>Maximum Stack Usage = 1188 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 0e2542b..de32e24 100644
--- a/keil/Objects/uwb_simple_example_MK8000 Release.dep
+++ b/keil/Objects/uwb_simple_example_MK8000 Release.dep
@@ -612,7 +612,7 @@
I (..\user_config.h)(0x67AD8BE4)
I (include\drivers\mk_dma.h)(0x67219693)
I (include\drivers\mk_misc.h)(0x67AD8BE4)
-F (.\include\drivers\serial_at_cmd_app.c)(0x67C55137)(-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/drivers -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 -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 -DSTD_LIBC
-o ./objects/serial_at_cmd_app.o -MD)
+F (.\include\drivers\serial_at_cmd_app.c)(0x67C551EF)(-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/drivers -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 -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 -DSTD_LIBC
-o ./objects/serial_at_cmd_app.o -MD)
I (include\drivers\serial_at_cmd_app.h)(0x67AD8BE4)
I (d:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x5DDFFD72)
I (include\drivers\global_param.h)(0x67AD8BE4)
diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c
index 995913b..c3af57d 100644
--- a/keil/include/drivers/serial_at_cmd_app.c
+++ b/keil/include/drivers/serial_at_cmd_app.c
@@ -283,12 +283,13 @@
// if(gps_open_flag){
if(gps_open_flag&&!gps_first_flag){
- delay_ms(1000);
+
gps_timeout_flag=0;//不超时接收状态
gps_need_data_flag=0;//接收数据完成
gps_wait_count=0;//清0接收状态
gps_power_state=0;//立即关掉gps，防止串口数据过多导致无法切换休眠
update_led_power_state();
+ delay_ms(1000);
UDPClient_UploadGPS();//上传GPS超时无效数据
// }else{
diff --git a/keil/uwb_simple_example.uvguix.xookk b/keil/uwb_simple_example.uvguix.xookk
index f775834..d0f60d0 100644
--- a/keil/uwb_simple_example.uvguix.xookk
+++ b/keil/uwb_simple_example.uvguix.xookk
@@ -111,7 +111,7 @@
<RegID>0</RegID>
<MDITabState>
<Len>583</Len>
- <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000004000000030000000100000044443A5C70726F6A6563745F6368656E5C616E62616E675F416E63686F725C4368696E6155574250726F6A6563745C6B65696C5C696E636C7564655C7372635C6770732E6300000000056770732E6300000000C5D4F200FFFFFFFF56443A5C70726F6A6563745F6368656E5C616E62616E675F416E63686F725C4368696E6155574250726F6A6563745C6B65696C5C696E636C7564655C647269766572735C73657269616C5F61745F636D645F6170702E63000000001373657269616C5F61745F636D645F6170702E6300000000FFDC7800FFFFFFFF4A443A5C70726F6A6563745F6368656E5C616E62616E675F416E63686F725C4368696E6155574250726F6A6563745C6B65696C5C696E636C7564655C7372635C544350436C69656E742E63000000000B544350436C69656E742E6300000000BECEA100FFFFFFFF46443A5C70726F6A6563745F6368656E5C616E62616E675F416E63686F725C4368696E6155574250726F6A6563745C6B65696C5C696E636C7564655C6D61696E5C6D61696E2E6300000000066D61696E2E6300000000F0A0A100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000007408000074010000000F000044040000</Data>
+ <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000004000000010000000100000044443A5C70726F6A6563745F6368656E5C616E62616E675F416E63686F725C4368696E6155574250726F6A6563745C6B65696C5C696E636C7564655C7372635C6770732E6300000000056770732E6300000000C5D4F200FFFFFFFF56443A5C70726F6A6563745F6368656E5C616E62616E675F416E63686F725C4368696E6155574250726F6A6563745C6B65696C5C696E636C7564655C647269766572735C73657269616C5F61745F636D645F6170702E63000000001373657269616C5F61745F636D645F6170702E6300000000FFDC7800FFFFFFFF4A443A5C70726F6A6563745F6368656E5C616E62616E675F416E63686F725C4368696E6155574250726F6A6563745C6B65696C5C696E636C7564655C7372635C544350436C69656E742E63000000000B544350436C69656E742E6300000000BECEA100FFFFFFFF46443A5C70726F6A6563745F6368656E5C616E62616E675F416E63686F725C4368696E6155574250726F6A6563745C6B65696C5C696E636C7564655C6D61696E5C6D61696E2E6300000000066D61696E2E6300000000F0A0A100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000007408000074010000000F000044040000</Data>
</MDITabState>
</MDIClientArea>
<ViewEx>
@@ -3603,7 +3603,7 @@
<ActiveMDIGroup>0</ActiveMDIGroup>
<MDIGroup>
<Size>100</Size>
- <ActiveTab>3</ActiveTab>
+ <ActiveTab>1</ActiveTab>
<Doc>
<Name>.\include\src\gps.c</Name>
<ColumnNumber>1</ColumnNumber>
@@ -3615,9 +3615,9 @@
</Doc>
<Doc>
<Name>.\include\drivers\serial_at_cmd_app.c</Name>
- <ColumnNumber>26</ColumnNumber>
- <TopLine>275</TopLine>
- <CurrentLine>294</CurrentLine>
+ <ColumnNumber>41</ColumnNumber>
+ <TopLine>257</TopLine>
+ <CurrentLine>291</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
@@ -3633,9 +3633,9 @@
</Doc>
<Doc>
<Name>.\include\main\main.c</Name>
- <ColumnNumber>38</ColumnNumber>
+ <ColumnNumber>0</ColumnNumber>
<TopLine>372</TopLine>
- <CurrentLine>394</CurrentLine>
+ <CurrentLine>398</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
--
Gitblit v1.9.3