From d6cc49a243402da54839b24e2d1ec60eba72fe6b Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 05 八月 2022 11:01:50 +0800
Subject: [PATCH] 1
---
Src/main.c | 2
MDK-ARM/L051/L051_L051.dep | 4 +-
Src/application/dw_app.c | 2
MDK-ARM/L051/L051.build_log.htm | 60 +++++++++++++++++++++++++++++-
MDK-ARM/L051/L051.htm | 2
MDK-ARM/L051.uvguix.zhyin | 10 ++--
MDK-ARM/L051/免布线基站V1.34-6.5g.hex | 4 +-
7 files changed, 70 insertions(+), 14 deletions(-)
diff --git a/MDK-ARM/L051.uvguix.zhyin b/MDK-ARM/L051.uvguix.zhyin
index b78844f..03d9887 100644
--- a/MDK-ARM/L051.uvguix.zhyin
+++ b/MDK-ARM/L051.uvguix.zhyin
@@ -1805,8 +1805,8 @@
<RegID>59392</RegID>
<Name>File</Name>
<Buttons>
- <Len>2849</Len>
- <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000361742B960000000000000012000361742B0E55776247474153656E645461736B02617409455F4442474D6F64652F5343422D3E4149524352203D2030583035464130303030207C2028756E7369676E656420696E742920307830343B20084953505F496E69740A4953505F454E41424C450C506172616D5F524F4D5365740F73797374656D636F7265636C6F636B065265626F6F741148414C5F5350495F5772697465526561640B6C5F61753332435350696E0C4442475F4D4F44455F4346470E4442475F4D4F44455F5348454C4C0C74696D6533325F72657365740E5254434D4D4F44455F494E444558037472790A4765744E6561724D7367000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
+ <Len>2562</Len>
+ <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A4E52465F54494D455230960000000000000001000A4E52465F54494D45523000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
</Buttons>
<OriginalItems>
<Len>1423</Len>
@@ -3615,9 +3615,9 @@
</Doc>
<Doc>
<Name>../Src/main.c</Name>
- <ColumnNumber>21</ColumnNumber>
- <TopLine>296</TopLine>
- <CurrentLine>305</CurrentLine>
+ <ColumnNumber>0</ColumnNumber>
+ <TopLine>301</TopLine>
+ <CurrentLine>311</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index 91d1419..c0c13bb 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -27,8 +27,64 @@
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
Build target 'L051'
+compiling main.c...
+..\Drivers\ExternlDrivers\lis3dh_driver.h(67): warning: #1295-D: Deprecated declaration LIS3DH_ENTER_STY_Init - give arg types
+ void LIS3DH_ENTER_STY_Init();
+..\Src\OnChipDevices\Flash.h(3): warning: #47-D: incompatible redefinition of macro "FLASH_SIZE" (declared at line 125 of "../Drivers/STM32L0xx_HAL_Driver/Inc/stm32l0xx_hal_flash.h")
+ #define FLASH_SIZE (uint32_t)0x10000
+../Src/main.c(220): warning: #223-D: function "printf" declared implicitly
+ printf("进入升级模式\r\n");
+../Src/main.c(223): warning: #223-D: function "delay_ms" declared implicitly
+ delay_ms(100);
+../Src/main.c(233): warning: #223-D: function "delay_ms" declared implicitly
+ delay_ms(100);
+../Src/main.c(240): warning: #223-D: function "delay_ms" declared implicitly
+ delay_ms(100);
+../Src/main.c(344): warning: #186-D: pointless comparison of unsigned integer with zero
+ if(module_power<0)
+../Src/main.c(354): warning: #223-D: function "printf" declared implicitly
+ printf("标签ID: %d .\r\n",dev_id);
+../Src/main.c(301): warning: #177-D: variable "temp" was declared but never referenced
+ { float temp;
+../Src/main.c(302): warning: #177-D: variable "temp2" was declared but never referenced
+ uint16_t temp2;
+../Src/main.c(303): warning: #177-D: variable "i" was declared but never referenced
+ uint16_t i;
+../Src/main.c(454): warning: #177-D: variable "blink_count" was declared but never referenced
+ { static uint16_t blink_count=0;
+../Src/main.c(789): warning: #223-D: function "Usart1InitVariables" declared implicitly
+ Usart1InitVariables();
+../Src/main.c(364): warning: #177-D: function "SystemPower_Config" was declared but never referenced
+ static void SystemPower_Config(void)
+../Src/main.c: 14 warnings, 0 errors
+compiling dw_app.c...
+..\Src\application\dw_app.c(254): warning: #940-D: missing return statement at end of non-void function "FindNearBasePos"
+ }
+..\Src\application\dw_app.c(262): warning: #223-D: function "Get_ADC_Value" declared implicitly
+ temp_adc=Get_ADC_Value();
+..\Src\application\dw_app.c(573): warning: #223-D: function "USART_puts" declared implicitly
+ USART_puts(usart_send,6+report_num*6);
+..\Src\application\dw_app.c(305): warning: #177-D: variable "start_poll" was declared but never referenced
+ u32 start_poll;
+..\Src\application\dw_app.c(306): warning: #177-D: variable "getsync_flag" was declared but never referenced
+ u8 i,j,getsync_flag=0,timeout;
+..\Src\application\dw_app.c(587): warning: #177-D: variable "start_poll" was declared but never referenced
+ u32 start_poll,frame_len;
+..\Src\application\dw_app.c(104): warning: #177-D: variable "poll_rx_ts" was declared but never referenced
+ static uint64_t poll_rx_ts;
+..\Src\application\dw_app.c(105): warning: #177-D: variable "resp_tx_ts" was declared but never referenced
+ static uint64_t resp_tx_ts;
+..\Src\application\dw_app.c(106): warning: #177-D: variable "final_rx_ts" was declared but never referenced
+ static uint64_t final_rx_ts;
+..\Src\application\dw_app.c(107): warning: #177-D: variable "tof" was declared but never referenced
+ static double tof;
+..\Src\application\dw_app.c(158): warning: #177-D: function "final_msg_get_ts" was declared but never referenced
+ static void final_msg_get_ts(const uint8_t *ts_field, uint32_t *ts)
+..\Src\application\dw_app.c: 11 warnings, 0 errors
+linking...
+Program Size: Code=22824 RO-data=396 RW-data=256 ZI-data=6480
FromELF: creating hex file...
-"L051\L051.axf" - 0 Error(s), 0 Warning(s).
+"L051\L051.axf" - 0 Error(s), 25 Warning(s).
<h2>Software Packages used:</h2>
@@ -51,7 +107,7 @@
<h2>Collection of Component Files used:</h2>
* Component: ARM::CMSIS:CORE:5.5.0
-Build Time Elapsed: 00:00:01
+Build Time Elapsed: 00:00:02
</pre>
</body>
</html>
diff --git a/MDK-ARM/L051/L051.htm b/MDK-ARM/L051/L051.htm
index 62a1499..7ed87a7 100644
--- a/MDK-ARM/L051/L051.htm
+++ b/MDK-ARM/L051/L051.htm
@@ -3,7 +3,7 @@
<title>Static Call Graph - [L051\L051.axf]</title></head>
<body><HR>
<H1>Static Call Graph for image L051\L051.axf</H1><HR>
-<BR><P>#<CALLGRAPH># ARM Linker, 5060750: Last Updated: Fri Jul 29 17:42:45 2022
+<BR><P>#<CALLGRAPH># ARM Linker, 5060750: Last Updated: Mon Aug 01 11:04:31 2022
<BR><P>
<H3>Maximum Stack Usage = 224 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
Call chain for Maximum Stack Depth:</H3>
diff --git a/MDK-ARM/L051/L051_L051.dep b/MDK-ARM/L051/L051_L051.dep
index f3f7718..a9559c2 100644
--- a/MDK-ARM/L051/L051_L051.dep
+++ b/MDK-ARM/L051/L051_L051.dep
@@ -382,7 +382,7 @@
I (..\Src\OnChipDevices\ADC.h)(0x6167EBDD)
I (..\Src\algorithm\TrackingDiff.h)(0x6167EBDD)
I (..\Src\OnChipDevices\Flash.h)(0x62D60E80)
-F (..\Src\application\dw_app.c)(0x62E39C42)(--c99 -c --cpu Cortex-M0+ -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32L0xx/Include -I ../Drivers/CMSIS/Include -I ..\Drivers\ExternlDrivers -I ..\Src\decadriver -I ..\Src\ExternalDevices -I ..\Src\OnChipDevices -I ..\Src\algorithm -I ..\Src\application
-I.\RTE\_L051
-ID:\Users\zhyin\AppData\Local\Arm\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Include
-ID:\Users\zhyin\AppData\Local\Arm\Packs\Keil\STM32L0xx_DFP\2.1.0\Drivers\CMSIS\Device\ST\STM32L0xx\Include
-D__UVISION_VERSION="529" -D_RTE_ -DSTM32L051xx -DUSE_HAL_DRIVER -DSTM32L051xx
-o l051\dw_app.o --omf_browse l051\dw_app.crf --depend l051\dw_app.d)
+F (..\Src\application\dw_app.c)(0x62E742BD)(--c99 -c --cpu Cortex-M0+ -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32L0xx/Include -I ../Drivers/CMSIS/Include -I ..\Drivers\ExternlDrivers -I ..\Src\decadriver -I ..\Src\ExternalDevices -I ..\Src\OnChipDevices -I ..\Src\algorithm -I ..\Src\application
-I.\RTE\_L051
-ID:\Users\zhyin\AppData\Local\Arm\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Include
-ID:\Users\zhyin\AppData\Local\Arm\Packs\Keil\STM32L0xx_DFP\2.1.0\Drivers\CMSIS\Device\ST\STM32L0xx\Include
-D__UVISION_VERSION="529" -D_RTE_ -DSTM32L051xx -DUSE_HAL_DRIVER -DSTM32L051xx
-o l051\dw_app.o --omf_browse l051\dw_app.crf --depend l051\dw_app.d)
I (D:\Keil_v5\ARM\ARMCC\include\string.h)(0x5D9AD218)
I (D:\Keil_v5\ARM\ARMCC\include\math.h)(0x5D9AD212)
I (..\Src\application\dw_app.h)(0x62D60E80)
@@ -480,7 +480,7 @@
I (..\Src\algorithm\TrackingDiff.h)(0x6167EBDD)
I (..\Src\application\global_param.h)(0x62D60E80)
I (D:\Keil_v5\ARM\ARMCC\include\stdio.h)(0x5D9AD21A)
-F (../Src/main.c)(0x62E3AB93)(--c99 -c --cpu Cortex-M0+ -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32L0xx/Include -I ../Drivers/CMSIS/Include -I ..\Drivers\ExternlDrivers -I ..\Src\decadriver -I ..\Src\ExternalDevices -I ..\Src\OnChipDevices -I ..\Src\algorithm -I ..\Src\application
-I.\RTE\_L051
-ID:\Users\zhyin\AppData\Local\Arm\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Include
-ID:\Users\zhyin\AppData\Local\Arm\Packs\Keil\STM32L0xx_DFP\2.1.0\Drivers\CMSIS\Device\ST\STM32L0xx\Include
-D__UVISION_VERSION="529" -D_RTE_ -DSTM32L051xx -DUSE_HAL_DRIVER -DSTM32L051xx
-o l051\main.o --omf_browse l051\main.crf --depend l051\main.d)
+F (../Src/main.c)(0x62E742BD)(--c99 -c --cpu Cortex-M0+ -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc -I ../Drivers/STM32L0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32L0xx/Include -I ../Drivers/CMSIS/Include -I ..\Drivers\ExternlDrivers -I ..\Src\decadriver -I ..\Src\ExternalDevices -I ..\Src\OnChipDevices -I ..\Src\algorithm -I ..\Src\application
-I.\RTE\_L051
-ID:\Users\zhyin\AppData\Local\Arm\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Include
-ID:\Users\zhyin\AppData\Local\Arm\Packs\Keil\STM32L0xx_DFP\2.1.0\Drivers\CMSIS\Device\ST\STM32L0xx\Include
-D__UVISION_VERSION="529" -D_RTE_ -DSTM32L051xx -DUSE_HAL_DRIVER -DSTM32L051xx
-o l051\main.o --omf_browse l051\main.crf --depend l051\main.d)
I (../Inc/main.h)(0x62E0AC4A)
I (../Drivers/STM32L0xx_HAL_Driver/Inc/stm32l0xx_hal.h)(0x61EE13C3)
I (../Inc/stm32l0xx_hal_conf.h)(0x62D6107A)
diff --git a/MDK-ARM/L051/L051.hex "b/MDK-ARM/L051/\345\205\215\345\270\203\347\272\277\345\237\272\347\253\231V1.34-6.5g.hex"
similarity index 99%
rename from MDK-ARM/L051/L051.hex
rename to "MDK-ARM/L051/\345\205\215\345\270\203\347\272\277\345\237\272\347\253\231V1.34-6.5g.hex"
index a0845e7..ccf2e61 100644
--- a/MDK-ARM/L051/L051.hex
+++ "b/MDK-ARM/L051/\345\205\215\345\270\203\347\272\277\345\237\272\347\253\231V1.34-6.5g.hex"
@@ -985,7 +985,7 @@
:108D700070470000FEB544494248086001F09AFD82
:108D8000424800F0E1F8424C20834048801C00F04B
:108D9000DBF860833D48001D00F0D6F8A083FF207B
-:108DA0003C4D22306880284640300179E1710291C3
+:108DA0003C4D23306880284640300179E1710291C2
:108DB000E88E3949C0B208700190E88F2071A88F01
:108DC0006071A87AA070A888009060622889FCF77A
:108DD00055FC324A324BFCF74BFB01F015F80022F0
@@ -1460,7 +1460,7 @@
:10AB20000000000000000000000000000000000025
:10AB30000000000000000000000000000000000015
:10AB40000000000000000000000000000000000005
-:10AB500000000000000000000000000002021400DD
+:10AB500000000000000000000000000005021400DA
:10AB6000090901020081000000000000010000004E
:10AB700000000000000000000000000000000000D5
:10AB800000000000000000000000000000000000C5
diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c
index d20d355..b5e145e 100644
--- a/Src/application/dw_app.c
+++ b/Src/application/dw_app.c
@@ -78,7 +78,7 @@
NEARPOLL,
}tag_state=NEARPOLL;
static dwt_config_t config = {
- 2, /* Channel number. */
+ 5, /* Channel number. */
DWT_PRF_64M, /* Pulse repetition frequency. */
DWT_PLEN_128, /* Preamble length. */
DWT_PAC8, /* Preamble acquisition chunk size. Used in RX only. */
diff --git a/Src/main.c b/Src/main.c
index b53adef..f41e210 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -307,7 +307,7 @@
hardware_pici = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+2);
hardware_type = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4);
//deca_sleep(1000);
- g_com_map[VERSION] = (1<<8)|33;
+ g_com_map[VERSION] = (1<<8)|34;
active_flag = g_com_map[ACTIVE_INDEX];
module_power = g_com_map[POWER];
imu_enable=g_com_map[IMU_ENABLE];
--
Gitblit v1.9.3