aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-03-25 16:20:57 +0200
committerShlomo Hecht <shlomo@twine-s.com>2020-03-25 16:20:57 +0200
commite094952954ec5b1f643bc42581cfe46be15816e0 (patch)
tree62321795d68a822a92a64e61bfc2f48716132f65 /Software/Embedded_SW/Embedded/Modules/Control
parenta7b5371f0813281df0993cfb3ff1aa75634274d4 (diff)
downloadTango-e094952954ec5b1f643bc42581cfe46be15816e0.tar.gz
Tango-e094952954ec5b1f643bc42581cfe46be15816e0.zip
Version 1.4.6.19 new RML parameters, tension spring handling, some bug fixing
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 0e95f4053..52775b6ab 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -118,7 +118,6 @@ static GateMutex_Handle gateMillisecDB;
uint32_t Millisec_timerBase = TIMER1_BASE; //Timer handle
/******************** Functions ********************************************/
-void CalculateVOCAlarms(void);
//**********************************************************************
/******************** CODE ********************************************/
//**********************************************************************
@@ -749,7 +748,8 @@ uint32_t MillisecLowLoop(uint32_t tick)
MotorGetStatusFromFPGA(Motor_i);
}*/
midtankDisplay = 1-midtankDisplay;
- Gas_PPM_Info = Calculate_Gas_Power_Consumption();
+ if (WHS_Type == WHS_TYPE_UNKNOWN)
+ Gas_PPM_Info = Calculate_Gas_Power_Consumption();
//Trigger_WHS_MAX11614_Read_allADC();
#ifdef CONTROL_DEBUG
ResetControlTime();