Browse Source

update code

lijian 6 years ago
parent
commit
05f231ff6f
33 changed files with 38 additions and 39 deletions
  1. BIN
      .vscode/ipch/2e7f1c8d7c0b61cc/PANDO_CHANNEL.ipch
  2. BIN
      .vscode/ipch/2e7f1c8d7c0b61cc/mmap_address.bin
  3. BIN
      .vscode/ipch/3df749832913de8c/mmap_address.bin
  4. BIN
      .vscode/ipch/3df754832913f13d/PANDO_SUBDEVICE.ipch
  5. BIN
      .vscode/ipch/3df754832913f13d/mmap_address.bin
  6. BIN
      .vscode/ipch/4c3f5f8367c5a997/PANDO_CLOUD_ACCESS.ipch
  7. BIN
      .vscode/ipch/4c3f5f8367c5a997/mmap_address.bin
  8. BIN
      .vscode/ipch/62398c20325506b9/mmap_address.bin
  9. BIN
      .vscode/ipch/81582733f273247d/mmap_address.bin
  10. BIN
      .vscode/ipch/81dc5e9f88492d06/PANDO_ZERO_DEVICE.ipch
  11. BIN
      .vscode/ipch/81dc5e9f88492d06/mmap_address.bin
  12. BIN
      .vscode/ipch/82f9ea7bf84b7708/mmap_address.bin
  13. BIN
      .vscode/ipch/9749edc06922ea56/SIM7600.ipch
  14. BIN
      .vscode/ipch/9749edc06922ea56/mmap_address.bin
  15. BIN
      .vscode/ipch/c8b2ad9b43c64c18/SUB_DEVICE_PROTOCOL.ipch
  16. BIN
      .vscode/ipch/c8b2ad9b43c64c18/mmap_address.bin
  17. 12 13
      MDK-ARM/SIM7600.uvguix.Administrator
  18. BIN
      MDK-ARM/SIM7600/SIM7600.axf
  19. 1 1
      MDK-ARM/SIM7600/SIM7600.build_log.htm
  20. 14 14
      MDK-ARM/SIM7600/SIM7600.htm
  21. 1 1
      MDK-ARM/SIM7600/SIM7600_SIM7600.dep
  22. BIN
      MDK-ARM/SIM7600/sim7600.crf
  23. BIN
      MDK-ARM/SIM7600/sim7600.o
  24. 1 1
      framework/protocol/common_functions.c
  25. 1 1
      framework/protocol/common_functions.h
  26. 1 1
      framework/protocol/pando_endian.c
  27. 1 1
      framework/protocol/pando_endian.h
  28. 1 1
      framework/protocol/pando_machine.c
  29. 1 1
      framework/protocol/pando_machine.h
  30. 1 1
      framework/protocol/pando_protocol.c
  31. 1 1
      framework/protocol/pando_protocol.h
  32. 1 1
      framework/protocol/sub_device_protocol.c
  33. 1 1
      framework/protocol/sub_device_protocol.h

BIN
.vscode/ipch/2e7f1c8d7c0b61cc/PANDO_CHANNEL.ipch


BIN
.vscode/ipch/2e7f1c8d7c0b61cc/mmap_address.bin


BIN
.vscode/ipch/3df749832913de8c/mmap_address.bin


BIN
.vscode/ipch/3df754832913f13d/PANDO_SUBDEVICE.ipch


BIN
.vscode/ipch/3df754832913f13d/mmap_address.bin


BIN
.vscode/ipch/4c3f5f8367c5a997/PANDO_CLOUD_ACCESS.ipch


BIN
.vscode/ipch/4c3f5f8367c5a997/mmap_address.bin


BIN
.vscode/ipch/62398c20325506b9/mmap_address.bin


BIN
.vscode/ipch/81582733f273247d/mmap_address.bin


BIN
.vscode/ipch/81dc5e9f88492d06/PANDO_ZERO_DEVICE.ipch


BIN
.vscode/ipch/81dc5e9f88492d06/mmap_address.bin


BIN
.vscode/ipch/82f9ea7bf84b7708/mmap_address.bin


BIN
.vscode/ipch/9749edc06922ea56/SIM7600.ipch


BIN
.vscode/ipch/9749edc06922ea56/mmap_address.bin


BIN
.vscode/ipch/c8b2ad9b43c64c18/SUB_DEVICE_PROTOCOL.ipch


BIN
.vscode/ipch/c8b2ad9b43c64c18/mmap_address.bin


File diff suppressed because it is too large
+ 12 - 13
MDK-ARM/SIM7600.uvguix.Administrator


BIN
MDK-ARM/SIM7600/SIM7600.axf


+ 1 - 1
MDK-ARM/SIM7600/SIM7600.build_log.htm

@@ -66,7 +66,7 @@ Package Vendor: ARM
 <h2>Collection of Component Files used:</h2>
 
    * Component: ARM::CMSIS:CORE:5.0.1
-Build Time Elapsed:  00:00:02
+Build Time Elapsed:  00:00:20
 </pre>
 </body>
 </html>

+ 14 - 14
MDK-ARM/SIM7600/SIM7600.htm

@@ -3,7 +3,7 @@
 <title>Static Call Graph - [SIM7600\SIM7600.axf]</title></head>
 <body><HR>
 <H1>Static Call Graph for image SIM7600\SIM7600.axf</H1><HR>
-<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060422: Last Updated: Thu Mar 14 10:40:11 2019
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060422: Last Updated: Mon Mar 25 11:19:25 2019
 <BR><P>
 <H3>Maximum Stack Usage =       2472 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
 Call chain for Maximum Stack Depth:</H3>
@@ -263,8 +263,8 @@ Global Symbols
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f103xb.o(RESET)
 </UL>
 <P><STRONG><a name="[74]"></a>__aeabi_llsr</STRONG> (Thumb, 32 bytes, Stack size 0 bytes, llushr.o(.text))
-<BR><BR>[Called By]<UL><LI><a href="#[73]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_uldivmod
-<LI><a href="#[72]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_double_epilogue
+<BR><BR>[Called By]<UL><LI><a href="#[72]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_double_epilogue
+<LI><a href="#[73]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_uldivmod
 </UL>
 
 <P><STRONG><a name="[1a3]"></a>_ll_ushift_r</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, llushr.o(.text), UNUSED)
@@ -469,8 +469,8 @@ Global Symbols
 </UL>
 
 <P><STRONG><a name="[73]"></a>__aeabi_uldivmod</STRONG> (Thumb, 98 bytes, Stack size 40 bytes, uldiv.o(.text), UNUSED)
-<BR><BR>[Calls]<UL><LI><a href="#[75]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_llsl
-<LI><a href="#[74]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_llsr
+<BR><BR>[Calls]<UL><LI><a href="#[74]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_llsr
+<LI><a href="#[75]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_llsl
 </UL>
 <BR>[Called By]<UL><LI><a href="#[f9]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_printf_core
 </UL>
@@ -497,9 +497,9 @@ Global Symbols
 <P><STRONG><a name="[72]"></a>_double_epilogue</STRONG> (Thumb, 156 bytes, Stack size 32 bytes, depilogue.o(.text))
 <BR><BR>[Stack]<UL><LI>Max Depth = 40<LI>Call Chain = _double_epilogue &rArr; _double_round
 </UL>
-<BR>[Calls]<UL><LI><a href="#[75]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_llsl
+<BR>[Calls]<UL><LI><a href="#[74]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_llsr
+<LI><a href="#[75]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_llsl
 <LI><a href="#[78]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_double_round
-<LI><a href="#[74]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_llsr
 </UL>
 <BR>[Called By]<UL><LI><a href="#[71]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_ul2d
 </UL>
@@ -513,8 +513,8 @@ Global Symbols
 <P><STRONG><a name="[1a9]"></a>__scatterload_rt2</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, init.o(.text), UNUSED)
 
 <P><STRONG><a name="[75]"></a>__aeabi_llsl</STRONG> (Thumb, 30 bytes, Stack size 0 bytes, llshl.o(.text))
-<BR><BR>[Called By]<UL><LI><a href="#[73]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_uldivmod
-<LI><a href="#[72]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_double_epilogue
+<BR><BR>[Called By]<UL><LI><a href="#[72]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_double_epilogue
+<LI><a href="#[73]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_uldivmod
 </UL>
 
 <P><STRONG><a name="[1aa]"></a>_ll_shift_l</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, llshl.o(.text), UNUSED)
@@ -1578,10 +1578,10 @@ Global Symbols
 </UL>
 
 <P><STRONG><a name="[6e]"></a>__aeabi_errno_addr</STRONG> (Thumb, 4 bytes, Stack size 0 bytes, errno.o(i.__aeabi_errno_addr))
-<BR><BR>[Called By]<UL><LI><a href="#[77]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_strtoul
-<LI><a href="#[6f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;strtol
-<LI><a href="#[70]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;atol
+<BR><BR>[Called By]<UL><LI><a href="#[70]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;atol
 <LI><a href="#[6d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;atoi
+<LI><a href="#[77]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_strtoul
+<LI><a href="#[6f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;strtol
 </UL>
 
 <P><STRONG><a name="[1af]"></a>__rt_errno_addr</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, errno.o(i.__aeabi_errno_addr), UNUSED)
@@ -3867,9 +3867,9 @@ Local Symbols
 </UL>
 
 <P><STRONG><a name="[f9]"></a>_printf_core</STRONG> (Thumb, 996 bytes, Stack size 104 bytes, printf8.o(i._printf_core), UNUSED)
-<BR><BR>[Calls]<UL><LI><a href="#[73]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_uldivmod
-<LI><a href="#[fb]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_printf_pre_padding
+<BR><BR>[Calls]<UL><LI><a href="#[fb]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_printf_pre_padding
 <LI><a href="#[fc]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_printf_post_padding
+<LI><a href="#[73]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_uldivmod
 </UL>
 <BR>[Called By]<UL><LI><a href="#[fa]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__0sprintf$8
 <LI><a href="#[f8]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__0printf$8

+ 1 - 1
MDK-ARM/SIM7600/SIM7600_SIM7600.dep

@@ -1188,7 +1188,7 @@ I (..\SYSTEM\Usart\usart.h)(0x5C86311A)
 I (..\HARDWARE\LED\led.h)(0x5C89B45A)
 I (..\HARDWARE\4G_RTC\rtc.h)(0x5C672EC5)
 F (..\HARDWARE\4G_RTC\rtc.h)(0x5C672EC5)()
-F (..\HARDWARE\4G_SIM7600\sim7600.c)(0x5C89BF09)(-c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F1xx/Include -I ../Drivers/CMSIS/Include -I ..\SYSTEM\sys -I ..\SYSTEM\Delay -I ..\SYSTEM\Usart -I ..\HARDWARE\LED -I ..\HARDWARE\24CXX -I ..\HARDWARE\IIC -I ..\HARDWARE\4G_RTC -I ..\HARDWARE\4G_SIM7600 -I ..\SYSTEM\TimerBase -I ..\framework -I ..\framework\subdevice -I ..\framework\gateway -I ..\framework\gateway\mqtt -I ..\framework\lib -I ..\framework\lib\json -I ..\framework\platform\include -I ..\framework\protocol -I ..\framework\subdevice -I ..\object --C99

-I.\RTE\_SIM7600

-IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.0.1\CMSIS\Include

-IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="523" -D_RTE_ -DSTM32F10X_MD -DUSE_HAL_DRIVER -DSTM32F103xB

-o sim7600\sim7600.o --omf_browse sim7600\sim7600.crf --depend sim7600\sim7600.d)
+F (..\HARDWARE\4G_SIM7600\sim7600.c)(0x5C89C088)(-c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F1xx/Include -I ../Drivers/CMSIS/Include -I ..\SYSTEM\sys -I ..\SYSTEM\Delay -I ..\SYSTEM\Usart -I ..\HARDWARE\LED -I ..\HARDWARE\24CXX -I ..\HARDWARE\IIC -I ..\HARDWARE\4G_RTC -I ..\HARDWARE\4G_SIM7600 -I ..\SYSTEM\TimerBase -I ..\framework -I ..\framework\subdevice -I ..\framework\gateway -I ..\framework\gateway\mqtt -I ..\framework\lib -I ..\framework\lib\json -I ..\framework\platform\include -I ..\framework\protocol -I ..\framework\subdevice -I ..\object --C99

-I.\RTE\_SIM7600

-IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.0.1\CMSIS\Include

-IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="523" -D_RTE_ -DSTM32F10X_MD -DUSE_HAL_DRIVER -DSTM32F103xB

-o sim7600\sim7600.o --omf_browse sim7600\sim7600.crf --depend sim7600\sim7600.d)
 I (..\HARDWARE\4G_SIM7600\sim7600.h)(0x5C88D73E)
 I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x57F606B8)
 I (..\SYSTEM\sys\sys.h)(0x5C6E340E)

BIN
MDK-ARM/SIM7600/sim7600.crf


BIN
MDK-ARM/SIM7600/sim7600.o


+ 1 - 1
framework/protocol/common_functions.c

@@ -1,6 +1,6 @@
 /*******************************************************
  * File name: common_functions.c
- * Author:    Zhao Wenwu
+ * Author:    LIJIAN
  * Versions:  0.1
  * Description: Common APIs for all platforms.
  * History:

+ 1 - 1
framework/protocol/common_functions.h

@@ -1,6 +1,6 @@
 /*******************************************************
  * File name: common_functions.h
- * Author:    Zhao Wenwu
+ * Author:    LIJIAN
  * Versions:  0.1
  * Description: Common APIs for all platforms.
  * History:

+ 1 - 1
framework/protocol/pando_endian.c

@@ -1,6 +1,6 @@
 /*******************************************************
  * File name: pando_endian.c
- * Author:    Zhao Wenwu
+ * Author:    LIJIAN
  * Versions:  0.1
  * Description: APIs to change endian between net and host machine.
      Net is big endian, host endian depends machine. 

+ 1 - 1
framework/protocol/pando_endian.h

@@ -1,6 +1,6 @@
 /*******************************************************
  * File name: pando_endian.h
- * Author:    Zhao Wenwu
+ * Author:    LIJIAN
  * Versions:  0.1
  * Description: APIs to change endian between net and host machine.
      Net is big endian, host endian depends machine. 

+ 1 - 1
framework/protocol/pando_machine.c

@@ -1,6 +1,6 @@
 /*******************************************************
  * File name: pando_machine.c
- * Author:    Zhao Wenwu
+ * Author:    LIJIAN
  * Versions:  0.1
  * Description: APIs related to different machine platform, 
      Such as basic IO operation and some common functions.

+ 1 - 1
framework/protocol/pando_machine.h

@@ -1,6 +1,6 @@
 /*******************************************************
  * File name:pando_machine.h
- * Author:    Zhao Wenwu
+ * Author:    LIJIAN
  * Versions:  0.1
  * Description: APIs related to different machine platform, 
      Such as basic IO operation and some common functions.

+ 1 - 1
framework/protocol/pando_protocol.c

@@ -1,6 +1,6 @@
 /*******************************************************
  * File name: pando_protocol.c
- * Author:    Zhao Wenwu
+ * Author:    LIJIAN
  * Versions:  0.1
  * Description: APIs for access device layer to manipulate packets.
  * History:

+ 1 - 1
framework/protocol/pando_protocol.h

@@ -1,6 +1,6 @@
 /*******************************************************
  * File name: pando_protocol.h
- * Author:    Zhao Wenwu
+ * Author:    LIJIAN
  * Versions:  0.1
  * Description: APIs for access device layer to manipulate packets.
  * History:

+ 1 - 1
framework/protocol/sub_device_protocol.c

@@ -1,6 +1,6 @@
 /*******************************************************
  * File name:sub_device_protocol.c
- * Author:    Zhao Wenwu
+ * Author:    LIJIAN
  * Versions:  0.1
  * Description: APIs for sub device.
  * History:

+ 1 - 1
framework/protocol/sub_device_protocol.h

@@ -1,6 +1,6 @@
 /*******************************************************
  * File name:sub_device_protocol.h
- * Author:    Zhao Wenwu
+ * Author:    LIJIAN
  * Versions:  0.1
  * Description: APIs for sub device.
  * History:

Some files were not shown because too many files changed in this diff