From 5b8bde9ae08b29e4ce6d04149fe0cb78e0c5d68c Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期日, 24 三月 2024 13:48:14 +0800
Subject: [PATCH] 1.12,加入lora'升级标签。

---
 MDK-ARM/L051/L051.htm |  282 +++++++------------------------------------------------
 1 files changed, 38 insertions(+), 244 deletions(-)

diff --git a/MDK-ARM/L051/L051.htm b/MDK-ARM/L051/L051.htm
index a0b974f..751dc3a 100644
--- a/MDK-ARM/L051/L051.htm
+++ b/MDK-ARM/L051/L051.htm
@@ -3,11 +3,7 @@
 <title>Static Call Graph - [L051\L051.axf]</title></head>
 <body><HR>
 <H1>Static Call Graph for image L051\L051.axf</H1><HR>
-<<<<<<< HEAD
-<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Thu Mar 21 17:25:08 2024
-=======
-<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Sat Mar 23 19:12:15 2024
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Sun Mar 24 13:47:31 2024
 <BR><P>
 <H3>Maximum Stack Usage =        248 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
 Call chain for Maximum Stack Depth:</H3>
@@ -104,11 +100,7 @@
 <P><STRONG><a name="[20]"></a>__main</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry.o(.ARM.Collect$$$$00000000))
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32l051xx.o(.text)
 </UL>
-<<<<<<< HEAD
 <P><STRONG><a name="[17e]"></a>_main_stk</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry2.o(.ARM.Collect$$$$00000001))
-=======
-<P><STRONG><a name="[179]"></a>_main_stk</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry2.o(.ARM.Collect$$$$00000001))
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 
 <P><STRONG><a name="[4a]"></a>_main_scatterload</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry5.o(.ARM.Collect$$$$00000004))
 <BR><BR>[Calls]<UL><LI><a href="#[4b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__scatterload
@@ -118,7 +110,6 @@
 <BR><BR>[Called By]<UL><LI><a href="#[4b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__scatterload
 </UL>
 
-<<<<<<< HEAD
 <P><STRONG><a name="[17f]"></a>_main_clock</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry7b.o(.ARM.Collect$$$$00000008))
 
 <P><STRONG><a name="[180]"></a>_main_cpp_init</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry8b.o(.ARM.Collect$$$$0000000A))
@@ -128,17 +119,6 @@
 <P><STRONG><a name="[182]"></a>__rt_final_cpp</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry10a.o(.ARM.Collect$$$$0000000D))
 
 <P><STRONG><a name="[183]"></a>__rt_final_exit</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry11a.o(.ARM.Collect$$$$0000000F))
-=======
-<P><STRONG><a name="[17a]"></a>_main_clock</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry7b.o(.ARM.Collect$$$$00000008))
-
-<P><STRONG><a name="[17b]"></a>_main_cpp_init</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry8b.o(.ARM.Collect$$$$0000000A))
-
-<P><STRONG><a name="[17c]"></a>_main_init</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry9a.o(.ARM.Collect$$$$0000000B))
-
-<P><STRONG><a name="[17d]"></a>__rt_final_cpp</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry10a.o(.ARM.Collect$$$$0000000D))
-
-<P><STRONG><a name="[17e]"></a>__rt_final_exit</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry11a.o(.ARM.Collect$$$$0000000F))
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 
 <P><STRONG><a name="[0]"></a>Reset_Handler</STRONG> (Thumb, 8 bytes, Stack size 0 bytes, startup_stm32l051xx.o(.text))
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32l051xx.o(RESET)
@@ -201,36 +181,22 @@
 <P><STRONG><a name="[6]"></a>WWDG_IRQHandler</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32l051xx.o(.text))
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32l051xx.o(RESET)
 </UL>
-<<<<<<< HEAD
 <P><STRONG><a name="[184]"></a>__aeabi_uidiv</STRONG> (Thumb, 0 bytes, Stack size 12 bytes, uidiv.o(.text), UNUSED)
-=======
-<P><STRONG><a name="[17f]"></a>__aeabi_uidiv</STRONG> (Thumb, 0 bytes, Stack size 12 bytes, uidiv.o(.text), UNUSED)
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 
 <P><STRONG><a name="[6b]"></a>__aeabi_uidivmod</STRONG> (Thumb, 44 bytes, Stack size 12 bytes, uidiv.o(.text))
 <BR><BR>[Stack]<UL><LI>Max Depth = 12<LI>Call Chain = __aeabi_uidivmod
 </UL>
-<<<<<<< HEAD
-<BR>[Called By]<UL><LI><a href="#[11e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Program_Init
+<BR>[Called By]<UL><LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
+<LI><a href="#[11e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Program_Init
 <LI><a href="#[b2]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_LPTIM_CompareMatchCallback
+<LI><a href="#[114]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MbxTagUwbRec
 <LI><a href="#[10b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Lora_Send_Poll
 <LI><a href="#[a4]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_DMA_Init
 <LI><a href="#[a3]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_DMA_DeInit
 <LI><a href="#[82]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;dwt_initialise
 <LI><a href="#[ae]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_InitTick
-=======
-<BR>[Called By]<UL><LI><a href="#[11a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Program_Init
-<LI><a href="#[b0]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_LPTIM_CompareMatchCallback
-<LI><a href="#[110]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MbxTagUwbRec
-<LI><a href="#[107]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Lora_Send_Poll
-<LI><a href="#[80]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;dwt_initialise
-<LI><a href="#[a2]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_DMA_Init
-<LI><a href="#[a1]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_DMA_DeInit
-<LI><a href="#[ac]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_InitTick
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 <LI><a href="#[6a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;ADC_DelayMicroSecond
 <LI><a href="#[2a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;OnRxTimeout
-<LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
 <LI><a href="#[e1]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;UART_SetConfig
 <LI><a href="#[c6]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_RCC_GetSysClockFreq
 </UL>
@@ -255,14 +221,11 @@
 <LI><a href="#[68]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_drnd
 </UL>
 
-<<<<<<< HEAD
 <P><STRONG><a name="[185]"></a>_ll_ushift_r</STRONG> (Thumb, 0 bytes, Stack size 8 bytes, llushr.o(.text), UNUSED)
-=======
-<P><STRONG><a name="[180]"></a>_ll_ushift_r</STRONG> (Thumb, 0 bytes, Stack size 8 bytes, llushr.o(.text), UNUSED)
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 
 <P><STRONG><a name="[106]"></a>__aeabi_memcpy</STRONG> (Thumb, 36 bytes, Stack size 0 bytes, memcpya.o(.text))
-<BR><BR>[Called By]<UL><LI><a href="#[11e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Program_Init
+<BR><BR>[Called By]<UL><LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
+<LI><a href="#[11e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Program_Init
 <LI><a href="#[114]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MbxTagUwbRec
 <LI><a href="#[103]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraReportPoll
 <LI><a href="#[2c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;UsartParseDataHandler
@@ -270,7 +233,6 @@
 <LI><a href="#[b6]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;save_com_map_to_flash
 <LI><a href="#[15f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;UART_PushFrame
 <LI><a href="#[28]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;OnRxDone
-<LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
 <LI><a href="#[108]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraSendComMap
 <LI><a href="#[107]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraRspWriteCommap
 </UL>
@@ -279,35 +241,23 @@
 <BR><BR>[Called By]<UL><LI><a href="#[e8]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_UART_RxCpltCallback
 </UL>
 
-<<<<<<< HEAD
 <P><STRONG><a name="[186]"></a>__aeabi_memcpy8</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, memcpya.o(.text), UNUSED)
-=======
-<P><STRONG><a name="[181]"></a>__aeabi_memcpy8</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, memcpya.o(.text), UNUSED)
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 
 <P><STRONG><a name="[50]"></a>__aeabi_memset</STRONG> (Thumb, 14 bytes, Stack size 0 bytes, memseta.o(.text), UNUSED)
 <BR><BR>[Called By]<UL><LI><a href="#[51]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_memset$wrapper
 <LI><a href="#[4f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_memclr
 </UL>
 
-<<<<<<< HEAD
 <P><STRONG><a name="[187]"></a>__aeabi_memset4</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, memseta.o(.text), UNUSED)
 
 <P><STRONG><a name="[188]"></a>__aeabi_memset8</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, memseta.o(.text), UNUSED)
-=======
-<P><STRONG><a name="[182]"></a>__aeabi_memset4</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, memseta.o(.text), UNUSED)
-
-<P><STRONG><a name="[183]"></a>__aeabi_memset8</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, memseta.o(.text), UNUSED)
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 
 <P><STRONG><a name="[4f]"></a>__aeabi_memclr</STRONG> (Thumb, 4 bytes, Stack size 0 bytes, memseta.o(.text), UNUSED)
 <BR><BR>[Calls]<UL><LI><a href="#[50]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_memset
 </UL>
 
-<<<<<<< HEAD
 <P><STRONG><a name="[a1]"></a>__aeabi_memclr4</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, memseta.o(.text))
-<BR><BR>[Called By]<UL><LI><a href="#[c9]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_SPI_MspInit
-<LI><a href="#[a0]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_ADC_MspInit
+<BR><BR>[Called By]<UL><LI><a href="#[a0]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_ADC_MspInit
 <LI><a href="#[cc]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_TIM_MspPostInit
 <LI><a href="#[f7]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;UsartDeInit
 <LI><a href="#[ab]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SystemClock_Config
@@ -316,27 +266,11 @@
 <LI><a href="#[10e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MX_GPIO_Init
 <LI><a href="#[12c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SX126xGetPacketStatus
 <LI><a href="#[e0]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_UART_MspInit
+<LI><a href="#[c9]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_SPI_MspInit
 <LI><a href="#[80]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Reset_DW1000
 </UL>
 
 <P><STRONG><a name="[189]"></a>__aeabi_memclr8</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, memseta.o(.text), UNUSED)
-=======
-<P><STRONG><a name="[9f]"></a>__aeabi_memclr4</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, memseta.o(.text))
-<BR><BR>[Called By]<UL><LI><a href="#[9e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_ADC_MspInit
-<LI><a href="#[ca]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_TIM_MspPostInit
-<LI><a href="#[f5]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;UsartDeInit
-<LI><a href="#[a9]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SystemClock_Config
-<LI><a href="#[e6]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_UART_RxCpltCallback
-<LI><a href="#[10e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MX_USART1_UART_Init
-<LI><a href="#[10a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MX_GPIO_Init
-<LI><a href="#[7e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Reset_DW1000
-<LI><a href="#[128]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SX126xGetPacketStatus
-<LI><a href="#[de]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_UART_MspInit
-<LI><a href="#[c7]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_SPI_MspInit
-</UL>
-
-<P><STRONG><a name="[184]"></a>__aeabi_memclr8</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, memseta.o(.text), UNUSED)
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 
 <P><STRONG><a name="[51]"></a>_memset$wrapper</STRONG> (Thumb, 18 bytes, Stack size 8 bytes, memseta.o(.text), UNUSED)
 <BR><BR>[Calls]<UL><LI><a href="#[50]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_memset
@@ -345,10 +279,10 @@
 <P><STRONG><a name="[7d]"></a>memcmp</STRONG> (Thumb, 26 bytes, Stack size 12 bytes, memcmp.o(.text))
 <BR><BR>[Stack]<UL><LI>Max Depth = 12<LI>Call Chain = memcmp
 </UL>
-<BR>[Called By]<UL><LI><a href="#[f4]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;IdleTask
+<BR>[Called By]<UL><LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
+<LI><a href="#[f4]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;IdleTask
 <LI><a href="#[7c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;CmpTagInList
 <LI><a href="#[28]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;OnRxDone
-<LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
 </UL>
 
 <P><STRONG><a name="[52]"></a>__aeabi_fadd</STRONG> (Thumb, 162 bytes, Stack size 24 bytes, fadd.o(.text))
@@ -446,11 +380,7 @@
 <LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;RadioSetRxConfig
 </UL>
 
-<<<<<<< HEAD
 <P><STRONG><a name="[18a]"></a>scalbn</STRONG> (Thumb, 0 bytes, Stack size 16 bytes, dscalb.o(.text), UNUSED)
-=======
-<P><STRONG><a name="[185]"></a>scalbn</STRONG> (Thumb, 0 bytes, Stack size 16 bytes, dscalb.o(.text), UNUSED)
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 
 <P><STRONG><a name="[60]"></a>__aeabi_i2f</STRONG> (Thumb, 22 bytes, Stack size 8 bytes, fflti.o(.text))
 <BR><BR>[Stack]<UL><LI>Max Depth = 20<LI>Call Chain = __aeabi_i2f &rArr; _float_epilogue
@@ -532,11 +462,7 @@
 <BR>[Called By]<UL><LI><a href="#[98]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Get_Battary
 </UL>
 
-<<<<<<< HEAD
 <P><STRONG><a name="[18b]"></a>__aeabi_cfcmpeq</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, cfcmple.o(.text), UNUSED)
-=======
-<P><STRONG><a name="[186]"></a>__aeabi_cfcmpeq</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, cfcmple.o(.text), UNUSED)
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 
 <P><STRONG><a name="[b8]"></a>__aeabi_cfcmple</STRONG> (Thumb, 20 bytes, Stack size 0 bytes, cfcmple.o(.text))
 <BR><BR>[Called By]<UL><LI><a href="#[b2]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_LPTIM_CompareMatchCallback
@@ -555,11 +481,7 @@
 <LI><a href="#[68]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_drnd
 </UL>
 
-<<<<<<< HEAD
 <P><STRONG><a name="[18c]"></a>_ll_shift_l</STRONG> (Thumb, 0 bytes, Stack size 8 bytes, llshl.o(.text), UNUSED)
-=======
-<P><STRONG><a name="[187]"></a>_ll_shift_l</STRONG> (Thumb, 0 bytes, Stack size 8 bytes, llshl.o(.text), UNUSED)
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 
 <P><STRONG><a name="[59]"></a>__aeabi_lasr</STRONG> (Thumb, 38 bytes, Stack size 8 bytes, llsshr.o(.text))
 <BR><BR>[Stack]<UL><LI>Max Depth = 8<LI>Call Chain = __aeabi_lasr
@@ -567,15 +489,9 @@
 <BR>[Called By]<UL><LI><a href="#[58]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_dadd
 </UL>
 
-<<<<<<< HEAD
 <P><STRONG><a name="[18d]"></a>_ll_sshift_r</STRONG> (Thumb, 0 bytes, Stack size 8 bytes, llsshr.o(.text), UNUSED)
 
 <P><STRONG><a name="[18e]"></a>__I$use$fp</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, iusefp.o(.text), UNUSED)
-=======
-<P><STRONG><a name="[188]"></a>_ll_sshift_r</STRONG> (Thumb, 0 bytes, Stack size 8 bytes, llsshr.o(.text), UNUSED)
-
-<P><STRONG><a name="[189]"></a>__I$use$fp</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, iusefp.o(.text), UNUSED)
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 
 <P><STRONG><a name="[54]"></a>_float_round</STRONG> (Thumb, 16 bytes, Stack size 0 bytes, fepilogue.o(.text))
 <BR><BR>[Called By]<UL><LI><a href="#[57]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_fdiv
@@ -630,19 +546,11 @@
 <BR>[Called By]<UL><LI><a href="#[4a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_main_scatterload
 </UL>
 
-<<<<<<< HEAD
 <P><STRONG><a name="[18f]"></a>__scatterload_rt2</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, init.o(.text), UNUSED)
 
 <P><STRONG><a name="[190]"></a>__decompress</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __dczerorl2.o(.text), UNUSED)
 
 <P><STRONG><a name="[191]"></a>__decompress1</STRONG> (Thumb, 86 bytes, Stack size unknown bytes, __dczerorl2.o(.text), UNUSED)
-=======
-<P><STRONG><a name="[18a]"></a>__scatterload_rt2</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, init.o(.text), UNUSED)
-
-<P><STRONG><a name="[18b]"></a>__decompress</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, __dczerorl2.o(.text), UNUSED)
-
-<P><STRONG><a name="[18c]"></a>__decompress1</STRONG> (Thumb, 86 bytes, Stack size unknown bytes, __dczerorl2.o(.text), UNUSED)
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 
 <P><STRONG><a name="[6e]"></a>Anchor_RecNearPoll</STRONG> (Thumb, 296 bytes, Stack size 40 bytes, dw_mbx_tag.o(i.Anchor_RecNearPoll))
 <BR><BR>[Stack]<UL><LI>Max Depth = 160<LI>Call Chain = Anchor_RecNearPoll &rArr; dwt_starttx &rArr; dwt_entersleepaftertx &rArr; dwt_write32bitoffsetreg &rArr; dwt_writetodevice &rArr; writetospi &rArr; Uwb_CS_di &rArr; __2printf
@@ -679,21 +587,13 @@
 <P><STRONG><a name="[100]"></a>Checksum_u16</STRONG> (Thumb, 26 bytes, Stack size 8 bytes, dw_app.o(i.Checksum_u16))
 <BR><BR>[Stack]<UL><LI>Max Depth = 8<LI>Call Chain = Checksum_u16
 </UL>
-<<<<<<< HEAD
-<BR>[Called By]<UL><LI><a href="#[103]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraReportPoll
+<BR>[Called By]<UL><LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
+<LI><a href="#[103]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraReportPoll
 <LI><a href="#[ff]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraHeartBeartPoll
 <LI><a href="#[15e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SendComMap
-<LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
+<LI><a href="#[28]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;OnRxDone
 <LI><a href="#[108]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraSendComMap
 <LI><a href="#[107]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraRspWriteCommap
-=======
-<BR>[Called By]<UL><LI><a href="#[101]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraReportPoll
-<LI><a href="#[fd]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraHeartBeartPoll
-<LI><a href="#[15a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SendComMap
-<LI><a href="#[28]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;OnRxDone
-<LI><a href="#[106]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraSendComMap
-<LI><a href="#[105]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraRspWriteCommap
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 </UL>
 
 <P><STRONG><a name="[7c]"></a>CmpTagInList</STRONG> (Thumb, 40 bytes, Stack size 24 bytes, dw_mbx_tag.o(i.CmpTagInList))
@@ -714,9 +614,9 @@
 <P><STRONG><a name="[a8]"></a>Delay_Ms</STRONG> (Thumb, 26 bytes, Stack size 8 bytes, delay.o(i.Delay_Ms))
 <BR><BR>[Stack]<UL><LI>Max Depth = 8<LI>Call Chain = Delay_Ms
 </UL>
-<BR>[Called By]<UL><LI><a href="#[1e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
+<BR>[Called By]<UL><LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
+<LI><a href="#[1e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
 <LI><a href="#[a7]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_Delay_nMS
-<LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
 </UL>
 
 <P><STRONG><a name="[7f]"></a>Dw1000_Init</STRONG> (Thumb, 44 bytes, Stack size 8 bytes, dw_app.o(i.Dw1000_Init))
@@ -765,16 +665,12 @@
 <LI><a href="#[8c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_FLASH_Lock
 <LI><a href="#[8b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_FLASHEx_Erase
 </UL>
-<BR>[Called By]<UL><LI><a href="#[168]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;UpdateProcess
+<BR>[Called By]<UL><LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
+<LI><a href="#[168]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;UpdateProcess
 <LI><a href="#[b6]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;save_com_map_to_flash
-<LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
 </UL>
 
-<<<<<<< HEAD
 <P><STRONG><a name="[17d]"></a>FLASH_Read</STRONG> (Thumb, 18 bytes, Stack size 8 bytes, flash.o(i.FLASH_Read))
-=======
-<P><STRONG><a name="[178]"></a>FLASH_Read</STRONG> (Thumb, 18 bytes, Stack size 8 bytes, flash.o(i.FLASH_Read))
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 <BR><BR>[Stack]<UL><LI>Max Depth = 8<LI>Call Chain = FLASH_Read
 </UL>
 <BR>[Called By]<UL><LI><a href="#[b5]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;parameter_init
@@ -797,9 +693,9 @@
 <LI><a href="#[90]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_FLASH_Program
 <LI><a href="#[8c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_FLASH_Lock
 </UL>
-<BR>[Called By]<UL><LI><a href="#[168]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;UpdateProcess
+<BR>[Called By]<UL><LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
+<LI><a href="#[168]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;UpdateProcess
 <LI><a href="#[b6]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;save_com_map_to_flash
-<LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
 </UL>
 
 <P><STRONG><a name="[91]"></a>GPIO_Toggle</STRONG> (Thumb, 8 bytes, Stack size 8 bytes, main.o(i.GPIO_Toggle))
@@ -1004,25 +900,14 @@
 <P><STRONG><a name="[a2]"></a>HAL_GPIO_Init</STRONG> (Thumb, 346 bytes, Stack size 24 bytes, stm32l0xx_hal_gpio.o(i.HAL_GPIO_Init))
 <BR><BR>[Stack]<UL><LI>Max Depth = 24<LI>Call Chain = HAL_GPIO_Init
 </UL>
-<<<<<<< HEAD
-<BR>[Called By]<UL><LI><a href="#[c9]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_SPI_MspInit
-<LI><a href="#[a0]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_ADC_MspInit
+<BR>[Called By]<UL><LI><a href="#[a0]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_ADC_MspInit
 <LI><a href="#[cc]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_TIM_MspPostInit
 <LI><a href="#[f7]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;UsartDeInit
 <LI><a href="#[112]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MX_USART1_UART_Init
 <LI><a href="#[10e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MX_GPIO_Init
 <LI><a href="#[e0]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_UART_MspInit
+<LI><a href="#[c9]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_SPI_MspInit
 <LI><a href="#[80]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Reset_DW1000
-=======
-<BR>[Called By]<UL><LI><a href="#[9e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_ADC_MspInit
-<LI><a href="#[ca]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_TIM_MspPostInit
-<LI><a href="#[f5]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;UsartDeInit
-<LI><a href="#[10e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MX_USART1_UART_Init
-<LI><a href="#[10a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MX_GPIO_Init
-<LI><a href="#[7e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Reset_DW1000
-<LI><a href="#[de]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_UART_MspInit
-<LI><a href="#[c7]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_SPI_MspInit
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 </UL>
 
 <P><STRONG><a name="[86]"></a>HAL_GPIO_ReadPin</STRONG> (Thumb, 10 bytes, Stack size 0 bytes, stm32l0xx_hal_gpio.o(i.HAL_GPIO_ReadPin))
@@ -1030,7 +915,6 @@
 <LI><a href="#[ef]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;IIC2_Read_Byte
 <LI><a href="#[b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;EXTI0_1_IRQHandler
 <LI><a href="#[47]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;RadioIrqProcess
-<<<<<<< HEAD
 <LI><a href="#[1e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
 <LI><a href="#[f4]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;IdleTask
 <LI><a href="#[b2]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_LPTIM_CompareMatchCallback
@@ -1039,15 +923,6 @@
 <LI><a href="#[154]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SX126x_CS_Di
 <LI><a href="#[14e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SX126xWaitOnBusy
 <LI><a href="#[169]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Uwb_CS_di
-=======
-<LI><a href="#[f2]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;IdleTask
-<LI><a href="#[b0]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_LPTIM_CompareMatchCallback
-<LI><a href="#[101]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraReportPoll
-<LI><a href="#[fc]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LedTask
-<LI><a href="#[165]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Uwb_CS_di
-<LI><a href="#[150]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SX126x_CS_Di
-<LI><a href="#[14a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SX126xWaitOnBusy
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 </UL>
 
 <P><STRONG><a name="[92]"></a>HAL_GPIO_TogglePin</STRONG> (Thumb, 8 bytes, Stack size 0 bytes, stm32l0xx_hal_gpio.o(i.HAL_GPIO_TogglePin))
@@ -1113,8 +988,8 @@
 </UL>
 
 <P><STRONG><a name="[b3]"></a>HAL_IWDG_Refresh</STRONG> (Thumb, 10 bytes, Stack size 0 bytes, stm32l0xx_hal_iwdg.o(i.HAL_IWDG_Refresh))
-<BR><BR>[Called By]<UL><LI><a href="#[b2]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_LPTIM_CompareMatchCallback
-<LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
+<BR><BR>[Called By]<UL><LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
+<LI><a href="#[b2]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_LPTIM_CompareMatchCallback
 </UL>
 
 <P><STRONG><a name="[160]"></a>HAL_IncTick</STRONG> (Thumb, 10 bytes, Stack size 0 bytes, stm32l0xx_hal.o(i.HAL_IncTick))
@@ -1150,11 +1025,7 @@
 <BR><BR>[Called By]<UL><LI><a href="#[b9]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_LPTIM_IRQHandler
 </UL>
 
-<<<<<<< HEAD
 <P><STRONG><a name="[b2]"></a>HAL_LPTIM_CompareMatchCallback</STRONG> (Thumb, 374 bytes, Stack size 24 bytes, main.o(i.HAL_LPTIM_CompareMatchCallback))
-=======
-<P><STRONG><a name="[b0]"></a>HAL_LPTIM_CompareMatchCallback</STRONG> (Thumb, 332 bytes, Stack size 24 bytes, main.o(i.HAL_LPTIM_CompareMatchCallback))
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 <BR><BR>[Stack]<UL><LI>Max Depth = 196<LI>Call Chain = HAL_LPTIM_CompareMatchCallback &rArr; SystemClock_Config &rArr; HAL_RCC_OscConfig &rArr; HAL_InitTick &rArr; __aeabi_uidivmod
 </UL>
 <BR>[Calls]<UL><LI><a href="#[60]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_i2f
@@ -1219,11 +1090,11 @@
 </UL>
 
 <P><STRONG><a name="[75]"></a>HAL_LPTIM_ReadCounter</STRONG> (Thumb, 6 bytes, Stack size 0 bytes, stm32l0xx_hal_lptim.o(i.HAL_LPTIM_ReadCounter))
-<BR><BR>[Called By]<UL><LI><a href="#[114]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MbxTagUwbRec
+<BR><BR>[Called By]<UL><LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
+<LI><a href="#[114]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MbxTagUwbRec
 <LI><a href="#[6e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Anchor_RecNearPoll
 <LI><a href="#[2a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;OnRxTimeout
 <LI><a href="#[28]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;OnRxDone
-<LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
 </UL>
 
 <P><STRONG><a name="[17b]"></a>HAL_LPTIM_TimeOut_Start_IT</STRONG> (Thumb, 72 bytes, Stack size 16 bytes, stm32l0xx_hal_lptim.o(i.HAL_LPTIM_TimeOut_Start_IT))
@@ -1268,7 +1139,6 @@
 <BR><BR>[Called By]<UL><LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
 </UL>
 
-<<<<<<< HEAD
 <P><STRONG><a name="[161]"></a>HAL_PWR_EnableBkUpAccess</STRONG> (Thumb, 12 bytes, Stack size 0 bytes, stm32l0xx_hal_pwr.o(i.HAL_PWR_EnableBkUpAccess))
 <BR><BR>[Called By]<UL><LI><a href="#[ab]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SystemClock_Config
 </UL>
@@ -1278,9 +1148,6 @@
 </UL>
 
 <P><STRONG><a name="[c4]"></a>HAL_RCCEx_PeriphCLKConfig</STRONG> (Thumb, 342 bytes, Stack size 24 bytes, stm32l0xx_hal_rcc_ex.o(i.HAL_RCCEx_PeriphCLKConfig))
-=======
-<P><STRONG><a name="[c2]"></a>HAL_RCCEx_PeriphCLKConfig</STRONG> (Thumb, 342 bytes, Stack size 24 bytes, stm32l0xx_hal_rcc_ex.o(i.HAL_RCCEx_PeriphCLKConfig))
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 <BR><BR>[Stack]<UL><LI>Max Depth = 24<LI>Call Chain = HAL_RCCEx_PeriphCLKConfig
 </UL>
 <BR>[Calls]<UL><LI><a href="#[6d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_GetTick
@@ -1724,11 +1591,7 @@
 <BR><BR>[Called By]<UL><LI><a href="#[103]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraReportPoll
 </UL>
 
-<<<<<<< HEAD
-<P><STRONG><a name="[103]"></a>LoraReportPoll</STRONG> (Thumb, 328 bytes, Stack size 32 bytes, dw_mbx_tag.o(i.LoraReportPoll))
-=======
-<P><STRONG><a name="[101]"></a>LoraReportPoll</STRONG> (Thumb, 344 bytes, Stack size 32 bytes, dw_mbx_tag.o(i.LoraReportPoll))
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
+<P><STRONG><a name="[103]"></a>LoraReportPoll</STRONG> (Thumb, 344 bytes, Stack size 32 bytes, dw_mbx_tag.o(i.LoraReportPoll))
 <BR><BR>[Stack]<UL><LI>Max Depth = 184<LI>Call Chain = LoraReportPoll &rArr; Get_Battary &rArr; __aeabi_dmul &rArr; _double_epilogue &rArr; _double_round
 </UL>
 <BR>[Calls]<UL><LI><a href="#[99]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_GPIO_WritePin
@@ -1762,7 +1625,7 @@
 <BR>[Called By]<UL><LI><a href="#[28]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;OnRxDone
 </UL>
 
-<P><STRONG><a name="[109]"></a>LoraUp_Poll</STRONG> (Thumb, 614 bytes, Stack size 32 bytes, lora.o(i.LoraUp_Poll))
+<P><STRONG><a name="[109]"></a>LoraUp_Poll</STRONG> (Thumb, 590 bytes, Stack size 32 bytes, lora.o(i.LoraUp_Poll))
 <BR><BR>[Stack]<UL><LI>Max Depth = 112<LI>Call Chain = LoraUp_Poll &rArr; FLASH_Prepare &rArr; HAL_FLASHEx_Erase &rArr; FLASH_WaitForLastOperation &rArr; FLASH_SetErrorCode
 </UL>
 <BR>[Calls]<UL><LI><a href="#[b3]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_IWDG_Refresh
@@ -1779,7 +1642,7 @@
 <LI><a href="#[106]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_memcpy
 <LI><a href="#[6b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_uidivmod
 </UL>
-<BR>[Called By]<UL><LI><a href="#[28]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;OnRxDone
+<BR>[Called By]<UL><LI><a href="#[1e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
 </UL>
 
 <P><STRONG><a name="[10b]"></a>Lora_Send_Poll</STRONG> (Thumb, 98 bytes, Stack size 16 bytes, dw_mbx_tag.o(i.Lora_Send_Poll))
@@ -1793,11 +1656,7 @@
 <BR>[Called By]<UL><LI><a href="#[1e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
 </UL>
 
-<<<<<<< HEAD
-<P><STRONG><a name="[114]"></a>MbxTagUwbRec</STRONG> (Thumb, 390 bytes, Stack size 24 bytes, dw_mbx_tag.o(i.MbxTagUwbRec))
-=======
-<P><STRONG><a name="[110]"></a>MbxTagUwbRec</STRONG> (Thumb, 404 bytes, Stack size 24 bytes, dw_mbx_tag.o(i.MbxTagUwbRec))
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
+<P><STRONG><a name="[114]"></a>MbxTagUwbRec</STRONG> (Thumb, 404 bytes, Stack size 24 bytes, dw_mbx_tag.o(i.MbxTagUwbRec))
 <BR><BR>[Stack]<UL><LI>Max Depth = 184<LI>Call Chain = MbxTagUwbRec &rArr; Anchor_RecNearPoll &rArr; dwt_starttx &rArr; dwt_entersleepaftertx &rArr; dwt_write32bitoffsetreg &rArr; dwt_writetodevice &rArr; writetospi &rArr; Uwb_CS_di &rArr; __2printf
 </UL>
 <BR>[Calls]<UL><LI><a href="#[99]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_GPIO_WritePin
@@ -1809,16 +1668,10 @@
 <LI><a href="#[116]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;dwt_rxenable
 <LI><a href="#[118]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;dwt_readrxdata
 <LI><a href="#[76]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;dwt_read32bitoffsetreg
-<<<<<<< HEAD
 <LI><a href="#[119]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;dwt_forcetrxoff
 <LI><a href="#[11a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;dwt_entersleep
 <LI><a href="#[106]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_memcpy
-=======
-<LI><a href="#[115]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;dwt_forcetrxoff
-<LI><a href="#[116]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;dwt_entersleep
-<LI><a href="#[104]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_memcpy
 <LI><a href="#[6b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_uidivmod
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 </UL>
 <BR>[Called By]<UL><LI><a href="#[28]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;OnRxDone
 </UL>
@@ -1826,13 +1679,8 @@
 <P><STRONG><a name="[1]"></a>NMI_Handler</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, stm32l0xx_it.o(i.NMI_Handler))
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32l051xx.o(RESET)
 </UL>
-<<<<<<< HEAD
-<P><STRONG><a name="[28]"></a>OnRxDone</STRONG> (Thumb, 388 bytes, Stack size 32 bytes, lora.o(i.OnRxDone))
-<BR><BR>[Stack]<UL><LI>Max Depth = 216<LI>Call Chain = OnRxDone &rArr; MbxTagUwbRec &rArr; Anchor_RecNearPoll &rArr; dwt_starttx &rArr; dwt_entersleepaftertx &rArr; dwt_write32bitoffsetreg &rArr; dwt_writetodevice &rArr; writetospi &rArr; Uwb_CS_di &rArr; __2printf
-=======
-<P><STRONG><a name="[28]"></a>OnRxDone</STRONG> (Thumb, 450 bytes, Stack size 40 bytes, lora.o(i.OnRxDone))
+<P><STRONG><a name="[28]"></a>OnRxDone</STRONG> (Thumb, 508 bytes, Stack size 40 bytes, lora.o(i.OnRxDone))
 <BR><BR>[Stack]<UL><LI>Max Depth = 224<LI>Call Chain = OnRxDone &rArr; MbxTagUwbRec &rArr; Anchor_RecNearPoll &rArr; dwt_starttx &rArr; dwt_entersleepaftertx &rArr; dwt_write32bitoffsetreg &rArr; dwt_writetodevice &rArr; writetospi &rArr; Uwb_CS_di &rArr; __2printf
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 </UL>
 <BR>[Calls]<UL><LI><a href="#[63]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_ui2d
 <LI><a href="#[5c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_dsub
@@ -1841,18 +1689,11 @@
 <LI><a href="#[99]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_GPIO_WritePin
 <LI><a href="#[102]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SwitchLoraSettings
 <LI><a href="#[75]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_LPTIM_ReadCounter
-<<<<<<< HEAD
 <LI><a href="#[114]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MbxTagUwbRec
 <LI><a href="#[11b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;UWB_Wkup
+<LI><a href="#[100]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Checksum_u16
 <LI><a href="#[b6]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;save_com_map_to_flash
-=======
-<LI><a href="#[110]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MbxTagUwbRec
-<LI><a href="#[117]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;UWB_Wkup
-<LI><a href="#[fe]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Checksum_u16
-<LI><a href="#[b4]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;save_com_map_to_flash
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 <LI><a href="#[64]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_d2iz
-<LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
 <LI><a href="#[108]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraSendComMap
 <LI><a href="#[107]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraRspWriteCommap
 <LI><a href="#[7d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;memcmp
@@ -1902,11 +1743,7 @@
 <P><STRONG><a name="[4]"></a>PendSV_Handler</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, stm32l0xx_it.o(i.PendSV_Handler))
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32l051xx.o(RESET)
 </UL>
-<<<<<<< HEAD
-<P><STRONG><a name="[11e]"></a>Program_Init</STRONG> (Thumb, 232 bytes, Stack size 32 bytes, main.o(i.Program_Init))
-=======
-<P><STRONG><a name="[11a]"></a>Program_Init</STRONG> (Thumb, 236 bytes, Stack size 32 bytes, main.o(i.Program_Init))
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
+<P><STRONG><a name="[11e]"></a>Program_Init</STRONG> (Thumb, 236 bytes, Stack size 32 bytes, main.o(i.Program_Init))
 <BR><BR>[Stack]<UL><LI>Max Depth = 168<LI>Call Chain = Program_Init &rArr; ceil &rArr; __aeabi_drsub &rArr; __aeabi_dadd &rArr; _double_epilogue &rArr; _double_round
 </UL>
 <BR>[Calls]<UL><LI><a href="#[63]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_ui2d
@@ -2776,13 +2613,13 @@
 <P><STRONG><a name="[102]"></a>SwitchLoraSettings</STRONG> (Thumb, 106 bytes, Stack size 72 bytes, lora.o(i.SwitchLoraSettings))
 <BR><BR>[Stack]<UL><LI>Max Depth = 72<LI>Call Chain = SwitchLoraSettings
 </UL>
-<BR>[Called By]<UL><LI><a href="#[101]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraInit
+<BR>[Called By]<UL><LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
+<LI><a href="#[101]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraInit
 <LI><a href="#[103]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraReportPoll
 <LI><a href="#[29]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;OnTxTimeout
 <LI><a href="#[2a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;OnRxTimeout
 <LI><a href="#[2b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;OnRxError
 <LI><a href="#[28]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;OnRxDone
-<LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
 </UL>
 
 <P><STRONG><a name="[5]"></a>SysTick_Handler</STRONG> (Thumb, 8 bytes, Stack size 8 bytes, stm32l0xx_it.o(i.SysTick_Handler))
@@ -2960,11 +2797,7 @@
 <BR><BR>[Calls]<UL><LI><a href="#[16b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_printf_core
 </UL>
 
-<<<<<<< HEAD
 <P><STRONG><a name="[192]"></a>__1printf$bare</STRONG> (Thumb, 0 bytes, Stack size 8 bytes, printfb.o(i.__0printf$bare), UNUSED)
-=======
-<P><STRONG><a name="[18d]"></a>__1printf$bare</STRONG> (Thumb, 0 bytes, Stack size 8 bytes, printfb.o(i.__0printf$bare), UNUSED)
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 
 <P><STRONG><a name="[11c]"></a>__2printf</STRONG> (Thumb, 0 bytes, Stack size 8 bytes, printfb.o(i.__0printf$bare))
 <BR><BR>[Stack]<UL><LI>Max Depth = 8<LI>Call Chain = __2printf
@@ -2986,19 +2819,11 @@
 <LI><a href="#[e1]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;UART_SetConfig
 </UL>
 
-<<<<<<< HEAD
 <P><STRONG><a name="[193]"></a>__scatterload_copy</STRONG> (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_copy), UNUSED)
 
 <P><STRONG><a name="[194]"></a>__scatterload_null</STRONG> (Thumb, 2 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_null), UNUSED)
 
 <P><STRONG><a name="[195]"></a>__scatterload_zeroinit</STRONG> (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_zeroinit), UNUSED)
-=======
-<P><STRONG><a name="[18e]"></a>__scatterload_copy</STRONG> (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_copy), UNUSED)
-
-<P><STRONG><a name="[18f]"></a>__scatterload_null</STRONG> (Thumb, 2 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_null), UNUSED)
-
-<P><STRONG><a name="[190]"></a>__scatterload_zeroinit</STRONG> (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_zeroinit), UNUSED)
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 
 <P><STRONG><a name="[16c]"></a>_dwt_aonarrayupload</STRONG> (Thumb, 38 bytes, Stack size 8 bytes, deca_device.o(i._dwt_aonarrayupload))
 <BR><BR>[Stack]<UL><LI>Max Depth = 80<LI>Call Chain = _dwt_aonarrayupload &rArr; dwt_writetodevice &rArr; writetospi &rArr; Uwb_CS_di &rArr; __2printf
@@ -3064,12 +2889,12 @@
 </UL>
 <BR>[Calls]<UL><LI><a href="#[ed]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;delay_us
 </UL>
-<BR>[Called By]<UL><LI><a href="#[b2]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_LPTIM_CompareMatchCallback
+<BR>[Called By]<UL><LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
+<LI><a href="#[b2]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_LPTIM_CompareMatchCallback
 <LI><a href="#[2c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;UsartParseDataHandler
 <LI><a href="#[168]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;UpdateProcess
 <LI><a href="#[80]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Reset_DW1000
 <LI><a href="#[172]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_dwt_loaducodefromrom
-<LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
 </UL>
 
 <P><STRONG><a name="[ed]"></a>delay_us</STRONG> (Thumb, 140 bytes, Stack size 0 bytes, lis3dh_driver.o(i.delay_us))
@@ -3380,13 +3205,13 @@
 </UL>
 <BR>[Address Reference Count : 1]<UL><LI> printfb.o(i.__0printf$bare)
 </UL>
-<P><STRONG><a name="[1e]"></a>main</STRONG> (Thumb, 242 bytes, Stack size 0 bytes, main.o(i.main))
+<P><STRONG><a name="[1e]"></a>main</STRONG> (Thumb, 268 bytes, Stack size 0 bytes, main.o(i.main))
 <BR><BR>[Stack]<UL><LI>Max Depth = 200<LI>Call Chain = main &rArr; Lora_Send_Poll &rArr; LoraReportPoll &rArr; Get_Battary &rArr; __aeabi_dmul &rArr; _double_epilogue &rArr; _double_round
 </UL>
-<<<<<<< HEAD
 <BR>[Calls]<UL><LI><a href="#[99]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_GPIO_WritePin
 <LI><a href="#[86]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_GPIO_ReadPin
 <LI><a href="#[f8]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LIS3DH_Data_Init
+<LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraUp_Poll
 <LI><a href="#[101]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraInit
 <LI><a href="#[d7]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_UART_Receive_IT
 <LI><a href="#[e7]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_UART_Receive_DMA
@@ -3411,44 +3236,13 @@
 <LI><a href="#[7f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Dw1000_Init
 <LI><a href="#[11a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;dwt_entersleep
 <LI><a href="#[174]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;dwt_configuresleep
-=======
-<BR>[Calls]<UL><LI><a href="#[97]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_GPIO_WritePin
-<LI><a href="#[f6]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LIS3DH_Data_Init
-<LI><a href="#[ff]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LoraInit
-<LI><a href="#[d5]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_UART_Receive_IT
-<LI><a href="#[e5]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_UART_Receive_DMA
-<LI><a href="#[dd]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_UART_Init
-<LI><a href="#[177]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_LPTIM_TimeOut_Start_IT
-<LI><a href="#[be]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_LPTIM_Init
-<LI><a href="#[ab]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_Init
-<LI><a href="#[aa]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_IWDG_Init
-<LI><a href="#[a6]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Delay_Ms
-<LI><a href="#[a9]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SystemClock_Config
-<LI><a href="#[11a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Program_Init
-<LI><a href="#[119]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;OneSecondTask
-<LI><a href="#[f2]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;IdleTask
-<LI><a href="#[10e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MX_USART1_UART_Init
-<LI><a href="#[10c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MX_TIM2_Init
-<LI><a href="#[10b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MX_SPI1_Init
-<LI><a href="#[10a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MX_GPIO_Init
-<LI><a href="#[109]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MX_DMA_Init
-<LI><a href="#[108]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MX_ADC_Init
-<LI><a href="#[107]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Lora_Send_Poll
-<LI><a href="#[7d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Dw1000_Init
-<LI><a href="#[116]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;dwt_entersleep
-<LI><a href="#[170]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;dwt_configuresleep
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 </UL>
 <BR>[Address Reference Count : 1]<UL><LI> entry9a.o(.ARM.Collect$$$$0000000B)
 </UL>
 <P><STRONG><a name="[b5]"></a>parameter_init</STRONG> (Thumb, 16 bytes, Stack size 8 bytes, global_param.o(i.parameter_init))
 <BR><BR>[Stack]<UL><LI>Max Depth = 16<LI>Call Chain = parameter_init &rArr; FLASH_Read
 </UL>
-<<<<<<< HEAD
 <BR>[Calls]<UL><LI><a href="#[17d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;FLASH_Read
-=======
-<BR>[Calls]<UL><LI><a href="#[178]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;FLASH_Read
->>>>>>> 0401ba0353be795d83dad129a942d892c7f13eb5
 </UL>
 <BR>[Called By]<UL><LI><a href="#[11e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Program_Init
 <LI><a href="#[b2]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_LPTIM_CompareMatchCallback

--
Gitblit v1.9.3