zhangbo
2025-05-09 b85907abb200e19f362959e8c6c6fe0d91d22180
修改了1分钟休眠机制现在收到消息就会继续测距不唤醒
已修改9个文件
14340 ■■■■ 文件已修改
keil/JLinkLog.txt 14259 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/Listings/uwb_simple_example.map 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/Objects/uwb_simple_example.build_log.htm 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/Objects/uwb_simple_example.hex 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/Objects/uwb_simple_example.htm 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/Objects/uwb_simple_example_MK8000 Release.dep 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/include/main/main.c 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/uwb_app.c 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/uwb_simple_example.uvoptx 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
keil/JLinkLog.txt
ÎļþÌ«´ó
keil/Listings/uwb_simple_example.map
@@ -1791,9 +1791,9 @@
    main.o(.ARM.exidx.text.main) refers to main.o(.text.main) for [Anonymous Symbol]
    main.o(.text.sleep_timer_callback) refers to pca9555.o(.text.read_5v_input_pca) for read_5v_input_pca
    main.o(.text.sleep_timer_callback) refers to ws2812.o(.text.Set4LEDColor) for Set4LEDColor
    main.o(.text.sleep_timer_callback) refers to uwb_app.o(.text.OpenUWB) for OpenUWB
    main.o(.text.sleep_timer_callback) refers to uwb_app.o(.text.CloseUWB) for CloseUWB
    main.o(.text.sleep_timer_callback) refers to uwb_app.o(.text.UWBSendUDPTask) for UWBSendUDPTask
    main.o(.text.sleep_timer_callback) refers to uwb_app.o(.text.OpenUWB) for OpenUWB
    main.o(.text.sleep_timer_callback) refers to main.o(.bss..L_MergedGlobals.10) for [Anonymous Symbol]
    main.o(.text.sleep_timer_callback) refers to ws2812.o(.bss.powerled) for powerled
    main.o(.text.sleep_timer_callback) refers to ws2812.o(.bss.uwbled) for uwbled
@@ -1975,8 +1975,8 @@
    uwb_app.o(.ARM.exidx.text.uwb_app_poll) refers to uwb_app.o(.text.uwb_app_poll) for [Anonymous Symbol]
    uwb_app.o(.text.Anchor_App) refers to memcpya.o(.text) for __aeabi_memcpy
    uwb_app.o(.text.Anchor_App) refers to uwb_app.o(.text.Anchor_RecNearPoll) for Anchor_RecNearPoll
    uwb_app.o(.text.Anchor_App) refers to main.o(.bss..L_MergedGlobals.10) for uwb_offtime_count
    uwb_app.o(.text.Anchor_App) refers to uwb_app.o(.bss.rx_buf) for [Anonymous Symbol]
    uwb_app.o(.text.Anchor_App) refers to main.o(.bss..L_MergedGlobals.10) for group_id
    uwb_app.o(.text.Anchor_App) refers to uwb_app.o(.data.wltag_state) for wltag_state
    uwb_app.o(.text.Anchor_App) refers to uwb_app.o(.bss..L_MergedGlobals.1) for [Anonymous Symbol]
    uwb_app.o(.text.Anchor_App) refers to uwb_app.o(.bss..L_MergedGlobals.5) for [Anonymous Symbol]
@@ -5988,7 +5988,7 @@
    Removing main.o(.ARM.exidx.text._4gUsart_handler), (8 bytes).
    Removing main.o(.ARM.exidx.text.Program_Init), (8 bytes).
    Removing main.o(.ARM.exidx.text.IdleTask), (8 bytes).
    Removing main.o(.text.upload_apppoll), (96 bytes).
    Removing main.o(.text.upload_apppoll), (104 bytes).
    Removing main.o(.ARM.exidx.text.upload_apppoll), (8 bytes).
    Removing main.o(.ARM.exidx.text.main), (8 bytes).
    Removing main.o(.ARM.exidx.text.sleep_timer_callback), (8 bytes).
@@ -7181,7 +7181,7 @@
    Removing dfltul.o(.text), (28 bytes).
    Removing dmake.o(.text), (44 bytes).
2046 unused section(s) (total 91219 bytes) removed from the image.
2046 unused section(s) (total 91227 bytes) removed from the image.
==============================================================================
@@ -7636,8 +7636,8 @@
    __arm_cp.6_1                             0x000027d0   Number         4  lis3dh_driver.o(.text.Accelerometer_Init)
    [Anonymous Symbol]                       0x000027d4   Section        0  uwb_app.o(.text.Anchor_App)
    __arm_cp.14_0                            0x00002904   Number         4  uwb_app.o(.text.Anchor_App)
    __arm_cp.14_2                            0x00002908   Number         4  uwb_app.o(.text.Anchor_App)
    __arm_cp.14_4                            0x0000290c   Number         4  uwb_app.o(.text.Anchor_App)
    __arm_cp.14_1                            0x00002908   Number         4  uwb_app.o(.text.Anchor_App)
    __arm_cp.14_3                            0x0000290c   Number         4  uwb_app.o(.text.Anchor_App)
    __arm_cp.14_5                            0x00002910   Number         4  uwb_app.o(.text.Anchor_App)
    __arm_cp.14_6                            0x00002914   Number         4  uwb_app.o(.text.Anchor_App)
    __arm_cp.14_7                            0x00002918   Number         4  uwb_app.o(.text.Anchor_App)
@@ -11380,7 +11380,7 @@
        48          4          0          0          0       2732   internet.o
         0          0          0          0          4        329   libc.o
      1436          8          0          0         18      40805   lis3dh_driver.o
      2660        392         99         62        135      14273   main.o
      2660        392         99         62        135      14276   main.o
       944        156         57          0         32      12591   mk_adc.o
       520         96         25         64          0      18783   mk_aes.o
       494        140         45          0          0       6882   mk_calib.o
@@ -11414,12 +11414,12 @@
       376        100          0          4       1032       2937   tcpclient_1.o
      1252         60        112          0        248       9807   uart.o
       112          4          0          0       1044       3220   usart.o
      1528        164          6         22       1074      13428   uwb_app.o
      1528        164          6         22       1074      13364   uwb_app.o
       260          8          0          0         24       6064   ws2812.o
       184          8          0          0         12       4253   wsf_nvm.o
    ----------------------------------------------------------------------
     51288       7054       7736        768      52371     501340   Object Totals
     51288       7054       7736        768      52371     501279   Object Totals
         0          0         32          0      14336          0   (incl. Generated)
        28          0          3          8         40          0   (incl. Padding)
@@ -11534,8 +11534,8 @@
      Code (inc. data)   RO Data    RW Data    ZI Data      Debug   
     82664       9646      11852       2088      58688     745458   Grand Totals
     82664       9646      11852        576      58688     745458   ELF Image Totals (compressed)
     82664       9646      11852       2088      58688     745397   Grand Totals
     82664       9646      11852        576      58688     745397   ELF Image Totals (compressed)
     82664       9646      11852        576          0          0   ROM Totals
==============================================================================
keil/Objects/uwb_simple_example.build_log.htm
@@ -42,7 +42,7 @@
  D:\keil\pack\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:00
</pre>
</body>
</html>
keil/Objects/uwb_simple_example.hex
@@ -636,12 +636,12 @@
:1027A00003F078FA3320012103F074FA5F21204608
:1027B00003F070FA0F2003F021FA28700A2009F0C4
:1027C00079FCB0BD02480021C187B0BDC8980102A4
:1027D0006EB20102F0B583B04A4E30788449097870
:1027E000814239D1707A202836D1474802210160D0
:1027F000934B0120987200271F833079D872B27AE8
:102800001A737079B17909020C189C839C8200922A
:10281000520091190B313D4D32352846FDF784FCAD
:102820003B48FF2101603B48077001A80480844CAD
:1027D0006EB20102F0B583B04A48002707704A4E36
:1027E000307883490978814236D1707A202833D1F4
:1027F000464802210160924B012098721F83307974
:10280000D872B27A1A737079B17909020C189C8364
:102810009C820092520091190B313D4D3235284671
:10282000FDF782FC3B48FF21016001A80480844C35
:10283000A178002913D03848027843781B029A18EF
:1028400001AB1B88934204D0801C7F1CB942F3D19A
:102850000F46E782312904D9002003B0F0BD0027DC
@@ -655,8 +655,8 @@
:1028D00004D100F023F8002003B0F0BD0028BBD1E4
:1028E000A38A02AC23800906F3D00B490B784C78FD
:1028F0002402E31802AC24889C42ADD0891C521EED
:10290000F4D1E6E7F82602022C980102049C0102A9
:1029100068450202EC9A0102A09B0102F0B581B069
:10290000F4D1E6E7EC9A0102F82602022C980102C3
:10291000049C010268450202A09B0102F0B581B04F
:10292000304C212100916172454FF8702E49098881
:102930006170BA8A62712D4B1B88E3717D6B7D6279
:102940002B4E36782670090AA170110AA171190A56
@@ -2098,7 +2098,7 @@
:108300006882B88AA882F98AE982494A518310832F
:10831000BE8D168194807D200490C000F988F7F707
:10832000D9FE2883701E864170002864F98E0020D3
:10833000F8831D2900D901202872FF200E30788093
:10833000F8831D2900D90120287287204000788009
:108340003220385C687203253AA228462946234623
:108350000AF0BCF87888C1B20091030A39A2284615
:1083600029460AF0B3F866203B5A6820385A6A2139
@@ -4376,17 +4376,17 @@
:1011500001273A030025074E28463146FBF78EFD4E
:10116000BB02054A28463146FCF766FA62B62046BD
:1011700001B0F0BD00E002046EB20102B0B52A4D2C
:10118000E87B411CE973C00735D1FF2420460230BB
:10118000E87B411CE973C00739D1FF2420460230B7
:10119000A881686A401C68622879401C2871C0B226
:1011A0003D2803D30120A86200202871FFF72AFD03
:1011B000002810D10120A873E87A0F2800D8240253
:1011C0001A4804601A4800681A4909681A4A1268DD
:1011D0002346F7F7BFFB01206873A86A012812D0E5
:1011E00000280AD1E86A696A081A052810D113484C
:1011F0000021017013E000202873A879002801D095
:10120000401EA871B0BDE86A696A081A1E2806D097
:101210000128F2D1F1F70CFCF9F79CFAEDE7F6F7AB
:10122000D5FD686AE862E8E7E89A0102E42602026E
:1011D0002346F7F7BFFB01206873A86A012816D0E1
:1011E00000280ED1E86A696A081A052814D1134844
:1011F00000210170F6F7EAFD686AE86201E000206C
:101200002873A879002801D0401EA871B0BDE86AF3
:10121000696A081A1E28EAD00128F2D1F1F708FC01
:10122000F9F798FAEDE7C046E89A0102E4260202CF
:1012300068450202F426020248220202729A010262
:1012400070B514460D4606461120FAF70FFE2248E7
:10125000042101600C4804601E4805608660002E71
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>#&#060CALLGRAPH&#062# ARM Linker, 6140002: Last Updated: Thu May  8 15:34:25 2025
<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 6140002: Last Updated: Fri May  9 09:25:21 2025
<BR><P>
<H3>Maximum Stack Usage =       1604 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
Call chain for Maximum Stack Depth:</H3>
keil/Objects/uwb_simple_example_MK8000 Release.dep
@@ -748,7 +748,7 @@
I (D:\keil\ARM\ARMCLANG\include\stdarg.h)(0x5DDFFD72)
I (include\drivers\mk_gpio.h)(0x680D9C68)
I (include\drivers\Usart.h)(0x680D9C68)
F (.\include\main\main.c)(0x681C5C07)(-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)(0x681D597F)(-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)(0x680D9C68)
I (include\drivers\mk_common.h)(0x680D9C68)
I (D:\keil\ARM\ARMCLANG\include\stddef.h)(0x5DDFFD72)
@@ -846,7 +846,7 @@
I (include\drivers\mk_misc.h)(0x680D9C68)
I (include\drivers\serial_at_cmd_app.h)(0x680D9C68)
I (include\drivers\DBG.h)(0x680D9C68)
F (.\uwb_app.c)(0x681C54FB)(-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/uwb_app.o -MD)
F (.\uwb_app.c)(0x681C8227)(-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/uwb_app.o -MD)
I (include\drivers\mk_trace.h)(0x680D9C68)
I (include\drivers\mk_common.h)(0x680D9C68)
I (D:\keil\ARM\ARMCLANG\include\stddef.h)(0x5DDFFD72)
keil/include/main/main.c
@@ -433,7 +433,7 @@
        }
    g_com_map[MODBUS_MODE] = 0;
        log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
    g_com_map[VERSION] = (1<<8)|13;
    g_com_map[VERSION] = (1<<8)|14;
         
        
    LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -650,6 +650,7 @@
                            break;
                            
                            case UWB_MEASUREMENT_INTERVAL_SLEEP:
                                   taglist_num = 0;
                                     OpenUWB();    
                   state_start_time = uwb_time_count;                            
                            break;                        
keil/uwb_app.c
@@ -770,6 +770,8 @@
{
                uint8_t i;
                uint16_t tempid;
          uwb_offtime_count=0;
          CountState_t current_state = STATE_NORMAL;
            if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL)//判断是否是和自己是同一组通讯的且为poll包
        {    flag_recsuccess = 1;
                        wltag_state=RANGE;//成功后从search切换为range
@@ -784,8 +786,8 @@
            memcpy(rec_ancdistlist,&rx_buf[FZ_NEARBASEID_INDEX+2*rec_nearbase_num],2*rec_nearbase_num);
            memcpy(&rec_antdelay,&rx_buf[FZ_NEARBASEID_INDEX+rec_nearbase_num*4],2);
            uwbled=BLUE;
                      uwb_offtime_count=0;
                      CountState_t current_state = STATE_NORMAL;
//            for(i=0; i<rec_nearbase_num; i++)
//            {
//                if(rec_ancidlist[i] == dev_id)
keil/uwb_simple_example.uvoptx
@@ -270,6 +270,11 @@
          <WinNumber>1</WinNumber>
          <ItemText>url</ItemText>
        </Ww>
        <Ww>
          <count>24</count>
          <WinNumber>1</WinNumber>
          <ItemText>current_state</ItemText>
        </Ww>
      </WatchWindow1>
      <WatchWindow2>
        <Ww>
@@ -367,6 +372,11 @@
          <WinNumber>2</WinNumber>
          <ItemText>uwb_time_count,0x0A</ItemText>
        </Ww>
        <Ww>
          <count>19</count>
          <WinNumber>2</WinNumber>
          <ItemText>uwb_offtime_count,0x0A</ItemText>
        </Ww>
      </WatchWindow2>
      <MemoryWindow1>
        <Mm>