modified dlt645 bug

app/MDKProject/Listings/os_cpu_a.lst

@@ -435,12 +435,10 @@ ARM Macro Assembler    Page 7
               00000000 
               00000000 
 Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
-ork --depend=..\obj\os_cpu_a.d -o..\obj\os_cpu_a.o -I.\RTE\_Target_1 -ID:\workS
-oftware\stm32Software\mdk\mdkpack\Keil\STM32F2xx_DFP\2.9.0\Drivers\CMSIS\Device
-\ST\STM32F2xx\Include -ID:\workSoftware\stm32Software\mdk\mdkcore\ARM\CMSIS\Inc
-lude --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 529" -
--predefine="STM32F207xx SETA 1" --list=.\listings\os_cpu_a.lst ..\UCOS-II\Ports
-\os_cpu_a.asm
+ork --depend=..\obj\os_cpu_a.d -o..\obj\os_cpu_a.o -ID:\keil\packs\Keil\STM32F2
+xx_DFP\2.10.0\Drivers\CMSIS\Device\ST\STM32F2xx\Include --predefine="__MICROLIB
+ SETA 1" --predefine="__UVISION_VERSION SETA 538" --predefine="STM32F207xx SETA
+ 1" --list=.\listings\os_cpu_a.lst ..\UCOS-II\Ports\os_cpu_a.asm
 
 
 

app/MDKProject/Listings/startup_stm32f2xx.lst

@@ -834,12 +834,11 @@ ARM Macro Assembler    Page 13
               00000000 
               00000000 
 Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
-ork --depend=..\obj\startup_stm32f2xx.d -o..\obj\startup_stm32f2xx.o -I.\RTE\_T
-arget_1 -ID:\workSoftware\stm32Software\mdk\mdkpack\Keil\STM32F2xx_DFP\2.9.0\Dr
-ivers\CMSIS\Device\ST\STM32F2xx\Include -ID:\workSoftware\stm32Software\mdk\mdk
-core\ARM\CMSIS\Include --predefine="__MICROLIB SETA 1" --predefine="__UVISION_V
-ERSION SETA 529" --predefine="STM32F207xx SETA 1" --list=.\listings\startup_stm
-32f2xx.lst ..\CORE\startup_stm32f2xx.s
+ork --depend=..\obj\startup_stm32f2xx.d -o..\obj\startup_stm32f2xx.o -ID:\keil\
+packs\Keil\STM32F2xx_DFP\2.10.0\Drivers\CMSIS\Device\ST\STM32F2xx\Include --pre
+define="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 538" --predefine
+="STM32F207xx SETA 1" --list=.\listings\startup_stm32f2xx.lst ..\CORE\startup_s
+tm32f2xx.s
 
 
 

app/MDKProject/lora_gateway.uvoptx

@@ -10,7 +10,7 @@
     <aExt>*.s*; *.src; *.a*</aExt>
     <oExt>*.obj; *.o</oExt>
     <lExt>*.lib</lExt>
-    <tExt>*.txt; *.h; *.inc</tExt>
+    <tExt>*.txt; *.h; *.inc; *.md</tExt>
     <pExt>*.plm</pExt>
     <CppX>*.cpp</CppX>
     <nMigrate>0</nMigrate>
@@ -117,6 +117,10 @@
         <pMon>Segger\JL2CM3.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>JL2CM3</Key>
@@ -137,11 +141,6 @@
           <Key>ARMDBGFLAGS</Key>
           <Name></Name>
         </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGUARM</Key>
-          <Name></Name>
-        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>CMSIS_AGDI</Key>
@@ -153,12 +152,36 @@
           <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F2xx_1024 -FS08000000 -FL0100000 -FP0($$Device:STM32F207ZGTx$CMSIS\Flash\STM32F2xx_1024.FLM))</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint/>
+      <Breakpoint>
+        <Bp>
+          <Number>0</Number>
+          <Type>0</Type>
+          <LineNumber>259</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134241660</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>..\SYSTEM\source\protocol.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\lora_gateway\../SYSTEM/source/protocol.c\259</Expression>
+        </Bp>
+      </Breakpoint>
+      <WatchWindow1>
+        <Ww>
+          <count>0</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>value</ItemText>
+        </Ww>
+      </WatchWindow1>
       <MemoryWindow1>
         <Mm>
           <WinNumber>1</WinNumber>
-          <SubType>0</SubType>
-          <ItemText>lora_config_json</ItemText>
+          <SubType>8</SubType>
+          <ItemText>json</ItemText>
           <AccSizeX>0</AccSizeX>
         </Mm>
       </MemoryWindow1>
@@ -216,7 +239,7 @@
 
   <Group>
     <GroupName>USER</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -272,7 +295,7 @@
 
   <Group>
     <GroupName>SYSTEM</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -1208,7 +1231,7 @@
 
   <Group>
     <GroupName>DLT645</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>

app/MDKProject/lora_gateway.uvprojx

@@ -16,8 +16,8 @@
         <TargetCommonOption>
           <Device>STM32F207ZGTx</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F2xx_DFP.2.9.0</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
+          <PackID>Keil.STM32F2xx_DFP.2.10.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IRAM(0x20000000,0x00020000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
@@ -185,6 +185,8 @@
             <uocXRam>0</uocXRam>
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <nBranchProt>0</nBranchProt>
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -351,7 +353,7 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
+            <ClangAsOpt>4</ClangAsOpt>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define></Define>

app/OBJ/cjson.d

@@ -1,17 +1,17 @@
 ..\obj\cjson.o: ..\HARDWARE\sources\cJSON.c
-..\obj\cjson.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
-..\obj\cjson.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdio.h
-..\obj\cjson.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\math.h
-..\obj\cjson.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
-..\obj\cjson.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\limits.h
-..\obj\cjson.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\ctype.h
-..\obj\cjson.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\float.h
+..\obj\cjson.o: D:\keil\ARM\ARMCC\Bin\..\include\string.h
+..\obj\cjson.o: D:\keil\ARM\ARMCC\Bin\..\include\stdio.h
+..\obj\cjson.o: D:\keil\ARM\ARMCC\Bin\..\include\math.h
+..\obj\cjson.o: D:\keil\ARM\ARMCC\Bin\..\include\stdlib.h
+..\obj\cjson.o: D:\keil\ARM\ARMCC\Bin\..\include\limits.h
+..\obj\cjson.o: D:\keil\ARM\ARMCC\Bin\..\include\ctype.h
+..\obj\cjson.o: D:\keil\ARM\ARMCC\Bin\..\include\float.h
 ..\obj\cjson.o: ..\HARDWARE\includes\cJSON.h
-..\obj\cjson.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stddef.h
+..\obj\cjson.o: D:\keil\ARM\ARMCC\Bin\..\include\stddef.h
 ..\obj\cjson.o: ..\HARDWARE\includes\malloc.h
 ..\obj\cjson.o: ..\USER\stm32f2xx.h
 ..\obj\cjson.o: ..\CORE\core_cm3.h
-..\obj\cjson.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\cjson.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\cjson.o: ..\CORE\core_cmInstr.h
 ..\obj\cjson.o: ..\CORE\core_cmFunc.h
 ..\obj\cjson.o: ..\USER\system_stm32f2xx.h

app/OBJ/delay.d

@@ -2,7 +2,7 @@
 ..\obj\delay.o: ..\HARDWARE\includes\delay.h
 ..\obj\delay.o: ..\USER\stm32f2xx.h
 ..\obj\delay.o: ..\CORE\core_cm3.h
-..\obj\delay.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\delay.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\delay.o: ..\CORE\core_cmInstr.h
 ..\obj\delay.o: ..\CORE\core_cmFunc.h
 ..\obj\delay.o: ..\USER\system_stm32f2xx.h
@@ -35,10 +35,10 @@
 ..\obj\delay.o: ..\Libraries\inc\stm32f2xx_wwdg.h
 ..\obj\delay.o: ..\Libraries\inc\misc.h
 ..\obj\delay.o: ..\UCOS-II\CONFIG\includes.h
-..\obj\delay.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdarg.h
-..\obj\delay.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdio.h
-..\obj\delay.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
-..\obj\delay.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\math.h
+..\obj\delay.o: D:\keil\ARM\ARMCC\Bin\..\include\stdarg.h
+..\obj\delay.o: D:\keil\ARM\ARMCC\Bin\..\include\stdio.h
+..\obj\delay.o: D:\keil\ARM\ARMCC\Bin\..\include\stdlib.h
+..\obj\delay.o: D:\keil\ARM\ARMCC\Bin\..\include\math.h
 ..\obj\delay.o: ..\UCOS-II\Source\ucos_ii.h
 ..\obj\delay.o: ..\UCOS-II\CONFIG\os_cfg.h
 ..\obj\delay.o: ..\UCOS-II\Ports\os_cpu.h

app/OBJ/demo_nand_fatfs.d

@@ -2,7 +2,7 @@
 ..\obj\demo_nand_fatfs.o: ..\USER\bsp.h
 ..\obj\demo_nand_fatfs.o: ..\USER\stm32f2xx.h
 ..\obj\demo_nand_fatfs.o: ..\CORE\core_cm3.h
-..\obj\demo_nand_fatfs.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\demo_nand_fatfs.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\demo_nand_fatfs.o: ..\CORE\core_cmInstr.h
 ..\obj\demo_nand_fatfs.o: ..\CORE\core_cmFunc.h
 ..\obj\demo_nand_fatfs.o: ..\USER\system_stm32f2xx.h
@@ -34,9 +34,9 @@
 ..\obj\demo_nand_fatfs.o: ..\Libraries\inc\stm32f2xx_usart.h
 ..\obj\demo_nand_fatfs.o: ..\Libraries\inc\stm32f2xx_wwdg.h
 ..\obj\demo_nand_fatfs.o: ..\Libraries\inc\misc.h
-..\obj\demo_nand_fatfs.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdio.h
-..\obj\demo_nand_fatfs.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
-..\obj\demo_nand_fatfs.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+..\obj\demo_nand_fatfs.o: D:\keil\ARM\ARMCC\Bin\..\include\stdio.h
+..\obj\demo_nand_fatfs.o: D:\keil\ARM\ARMCC\Bin\..\include\string.h
+..\obj\demo_nand_fatfs.o: D:\keil\ARM\ARMCC\Bin\..\include\stdlib.h
 ..\obj\demo_nand_fatfs.o: ..\HARDWARE\includes\nandflash.h
 ..\obj\demo_nand_fatfs.o: ..\USER\FatFS\src\ff.h
 ..\obj\demo_nand_fatfs.o: ..\USER\FatFS\src\integer.h

app/OBJ/diskio.d

@@ -4,7 +4,7 @@
 ..\obj\diskio.o: ..\HARDWARE\includes\nandflash.h
 ..\obj\diskio.o: ..\USER\stm32f2xx.h
 ..\obj\diskio.o: ..\CORE\core_cm3.h
-..\obj\diskio.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\diskio.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\diskio.o: ..\CORE\core_cmInstr.h
 ..\obj\diskio.o: ..\CORE\core_cmFunc.h
 ..\obj\diskio.o: ..\USER\system_stm32f2xx.h

app/OBJ/dlt645.d

@@ -1,10 +1,10 @@
 ..\obj\dlt645.o: ..\dlt\src\dlt645.c
 ..\obj\dlt645.o: ..\dlt\inc\dlt645_private.h
 ..\obj\dlt645.o: ..\dlt\inc\dlt645.h
-..\obj\dlt645.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\dlt645.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\dlt645.o: ..\UCOS-II\Source\ucos_ii.h
 ..\obj\dlt645.o: ..\UCOS-II\CONFIG\os_cfg.h
 ..\obj\dlt645.o: ..\UCOS-II\Ports\os_cpu.h
 ..\obj\dlt645.o: ..\dlt\inc\dlt645_1997.h
 ..\obj\dlt645.o: ..\dlt\inc\dlt645_2007.h
-..\obj\dlt645.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
+..\obj\dlt645.o: D:\keil\ARM\ARMCC\Bin\..\include\string.h

app/OBJ/dlt645_1997.d

@@ -1,9 +1,9 @@
 ..\obj\dlt645_1997.o: ..\dlt\src\dlt645_1997.c
 ..\obj\dlt645_1997.o: ..\dlt\inc\dlt645_private.h
 ..\obj\dlt645_1997.o: ..\dlt\inc\dlt645.h
-..\obj\dlt645_1997.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\dlt645_1997.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\dlt645_1997.o: ..\UCOS-II\Source\ucos_ii.h
 ..\obj\dlt645_1997.o: ..\UCOS-II\CONFIG\os_cfg.h
 ..\obj\dlt645_1997.o: ..\UCOS-II\Ports\os_cpu.h
 ..\obj\dlt645_1997.o: ..\dlt\inc\dlt645_1997_private.h
-..\obj\dlt645_1997.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
+..\obj\dlt645_1997.o: D:\keil\ARM\ARMCC\Bin\..\include\string.h

app/OBJ/dlt645_2007.d

@@ -1,9 +1,9 @@
 ..\obj\dlt645_2007.o: ..\dlt\src\dlt645_2007.c
 ..\obj\dlt645_2007.o: ..\dlt\inc\dlt645_private.h
 ..\obj\dlt645_2007.o: ..\dlt\inc\dlt645.h
-..\obj\dlt645_2007.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\dlt645_2007.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\dlt645_2007.o: ..\UCOS-II\Source\ucos_ii.h
 ..\obj\dlt645_2007.o: ..\UCOS-II\CONFIG\os_cfg.h
 ..\obj\dlt645_2007.o: ..\UCOS-II\Ports\os_cpu.h
 ..\obj\dlt645_2007.o: ..\dlt\inc\dlt645_2007_private.h
-..\obj\dlt645_2007.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
+..\obj\dlt645_2007.o: D:\keil\ARM\ARMCC\Bin\..\include\string.h

app/OBJ/dlt645_data.d

@@ -1,9 +1,9 @@
 ..\obj\dlt645_data.o: ..\dlt\src\dlt645_data.c
 ..\obj\dlt645_data.o: ..\dlt\inc\dlt645_private.h
 ..\obj\dlt645_data.o: ..\dlt\inc\dlt645.h
-..\obj\dlt645_data.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\dlt645_data.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\dlt645_data.o: ..\UCOS-II\Source\ucos_ii.h
 ..\obj\dlt645_data.o: ..\UCOS-II\CONFIG\os_cfg.h
 ..\obj\dlt645_data.o: ..\UCOS-II\Ports\os_cpu.h
-..\obj\dlt645_data.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
-..\obj\dlt645_data.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\math.h
+..\obj\dlt645_data.o: D:\keil\ARM\ARMCC\Bin\..\include\string.h
+..\obj\dlt645_data.o: D:\keil\ARM\ARMCC\Bin\..\include\math.h

app/OBJ/dlt645_port.d

@@ -1,6 +1,6 @@
 ..\obj\dlt645_port.o: ..\dlt\port\dlt645_port.c
 ..\obj\dlt645_port.o: ..\dlt\inc\dlt645.h
-..\obj\dlt645_port.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\dlt645_port.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\dlt645_port.o: ..\UCOS-II\Source\ucos_ii.h
 ..\obj\dlt645_port.o: ..\UCOS-II\CONFIG\os_cfg.h
 ..\obj\dlt645_port.o: ..\UCOS-II\Ports\os_cpu.h
@@ -39,5 +39,5 @@
 ..\obj\dlt645_port.o: ..\Libraries\inc\misc.h
 ..\obj\dlt645_port.o: ..\HARDWARE\includes\delay.h
 ..\obj\dlt645_port.o: ..\HARDWARE\includes\usart.h
-..\obj\dlt645_port.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdio.h
-..\obj\dlt645_port.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
+..\obj\dlt645_port.o: D:\keil\ARM\ARMCC\Bin\..\include\stdio.h
+..\obj\dlt645_port.o: D:\keil\ARM\ARMCC\Bin\..\include\string.h

app/OBJ/gateway_message.d

@@ -1,11 +1,11 @@
 ..\obj\gateway_message.o: ..\SYSTEM\source\gateway_message.c
-..\obj\gateway_message.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
-..\obj\gateway_message.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+..\obj\gateway_message.o: D:\keil\ARM\ARMCC\Bin\..\include\string.h
+..\obj\gateway_message.o: D:\keil\ARM\ARMCC\Bin\..\include\stdlib.h
 ..\obj\gateway_message.o: ..\SYSTEM\includes\protocol.h
 ..\obj\gateway_message.o: ..\SYSTEM\includes\gateway_message.h
 ..\obj\gateway_message.o: ..\USER\stm32f2xx.h
 ..\obj\gateway_message.o: ..\CORE\core_cm3.h
-..\obj\gateway_message.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\gateway_message.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\gateway_message.o: ..\CORE\core_cmInstr.h
 ..\obj\gateway_message.o: ..\CORE\core_cmFunc.h
 ..\obj\gateway_message.o: ..\USER\system_stm32f2xx.h

app/OBJ/led.d

@@ -2,7 +2,7 @@
 ..\obj\led.o: ..\HARDWARE\includes\led.h
 ..\obj\led.o: ..\USER\stm32f2xx.h
 ..\obj\led.o: ..\CORE\core_cm3.h
-..\obj\led.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\led.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\led.o: ..\CORE\core_cmInstr.h
 ..\obj\led.o: ..\CORE\core_cmFunc.h
 ..\obj\led.o: ..\USER\system_stm32f2xx.h

app/OBJ/log.d

@@ -1,11 +1,11 @@
 ..\obj\log.o: ..\HARDWARE\sources\log.c
 ..\obj\log.o: ..\HARDWARE\includes\log.h
-..\obj\log.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdarg.h
-..\obj\log.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdio.h
+..\obj\log.o: D:\keil\ARM\ARMCC\Bin\..\include\stdarg.h
+..\obj\log.o: D:\keil\ARM\ARMCC\Bin\..\include\stdio.h
 ..\obj\log.o: ..\HARDWARE\includes\usart.h
 ..\obj\log.o: ..\USER\stm32f2xx.h
 ..\obj\log.o: ..\CORE\core_cm3.h
-..\obj\log.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\log.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\log.o: ..\CORE\core_cmInstr.h
 ..\obj\log.o: ..\CORE\core_cmFunc.h
 ..\obj\log.o: ..\USER\system_stm32f2xx.h

app/OBJ/lora_gateway.build_log.htm

@@ -3,104 +3,67 @@
 <pre>
 <h1>礦ision Build Log</h1>
 <h2>Tool Versions:</h2>
-IDE-Version: μVision V5.29.0.0
-Copyright (C) 2019 ARM Ltd and ARM Germany GmbH. All rights reserved.
-License Information: s yf, 11, LIC=WHYH9-4R8F5-WFPI7-E0KRQ-DXARV-W9U12
+IDE-Version: μVision V5.38.0.0
+Copyright (C) 2022 ARM Ltd and ARM Germany GmbH. All rights reserved.
+License Information: 1 Microsoft, Microsoft, LIC=D0D7S-LG060-BSSYX-H6MYT-AINFY-M35VW
  
 Tool Versions:
-Toolchain:       MDK-ARM Plus  Version: 5.29.0.0
-Toolchain Path:  D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin
+Toolchain:       MDK-ARM Plus  Version: 5.38.0.0
+Toolchain Path:  D:\keil\ARM\ARMCC\Bin
 C Compiler:      Armcc.exe V5.06 update 6 (build 750)
 Assembler:       Armasm.exe V5.06 update 6 (build 750)
 Linker/Locator:  ArmLink.exe V5.06 update 6 (build 750)
 Library Manager: ArmAr.exe V5.06 update 6 (build 750)
 Hex Converter:   FromElf.exe V5.06 update 6 (build 750)
-CPU DLL:         SARMCM3.DLL V5.29.0.0
-Dialog DLL:      DCM.DLL V1.17.3.0
-Target DLL:      Segger\JL2CM3.dll V2.99.36.0
-Dialog DLL:      TCM.DLL V1.36.5.0
+CPU DLL:         SARMCM3.DLL V5.38.0.0
+Dialog DLL:      DCM.DLL V1.17.5.0
+Target DLL:      Segger\JL2CM3.dll V2.99.42.0
+Dialog DLL:      TCM.DLL V1.56.4.0
  
 <h2>Project:</h2>
-D:\Project\Lora_gateway_sx1278\app\MDKProject\lora_gateway.uvprojx
-Project File Date:  08/21/2023
+C:\Users\Administrator\Desktop\Lora_gateway_sx1278\app\MDKProject\lora_gateway.uvprojx
+Project File Date:  08/25/2023
 
 <h2>Output:</h2>
-*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin'
+*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\keil\ARM\ARMCC\Bin'
 Build target 'Target 1'
-compiling gateway_message.c...
+compiling protocol.c...
 ..\SYSTEM\includes\gateway_message.h(108): warning:  #1295-D: Deprecated declaration get_gateway_config_params - give arg types
   GATEWAY_PARAMS *get_gateway_config_params();
-..\SYSTEM\includes\protocol.h(12): warning:  #1-D: last line of file ends without a newline
-  #endif
-..\SYSTEM\source\gateway_message.c(42): warning:  #223-D: function "sprintf" declared implicitly
-          sprintf(nodeStart, "node_%d", nodeIndex);
-..\SYSTEM\source\gateway_message.c(76): warning:  #223-D: function "sscanf" declared implicitly
-        sscanf((const char *)&nodeIdString[j * 2], "%2hhx", &byte);
-..\SYSTEM\source\gateway_message.c(88): warning:  #223-D: function "sprintf" declared implicitly
-          sprintf(device, "\"device_%d\":", deviceIndex);
-..\SYSTEM\source\gateway_message.c(67): warning:  #177-D: variable "deviceString"  was declared but never referenced
-      char *deviceString = (char *)nodestring; // 用于移位解析device设备信息
-..\SYSTEM\source\gateway_message.c(189): warning:  #223-D: function "sscanf" declared implicitly
-            sscanf((const char *)&string[j * 2], "%2hhx", &byte);
-..\SYSTEM\source\gateway_message.c(260): warning:  #223-D: function "sscanf" declared implicitly
-      sscanf(ptr, "%[^\"],", value);
-..\SYSTEM\source\gateway_message.c(278): warning:  #223-D: function "sprintf" declared implicitly
-      sprintf(node_index, "node_%d", nodeNum);
-..\SYSTEM\source\gateway_message.c(279): warning:  #167-D: argument of type "uint8_t *" is incompatible with parameter of type "const char *"
-      strstr(ptr, node_index); // 将指针指向第一个节点
-..\SYSTEM\source\gateway_message.c: 10 warnings, 0 errors
-compiling node_data_acquisition.c...
-..\SYSTEM\includes\node_data_acquisition.h(8): warning:  #1-D: last line of file ends without a newline
+..\SYSTEM\includes\protocol.h(14): warning:  #1-D: last line of file ends without a newline
   #endif
 ..\SYSTEM\includes\node_message.h(63): warning:  #1295-D: Deprecated declaration get_node_receive_params - give arg types
   NODE_DEVICE_PARAMS *get_node_receive_params();
+..\SYSTEM\includes\node_message.h(64): warning:  #1295-D: Deprecated declaration free_all_node_params - give arg types
+  void free_all_node_params();
 ..\SYSTEM\includes\node_message.h(68): warning:  #1-D: last line of file ends without a newline
   #endif
-..\SYSTEM\source\node_data_acquisition.c(17): warning:  #188-D: enumerated type mixed with another type
-  			mmodbus_set16bitOrder(node->params[i].modbus_read->bigLittleFormat);
-..\SYSTEM\source\node_data_acquisition.c(99): warning:  #1-D: last line of file ends without a newline
+..\SYSTEM\source\protocol.c(115): warning:  #167-D: argument of type "uint8_t *" is incompatible with parameter of type "const char *"
+  	len = strlen(string);
+..\SYSTEM\source\protocol.c(408): warning:  #223-D: function "sprintf" declared implicitly
+  	sprintf(json, "{\"data\":[");
+..\SYSTEM\source\protocol.c(569): warning:  #167-D: argument of type "uint8_t *" is incompatible with parameter of type "const char *"
+  	if(strlen(string)<10)
+..\SYSTEM\source\protocol.c(574): warning:  #940-D: missing return statement at end of non-void function "GatewayProtocolAnalysis" 
   }
-..\SYSTEM\source\node_data_acquisition.c: 5 warnings, 0 errors
-compiling main.c...
-..\HARDWARE\includes\usart.h(88): warning:  #1295-D: Deprecated declaration USART_232_config - give arg types
-  void USART_232_config();
-..\HARDWARE\includes\usart.h(90): warning:  #1295-D: Deprecated declaration USART_485_config - give arg types
-  void USART_485_config();
-..\HARDWARE\includes\led.h(49): warning:  #1-D: last line of file ends without a newline
-  					
-..\SYSTEM\includes\myfile.h(12): warning:  #1295-D: Deprecated declaration ViewRootDir - give arg types
-  void ViewRootDir();
-..\SYSTEM\includes\myfile.h(14): warning:  #1-D: last line of file ends without a newline
-  #endif
-..\USER\main.c(102): warning:  #177-D: variable "cpu_sr"  was declared but never referenced
-  	OS_CPU_SR cpu_sr;
-..\USER\main.c(114): warning:  #177-D: variable "cpu_sr"  was declared but never referenced
-  	OS_CPU_SR cpu_sr;
-..\USER\main.c(141): warning:  #177-D: variable "NVIC_InitStructure"  was declared but never referenced
-    NVIC_InitTypeDef NVIC_InitStructure;
-..\USER\main.c: 8 warnings, 0 errors
-compiling stm32f2xx_it.c...
-..\SYSTEM\includes\node_data_acquisition.h(8): warning:  #1-D: last line of file ends without a newline
-  #endif
-..\USER\stm32f2xx_it.c: 1 warning, 0 errors
+..\SYSTEM\source\protocol.c: 9 warnings, 0 errors
 linking...
-Program Size: Code=46704 RO-data=177340 RW-data=452 ZI-data=667932  
+Program Size: Code=48260 RO-data=177336 RW-data=460 ZI-data=667924  
 FromELF: creating hex file...
-"..\OBJ\lora_gateway.axf" - 0 Error(s), 24 Warning(s).
+"..\OBJ\lora_gateway.axf" - 0 Error(s), 9 Warning(s).
 
 <h2>Software Packages used:</h2>
 
 Package Vendor: Keil
-                http://www.keil.com/pack/Keil.STM32F2xx_DFP.2.9.0.pack
-                Keil.STM32F2xx_DFP.2.9.0
+                http://www.keil.com/pack/Keil.STM32F2xx_DFP.2.10.0.pack
+                Keil.STM32F2xx_DFP.2.10.0
                 STMicroelectronics STM32F2 Series Device Support, Drivers and Examples
 
 <h2>Collection of Component include folders:</h2>
-  .\RTE\_Target_1
-  D:\workSoftware\stm32Software\mdk\mdkpack\Keil\STM32F2xx_DFP\2.9.0\Drivers\CMSIS\Device\ST\STM32F2xx\Include
+  D:/keil/packs/Keil/STM32F2xx_DFP/2.10.0/Drivers/CMSIS/Device/ST/STM32F2xx/Include
 
 <h2>Collection of Component Files used:</h2>
-Build Time Elapsed:  00:00:01
+Build Time Elapsed:  00:00:02
 </pre>
 </body>
 </html>

app/OBJ/main.d

@@ -2,7 +2,7 @@
 ..\obj\main.o: ..\USER\main.h
 ..\obj\main.o: ..\USER\stm32f2xx.h
 ..\obj\main.o: ..\CORE\core_cm3.h
-..\obj\main.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\main.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\main.o: ..\CORE\core_cmInstr.h
 ..\obj\main.o: ..\CORE\core_cmFunc.h
 ..\obj\main.o: ..\USER\system_stm32f2xx.h
@@ -34,23 +34,23 @@
 ..\obj\main.o: ..\Libraries\inc\stm32f2xx_usart.h
 ..\obj\main.o: ..\Libraries\inc\stm32f2xx_wwdg.h
 ..\obj\main.o: ..\Libraries\inc\misc.h
-..\obj\main.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdio.h
+..\obj\main.o: D:\keil\ARM\ARMCC\Bin\..\include\stdio.h
 ..\obj\main.o: ..\HARDWARE\includes\sram.h
 ..\obj\main.o: ..\HARDWARE\includes\nandflash.h
 ..\obj\main.o: ..\HARDWARE\includes\usart.h
 ..\obj\main.o: ..\HARDWARE\includes\malloc.h
 ..\obj\main.o: ..\USER\demo_nand_fatfs.h
 ..\obj\main.o: ..\HARDWARE\includes\cjson.h
-..\obj\main.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stddef.h
+..\obj\main.o: D:\keil\ARM\ARMCC\Bin\..\include\stddef.h
 ..\obj\main.o: ..\HARDWARE\includes\delay.h
-..\obj\main.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
+..\obj\main.o: D:\keil\ARM\ARMCC\Bin\..\include\string.h
 ..\obj\main.o: ..\HARDWARE\includes\led.h
 ..\obj\main.o: ..\HARDWARE\includes\log.h
-..\obj\main.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdarg.h
+..\obj\main.o: D:\keil\ARM\ARMCC\Bin\..\include\stdarg.h
 ..\obj\main.o: ..\SYSTEM\includes\task.h
 ..\obj\main.o: ..\UCOS-II\CONFIG\includes.h
-..\obj\main.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
-..\obj\main.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\math.h
+..\obj\main.o: D:\keil\ARM\ARMCC\Bin\..\include\stdlib.h
+..\obj\main.o: D:\keil\ARM\ARMCC\Bin\..\include\math.h
 ..\obj\main.o: ..\UCOS-II\Source\ucos_ii.h
 ..\obj\main.o: ..\UCOS-II\CONFIG\os_cfg.h
 ..\obj\main.o: ..\UCOS-II\Ports\os_cpu.h

app/OBJ/malloc.d

@@ -2,7 +2,7 @@
 ..\obj\malloc.o: ..\HARDWARE\includes\malloc.h
 ..\obj\malloc.o: ..\USER\stm32f2xx.h
 ..\obj\malloc.o: ..\CORE\core_cm3.h
-..\obj\malloc.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\malloc.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\malloc.o: ..\CORE\core_cmInstr.h
 ..\obj\malloc.o: ..\CORE\core_cmFunc.h
 ..\obj\malloc.o: ..\USER\system_stm32f2xx.h

app/OBJ/misc.d

@@ -2,7 +2,7 @@
 ..\obj\misc.o: ..\Libraries\inc\misc.h
 ..\obj\misc.o: ..\USER\stm32f2xx.h
 ..\obj\misc.o: ..\CORE\core_cm3.h
-..\obj\misc.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\misc.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\misc.o: ..\CORE\core_cmInstr.h
 ..\obj\misc.o: ..\CORE\core_cmFunc.h
 ..\obj\misc.o: ..\USER\system_stm32f2xx.h

app/OBJ/mmodbus.d

@@ -2,7 +2,7 @@
 ..\obj\mmodbus.o: ..\modbus\mmodbus.h
 ..\obj\mmodbus.o: ..\USER\stm32f2xx.h
 ..\obj\mmodbus.o: ..\CORE\core_cm3.h
-..\obj\mmodbus.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\mmodbus.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\mmodbus.o: ..\CORE\core_cmInstr.h
 ..\obj\mmodbus.o: ..\CORE\core_cmFunc.h
 ..\obj\mmodbus.o: ..\USER\system_stm32f2xx.h
@@ -35,9 +35,9 @@
 ..\obj\mmodbus.o: ..\Libraries\inc\stm32f2xx_wwdg.h
 ..\obj\mmodbus.o: ..\Libraries\inc\misc.h
 ..\obj\mmodbus.o: ..\modbus\mmodbusConfig.h
-..\obj\mmodbus.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdbool.h
-..\obj\mmodbus.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
-..\obj\mmodbus.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdio.h
+..\obj\mmodbus.o: D:\keil\ARM\ARMCC\Bin\..\include\stdbool.h
+..\obj\mmodbus.o: D:\keil\ARM\ARMCC\Bin\..\include\string.h
+..\obj\mmodbus.o: D:\keil\ARM\ARMCC\Bin\..\include\stdio.h
 ..\obj\mmodbus.o: ..\UCOS-II\Source\ucos_ii.h
 ..\obj\mmodbus.o: ..\UCOS-II\CONFIG\os_cfg.h
 ..\obj\mmodbus.o: ..\UCOS-II\Ports\os_cpu.h

app/OBJ/myfile.d

@@ -3,7 +3,7 @@
 ..\obj\myfile.o: ..\USER\bsp.h
 ..\obj\myfile.o: ..\USER\stm32f2xx.h
 ..\obj\myfile.o: ..\CORE\core_cm3.h
-..\obj\myfile.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\myfile.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\myfile.o: ..\CORE\core_cmInstr.h
 ..\obj\myfile.o: ..\CORE\core_cmFunc.h
 ..\obj\myfile.o: ..\USER\system_stm32f2xx.h
@@ -35,9 +35,9 @@
 ..\obj\myfile.o: ..\Libraries\inc\stm32f2xx_usart.h
 ..\obj\myfile.o: ..\Libraries\inc\stm32f2xx_wwdg.h
 ..\obj\myfile.o: ..\Libraries\inc\misc.h
-..\obj\myfile.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdio.h
-..\obj\myfile.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
-..\obj\myfile.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+..\obj\myfile.o: D:\keil\ARM\ARMCC\Bin\..\include\stdio.h
+..\obj\myfile.o: D:\keil\ARM\ARMCC\Bin\..\include\string.h
+..\obj\myfile.o: D:\keil\ARM\ARMCC\Bin\..\include\stdlib.h
 ..\obj\myfile.o: ..\HARDWARE\includes\nandflash.h
 ..\obj\myfile.o: ..\USER\FatFS\src\ff.h
 ..\obj\myfile.o: ..\USER\FatFS\src\integer.h

app/OBJ/nandflash.d

@@ -2,7 +2,7 @@
 ..\obj\nandflash.o: ..\HARDWARE\includes\nandflash.h
 ..\obj\nandflash.o: ..\USER\stm32f2xx.h
 ..\obj\nandflash.o: ..\CORE\core_cm3.h
-..\obj\nandflash.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\nandflash.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\nandflash.o: ..\CORE\core_cmInstr.h
 ..\obj\nandflash.o: ..\CORE\core_cmFunc.h
 ..\obj\nandflash.o: ..\USER\system_stm32f2xx.h
@@ -34,5 +34,5 @@
 ..\obj\nandflash.o: ..\Libraries\inc\stm32f2xx_usart.h
 ..\obj\nandflash.o: ..\Libraries\inc\stm32f2xx_wwdg.h
 ..\obj\nandflash.o: ..\Libraries\inc\misc.h
-..\obj\nandflash.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
-..\obj\nandflash.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdio.h
+..\obj\nandflash.o: D:\keil\ARM\ARMCC\Bin\..\include\string.h
+..\obj\nandflash.o: D:\keil\ARM\ARMCC\Bin\..\include\stdio.h

app/OBJ/node_data_acquisition.d

@@ -3,7 +3,7 @@
 ..\obj\node_data_acquisition.o: ..\modbus\mmodbus.h
 ..\obj\node_data_acquisition.o: ..\USER\stm32f2xx.h
 ..\obj\node_data_acquisition.o: ..\CORE\core_cm3.h
-..\obj\node_data_acquisition.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\node_data_acquisition.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\node_data_acquisition.o: ..\CORE\core_cmInstr.h
 ..\obj\node_data_acquisition.o: ..\CORE\core_cmFunc.h
 ..\obj\node_data_acquisition.o: ..\USER\system_stm32f2xx.h
@@ -36,13 +36,13 @@
 ..\obj\node_data_acquisition.o: ..\Libraries\inc\stm32f2xx_wwdg.h
 ..\obj\node_data_acquisition.o: ..\Libraries\inc\misc.h
 ..\obj\node_data_acquisition.o: ..\modbus\mmodbusConfig.h
-..\obj\node_data_acquisition.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdbool.h
-..\obj\node_data_acquisition.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
-..\obj\node_data_acquisition.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdio.h
+..\obj\node_data_acquisition.o: D:\keil\ARM\ARMCC\Bin\..\include\stdbool.h
+..\obj\node_data_acquisition.o: D:\keil\ARM\ARMCC\Bin\..\include\string.h
+..\obj\node_data_acquisition.o: D:\keil\ARM\ARMCC\Bin\..\include\stdio.h
 ..\obj\node_data_acquisition.o: ..\UCOS-II\Source\ucos_ii.h
 ..\obj\node_data_acquisition.o: ..\UCOS-II\CONFIG\os_cfg.h
 ..\obj\node_data_acquisition.o: ..\UCOS-II\Ports\os_cpu.h
 ..\obj\node_data_acquisition.o: ..\dlt\inc\dlt645.h
 ..\obj\node_data_acquisition.o: ..\dlt\port\dlt645_port.h
 ..\obj\node_data_acquisition.o: ..\SYSTEM\includes\node_message.h
-..\obj\node_data_acquisition.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\math.h
+..\obj\node_data_acquisition.o: D:\keil\ARM\ARMCC\Bin\..\include\math.h

app/OBJ/node_message.d

@@ -2,7 +2,7 @@
 ..\obj\node_message.o: ..\SYSTEM\includes\node_message.h
 ..\obj\node_message.o: ..\USER\stm32f2xx.h
 ..\obj\node_message.o: ..\CORE\core_cm3.h
-..\obj\node_message.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\node_message.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\node_message.o: ..\CORE\core_cmInstr.h
 ..\obj\node_message.o: ..\CORE\core_cmFunc.h
 ..\obj\node_message.o: ..\USER\system_stm32f2xx.h
@@ -34,4 +34,4 @@
 ..\obj\node_message.o: ..\Libraries\inc\stm32f2xx_usart.h
 ..\obj\node_message.o: ..\Libraries\inc\stm32f2xx_wwdg.h
 ..\obj\node_message.o: ..\Libraries\inc\misc.h
-..\obj\node_message.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
+..\obj\node_message.o: D:\keil\ARM\ARMCC\Bin\..\include\stdlib.h

app/OBJ/protocol.d

@@ -3,7 +3,7 @@
 ..\obj\protocol.o: ..\SYSTEM\includes\gateway_message.h
 ..\obj\protocol.o: ..\USER\stm32f2xx.h
 ..\obj\protocol.o: ..\CORE\core_cm3.h
-..\obj\protocol.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\protocol.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\protocol.o: ..\CORE\core_cmInstr.h
 ..\obj\protocol.o: ..\CORE\core_cmFunc.h
 ..\obj\protocol.o: ..\USER\system_stm32f2xx.h
@@ -35,6 +35,6 @@
 ..\obj\protocol.o: ..\Libraries\inc\stm32f2xx_usart.h
 ..\obj\protocol.o: ..\Libraries\inc\stm32f2xx_wwdg.h
 ..\obj\protocol.o: ..\Libraries\inc\misc.h
-..\obj\protocol.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdlib.h
-..\obj\protocol.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\string.h
+..\obj\protocol.o: D:\keil\ARM\ARMCC\Bin\..\include\stdlib.h
+..\obj\protocol.o: D:\keil\ARM\ARMCC\Bin\..\include\string.h
 ..\obj\protocol.o: ..\SYSTEM\includes\node_message.h

app/OBJ/radio.d

@@ -1,7 +1,7 @@
 ..\obj\radio.o: ..\Sx1278\radio\radio.c
 ..\obj\radio.o: ..\Sx1278\platform\platform.h
 ..\obj\radio.o: ..\Sx1278\platform\sx12xxEiger.h
-..\obj\radio.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
-..\obj\radio.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdbool.h
+..\obj\radio.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\radio.o: D:\keil\ARM\ARMCC\Bin\..\include\stdbool.h
 ..\obj\radio.o: ..\Sx1278\radio\radio.h
 ..\obj\radio.o: ..\Sx1278\radio\sx1276.h

app/OBJ/spi.d

@@ -3,7 +3,7 @@
 ..\obj\spi.o: ..\Libraries\inc\stm32f2xx_spi.h
 ..\obj\spi.o: ..\USER\stm32f2xx.h
 ..\obj\spi.o: ..\CORE\core_cm3.h
-..\obj\spi.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\spi.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\spi.o: ..\CORE\core_cmInstr.h
 ..\obj\spi.o: ..\CORE\core_cmFunc.h
 ..\obj\spi.o: ..\USER\system_stm32f2xx.h

app/OBJ/sram.d

@@ -2,7 +2,7 @@
 ..\obj\sram.o: ..\HARDWARE\includes\sram.h
 ..\obj\sram.o: ..\USER\stm32f2xx.h
 ..\obj\sram.o: ..\CORE\core_cm3.h
-..\obj\sram.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\sram.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\sram.o: ..\CORE\core_cmInstr.h
 ..\obj\sram.o: ..\CORE\core_cmFunc.h
 ..\obj\sram.o: ..\USER\system_stm32f2xx.h
@@ -34,4 +34,4 @@
 ..\obj\sram.o: ..\Libraries\inc\stm32f2xx_usart.h
 ..\obj\sram.o: ..\Libraries\inc\stm32f2xx_wwdg.h
 ..\obj\sram.o: ..\Libraries\inc\misc.h
-..\obj\sram.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdio.h
+..\obj\sram.o: D:\keil\ARM\ARMCC\Bin\..\include\stdio.h

app/OBJ/stm32f2xx_adc.d

@@ -2,7 +2,7 @@
 ..\obj\stm32f2xx_adc.o: ..\Libraries\inc\stm32f2xx_adc.h
 ..\obj\stm32f2xx_adc.o: ..\USER\stm32f2xx.h
 ..\obj\stm32f2xx_adc.o: ..\CORE\core_cm3.h
-..\obj\stm32f2xx_adc.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\stm32f2xx_adc.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\stm32f2xx_adc.o: ..\CORE\core_cmInstr.h
 ..\obj\stm32f2xx_adc.o: ..\CORE\core_cmFunc.h
 ..\obj\stm32f2xx_adc.o: ..\USER\system_stm32f2xx.h

app/OBJ/stm32f2xx_can.d

@@ -2,7 +2,7 @@
 ..\obj\stm32f2xx_can.o: ..\Libraries\inc\stm32f2xx_can.h
 ..\obj\stm32f2xx_can.o: ..\USER\stm32f2xx.h
 ..\obj\stm32f2xx_can.o: ..\CORE\core_cm3.h
-..\obj\stm32f2xx_can.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\stm32f2xx_can.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\stm32f2xx_can.o: ..\CORE\core_cmInstr.h
 ..\obj\stm32f2xx_can.o: ..\CORE\core_cmFunc.h
 ..\obj\stm32f2xx_can.o: ..\USER\system_stm32f2xx.h

app/OBJ/stm32f2xx_crc.d

@@ -2,7 +2,7 @@
 ..\obj\stm32f2xx_crc.o: ..\Libraries\inc\stm32f2xx_crc.h
 ..\obj\stm32f2xx_crc.o: ..\USER\stm32f2xx.h
 ..\obj\stm32f2xx_crc.o: ..\CORE\core_cm3.h
-..\obj\stm32f2xx_crc.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\stm32f2xx_crc.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\stm32f2xx_crc.o: ..\CORE\core_cmInstr.h
 ..\obj\stm32f2xx_crc.o: ..\CORE\core_cmFunc.h
 ..\obj\stm32f2xx_crc.o: ..\USER\system_stm32f2xx.h

app/OBJ/stm32f2xx_cryp.d

@@ -2,7 +2,7 @@
 ..\obj\stm32f2xx_cryp.o: ..\Libraries\inc\stm32f2xx_cryp.h
 ..\obj\stm32f2xx_cryp.o: ..\USER\stm32f2xx.h
 ..\obj\stm32f2xx_cryp.o: ..\CORE\core_cm3.h
-..\obj\stm32f2xx_cryp.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\stm32f2xx_cryp.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\stm32f2xx_cryp.o: ..\CORE\core_cmInstr.h
 ..\obj\stm32f2xx_cryp.o: ..\CORE\core_cmFunc.h
 ..\obj\stm32f2xx_cryp.o: ..\USER\system_stm32f2xx.h

app/OBJ/stm32f2xx_cryp_aes.d

@@ -2,7 +2,7 @@
 ..\obj\stm32f2xx_cryp_aes.o: ..\Libraries\inc\stm32f2xx_cryp.h
 ..\obj\stm32f2xx_cryp_aes.o: ..\USER\stm32f2xx.h
 ..\obj\stm32f2xx_cryp_aes.o: ..\CORE\core_cm3.h
-..\obj\stm32f2xx_cryp_aes.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\stm32f2xx_cryp_aes.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\stm32f2xx_cryp_aes.o: ..\CORE\core_cmInstr.h
 ..\obj\stm32f2xx_cryp_aes.o: ..\CORE\core_cmFunc.h
 ..\obj\stm32f2xx_cryp_aes.o: ..\USER\system_stm32f2xx.h

app/OBJ/stm32f2xx_cryp_des.d

@@ -2,7 +2,7 @@
 ..\obj\stm32f2xx_cryp_des.o: ..\Libraries\inc\stm32f2xx_cryp.h
 ..\obj\stm32f2xx_cryp_des.o: ..\USER\stm32f2xx.h
 ..\obj\stm32f2xx_cryp_des.o: ..\CORE\core_cm3.h
-..\obj\stm32f2xx_cryp_des.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\stm32f2xx_cryp_des.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\stm32f2xx_cryp_des.o: ..\CORE\core_cmInstr.h
 ..\obj\stm32f2xx_cryp_des.o: ..\CORE\core_cmFunc.h
 ..\obj\stm32f2xx_cryp_des.o: ..\USER\system_stm32f2xx.h

app/OBJ/stm32f2xx_cryp_tdes.d

@@ -2,7 +2,7 @@
 ..\obj\stm32f2xx_cryp_tdes.o: ..\Libraries\inc\stm32f2xx_cryp.h
 ..\obj\stm32f2xx_cryp_tdes.o: ..\USER\stm32f2xx.h
 ..\obj\stm32f2xx_cryp_tdes.o: ..\CORE\core_cm3.h
-..\obj\stm32f2xx_cryp_tdes.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\stm32f2xx_cryp_tdes.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\stm32f2xx_cryp_tdes.o: ..\CORE\core_cmInstr.h
 ..\obj\stm32f2xx_cryp_tdes.o: ..\CORE\core_cmFunc.h
 ..\obj\stm32f2xx_cryp_tdes.o: ..\USER\system_stm32f2xx.h

app/OBJ/stm32f2xx_dac.d

@@ -2,7 +2,7 @@
 ..\obj\stm32f2xx_dac.o: ..\Libraries\inc\stm32f2xx_dac.h
 ..\obj\stm32f2xx_dac.o: ..\USER\stm32f2xx.h
 ..\obj\stm32f2xx_dac.o: ..\CORE\core_cm3.h
-..\obj\stm32f2xx_dac.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\stm32f2xx_dac.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\stm32f2xx_dac.o: ..\CORE\core_cmInstr.h
 ..\obj\stm32f2xx_dac.o: ..\CORE\core_cmFunc.h
 ..\obj\stm32f2xx_dac.o: ..\USER\system_stm32f2xx.h

app/OBJ/stm32f2xx_dbgmcu.d

@@ -2,7 +2,7 @@
 ..\obj\stm32f2xx_dbgmcu.o: ..\Libraries\inc\stm32f2xx_dbgmcu.h
 ..\obj\stm32f2xx_dbgmcu.o: ..\USER\stm32f2xx.h
 ..\obj\stm32f2xx_dbgmcu.o: ..\CORE\core_cm3.h
-..\obj\stm32f2xx_dbgmcu.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\stm32f2xx_dbgmcu.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\stm32f2xx_dbgmcu.o: ..\CORE\core_cmInstr.h
 ..\obj\stm32f2xx_dbgmcu.o: ..\CORE\core_cmFunc.h
 ..\obj\stm32f2xx_dbgmcu.o: ..\USER\system_stm32f2xx.h

app/OBJ/stm32f2xx_dcmi.d

@@ -2,7 +2,7 @@
 ..\obj\stm32f2xx_dcmi.o: ..\Libraries\inc\stm32f2xx_dcmi.h
 ..\obj\stm32f2xx_dcmi.o: ..\USER\stm32f2xx.h
 ..\obj\stm32f2xx_dcmi.o: ..\CORE\core_cm3.h
-..\obj\stm32f2xx_dcmi.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\stm32f2xx_dcmi.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\stm32f2xx_dcmi.o: ..\CORE\core_cmInstr.h
 ..\obj\stm32f2xx_dcmi.o: ..\CORE\core_cmFunc.h
 ..\obj\stm32f2xx_dcmi.o: ..\USER\system_stm32f2xx.h

app/OBJ/stm32f2xx_dma.d

@@ -2,7 +2,7 @@
 ..\obj\stm32f2xx_dma.o: ..\Libraries\inc\stm32f2xx_dma.h
 ..\obj\stm32f2xx_dma.o: ..\USER\stm32f2xx.h
 ..\obj\stm32f2xx_dma.o: ..\CORE\core_cm3.h
-..\obj\stm32f2xx_dma.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\stm32f2xx_dma.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\stm32f2xx_dma.o: ..\CORE\core_cmInstr.h
 ..\obj\stm32f2xx_dma.o: ..\CORE\core_cmFunc.h
 ..\obj\stm32f2xx_dma.o: ..\USER\system_stm32f2xx.h

app/OBJ/stm32f2xx_exti.d

@@ -2,7 +2,7 @@
 ..\obj\stm32f2xx_exti.o: ..\Libraries\inc\stm32f2xx_exti.h
 ..\obj\stm32f2xx_exti.o: ..\USER\stm32f2xx.h
 ..\obj\stm32f2xx_exti.o: ..\CORE\core_cm3.h
-..\obj\stm32f2xx_exti.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\stm32f2xx_exti.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\stm32f2xx_exti.o: ..\CORE\core_cmInstr.h
 ..\obj\stm32f2xx_exti.o: ..\CORE\core_cmFunc.h
 ..\obj\stm32f2xx_exti.o: ..\USER\system_stm32f2xx.h

app/OBJ/stm32f2xx_flash.d

@@ -2,7 +2,7 @@
 ..\obj\stm32f2xx_flash.o: ..\Libraries\inc\stm32f2xx_flash.h
 ..\obj\stm32f2xx_flash.o: ..\USER\stm32f2xx.h
 ..\obj\stm32f2xx_flash.o: ..\CORE\core_cm3.h
-..\obj\stm32f2xx_flash.o: D:\workSoftware\stm32Software\mdk\mdkcore\ARM\ARMCC\Bin\..\include\stdint.h
+..\obj\stm32f2xx_flash.o: D:\keil\ARM\ARMCC\Bin\..\include\stdint.h
 ..\obj\stm32f2xx_flash.o: ..\CORE\core_cmInstr.h
 ..\obj\stm32f2xx_flash.o: ..\CORE\core_cmFunc.h
 ..\obj\stm32f2xx_flash.o: ..\USER\system_stm32f2xx.h