diff options
| author | Roy <roy.mail.net@gmail.com> | 2020-10-12 10:09:07 +0300 |
|---|---|---|
| committer | Roy <roy.mail.net@gmail.com> | 2020-10-12 10:09:07 +0300 |
| commit | 2d2568104e8aaef6b90575284bf2e65315395da0 (patch) | |
| tree | 836c9ccd3d19a9b4097e5513fd6e2fd68e58f3c5 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 4902057feed8887c9ae5e05a1e618a1d085b6dde (diff) | |
| parent | ce5c7688337926ded0ee0778819f26b668cfc1d7 (diff) | |
| download | Tango-2d2568104e8aaef6b90575284bf2e65315395da0.tar.gz Tango-2d2568104e8aaef6b90575284bf2e65315395da0.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 765712502..f1d2005fb 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -777,9 +777,15 @@ uint32_t MillisecLowLoop(uint32_t tick) { //Trigger_WHS_PT100_Read_All(); WHS_Blower_Avarege(HEAD_FLOW_METER); + WHS_Blower_Avarege(NU_FLOW_METER); WHS_Blower_Avarege(DRIER_FLOW_METER); WHS_Start_Blower_Control_Closed_Loop (); + if (ReadingVocEverySec == true)//eOneSecond + { + Trigger_WHS_MAX11614_Read_Gas_Sensor(); + } + /* static uint8_t Whs_emptying_cycle = 0; // #warning TBD need to define the timing @@ -827,7 +833,10 @@ uint32_t MillisecLowLoop(uint32_t tick) Gas_PPM_Info = Calculate_Gas_Power_Consumption();*/ // ReportWithPackageFilter(ThreadFilter,"waste tank calculate level",__FILE__,__LINE__,(int)(GetWHSWasteTankLevelMiliLiter()*1000),RpWarning,(int) msec_millisecondCounter,0); //Trigger_WHS_MAX11614_Read_allADC(); - Trigger_WHS_MAX11614_Read_Gas_Sensor(); + if ((WHS_Type == WHS_TYPE_NEW) && (ReadingVocEverySec == false))//OneMinute_Tick + { + Trigger_WHS_MAX11614_Read_Gas_Sensor(); + } #ifdef CONTROL_DEBUG ResetControlTime(); #endif |