aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2020-05-14 15:03:53 +0300
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2020-05-14 15:03:53 +0300
commit65c84c24a66eb8b5ab760d192cf6a2ee0a79cc0e (patch)
tree4d024c9e1411c4d82090af03b6f6ee284a843e72 /Software/Embedded_SW/Embedded/Modules/Control
parentb2eb7adadae2fb7d7648d6d85e0f4721c7327011 (diff)
parentf901e3fa887c9cfd02fdb32ec2845e0f8908a549 (diff)
downloadTango-65c84c24a66eb8b5ab760d192cf6a2ee0a79cc0e.tar.gz
Tango-65c84c24a66eb8b5ab760d192cf6a2ee0a79cc0e.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.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index e0d1e38de..fab0831fe 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -737,7 +737,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
WHS_Blower_Avarege(DRIER_FLOW_METER);
WHS_Start_Blower_Control_Closed_Loop ();
- static uint8_t Whs_emptying_cycle = 0;
+ /* static uint8_t Whs_emptying_cycle = 0;
// #warning TBD need to define the timing
if(Whs_emptying_cycle >= 2)
@@ -749,7 +749,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
{
Whs_emptying_cycle++;
}
-
+ */
}
}
if (Tensecond_Tick)
@@ -774,7 +774,8 @@ uint32_t MillisecLowLoop(uint32_t tick)
/*if (WHS_Type == WHS_TYPE_UNKNOWN)
Gas_PPM_Info = Calculate_Gas_Power_Consumption();*/
if (WHS_Type == WHS_TYPE_NEW)
- ReportWithPackageFilter(ThreadFilter,"waste tank calculate level",__FILE__,__LINE__,(int)(GetWHSWasteTankLevelMiliLiter()*1000),RpWarning,(int) msec_millisecondCounter,0);
+ waste_seq_step1();// include 1Sec delay
+// ReportWithPackageFilter(ThreadFilter,"waste tank calculate level",__FILE__,__LINE__,(int)(GetWHSWasteTankLevelMiliLiter()*1000),RpWarning,(int) msec_millisecondCounter,0);
//Trigger_WHS_MAX11614_Read_allADC();
#ifdef CONTROL_DEBUG
ResetControlTime();