Compare commits

..

No commits in common. "b60e28def70fcb91776b83d59cdc12a4348cabbd" and "4e26d518dab760698bbcebdce1f298fe8ca6f664" have entirely different histories.

316 changed files with 25854 additions and 90519 deletions

File diff suppressed because one or more lines are too long

View File

@ -129,7 +129,6 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
<Name></Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@ -157,29 +156,12 @@
<Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0TM4C129_512 -FS00 -FL080000 -FP0($$Device:TM4C1294KCPDT$Flash\TM4C129_512.FLM))</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint>
<Bp>
<Number>0</Number>
<Type>0</Type>
<LineNumber>402</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>129278</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>..\Src\Usr\Task\Task-145\Master\MasterTaskToDAS.c</Filename>
<ExecCommand></ExecCommand>
<Expression>\\The14thPlan\../Src/Usr/Task/Task-145/Master/MasterTaskToDAS.c\402</Expression>
</Bp>
</Breakpoint>
<Breakpoint/>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
<SubType>0</SubType>
<ItemText>gs_sendDataTmp</ItemText>
<ItemText>gs_toDASRecvBuf[i]</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
@ -1255,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>
@ -1819,7 +1801,7 @@
<Group>
<GroupName>Usr\Driver\UpDriver\Lwip\ports</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@ -1931,7 +1913,7 @@
<Group>
<GroupName>Usr\Task\Master</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@ -2095,7 +2077,7 @@
<Group>
<GroupName>Usr\Task\Slave</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@ -2199,7 +2181,7 @@
<Group>
<GroupName>Usr\App</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -459,12 +459,12 @@ Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M4.fp --apcs=int
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"
--list=.\listings\cpu_a.lst ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU\ARM-Cortex-M
4\RealView\cpu_a.asm
erwork --depend=.\objects\cpu_a.d -o.\objects\cpu_a.o -IE:\Git_project\YuanWeiS
hiYanShi\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE -ID:\Keil_v5\A
RM\PACK\Keil\TM4C_DFP\1.1.0\Device\Include\TM4C129 -ID:\Keil_v5\ARM\CMSIS\Inclu
de --predefine="__UVISION_VERSION SETA 518" --predefine="TM4C1294KCPDT SETA 1"
--list=.\listings\cpu_a.lst ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU\ARM-Cortex-M4
\RealView\cpu_a.asm

View File

@ -755,11 +755,11 @@ ARM Macro Assembler Page 12
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
ETA 1" --list=.\listings\cstartup.lst ..\Src\StartUp\cstartup.s
erwork --depend=.\objects\cstartup.d -o.\objects\cstartup.o -IE:\Git_project\Yu
anWeiShiYanShi\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE -ID:\Kei
l_v5\ARM\PACK\Keil\TM4C_DFP\1.1.0\Device\Include\TM4C129 -ID:\Keil_v5\ARM\CMSIS
\Include --predefine="__UVISION_VERSION SETA 518" --predefine="TM4C1294KCPDT SE
TA 1" --list=.\listings\cstartup.lst ..\Src\StartUp\cstartup.s

View File

@ -444,12 +444,12 @@ ARM Macro Assembler Page 7
310 00000220
311 00000220 END
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
SETA 1" --list=.\listings\lib_mem_a.lst ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\
Ports\ARM-Cortex-M4\RealView\lib_mem_a.asm
erwork --depend=.\objects\lib_mem_a.d -o.\objects\lib_mem_a.o -IE:\Git_project\
YuanWeiShiYanShi\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE -ID:\K
eil_v5\ARM\PACK\Keil\TM4C_DFP\1.1.0\Device\Include\TM4C129 -ID:\Keil_v5\ARM\CMS
IS\Include --predefine="__UVISION_VERSION SETA 518" --predefine="TM4C1294KCPDT
SETA 1" --list=.\listings\lib_mem_a.lst ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\P
orts\ARM-Cortex-M4\RealView\lib_mem_a.asm

View File

@ -530,12 +530,12 @@ ARM Macro Assembler Page 9
00000000
00000000
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
ETA 1" --list=.\listings\os_cpu_a.lst ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Po
rts\ARM-Cortex-M4\Generic\RealView\os_cpu_a.asm
erwork --depend=.\objects\os_cpu_a.d -o.\objects\os_cpu_a.o -IE:\Git_project\Yu
anWeiShiYanShi\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE -ID:\Kei
l_v5\ARM\PACK\Keil\TM4C_DFP\1.1.0\Device\Include\TM4C129 -ID:\Keil_v5\ARM\CMSIS
\Include --predefine="__UVISION_VERSION SETA 518" --predefine="TM4C1294KCPDT SE
TA 1" --list=.\listings\os_cpu_a.lst ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Por
ts\ARM-Cortex-M4\Generic\RealView\os_cpu_a.asm

File diff suppressed because it is too large Load Diff

View File

@ -20,8 +20,8 @@ Target DLL: Segger\JL2CM3.dll V2.99.19.0
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
E:\Git_project\YuanWeiShiYanShi\20231023_InSituLab_emb\InsituLabProject_QRS\Project\InsituLab.uvprojx
Project File Date: 07/18/2024
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 1 (build 61)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
@ -30,11 +30,11 @@ After Build - User command #1: fromelf.exe --bin -o ./bin/The14thPlan.bin ./Ob
".\Objects\The14thPlan.axf" - 0 Error(s), 0 Warning(s).
<h2>Collection of Component include folders:</h2>
E:\ZMTS_project\Git_PROJECT\14th\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE
E:\Git_project\YuanWeiShiYanShi\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE
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:02
Build Time Elapsed: 00:00:00
</pre>
</body>
</html>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -25,52 +25,11 @@
.\objects\app_main.o: ..\Src\Usr\Driver\UpDriver\Fatfs\FileSys.h
.\objects\app_main.o: ..\Src\Usr\Driver\UpDriver\Fatfs\FileConf.h
.\objects\app_main.o: ..\Src\Usr\Driver\UpDriver\Rtc\RtcDrv.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Master\MasterTaskRun.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Master\MasterTaskWatchdog.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Master\MasterTaskFile.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Master\MasterTaskOutput.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Master\MasterTaskToDAS.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Master\MasterTaskToUPC.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Master\MasterTaskVCB.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Master\MasterTaskInsideEnv.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Master\MasterTaskBaseStation.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Master\MasterTaskTimer.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Master\MasterTaskDeviceWork.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Master\MasterTaskToWeb.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Master\MasterTaskToSlave.h
.\objects\app_main.o: ..\Src\Usr\Driver\UpDriver\lwip\include\arch\ZtmsLwip.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/opt.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/debug.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/arch.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\arch/cc.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/opt.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/lwipopts.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/api.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/netbuf.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/pbuf.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/err.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\ipv4\lwip/ip_addr.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/def.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/sys.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\arch/sys_arch.h
.\objects\app_main.o: ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Source\os.h
.\objects\app_main.o: ..\Src\Micrium-DK-TM4C129X-OS2\uC-BSP\bsp_sys.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/netifapi.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/netif.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/dhcp.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\ipv4\lwip/autoip.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/tcp.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/mem.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\ipv4\lwip/ip.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\ipv4\lwip/icmp.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/udp.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/tcpip.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/api_msg.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\ipv4\lwip/igmp.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/timers.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/sockets.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\ipv4\lwip/inet.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/stats.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/memp.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/memp_std.h
.\objects\app_main.o: ..\src\Usr\Driver\UpDriver\lwip\include\lwip/tcp_impl.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Slave\SlaveTaskWatchdog.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Slave\SlaveTaskFile.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Slave\SlaveTaskToDAS.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Slave\SlaveTaskTimer.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Slave\SlaveTasktoMaster.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Slave\SlaveTaskInsideEnv.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Slave\SlaveTaskOutput.h
.\objects\app_main.o: ..\Src\Usr\Task\Task-145\Slave\SlaveTaskVCB.h

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