diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-10-07 21:26:18 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-10-07 21:26:18 +0300 |
| commit | d93d90e692d19ccb8c29892a3471e59f969124ee (patch) | |
| tree | 34ab053519c1fa62dc86ff499675295db08fc2a6 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 2a85f8d0a25260276c458074019fc58030317918 (diff) | |
| parent | 449c7faf0b98369994736862e16b086e680c4d2e (diff) | |
| download | Tango-d93d90e692d19ccb8c29892a3471e59f969124ee.tar.gz Tango-d93d90e692d19ccb8c29892a3471e59f969124ee.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 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 5f1c0ffaf..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,7 @@ 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(); - if (WHS_Type == WHS_TYPE_NEW) + if ((WHS_Type == WHS_TYPE_NEW) && (ReadingVocEverySec == false))//OneMinute_Tick { Trigger_WHS_MAX11614_Read_Gas_Sensor(); } |