V101_TEST_TIMER #2

Merged
Rjh913828050 merged 2 commits from V101_TEST_TIMER into V101 2024-09-03 01:15:52 +00:00
19 changed files with 9322 additions and 9087 deletions
Showing only changes of commit bcf9e592a2 - Show all commits

File diff suppressed because it is too large Load Diff

View File

@ -2141,7 +2141,7 @@ I (..\Src\Usr\Task\Task-145\Master\MasterTaskToSlave.h)(0x66A9F91E)
I (..\Src\Usr\Task\Task-145\Master\MasterTaskWatchdog.h)(0x66A99389)
I (..\Src\Usr\Task\Task-145\Master\MasterTaskFile.h)(0x66A99389)
I (..\Src\Usr\Task\Task-145\Master\MasterTaskVCB.h)(0x66A99389)
F (..\Src\Usr\Task\Task-145\Master\MasterTaskRun.c)(0x66A99389)(--c99 -c --cpu Cortex-M4.fp -g -O0 --apcs=interwork -I ..\Src\Tm4c1294-StdLib -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-BSP -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU\ARM-Cortex-M4\RealView -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\Ports -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\Ports\ARM-Cortex-M4\RealView -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Ports -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Source -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Ports\ARM-Cortex-M4\Generic\RealView -I ..\Src\Usr\BSP -I ..\Src\Usr\App\FourteenthFiveYearPlan -I ..\Src\Usr\Driver\DnDriver\ISL1208 -I ..\Src\Usr\Driver\DnDriver\SDDriver -I ..\Src\Usr\Driver\UpDriver\Fatfs -I ..\Src\Usr\Driver\UpDriver\Rtc -I ..\Src\Usr\Tool -I ..\Src\Usr\Driver\DnDriver\RS-SW-N018 -I ..\Src\Usr\Driver\UpDriver\TempAndHumi -I ..\src\Usr\Driver\UpDriver\lwip\include -I ..\src\Usr\Driver\UpDriver\lwip\include\ipv4 -I ..\Src\Usr\Task\Task-145\Master -I ..\Src\Usr\Task\Task-145\Slave -I ..\Src\Usr\Driver\UpDriver\lwip\include\arch -I E:\ZMTS_project\Git_PROJECT\14th\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE -I D:\Keil_v5\ARM\PACK\Keil\TM4C_DFP\1.1.0\Device\Include\TM4C129 -I D:\Keil_v5\ARM\CMSIS\Include -D__UVISION_VERSION="518" -DTM4C1294KCPDT -Drvmdk -DPART_TM4C1294KCPDT -DTARGET_IS_TM4C129_RA1 -o .\objects\mastertaskrun.o --omf_browse .\objects\mastertaskrun.crf --depend .\objects\mastertaskrun.d)
F (..\Src\Usr\Task\Task-145\Master\MasterTaskRun.c)(0x66B1FABB)(--c99 -c --cpu Cortex-M4.fp -g -O0 --apcs=interwork -I ..\Src\Tm4c1294-StdLib -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-BSP -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU\ARM-Cortex-M4\RealView -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\Ports -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\Ports\ARM-Cortex-M4\RealView -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Ports -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Source -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Ports\ARM-Cortex-M4\Generic\RealView -I ..\Src\Usr\BSP -I ..\Src\Usr\App\FourteenthFiveYearPlan -I ..\Src\Usr\Driver\DnDriver\ISL1208 -I ..\Src\Usr\Driver\DnDriver\SDDriver -I ..\Src\Usr\Driver\UpDriver\Fatfs -I ..\Src\Usr\Driver\UpDriver\Rtc -I ..\Src\Usr\Tool -I ..\Src\Usr\Driver\DnDriver\RS-SW-N018 -I ..\Src\Usr\Driver\UpDriver\TempAndHumi -I ..\src\Usr\Driver\UpDriver\lwip\include -I ..\src\Usr\Driver\UpDriver\lwip\include\ipv4 -I ..\Src\Usr\Task\Task-145\Master -I ..\Src\Usr\Task\Task-145\Slave -I ..\Src\Usr\Driver\UpDriver\lwip\include\arch -I E:\ZMTS_project\Git_PROJECT\14th\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE -I D:\Keil_v5\ARM\PACK\Keil\TM4C_DFP\1.1.0\Device\Include\TM4C129 -I D:\Keil_v5\ARM\CMSIS\Include -D__UVISION_VERSION="518" -DTM4C1294KCPDT -Drvmdk -DPART_TM4C1294KCPDT -DTARGET_IS_TM4C129_RA1 -o .\objects\mastertaskrun.o --omf_browse .\objects\mastertaskrun.crf --depend .\objects\mastertaskrun.d)
I (D:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x55DB2B80)
I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x55DB2B76)
I (D:\Keil_v5\ARM\ARMCC\include\stddef.h)(0x55DB2B7E)
@ -2212,7 +2212,7 @@ I (..\src\Usr\Driver\UpDriver\lwip\include\netif/tivaif.h)(0x66A99389)
I (..\Src\Usr\Task\Task-145\Master\MasterTaskBaseStation.h)(0x66A99389)
I (..\Src\Usr\Task\Task-145\Master\MasterTaskWatchdog.h)(0x66A99389)
I (..\Src\Usr\Task\Task-145\Master\MasterTaskFile.h)(0x66A99389)
F (..\Src\Usr\Task\Task-145\Master\MasterTaskDeviceWork.c)(0x66A99389)(--c99 -c --cpu Cortex-M4.fp -g -O0 --apcs=interwork -I ..\Src\Tm4c1294-StdLib -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-BSP -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU\ARM-Cortex-M4\RealView -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\Ports -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\Ports\ARM-Cortex-M4\RealView -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Ports -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Source -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Ports\ARM-Cortex-M4\Generic\RealView -I ..\Src\Usr\BSP -I ..\Src\Usr\App\FourteenthFiveYearPlan -I ..\Src\Usr\Driver\DnDriver\ISL1208 -I ..\Src\Usr\Driver\DnDriver\SDDriver -I ..\Src\Usr\Driver\UpDriver\Fatfs -I ..\Src\Usr\Driver\UpDriver\Rtc -I ..\Src\Usr\Tool -I ..\Src\Usr\Driver\DnDriver\RS-SW-N018 -I ..\Src\Usr\Driver\UpDriver\TempAndHumi -I ..\src\Usr\Driver\UpDriver\lwip\include -I ..\src\Usr\Driver\UpDriver\lwip\include\ipv4 -I ..\Src\Usr\Task\Task-145\Master -I ..\Src\Usr\Task\Task-145\Slave -I ..\Src\Usr\Driver\UpDriver\lwip\include\arch -I E:\ZMTS_project\Git_PROJECT\14th\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE -I D:\Keil_v5\ARM\PACK\Keil\TM4C_DFP\1.1.0\Device\Include\TM4C129 -I D:\Keil_v5\ARM\CMSIS\Include -D__UVISION_VERSION="518" -DTM4C1294KCPDT -Drvmdk -DPART_TM4C1294KCPDT -DTARGET_IS_TM4C129_RA1 -o .\objects\mastertaskdevicework.o --omf_browse .\objects\mastertaskdevicework.crf --depend .\objects\mastertaskdevicework.d)
F (..\Src\Usr\Task\Task-145\Master\MasterTaskDeviceWork.c)(0x66B46582)(--c99 -c --cpu Cortex-M4.fp -g -O0 --apcs=interwork -I ..\Src\Tm4c1294-StdLib -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-BSP -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU\ARM-Cortex-M4\RealView -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\Ports -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\Ports\ARM-Cortex-M4\RealView -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Ports -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Source -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Ports\ARM-Cortex-M4\Generic\RealView -I ..\Src\Usr\BSP -I ..\Src\Usr\App\FourteenthFiveYearPlan -I ..\Src\Usr\Driver\DnDriver\ISL1208 -I ..\Src\Usr\Driver\DnDriver\SDDriver -I ..\Src\Usr\Driver\UpDriver\Fatfs -I ..\Src\Usr\Driver\UpDriver\Rtc -I ..\Src\Usr\Tool -I ..\Src\Usr\Driver\DnDriver\RS-SW-N018 -I ..\Src\Usr\Driver\UpDriver\TempAndHumi -I ..\src\Usr\Driver\UpDriver\lwip\include -I ..\src\Usr\Driver\UpDriver\lwip\include\ipv4 -I ..\Src\Usr\Task\Task-145\Master -I ..\Src\Usr\Task\Task-145\Slave -I ..\Src\Usr\Driver\UpDriver\lwip\include\arch -I E:\ZMTS_project\Git_PROJECT\14th\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE -I D:\Keil_v5\ARM\PACK\Keil\TM4C_DFP\1.1.0\Device\Include\TM4C129 -I D:\Keil_v5\ARM\CMSIS\Include -D__UVISION_VERSION="518" -DTM4C1294KCPDT -Drvmdk -DPART_TM4C1294KCPDT -DTARGET_IS_TM4C129_RA1 -o .\objects\mastertaskdevicework.o --omf_browse .\objects\mastertaskdevicework.crf --depend .\objects\mastertaskdevicework.d)
I (D:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x55DB2B80)
I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x55DB2B76)
I (D:\Keil_v5\ARM\ARMCC\include\stddef.h)(0x55DB2B7E)
@ -2235,13 +2235,17 @@ I (..\Src\Tm4c1294-StdLib\driverlib/sysctl.h)(0x66A99389)
I (..\Src\Tm4c1294-StdLib\driverlib/timer.h)(0x66A99389)
I (..\Src\Tm4c1294-StdLib\driverlib/interrupt.h)(0x66A99389)
I (..\Src\Tm4c1294-StdLib\inc/hw_ints.h)(0x66A99389)
I (..\Src\Usr\BSP\McuBspUart.h)(0x66A99389)
I (..\Src\Tm4c1294-StdLib\driverlib/gpio.h)(0x66A99389)
I (..\Src\Tm4c1294-StdLib\driverlib/pin_map.h)(0x66A99389)
I (..\Src\Tm4c1294-StdLib\driverlib/uart.h)(0x66A99389)
I (..\Src\Usr\Task\Task-145\Master\MasterTaskDeviceWork.h)(0x66A99389)
I (..\Src\Usr\Task\Task-145\Master\MasterTaskOutput.h)(0x66A99389)
I (..\Src\Usr\Task\Task-145\Master\MasterTaskWatchdog.h)(0x66A99389)
I (..\Src\Usr\Task\Task-145\Master\MasterTaskFile.h)(0x66A99389)
I (..\Src\Usr\Task\Task-145\Master\MasterTaskToDAS.h)(0x66A99389)
I (..\Src\Usr\Task\Task-145\Master\MasterTaskTimer.h)(0x66A99389)
F (..\Src\Usr\Task\Task-145\Master\MasterTaskTimer.c)(0x66A99389)(--c99 -c --cpu Cortex-M4.fp -g -O0 --apcs=interwork -I ..\Src\Tm4c1294-StdLib -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-BSP -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU\ARM-Cortex-M4\RealView -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\Ports -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\Ports\ARM-Cortex-M4\RealView -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Ports -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Source -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Ports\ARM-Cortex-M4\Generic\RealView -I ..\Src\Usr\BSP -I ..\Src\Usr\App\FourteenthFiveYearPlan -I ..\Src\Usr\Driver\DnDriver\ISL1208 -I ..\Src\Usr\Driver\DnDriver\SDDriver -I ..\Src\Usr\Driver\UpDriver\Fatfs -I ..\Src\Usr\Driver\UpDriver\Rtc -I ..\Src\Usr\Tool -I ..\Src\Usr\Driver\DnDriver\RS-SW-N018 -I ..\Src\Usr\Driver\UpDriver\TempAndHumi -I ..\src\Usr\Driver\UpDriver\lwip\include -I ..\src\Usr\Driver\UpDriver\lwip\include\ipv4 -I ..\Src\Usr\Task\Task-145\Master -I ..\Src\Usr\Task\Task-145\Slave -I ..\Src\Usr\Driver\UpDriver\lwip\include\arch -I E:\ZMTS_project\Git_PROJECT\14th\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE -I D:\Keil_v5\ARM\PACK\Keil\TM4C_DFP\1.1.0\Device\Include\TM4C129 -I D:\Keil_v5\ARM\CMSIS\Include -D__UVISION_VERSION="518" -DTM4C1294KCPDT -Drvmdk -DPART_TM4C1294KCPDT -DTARGET_IS_TM4C129_RA1 -o .\objects\mastertasktimer.o --omf_browse .\objects\mastertasktimer.crf --depend .\objects\mastertasktimer.d)
F (..\Src\Usr\Task\Task-145\Master\MasterTaskTimer.c)(0x66B4641F)(--c99 -c --cpu Cortex-M4.fp -g -O0 --apcs=interwork -I ..\Src\Tm4c1294-StdLib -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-BSP -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU\ARM-Cortex-M4\RealView -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\Ports -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\Ports\ARM-Cortex-M4\RealView -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Ports -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Source -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Ports\ARM-Cortex-M4\Generic\RealView -I ..\Src\Usr\BSP -I ..\Src\Usr\App\FourteenthFiveYearPlan -I ..\Src\Usr\Driver\DnDriver\ISL1208 -I ..\Src\Usr\Driver\DnDriver\SDDriver -I ..\Src\Usr\Driver\UpDriver\Fatfs -I ..\Src\Usr\Driver\UpDriver\Rtc -I ..\Src\Usr\Tool -I ..\Src\Usr\Driver\DnDriver\RS-SW-N018 -I ..\Src\Usr\Driver\UpDriver\TempAndHumi -I ..\src\Usr\Driver\UpDriver\lwip\include -I ..\src\Usr\Driver\UpDriver\lwip\include\ipv4 -I ..\Src\Usr\Task\Task-145\Master -I ..\Src\Usr\Task\Task-145\Slave -I ..\Src\Usr\Driver\UpDriver\lwip\include\arch -I E:\ZMTS_project\Git_PROJECT\14th\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE -I D:\Keil_v5\ARM\PACK\Keil\TM4C_DFP\1.1.0\Device\Include\TM4C129 -I D:\Keil_v5\ARM\CMSIS\Include -D__UVISION_VERSION="518" -DTM4C1294KCPDT -Drvmdk -DPART_TM4C1294KCPDT -DTARGET_IS_TM4C129_RA1 -o .\objects\mastertasktimer.o --omf_browse .\objects\mastertasktimer.crf --depend .\objects\mastertasktimer.d)
I (..\Src\Usr\Task\Task-145\Master\MasterTaskTimer.h)(0x66A99389)
I (..\Src\Usr\BSP\McuBspTimer.h)(0x66A99389)
I (D:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x55DB2B80)
@ -2521,7 +2525,7 @@ I (..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Source\ucos_ii.h)(0x66A99389)
I (..\Src\Usr\App\FourteenthFiveYearPlan\app_cfg.h)(0x66B17F77)
I (..\Src\Usr\App\FourteenthFiveYearPlan\os_cfg.h)(0x66A99389)
I (..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Ports\ARM-Cortex-M4\Generic\RealView\os_cpu.h)(0x66A99389)
F (..\Src\Usr\App\FourteenthFiveYearPlan\app_main.c)(0x66B17F48)(--c99 -c --cpu Cortex-M4.fp -g -O0 --apcs=interwork -I ..\Src\Tm4c1294-StdLib -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-BSP -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU\ARM-Cortex-M4\RealView -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\Ports -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\Ports\ARM-Cortex-M4\RealView -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Ports -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Source -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Ports\ARM-Cortex-M4\Generic\RealView -I ..\Src\Usr\BSP -I ..\Src\Usr\App\FourteenthFiveYearPlan -I ..\Src\Usr\Driver\DnDriver\ISL1208 -I ..\Src\Usr\Driver\DnDriver\SDDriver -I ..\Src\Usr\Driver\UpDriver\Fatfs -I ..\Src\Usr\Driver\UpDriver\Rtc -I ..\Src\Usr\Tool -I ..\Src\Usr\Driver\DnDriver\RS-SW-N018 -I ..\Src\Usr\Driver\UpDriver\TempAndHumi -I ..\src\Usr\Driver\UpDriver\lwip\include -I ..\src\Usr\Driver\UpDriver\lwip\include\ipv4 -I ..\Src\Usr\Task\Task-145\Master -I ..\Src\Usr\Task\Task-145\Slave -I ..\Src\Usr\Driver\UpDriver\lwip\include\arch -I E:\ZMTS_project\Git_PROJECT\14th\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE -I D:\Keil_v5\ARM\PACK\Keil\TM4C_DFP\1.1.0\Device\Include\TM4C129 -I D:\Keil_v5\ARM\CMSIS\Include -D__UVISION_VERSION="518" -DTM4C1294KCPDT -Drvmdk -DPART_TM4C1294KCPDT -DTARGET_IS_TM4C129_RA1 -o .\objects\app_main.o --omf_browse .\objects\app_main.crf --depend .\objects\app_main.d)
F (..\Src\Usr\App\FourteenthFiveYearPlan\app_main.c)(0x66B1CDF5)(--c99 -c --cpu Cortex-M4.fp -g -O0 --apcs=interwork -I ..\Src\Tm4c1294-StdLib -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-BSP -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-CPU\ARM-Cortex-M4\RealView -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\Ports -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB\Ports\ARM-Cortex-M4\RealView -I ..\Src\Micrium-DK-TM4C129X-OS2\uC-LIB -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Ports -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Source -I ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Ports\ARM-Cortex-M4\Generic\RealView -I ..\Src\Usr\BSP -I ..\Src\Usr\App\FourteenthFiveYearPlan -I ..\Src\Usr\Driver\DnDriver\ISL1208 -I ..\Src\Usr\Driver\DnDriver\SDDriver -I ..\Src\Usr\Driver\UpDriver\Fatfs -I ..\Src\Usr\Driver\UpDriver\Rtc -I ..\Src\Usr\Tool -I ..\Src\Usr\Driver\DnDriver\RS-SW-N018 -I ..\Src\Usr\Driver\UpDriver\TempAndHumi -I ..\src\Usr\Driver\UpDriver\lwip\include -I ..\src\Usr\Driver\UpDriver\lwip\include\ipv4 -I ..\Src\Usr\Task\Task-145\Master -I ..\Src\Usr\Task\Task-145\Slave -I ..\Src\Usr\Driver\UpDriver\lwip\include\arch -I E:\ZMTS_project\Git_PROJECT\14th\20231023_InSituLab_emb\InsituLabProject_QRS\Project\RTE -I D:\Keil_v5\ARM\PACK\Keil\TM4C_DFP\1.1.0\Device\Include\TM4C129 -I D:\Keil_v5\ARM\CMSIS\Include -D__UVISION_VERSION="518" -DTM4C1294KCPDT -Drvmdk -DPART_TM4C1294KCPDT -DTARGET_IS_TM4C129_RA1 -o .\objects\app_main.o --omf_browse .\objects\app_main.crf --depend .\objects\app_main.d)
I (D:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x55DB2B80)
I (D:\Keil_v5\ARM\ARMCC\include\stdbool.h)(0x55DB2B76)
I (D:\Keil_v5\ARM\ARMCC\include\stddef.h)(0x55DB2B7E)

View File

@ -27,15 +27,33 @@ Project File Date: 07/31/2024
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 1 (build 61)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
Build target 'InsituLab'
compiling MasterTaskTimer.c...
compiling app_main.c...
..\Src\Usr\App\FourteenthFiveYearPlan\app_main.c(135): warning: #177-D: variable "AppTaskDasHeartStk" was declared but never referenced
static OS_STK AppTaskDasHeartStk[APP_CFG_TASK_DAS_HEART_STK_SIZE];
..\Src\Usr\App\FourteenthFiveYearPlan\app_main.c(143): warning: #177-D: variable "AppTaskBSRecvStk" was declared but never referenced
static OS_STK AppTaskBSRecvStk[APP_CFG_TASK_BS_RECV_STK_SIZE];
..\Src\Usr\App\FourteenthFiveYearPlan\app_main.c(144): warning: #177-D: variable "AppTaskBSSortStk" was declared but never referenced
static OS_STK AppTaskBSSortStk[APP_CFG_TASK_BS_SORT_STK_SIZE];
..\Src\Usr\App\FourteenthFiveYearPlan\app_main.c(145): warning: #177-D: variable "AppTaskBSHandleStk" was declared but never referenced
static OS_STK AppTaskBSHandleStk[APP_CFG_TASK_BS_HANDLE_STK_SIZE];
..\Src\Usr\App\FourteenthFiveYearPlan\app_main.c(178): warning: #177-D: variable "AppTaskWitchDogStk" was declared but never referenced
static OS_STK AppTaskWitchDogStk[APP_CFG_TASK_WTACHDOG_STK_SIZE];
..\Src\Usr\App\FourteenthFiveYearPlan\app_main.c: 5 warnings, 0 errors
compiling MasterTaskRun.c...
compiling MasterTaskDeviceWork.c...
linking...
Program Size: Code=175924 RO-data=7064 RW-data=2668 ZI-data=231044
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).
".\Objects\The14thPlan.axf" - 0 Error(s), 5 Warning(s).
<h2>Collection of Component include folders:</h2>
E:\ZMTS_project\Git_PROJECT\14th\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:01
Build Time Elapsed: 00:00:04
</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

@ -22,6 +22,12 @@
.\objects\mastertaskdevicework.o: ..\Src\Tm4c1294-StdLib\driverlib/timer.h
.\objects\mastertaskdevicework.o: ..\Src\Tm4c1294-StdLib\driverlib/interrupt.h
.\objects\mastertaskdevicework.o: ..\Src\Tm4c1294-StdLib\inc/hw_ints.h
.\objects\mastertaskdevicework.o: ..\Src\Usr\BSP\McuBspUart.h
.\objects\mastertaskdevicework.o: ..\Src\Micrium-DK-TM4C129X-OS2\uCOS-II\Source\os.h
.\objects\mastertaskdevicework.o: ..\Src\Micrium-DK-TM4C129X-OS2\uC-BSP\bsp_sys.h
.\objects\mastertaskdevicework.o: ..\Src\Tm4c1294-StdLib\driverlib/gpio.h
.\objects\mastertaskdevicework.o: ..\Src\Tm4c1294-StdLib\driverlib/pin_map.h
.\objects\mastertaskdevicework.o: ..\Src\Tm4c1294-StdLib\driverlib/uart.h
.\objects\mastertaskdevicework.o: ..\Src\Usr\Task\Task-145\Master\MasterTaskDeviceWork.h
.\objects\mastertaskdevicework.o: ..\Src\Usr\Task\Task-145\Master\MasterTaskOutput.h
.\objects\mastertaskdevicework.o: ..\Src\Usr\Task\Task-145\Master\MasterTaskWatchdog.h

View File

@ -336,6 +336,7 @@ static void AppTaskMasterStart (void *p_arg)
MT_VCBInit();
MT_InsideEnvInit();
MT_TimerInit();
MT_DeviceWorkInit();
/*************************************************************************************/
AppTaskMasterCreate(); /* Creates all the necessary application tasks. */
@ -507,16 +508,16 @@ static void AppTaskMasterCreate (void)
(INT32U ) APP_CFG_TASK_DAS_HANDLE_STK_SIZE,
(void *) 0,
(INT16U )(OS_TASK_OPT_STK_CHK | OS_TASK_OPT_STK_CLR));
/* DAS心跳监控任务 */
OSTaskCreateExt((void (*)(void *)) MT_DasHeartMonitor,
(void *) 0,
(OS_STK *)&AppTaskDasHeartStk[APP_CFG_TASK_DAS_HEART_STK_SIZE - 1],
(INT8U ) APP_CFG_TASK_DAS_HEART_PRIO,
(INT16U ) APP_CFG_TASK_DAS_HEART_PRIO,
(OS_STK *)&AppTaskDasHeartStk[0],
(INT32U ) APP_CFG_TASK_DAS_HEART_STK_SIZE,
(void *) 0,
(INT16U )(OS_TASK_OPT_STK_CHK | OS_TASK_OPT_STK_CLR));
// /* DAS心跳监控任务 */
// OSTaskCreateExt((void (*)(void *)) MT_DasHeartMonitor,
// (void *) 0,
// (OS_STK *)&AppTaskDasHeartStk[APP_CFG_TASK_DAS_HEART_STK_SIZE - 1],
// (INT8U ) APP_CFG_TASK_DAS_HEART_PRIO,
// (INT16U ) APP_CFG_TASK_DAS_HEART_PRIO,
// (OS_STK *)&AppTaskDasHeartStk[0],
// (INT32U ) APP_CFG_TASK_DAS_HEART_STK_SIZE,
// (void *) 0,
// (INT16U )(OS_TASK_OPT_STK_CHK | OS_TASK_OPT_STK_CLR));
/* DAS状态数据发送任务 */
OSTaskCreateExt((void (*)(void *)) MT_ToDASSendOutputSta,
(void *) 0,
@ -647,36 +648,36 @@ static void AppTaskMasterCreate (void)
(INT32U ) APP_CFG_TASK_VCB_STK_SIZE,
(void *) 0,
(INT16U )(OS_TASK_OPT_STK_CHK | OS_TASK_OPT_STK_CLR));
/* 基站通信接收任务 */
OSTaskCreateExt((void (*)(void *)) MT_ToBaseStationRecv,
(void *) 0,
(OS_STK *)&AppTaskBSRecvStk[APP_CFG_TASK_BS_RECV_STK_SIZE - 1],
(INT8U ) APP_CFG_TASK_BS_RECV_PRIO,
(INT16U ) APP_CFG_TASK_BS_RECV_PRIO,
(OS_STK *)&AppTaskBSRecvStk[0],
(INT32U ) APP_CFG_TASK_BS_RECV_STK_SIZE,
(void *) 0,
(INT16U )(OS_TASK_OPT_STK_CHK | OS_TASK_OPT_STK_CLR));
/* 基站通信分拣任务 */
OSTaskCreateExt((void (*)(void *)) MT_ToBaseStationSort,
(void *) 0,
(OS_STK *)&AppTaskBSSortStk[APP_CFG_TASK_BS_SORT_STK_SIZE - 1],
(INT8U ) APP_CFG_TASK_BS_SORT_PRIO,
(INT16U ) APP_CFG_TASK_BS_SORT_PRIO,
(OS_STK *)&AppTaskBSSortStk[0],
(INT32U ) APP_CFG_TASK_BS_SORT_STK_SIZE,
(void *) 0,
(INT16U )(OS_TASK_OPT_STK_CHK | OS_TASK_OPT_STK_CLR));
/* 基站通信处理任务 */
OSTaskCreateExt((void (*)(void *)) MT_ToBaseStationHandle,
(void *) 0,
(OS_STK *)&AppTaskBSHandleStk[APP_CFG_TASK_BS_HANDLE_STK_SIZE - 1],
(INT8U ) APP_CFG_TASK_BS_HANDLE_PRIO,
(INT16U ) APP_CFG_TASK_BS_HANDLE_PRIO,
(OS_STK *)&AppTaskBSHandleStk[0],
(INT32U ) APP_CFG_TASK_BS_HANDLE_STK_SIZE,
(void *) 0,
(INT16U )(OS_TASK_OPT_STK_CHK | OS_TASK_OPT_STK_CLR));
// /* 基站通信接收任务 */
// OSTaskCreateExt((void (*)(void *)) MT_ToBaseStationRecv,
// (void *) 0,
// (OS_STK *)&AppTaskBSRecvStk[APP_CFG_TASK_BS_RECV_STK_SIZE - 1],
// (INT8U ) APP_CFG_TASK_BS_RECV_PRIO,
// (INT16U ) APP_CFG_TASK_BS_RECV_PRIO,
// (OS_STK *)&AppTaskBSRecvStk[0],
// (INT32U ) APP_CFG_TASK_BS_RECV_STK_SIZE,
// (void *) 0,
// (INT16U )(OS_TASK_OPT_STK_CHK | OS_TASK_OPT_STK_CLR));
// /* 基站通信分拣任务 */
// OSTaskCreateExt((void (*)(void *)) MT_ToBaseStationSort,
// (void *) 0,
// (OS_STK *)&AppTaskBSSortStk[APP_CFG_TASK_BS_SORT_STK_SIZE - 1],
// (INT8U ) APP_CFG_TASK_BS_SORT_PRIO,
// (INT16U ) APP_CFG_TASK_BS_SORT_PRIO,
// (OS_STK *)&AppTaskBSSortStk[0],
// (INT32U ) APP_CFG_TASK_BS_SORT_STK_SIZE,
// (void *) 0,
// (INT16U )(OS_TASK_OPT_STK_CHK | OS_TASK_OPT_STK_CLR));
// /* 基站通信处理任务 */
// OSTaskCreateExt((void (*)(void *)) MT_ToBaseStationHandle,
// (void *) 0,
// (OS_STK *)&AppTaskBSHandleStk[APP_CFG_TASK_BS_HANDLE_STK_SIZE - 1],
// (INT8U ) APP_CFG_TASK_BS_HANDLE_PRIO,
// (INT16U ) APP_CFG_TASK_BS_HANDLE_PRIO,
// (OS_STK *)&AppTaskBSHandleStk[0],
// (INT32U ) APP_CFG_TASK_BS_HANDLE_STK_SIZE,
// (void *) 0,
// (INT16U )(OS_TASK_OPT_STK_CHK | OS_TASK_OPT_STK_CLR));
/* GCMS工作任务 */
OSTaskCreateExt((void (*)(void *)) MT_GCMSWork,
(void *) 0,
@ -827,16 +828,16 @@ static void AppTaskMasterCreate (void)
(INT32U ) APP_CFG_TASK_VEDIO2_STK_SIZE,
(void *) 0,
(INT16U )(OS_TASK_OPT_STK_CHK | OS_TASK_OPT_STK_CLR));
/* 看门狗工作任务 */
OSTaskCreateExt((void (*)(void *)) MT_WDOG,
(void *) 0,
(OS_STK *)&AppTaskWitchDogStk[APP_CFG_TASK_WTACHDOG_STK_SIZE - 1],
(INT8U ) APP_CFG_TASK_WTACHDOG_PRIO,
(INT16U ) APP_CFG_TASK_WTACHDOG_PRIO,
(OS_STK *)&AppTaskWitchDogStk[0],
(INT32U ) APP_CFG_TASK_WTACHDOG_STK_SIZE,
(void *) 0,
(INT16U )(OS_TASK_OPT_STK_CHK | OS_TASK_OPT_STK_CLR));
// /* 看门狗工作任务 */
// OSTaskCreateExt((void (*)(void *)) MT_WDOG,
// (void *) 0,
// (OS_STK *)&AppTaskWitchDogStk[APP_CFG_TASK_WTACHDOG_STK_SIZE - 1],
// (INT8U ) APP_CFG_TASK_WTACHDOG_PRIO,
// (INT16U ) APP_CFG_TASK_WTACHDOG_PRIO,
// (OS_STK *)&AppTaskWitchDogStk[0],
// (INT32U ) APP_CFG_TASK_WTACHDOG_STK_SIZE,
// (void *) 0,
// (INT16U )(OS_TASK_OPT_STK_CHK | OS_TASK_OPT_STK_CLR));
/* 定时器工作任务 */
OSTaskCreateExt((void (*)(void *)) MT_Timer,
(void *) 0,

View File

@ -6,6 +6,7 @@
#include <os.h>
#include "McuBspTimer.h"
#include "McuBspUart.h"
#include "MasterTaskDeviceWork.h"
#include "MasterTaskOutput.h"
@ -62,6 +63,12 @@
#define JOIN_VEDIO2_WORK_TASK "MT_VEDIO2_WORK: Join in!!\n"
#define JOIN_ADCP_WORK_TASK "MT_ADCP_WORK: Join in!!\n"
#define MASTER_UART_ID MCU_BSP_UART3
#define MASTER_UART_BANDRATE MCU_BSP_UART_BANDRATE_9600
#define MASTER_UART_DATABIT MCU_BSP_UART_DATABIT_8
#define MASTER_UART_STOPBIT MCU_BSP_UART_STOPBIT_ONE
#define MASTER_UART_CHECKBIT MCU_BSP_UART_CHECKBIT_NONE
typedef struct {
uint8_t enable; // 设备是否被使能
@ -78,27 +85,48 @@ typedef struct {
static uint32_t gs_eswitchFlag = 0;
static uint32_t gs_ipcFlag = 0;
static DEV_WORK_PARA gs_workPara[ALL_TYPE_NUM] = {{WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0},
{WORK_DISABLE, STATE_OFF, 7200, 3600, 1800, -1, -1, 0, 0},
{WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0},
{WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0},
{WORK_DISABLE, STATE_OFF, 1800, 288000, 0, -1, -1, 0, 0},
{WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0},
{WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0},
{WORK_DISABLE, STATE_OFF, 0, 1200, 0, -1, -1, 0, 0},
{WORK_DISABLE, STATE_OFF, 900, 60, 0, -1, -1, 0, 0},
{WORK_DISABLE, STATE_OFF, 1800, 60, 0, -1, -1, 0, 0},
{WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0},
{WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0},
{WORK_DISABLE, STATE_OFF, 900, 3600, 0, -1, -1, 0, 0},
{WORK_DISABLE, STATE_OFF, 1800, 3600, 2400, -1, -1, 0, 0},
{WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0},
{WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0},
{WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0},
{WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0}};
//static DEV_WORK_PARA gs_workPara[ALL_TYPE_NUM] = {{WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0}, // IPC_TYPE
// {WORK_DISABLE, STATE_OFF, 7200, 3600, 1800, -1, -1, 0, 0}, // GCMS_TYPE
// {WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0}, // SERIAL_PORT1_TYPE
// {WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0}, // SERIAL_PORT2_TYPE
// {WORK_DISABLE, STATE_OFF, 1800, 288000, 0, -1, -1, 0, 0}, // OSC_TYPE
// {WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0}, // ADCP_TYPE
// {WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0}, // CTDO_TYPE
// {WORK_DISABLE, STATE_OFF, 0, 1200, 0, -1, -1, 0, 0}, // GC_TYPE
// {WORK_DISABLE, STATE_OFF, 900, 60, 0, -1, -1, 0, 0}, // CH4_TYPE
// {WORK_DISABLE, STATE_OFF, 1800, 60, 0, -1, -1, 0, 0}, // CO2_TYPE
// {WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0}, // NET_TYPE
// {WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0}, // ICL_TYPE
// {WORK_DISABLE, STATE_OFF, 900, 3600, 0, -1, -1, 0, 0}, // RAMAN_TYPE
// {WORK_DISABLE, STATE_OFF, 1800, 3600, 2400, -1, -1, 0, 0}, // MS_TYPE
// {WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0}, // ACOUSTIC_TYPE
// {WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0}, // VEDIO1_TYPE
// {WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0}, // VEDIO2_TYPE
// {WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0}}; // ESWITCH2_TYPE
static DEV_WORK_PARA gs_workPara[ALL_TYPE_NUM] = {{WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0}, // IPC_TYPE
{WORK_DISABLE, STATE_OFF, 20, 10, 5, -1, -1, 0, 0}, // GCMS_TYPE
{WORK_DISABLE, STATE_OFF, 20, 10, 0, -1, -1, 0, 0}, // SERIAL_PORT1_TYPE
{WORK_DISABLE, STATE_OFF, 20, 0, 5, -1, -1, 0, 0}, // SERIAL_PORT2_TYPE
{WORK_DISABLE, STATE_OFF, 20, 0, 0, -1, -1, 0, 0}, // OSC_TYPE
{WORK_DISABLE, STATE_OFF, 0, 10, 5, -1, -1, 0, 0}, // ADCP_TYPE
{WORK_DISABLE, STATE_OFF, 0, 10, 0, -1, -1, 0, 0}, // CTDO_TYPE
{WORK_DISABLE, STATE_OFF, 0, 10, 0, -1, -1, 0, 0}, // GC_TYPE
{WORK_DISABLE, STATE_OFF, 0, 0, 5, -1, -1, 0, 0}, // CH4_TYPE
{WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0}, // CO2_TYPE
{WORK_DISABLE, STATE_OFF, 20, 10, 5, -1, -1, 0, 0}, // NET_TYPE
{WORK_DISABLE, STATE_OFF, 20, 10, 5, -1, -1, 0, 0}, // ICL_TYPE
{WORK_DISABLE, STATE_OFF, 20, 10, 5, -1, -1, 0, 0}, // RAMAN_TYPE
{WORK_DISABLE, STATE_OFF, 0, 10, 5, -1, -1, 0, 0}, // MS_TYPE
{WORK_DISABLE, STATE_OFF, 20, 10, 0, -1, -1, 0, 0}, // ACOUSTIC_TYPE
{WORK_DISABLE, STATE_OFF, 20, 0, 0, -1, -1, 0, 0}, // VEDIO1_TYPE
{WORK_DISABLE, STATE_OFF, 0, 0, 5, -1, -1, 0, 0}, // VEDIO2_TYPE
{WORK_DISABLE, STATE_OFF, 0, 0, 0, -1, -1, 0, 0}}; // ESWITCH2_TYPE
static unsigned short gs_ctrlSerial = 0;
/* 用于对工控机关机的延迟 */
static int gs_IpcCloseTimer = -1;
/* 用户交换机2关机的延迟 */
static int gs_EswitchCloseTimer = -1;
static void McuBspTimer1aIntHandler(void);
@ -179,6 +207,9 @@ static void MT_VEDIO2WorkToOff(void);
static int MT_DeviceWorkCtl(uint8_t devType, uint8_t mode);
static void MT_DeviceIpcCloseCallback(void);
static void MT_DeviceEswitchCloseCallback(void);
/* 关于所有设备的相关内容的初始化函数 */
void MT_DeviceWorkInit(void)
@ -191,7 +222,15 @@ void MT_DeviceWorkInit(void)
BSP_IntVectSet((CPU_INT08U)BSP_INT_ID_TMR1A, (CPU_FNCT_VOID)McuBspTimer1aIntHandler);
BSP_IntEn(BSP_INT_ID_TMR1A);
TimerIntEnable(TIMER1_BASE, TIMER_TIMA_TIMEOUT);
TimerEnable(TIMER1_BASE, TIMER_A);
TimerEnable(TIMER1_BASE, TIMER_A);
/* 注册工控机关机延迟定时器 */
gs_IpcCloseTimer = MT_TimerRegEventId();
/* 注册 */
gs_EswitchCloseTimer = MT_TimerRegEventId();
/* 测试使用 */
McuBspUartInit(MASTER_UART_ID, MASTER_UART_BANDRATE, MASTER_UART_DATABIT,
MASTER_UART_STOPBIT, MASTER_UART_CHECKBIT);
}
static void McuBspTimer1aIntHandler(void)
@ -228,6 +267,8 @@ void MT_GCMSWork(void *arg)
MT_DeviceWorkDisable(gs_workPara[GCMS_TYPE].timeSeqId, GCMS_TYPE);
continue;
}
/* 测试打印 */
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"GCMS JOIN PREHEAT", strlen("GCMS JOIN PREHEAT"));
/****************** 第一工作阶段,预热等待 ************************/
while (1) {
OSTimeDly(100);
@ -264,12 +305,14 @@ void MT_GCMSWork(void *arg)
if (gs_workPara[GCMS_TYPE].enable != WORK_ENABLE) {
continue; // 外部有强制关机的动作
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"GCMS JOIN analysis", strlen("GCMS JOIN analysis"));
/************************* 第二工作阶段,循环分析 **************************/
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[GCMS_TYPE].watchdogId);
if (gs_workPara[GCMS_TYPE].workTime < (gs_workPara[GCMS_TYPE].analysisTime + gs_workPara[GCMS_TYPE].offTime)) {
/* 说明已经不足以进行下一次的循环分析了,进行关机操作 */
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"GCMS JOIN OFF", strlen("GCMS JOIN OFF"));
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[GCMS_TYPE].watchdogId);
@ -356,6 +399,7 @@ void MT_SERIAL1Work(void *arg)
MT_DeviceWorkDisable(gs_workPara[SERIAL_PORT1_TYPE].timeSeqId, SERIAL_PORT1_TYPE);
continue;
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"SERIAL1 JOIN PREHEAT", strlen("SERIAL1 JOIN PREHEAT"));
/****************** 第一工作阶段,预热等待 ************************/
while (1) {
OSTimeDly(100);
@ -392,12 +436,14 @@ void MT_SERIAL1Work(void *arg)
if (gs_workPara[SERIAL_PORT1_TYPE].enable != WORK_ENABLE) {
continue; // 外部有强制关机的动作
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"SERIAL1 JOIN analysis", strlen("SERIAL1 JOIN analysis"));
/************************* 第二工作阶段,循环分析 **************************/
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[SERIAL_PORT1_TYPE].watchdogId);
if (gs_workPara[SERIAL_PORT1_TYPE].workTime < (gs_workPara[SERIAL_PORT1_TYPE].analysisTime + gs_workPara[SERIAL_PORT1_TYPE].offTime)) {
/* 说明已经不足以进行下一次的循环分析了,进行关机操作 */
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"SERIAL1 JOIN OFF", strlen("SERIAL1 JOIN OFF"));
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[SERIAL_PORT1_TYPE].watchdogId);
@ -485,6 +531,7 @@ void MT_SERIAL2Work(void *arg)
MT_DeviceWorkDisable(gs_workPara[SERIAL_PORT2_TYPE].timeSeqId, SERIAL_PORT2_TYPE);
continue;
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"SERIAL2 JOIN PREHEAT", strlen("SERIAL2 JOIN PREHEAT"));
/****************** 第一工作阶段,预热等待 ************************/
while (1) {
OSTimeDly(100);
@ -521,12 +568,14 @@ void MT_SERIAL2Work(void *arg)
if (gs_workPara[SERIAL_PORT2_TYPE].enable != WORK_ENABLE) {
continue; // 外部有强制关机的动作
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"SERIAL2 JOIN analysis", strlen("SERIAL2 JOIN analysis"));
/************************* 第二工作阶段,循环分析 **************************/
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[SERIAL_PORT2_TYPE].watchdogId);
if (gs_workPara[SERIAL_PORT2_TYPE].workTime < (gs_workPara[SERIAL_PORT2_TYPE].analysisTime + gs_workPara[SERIAL_PORT2_TYPE].offTime)) {
/* 说明已经不足以进行下一次的循环分析了,进行关机操作 */
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"SERIAL2 JOIN OFF", strlen("SERIAL2 JOIN OFF"));
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[SERIAL_PORT2_TYPE].watchdogId);
@ -613,6 +662,7 @@ void MT_OSCWork(void *arg)
MT_DeviceWorkDisable(gs_workPara[OSC_TYPE].timeSeqId, OSC_TYPE);
continue;
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"OSC JOIN PREHEAT", strlen("OSC JOIN PREHEAT"));
/****************** 第一工作阶段,预热等待 ************************/
while (1) {
OSTimeDly(100);
@ -649,12 +699,14 @@ void MT_OSCWork(void *arg)
if (gs_workPara[OSC_TYPE].enable != WORK_ENABLE) {
continue; // 外部有强制关机的动作
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"OSC JOIN analysis", strlen("OSC JOIN analysis"));
/************************* 第二工作阶段,循环分析 **************************/
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[OSC_TYPE].watchdogId);
if (gs_workPara[OSC_TYPE].workTime < (gs_workPara[OSC_TYPE].analysisTime + gs_workPara[OSC_TYPE].offTime)) {
/* 说明已经不足以进行下一次的循环分析了,进行关机操作 */
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"OSC JOIN OFF", strlen("OSC JOIN OFF"));
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[OSC_TYPE].watchdogId);
@ -741,6 +793,7 @@ void MT_ADCPWork(void *arg)
MT_DeviceWorkDisable(gs_workPara[ADCP_TYPE].timeSeqId, ADCP_TYPE);
continue;
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"ADCP JOIN PREHEAT", strlen("ADCP JOIN PREHEAT"));
/****************** 第一工作阶段,预热等待 ************************/
while (1) {
OSTimeDly(100);
@ -777,12 +830,14 @@ void MT_ADCPWork(void *arg)
if (gs_workPara[ADCP_TYPE].enable != WORK_ENABLE) {
continue; // 外部有强制关机的动作
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"ADCP JOIN analysis", strlen("ADCP JOIN analysis"));
/************************* 第二工作阶段,循环分析 **************************/
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[ADCP_TYPE].watchdogId);
if (gs_workPara[ADCP_TYPE].workTime < (gs_workPara[ADCP_TYPE].analysisTime + gs_workPara[ADCP_TYPE].offTime)) {
/* 说明已经不足以进行下一次的循环分析了,进行关机操作 */
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"ADCP JOIN OFF", strlen("ADCP JOIN OFF"));
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[ADCP_TYPE].watchdogId);
@ -869,6 +924,7 @@ void MT_GCWork(void *arg)
MT_DeviceWorkDisable(gs_workPara[GC_TYPE].timeSeqId, GC_TYPE);
continue;
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"GC JOIN PREHEAT", strlen("GC JOIN PREHEAT"));
/****************** 第一工作阶段,预热等待 ************************/
while (1) {
OSTimeDly(100);
@ -905,12 +961,14 @@ void MT_GCWork(void *arg)
if (gs_workPara[GC_TYPE].enable != WORK_ENABLE) {
continue; // 外部有强制关机的动作
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"GC JOIN analysis", strlen("GC JOIN analysis"));
/************************* 第二工作阶段,循环分析 **************************/
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[GC_TYPE].watchdogId);
if (gs_workPara[GC_TYPE].workTime < (gs_workPara[GC_TYPE].analysisTime + gs_workPara[GC_TYPE].offTime)) {
/* 说明已经不足以进行下一次的循环分析了,进行关机操作 */
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"GC JOIN OFF", strlen("GC JOIN OFF"));
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[GC_TYPE].watchdogId);
@ -997,6 +1055,7 @@ void MT_CH4Work(void *arg)
MT_DeviceWorkDisable(gs_workPara[CH4_TYPE].timeSeqId, CH4_TYPE);
continue;
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"CH4 JOIN PREHEAT", strlen("CH4 JOIN PREHEAT"));
/****************** 第一工作阶段,预热等待 ************************/
while (1) {
OSTimeDly(100);
@ -1033,12 +1092,14 @@ void MT_CH4Work(void *arg)
if (gs_workPara[CH4_TYPE].enable != WORK_ENABLE) {
continue; // 外部有强制关机的动作
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"CH4 JOIN analysis", strlen("CH4 JOIN analysis"));
/************************* 第二工作阶段,循环分析 **************************/
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[CH4_TYPE].watchdogId);
if (gs_workPara[CH4_TYPE].workTime < (gs_workPara[CH4_TYPE].analysisTime + gs_workPara[CH4_TYPE].offTime)) {
/* 说明已经不足以进行下一次的循环分析了,进行关机操作 */
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"CH4 JOIN OFF", strlen("CH4 JOIN OFF"));
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[CH4_TYPE].watchdogId);
@ -1125,6 +1186,7 @@ void MT_CO2Work(void *arg)
MT_DeviceWorkDisable(gs_workPara[CO2_TYPE].timeSeqId, CO2_TYPE);
continue;
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"CO2 JOIN PREHEAT", strlen("CO2 JOIN PREHEAT"));
/****************** 第一工作阶段,预热等待 ************************/
while (1) {
OSTimeDly(100);
@ -1161,12 +1223,14 @@ void MT_CO2Work(void *arg)
if (gs_workPara[CO2_TYPE].enable != WORK_ENABLE) {
continue; // 外部有强制关机的动作
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"CO2 JOIN analysis", strlen("CO2 JOIN analysis"));
/************************* 第二工作阶段,循环分析 **************************/
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[CO2_TYPE].watchdogId);
if (gs_workPara[CO2_TYPE].workTime < (gs_workPara[CO2_TYPE].analysisTime + gs_workPara[CO2_TYPE].offTime)) {
/* 说明已经不足以进行下一次的循环分析了,进行关机操作 */
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"CO2 JOIN OFF", strlen("CO2 JOIN OFF"));
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[CO2_TYPE].watchdogId);
@ -1253,6 +1317,7 @@ void MT_NETWork(void *arg)
MT_DeviceWorkDisable(gs_workPara[NET_TYPE].timeSeqId, NET_TYPE);
continue;
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"NET JOIN PREHEAT", strlen("NET JOIN PREHEAT"));
/****************** 第一工作阶段,预热等待 ************************/
while (1) {
OSTimeDly(100);
@ -1289,12 +1354,14 @@ void MT_NETWork(void *arg)
if (gs_workPara[NET_TYPE].enable != WORK_ENABLE) {
continue; // 外部有强制关机的动作
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"NET JOIN analysis", strlen("NET JOIN analysis"));
/************************* 第二工作阶段,循环分析 **************************/
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[NET_TYPE].watchdogId);
if (gs_workPara[NET_TYPE].workTime < (gs_workPara[NET_TYPE].analysisTime + gs_workPara[NET_TYPE].offTime)) {
/* 说明已经不足以进行下一次的循环分析了,进行关机操作 */
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"NET JOIN OFF", strlen("NET JOIN OFF"));
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[NET_TYPE].watchdogId);
@ -1381,6 +1448,7 @@ void MT_ICLWork(void *arg)
MT_DeviceWorkDisable(gs_workPara[ICL_TYPE].timeSeqId, ICL_TYPE);
continue;
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"ICL JOIN PREHEAT", strlen("ICL JOIN PREHEAT"));
/****************** 第一工作阶段,预热等待 ************************/
while (1) {
OSTimeDly(100);
@ -1417,12 +1485,14 @@ void MT_ICLWork(void *arg)
if (gs_workPara[ICL_TYPE].enable != WORK_ENABLE) {
continue; // 外部有强制关机的动作
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"ICL JOIN analysis", strlen("ICL JOIN analysis"));
/************************* 第二工作阶段,循环分析 **************************/
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[ICL_TYPE].watchdogId);
if (gs_workPara[ICL_TYPE].workTime < (gs_workPara[ICL_TYPE].analysisTime + gs_workPara[ICL_TYPE].offTime)) {
/* 说明已经不足以进行下一次的循环分析了,进行关机操作 */
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"ICL JOIN OFF", strlen("ICL JOIN OFF"));
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[ICL_TYPE].watchdogId);
@ -1509,6 +1579,7 @@ void MT_RAMANWork(void *arg)
MT_DeviceWorkDisable(gs_workPara[RAMAN_TYPE].timeSeqId, RAMAN_TYPE);
continue;
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"RAMAN JOIN PREHEAT", strlen("RAMAN JOIN PREHEAT"));
/****************** 第一工作阶段,预热等待 ************************/
while (1) {
OSTimeDly(100);
@ -1545,12 +1616,14 @@ void MT_RAMANWork(void *arg)
if (gs_workPara[RAMAN_TYPE].enable != WORK_ENABLE) {
continue; // 外部有强制关机的动作
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"RAMAN JOIN analysis", strlen("RAMAN JOIN analysis"));
/************************* 第二工作阶段,循环分析 **************************/
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[RAMAN_TYPE].watchdogId);
if (gs_workPara[RAMAN_TYPE].workTime < (gs_workPara[RAMAN_TYPE].analysisTime + gs_workPara[RAMAN_TYPE].offTime)) {
/* 说明已经不足以进行下一次的循环分析了,进行关机操作 */
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"RAMAN JOIN OFF", strlen("RAMAN JOIN OFF"));
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[RAMAN_TYPE].watchdogId);
@ -1637,6 +1710,7 @@ void MT_MSWork(void *arg)
MT_DeviceWorkDisable(gs_workPara[MS_TYPE].timeSeqId, MS_TYPE);
continue;
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"MS JOIN PREHEAT", strlen("MS JOIN PREHEAT"));
/****************** 第一工作阶段,预热等待 ************************/
while (1) {
OSTimeDly(100);
@ -1673,12 +1747,14 @@ void MT_MSWork(void *arg)
if (gs_workPara[MS_TYPE].enable != WORK_ENABLE) {
continue; // 外部有强制关机的动作
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"MS JOIN analysis", strlen("MS JOIN analysis"));
/************************* 第二工作阶段,循环分析 **************************/
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[MS_TYPE].watchdogId);
if (gs_workPara[MS_TYPE].workTime < (gs_workPara[MS_TYPE].analysisTime + gs_workPara[MS_TYPE].offTime)) {
/* 说明已经不足以进行下一次的循环分析了,进行关机操作 */
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"MS JOIN OFF", strlen("MS JOIN OFF"));
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[MS_TYPE].watchdogId);
@ -1765,6 +1841,7 @@ void MT_ACOUSTICWork(void *arg)
MT_DeviceWorkDisable(gs_workPara[ACOUSTIC_TYPE].timeSeqId, ACOUSTIC_TYPE);
continue;
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"ACOUSTIC JOIN PREHEAT", strlen("ACOUSTIC JOIN PREHEAT"));
/****************** 第一工作阶段,预热等待 ************************/
while (1) {
OSTimeDly(100);
@ -1801,12 +1878,14 @@ void MT_ACOUSTICWork(void *arg)
if (gs_workPara[ACOUSTIC_TYPE].enable != WORK_ENABLE) {
continue; // 外部有强制关机的动作
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"ACOUSTIC JOIN analysis", strlen("ACOUSTIC JOIN analysis"));
/************************* 第二工作阶段,循环分析 **************************/
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[ACOUSTIC_TYPE].watchdogId);
if (gs_workPara[ACOUSTIC_TYPE].workTime < (gs_workPara[ACOUSTIC_TYPE].analysisTime + gs_workPara[ACOUSTIC_TYPE].offTime)) {
/* 说明已经不足以进行下一次的循环分析了,进行关机操作 */
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"ACOUSTIC JOIN OFF", strlen("ACOUSTIC JOIN OFF"));
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[ACOUSTIC_TYPE].watchdogId);
@ -1893,6 +1972,7 @@ void MT_VEDIO1Work(void *arg)
MT_DeviceWorkDisable(gs_workPara[VEDIO1_TYPE].timeSeqId, VEDIO1_TYPE);
continue;
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"VEDIO1 JOIN PREHEAT", strlen("VEDIO1 JOIN PREHEAT"));
/****************** 第一工作阶段,预热等待 ************************/
while (1) {
OSTimeDly(100);
@ -1929,12 +2009,14 @@ void MT_VEDIO1Work(void *arg)
if (gs_workPara[VEDIO1_TYPE].enable != WORK_ENABLE) {
continue; // 外部有强制关机的动作
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"VEDIO1 JOIN analysis", strlen("VEDIO1 JOIN analysis"));
/************************* 第二工作阶段,循环分析 **************************/
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[VEDIO1_TYPE].watchdogId);
if (gs_workPara[VEDIO1_TYPE].workTime < (gs_workPara[VEDIO1_TYPE].analysisTime + gs_workPara[VEDIO1_TYPE].offTime)) {
/* 说明已经不足以进行下一次的循环分析了,进行关机操作 */
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"VEDIO1 JOIN OFF", strlen("VEDIO1 JOIN OFF"));
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[VEDIO1_TYPE].watchdogId);
@ -2021,6 +2103,7 @@ void MT_VEDIO2Work(void *arg)
MT_DeviceWorkDisable(gs_workPara[VEDIO2_TYPE].timeSeqId, VEDIO2_TYPE);
continue;
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"VEDIO2 JOIN PREHEAT", strlen("VEDIO2 JOIN PREHEAT"));
/****************** 第一工作阶段,预热等待 ************************/
while (1) {
OSTimeDly(100);
@ -2057,12 +2140,14 @@ void MT_VEDIO2Work(void *arg)
if (gs_workPara[VEDIO2_TYPE].enable != WORK_ENABLE) {
continue; // 外部有强制关机的动作
}
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"VEDIO2 JOIN analysis", strlen("VEDIO2 JOIN analysis"));
/************************* 第二工作阶段,循环分析 **************************/
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[VEDIO2_TYPE].watchdogId);
if (gs_workPara[VEDIO2_TYPE].workTime < (gs_workPara[VEDIO2_TYPE].analysisTime + gs_workPara[VEDIO2_TYPE].offTime)) {
/* 说明已经不足以进行下一次的循环分析了,进行关机操作 */
McuBspUartSendData(MASTER_UART_ID, (uint8_t *)"VEDIO2 JOIN OFF", strlen("VEDIO2 JOIN OFF"));
while (1) {
OSTimeDly(1000);
MT_WDOGFreed(gs_workPara[VEDIO2_TYPE].watchdogId);
@ -2177,19 +2262,14 @@ int MT_DeviceWorkDisable(uint8_t timeSeqId, uint8_t deviceId)
deviceId == GC_TYPE || deviceId == CO2_TYPE || deviceId == NET_TYPE || deviceId == RAMAN_TYPE ||
deviceId == MS_TYPE || deviceId == ACOUSTIC_TYPE || deviceId == VEDIO2_TYPE) {
/* 需要打开的对应电源设备 */
MT_TimerStartEvent(&gs_EswitchCloseTimer, 300, 1, MT_DeviceEswitchCloseCallback);
gs_eswitchFlag &= ~(1 << deviceId);
if (gs_eswitchFlag == 0) {
MT_OutputSetOutput(ESWITCH2_TYPE, CTRL1_OBJ, CLOSE_SET);
}
}
/* 判断是否需要关闭工控机 */
if (deviceId != CTDO_TYPE) {
/* 需要打开的对应电源设备 */
MT_TimerStartEvent(&gs_IpcCloseTimer, 300, 1, MT_DeviceIpcCloseCallback);
gs_ipcFlag &= ~(1 << deviceId);
if (gs_ipcFlag == 0) {
MT_OutputSetOutput(IPC_TYPE, CTRL1_OBJ, CLOSE_SET);
}
}
/* 关闭对应设备 */
MT_OutputSetOutput(deviceId, CTRL1_OBJ, CLOSE_SET);
@ -2219,6 +2299,20 @@ int MT_DeviceWorkAskDisable(uint8_t timeSeqId, uint8_t deviceId)
return 0;
}
static void MT_DeviceIpcCloseCallback(void)
{
if (gs_ipcFlag == 0) {
MT_OutputSetOutput(IPC_TYPE, CTRL1_OBJ, CLOSE_SET);
}
}
static void MT_DeviceEswitchCloseCallback(void)
{
if (gs_eswitchFlag == 0) {
MT_OutputSetOutput(ESWITCH2_TYPE, CTRL1_OBJ, CLOSE_SET);
}
}
static int MT_DeviceWorkCtl(uint8_t devType, uint8_t mode)
{
uint8_t sendBuf[2] = {0};

View File

@ -77,6 +77,7 @@ int MT_TimerRegEventId(void)
for (i = 0; i < TASK_TIMER_NUM_MAX; i++) {
if (TaskTimerEvent[i].Enable != 1) {
TaskTimerEvent[i].Enable = 1;
TaskTimerEvent[i].StartOrEnd = 0;
return i;
}
}