Merge pull request 'V101_TEST_TIMER' (#2) from V101_TEST_TIMER into V101

Reviewed-on: http://10.20.98.37:8418/Rjh913828050/20231023_InSituLab_emb/pulls/2

BIN/Usr0/log/2024-8-9_run.log

@@ -0,0 +1,10 @@
+15:36:37	MT_ToDASRecv: Join in!!
+15:36:37	MT_ToDASSORT: Join in!!
+15:36:37	MT_ToDASHandle: Join in!!
+15:36:37	MT_ToDASSendSta: Join in!!
+15:36:45	DasConnectIP:192.168.1.230,Port:59862!!
+15:36:45	MT_ToDAS: TCP connect!!
+15:36:58	MT_ToDAS: TCP disconnect!!
+15:37:00	DasConnectIP:192.168.1.230,Port:59876!!
+15:37:00	MT_ToDAS: TCP connect!!
+15:37:05	MT_ToDAS: TCP disconnect!!

Doc/配置文档/Ubuntu相关指令操作.txt

@@ -0,0 +1,15 @@
+查看系统
+lsb_release -a
+查看网络连接
+sudo nmcli connection show
+扫描当前可用网络
+sudo nmcli dev wifi list
+sudo nmcli connection add type wifi ifname '*' con-name my_hidden_network ssid 'Mi 11 Ultra to rjh'
+sudo nmcli connection modify my_hidden_network wifi-sec.key-mgmt wpa-psk
+sudo nmcli connection modify my_hidden_network wifi-sec.psk 'laoziwozuishuai'
+sudo nmcli connection up my_hidden_network
+
+/* 查看串口信息 */
+udevadm info -a -n /dev/ttyS0
+/* 查看实际串口 */
+cat /proc/tty/driver/serial

InsituLabProject_QRS/Project/InsituLab.uvoptx

@@ -129,7 +129,6 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGUARM</Key>
-          <Name></Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -149,12 +148,12 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>JL2CM3</Key>
-          <Name>-U50120677 -O14 -S5 -ZTIFSpeedSel1000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight JTAG-DP") -D00(4BA00477) -L00(4) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0TM4C129_512.FLM -FS00 -FL080000 -FP0($$Device:TM4C1294KCPDT$Flash\TM4C129_512.FLM)</Name>
+          <Name>-U50120677 -O14 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight JTAG-DP") -D00(4BA00477) -L00(4) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0TM4C129_512.FLM -FS00 -FL080000 -FP0($$Device:TM4C1294KCPDT$Flash\TM4C129_512.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
-          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0TM4C129_512 -FS00 -FL080000 -FP0($$Device:TM4C1294KCPDT$Flash\TM4C129_512.FLM))</Name>
+          <Name>UL2CM3(-S0 -C0 -P0 )  -FN1 -FC1000 -FD20000000 -FF0TM4C129_512 -FL080000 -FS00 -FP0($$Device:TM4C1294KCPDT$Flash\TM4C129_512.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -162,7 +161,7 @@
         <Mm>
           <WinNumber>1</WinNumber>
           <SubType>0</SubType>
-          <ItemText>gs_sendDataTmp</ItemText>
+          <ItemText>gs_devTimeSeqAttribute[RUN_FIRST_TIME_SEQ].startTime</ItemText>
           <AccSizeX>0</AccSizeX>
         </Mm>
       </MemoryWindow1>
@@ -1218,7 +1217,7 @@
 
   <Group>
     <GroupName>Usr\Driver\UpDriver\RTC</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -1238,7 +1237,7 @@
 
   <Group>
     <GroupName>Usr\Driver\UpDriver\Fatfs</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -1758,7 +1757,7 @@
 
   <Group>
     <GroupName>Usr\Driver\UpDriver\Lwip\netif</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>

InsituLabProject_QRS/Project/InsituLab.uvprojx

@@ -137,7 +137,7 @@
           </Flash1>
           <bUseTDR>1</bUseTDR>
           <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
+          <Flash3></Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
           <pFcarmGrp></pFcarmGrp>
@@ -186,7 +186,7 @@
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
-            <useUlib>0</useUlib>
+            <useUlib>1</useUlib>
             <EndSel>0</EndSel>
             <uLtcg>0</uLtcg>
             <nSecure>0</nSecure>
@@ -313,7 +313,7 @@
             <Optim>1</Optim>
             <oTime>0</oTime>
             <SplitLS>0</SplitLS>
-            <OneElfS>0</OneElfS>
+            <OneElfS>1</OneElfS>
             <Strict>0</Strict>
             <EnumInt>0</EnumInt>
             <PlainCh>0</PlainCh>

InsituLabProject_QRS/Project/Listings/cpu_a.lst

@@ -462,9 +462,9 @@ ARM Macro Assembler    Page 8
 erwork --depend=.\objects\cpu_a.d -o.\objects\cpu_a.o -IE:\ZMTS_project\Git_PRO
 JECT\14th\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE -ID:\Keil_v5\
 ARM\PACK\Keil\TM4C_DFP\1.1.0\Device\Include\TM4C129 -ID:\Keil_v5\ARM\CMSIS\Incl
-ude --predefine="__UVISION_VERSION SETA 518" --predefine="TM4C1294KCPDT SETA 1"
+ude --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 518" --
- --list=.\listings\cpu_a.lst ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU\ARM-Cortex-M
+predefine="TM4C1294KCPDT SETA 1" --list=.\listings\cpu_a.lst ..\Src\Micrium-DK-
-4\RealView\cpu_a.asm
+TM4C129X-OS2\uC-CPU\ARM-Cortex-M4\RealView\cpu_a.asm
 
 
 
@@ -577,4 +577,4 @@ ealView\cpu_a.asm
 alView\cpu_a.asm
 Comment: CPU_WaitForInt used once
 10 symbols
-343 symbols in table
+344 symbols in table

InsituLabProject_QRS/Project/Listings/cstartup.lst

@@ -634,7 +634,7 @@ ARM Macro Assembler    Page 10
   340 00000000         
   341 00000000                 IF               {FPU} != "SoftVFP"
   342 00000000         ; Enable Floating Point Support at reset for FPU
-  343 00000000 F8DF 003C       LDR.W            R0, =0xE000ED88 ; Load address 
+  343 00000000 F8DF 0030       LDR.W            R0, =0xE000ED88 ; Load address 
                                                             of CPACR register
   344 00000004 6801            LDR              R1, [R0]    ; Read value at CPA
                                                             CR
@@ -655,7 +655,7 @@ ARM Macro Assembler    Page 11
 
 
   351 00000010         ; Enable lazy context switch
-  352 00000010 F8DF 0030       LDR.W            R0, =0xE000EF34 ; Load address 
+  352 00000010 F8DF 0024       LDR.W            R0, =0xE000EF34 ; Load address 
                                                             to FPCCR register
   353 00000014 6801            LDR              R1, [R0]
   354 00000016 F021 4140       AND              R1,  R1, #(0x3FFFFFFF) ; Clear 
@@ -667,7 +667,7 @@ ARM Macro Assembler    Page 11
                                                             d
   357 00000020                 ENDIF
   358 00000020         
-  359 00000020 4809            LDR              R0, =__main
+  359 00000020 4806            LDR              R0, =__main
   360 00000022 4700            BX               R0
   361 00000024                 ENDP
   362 00000024         
@@ -730,36 +730,26 @@ ARM Macro Assembler    Page 12
   404 00000034         ; User Initial Stack & Heap
   405 00000034         
   406 00000034                 IF               :DEF:__MICROLIB
-  413 00000034         
+  407 00000034         
-  414 00000034                 IMPORT           __use_two_region_memory
+  408 00000034                 EXPORT           __initial_sp
-  415 00000034                 EXPORT           __user_initial_stackheap
+  409 00000034                 EXPORT           __heap_base
-  416 00000034         __user_initial_stackheap
+  410 00000034                 EXPORT           __heap_limit
-  417 00000034         
+  411 00000034         
-  418 00000034 4805            LDR              R0, =  Heap_Mem
+  412 00000034                 ELSE
-  419 00000036 4906            LDR              R1, = (Stack_Mem + Stack_Size)
+  426                          ENDIF
-  420 00000038 4A06            LDR              R2, = (Heap_Mem +  Heap_Size)
+  427 00000034         
-  421 0000003A 4B07            LDR              R3, =  Stack_Mem
+  428 00000034         
-  422 0000003C 4770            BX               LR
+  429 00000034                 END
-  423 0000003E         
-  424 0000003E 00 00           ALIGN
-  425 00000040         
-  426 00000040                 ENDIF
-  427 00000040         
-  428 00000040         
-  429 00000040                 END
               E000ED88 
               E000EF34 
               00000000 
-              00000000 
-              00001000 
-              00003000 
-              00000000 
 Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M4.fp --apcs=int
 erwork --depend=.\objects\cstartup.d -o.\objects\cstartup.o -IE:\ZMTS_project\G
 it_PROJECT\14th\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE -ID:\Ke
 il_v5\ARM\PACK\Keil\TM4C_DFP\1.1.0\Device\Include\TM4C129 -ID:\Keil_v5\ARM\CMSI
-S\Include --predefine="__UVISION_VERSION SETA 518" --predefine="TM4C1294KCPDT S
+S\Include --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 5
-ETA 1" --list=.\listings\cstartup.lst ..\Src\StartUp\cstartup.s
+18" --predefine="TM4C1294KCPDT SETA 1" --list=.\listings\cstartup.lst ..\Src\St
+artUp\cstartup.s
 
 
 
@@ -780,9 +770,8 @@ Symbol: Stack_Mem
    Definitions
       At line 40 in file ..\Src\StartUp\cstartup.s
    Uses
-      At line 419 in file ..\Src\StartUp\cstartup.s
+      None
-      At line 421 in file ..\Src\StartUp\cstartup.s
+Comment: Stack_Mem unused
-
 __initial_sp 00001000
 
 Symbol: __initial_sp
@@ -790,7 +779,8 @@ Symbol: __initial_sp
       At line 41 in file ..\Src\StartUp\cstartup.s
    Uses
       At line 188 in file ..\Src\StartUp\cstartup.s
-Comment: __initial_sp used once
+      At line 408 in file ..\Src\StartUp\cstartup.s
+
 3 symbols
 
 
@@ -812,25 +802,24 @@ Symbol: Heap_Mem
    Definitions
       At line 57 in file ..\Src\StartUp\cstartup.s
    Uses
-      At line 418 in file ..\Src\StartUp\cstartup.s
+      None
-      At line 420 in file ..\Src\StartUp\cstartup.s
+Comment: Heap_Mem unused
-
 __heap_base 00000000
 
 Symbol: __heap_base
    Definitions
       At line 56 in file ..\Src\StartUp\cstartup.s
    Uses
-      None
+      At line 409 in file ..\Src\StartUp\cstartup.s
-Comment: __heap_base unused
+Comment: __heap_base used once
 __heap_limit 00003000
 
 Symbol: __heap_limit
    Definitions
       At line 58 in file ..\Src\StartUp\cstartup.s
    Uses
-      None
+      At line 410 in file ..\Src\StartUp\cstartup.s
-Comment: __heap_limit unused
+Comment: __heap_limit used once
 4 symbols
 
 
@@ -962,15 +951,7 @@ Symbol: Reset_Handler
       At line 189 in file ..\Src\StartUp\cstartup.s
       At line 338 in file ..\Src\StartUp\cstartup.s
 
-__user_initial_stackheap 00000034
+9 symbols
-
-Symbol: __user_initial_stackheap
-   Definitions
-      At line 416 in file ..\Src\StartUp\cstartup.s
-   Uses
-      At line 415 in file ..\Src\StartUp\cstartup.s
-Comment: __user_initial_stackheap used once
-10 symbols
 
 
 
@@ -984,8 +965,7 @@ Symbol: Heap_Size
       At line 53 in file ..\Src\StartUp\cstartup.s
    Uses
       At line 57 in file ..\Src\StartUp\cstartup.s
-      At line 420 in file ..\Src\StartUp\cstartup.s
+Comment: Heap_Size used once
-
 Stack_Size 00001000
 
 Symbol: Stack_Size
@@ -993,8 +973,7 @@ Symbol: Stack_Size
       At line 37 in file ..\Src\StartUp\cstartup.s
    Uses
       At line 40 in file ..\Src\StartUp\cstartup.s
-      At line 419 in file ..\Src\StartUp\cstartup.s
+Comment: Stack_Size used once
-
 __Vectors_Size 00000200
 
 Symbol: __Vectors_Size
@@ -2020,13 +1999,5 @@ Symbol: __main
    Uses
       At line 359 in file ..\Src\StartUp\cstartup.s
 Comment: __main used once
-__use_two_region_memory 00000000
+115 symbols
-
+473 symbols in table
-Symbol: __use_two_region_memory
-   Definitions
-      At line 414 in file ..\Src\StartUp\cstartup.s
-   Uses
-      None
-Comment: __use_two_region_memory unused
-116 symbols
-476 symbols in table

InsituLabProject_QRS/Project/Listings/lib_mem_a.lst

@@ -447,9 +447,9 @@ Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M4.fp --apcs=int
 erwork --depend=.\objects\lib_mem_a.d -o.\objects\lib_mem_a.o -IE:\ZMTS_project
 \Git_PROJECT\14th\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE -ID:\
 Keil_v5\ARM\PACK\Keil\TM4C_DFP\1.1.0\Device\Include\TM4C129 -ID:\Keil_v5\ARM\CM
-SIS\Include --predefine="__UVISION_VERSION SETA 518" --predefine="TM4C1294KCPDT
+SIS\Include --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA
- SETA 1" --list=.\listings\lib_mem_a.lst ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\
+ 518" --predefine="TM4C1294KCPDT SETA 1" --list=.\listings\lib_mem_a.lst ..\Src
-Ports\ARM-Cortex-M4\RealView\lib_mem_a.asm
+\Micrium-DK-TM4C129X-OS2\uC-LIB\Ports\ARM-Cortex-M4\RealView\lib_mem_a.asm
 
 
 
@@ -675,4 +675,4 @@ x-M4\RealView\lib_mem_a.asm
 x-M4\RealView\lib_mem_a.asm
 
 18 symbols
-351 symbols in table
+352 symbols in table

InsituLabProject_QRS/Project/Listings/os_cpu_a.lst

@@ -533,9 +533,9 @@ Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M4.fp --apcs=int
 erwork --depend=.\objects\os_cpu_a.d -o.\objects\os_cpu_a.o -IE:\ZMTS_project\G
 it_PROJECT\14th\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE -ID:\Ke
 il_v5\ARM\PACK\Keil\TM4C_DFP\1.1.0\Device\Include\TM4C129 -ID:\Keil_v5\ARM\CMSI
-S\Include --predefine="__UVISION_VERSION SETA 518" --predefine="TM4C1294KCPDT S
+S\Include --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 5
-ETA 1" --list=.\listings\os_cpu_a.lst ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Po
+18" --predefine="TM4C1294KCPDT SETA 1" --list=.\listings\os_cpu_a.lst ..\Src\Mi
-rts\ARM-Cortex-M4\Generic\RealView\os_cpu_a.asm
+crium-DK-TM4C129X-OS2\uCOS-II\Ports\ARM-Cortex-M4\Generic\RealView\os_cpu_a.asm
 
 
 
@@ -827,4 +827,4 @@ x-M4\Generic\RealView\os_cpu_a.asm
 ex-M4\Generic\RealView\os_cpu_a.asm
 Comment: OS_CPU_ExceptStkBase used once
 8 symbols
-359 symbols in table
+360 symbols in table

InsituLabProject_QRS/Project/Objects/The14thPlan.build_log.htm

@@ -5,10 +5,9 @@
 <h2>Tool Versions:</h2>
 IDE-Version: ¦ÌVision V5.18a
 Copyright (C) 2016 ARM Ltd and ARM Germany GmbH. All rights reserved.
-License Information: adm adm rjh Flex license: MDK-ARM Professional: 2 user(s) (mdk_pro) Support: Jul 2024
+License Information: adm adm rjh Flex license: error obtaining information 
- 
 Tool Versions:
-Toolchain:       MDK-ARM Professional: 2 user(s)  Version: 5.18a
+Toolchain:       MDK-Lite  Version: 5.18a
 Toolchain Path:  D:\Keil_v5\ARM\ARMCC\Bin
 C Compiler:      Armcc.exe V5.06 update 1 (build 61)
 Assembler:       Armasm.exe V5.06 update 1 (build 61)
@@ -22,11 +21,15 @@ Dialog DLL:      TCM.DLL V1.14.8.0
  
 <h2>Project:</h2>
 E:\ZMTS_project\Git_PROJECT\14th\20231023_InSituLab_emb\InsituLabProject_QRS\Project\InsituLab.uvprojx
-Project File Date:  07/31/2024
+Project File Date:  08/27/2024
 
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 1 (build 61)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
 Build target 'InsituLab'
+compiling MasterTaskDeviceWork.c...
+linking...
+Program Size: Code=169240 RO-data=6920 RW-data=2668 ZI-data=235556  
+FromELF: creating hex file...
 After Build - User command #1: fromelf.exe --bin -o  ./bin/The14thPlan.bin  ./Objects/The14thPlan.axf
 ".\Objects\The14thPlan.axf" - 0 Error(s), 0 Warning(s).
 
@@ -35,7 +38,7 @@ After Build - User command #1: fromelf.exe --bin -o  ./bin/The14thPlan.bin  ./Ob
   D:\Keil_v5\ARM\PACK\Keil\TM4C_DFP\1.1.0\Device\Include\TM4C129
 
 <h2>Collection of Component Files used:</h2>
-Build Time Elapsed:  00:00:01
+Build Time Elapsed:  00:00:02
 </pre>
 </body>
 </html>

InsituLabProject_QRS/Project/Objects/The14thPlan.lnp

@@ -143,7 +143,7 @@
 ".\objects\slavetasktodas.o"
 ".\objects\app_hooks.o"
 ".\objects\app_main.o"
---strict --scatter ".\Objects\The14thPlan.sct"
+--library_type=microlib --strict --scatter ".\Objects\The14thPlan.sct"
 --summary_stderr --info summarysizes --map --xref --callgraph --symbols
 --info sizes --info totals --info unused --info veneers
 --list ".\Listings\The14thPlan.map" -o .\Objects\The14thPlan.axf