aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c8
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/control.c2
2 files changed, 4 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 6542af287..a6c1d42f7 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -227,11 +227,6 @@ void OneMilliSecondMillisecInterrupt(UArg arg0)
return ;
}
uint32_t PT100Activity = 0;
-int32_t MillisecReadFromI2CTempSensor(uint32_t TempSensorId, MSecFptr Callback)
-{
-#warning call I2C temeratures
- return OK;
-}
int32_t MillisecReadFromTempSensor(uint32_t TempSensorId, MSecFptr Callback)
{
@@ -744,8 +739,9 @@ uint32_t MillisecLowLoop(uint32_t tick)
midtankDisplay = 1-midtankDisplay;
Gas_PPM_Info = Calculate_Gas_Power_Consumption();
//Trigger_WHS_MAX11614_Read_allADC();
+#ifdef CONTROL_DEBUG
ResetControlTime();
-
+#endif
}
if (OneHourTick)
{
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c
index bb3149b43..5adf6f83d 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/control.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c
@@ -560,10 +560,12 @@ uint32_t ControlLoop(uint32_t tick)
return OK;
}
uint32_t prevtick = 0;
+#ifdef CONTROL_DEBUG
void ResetControlTime(void)
{
memset(ControlTime,0,sizeof(ControlTime));
}
+#endif
uint32_t ControlLowLoop(uint32_t tick)
{
uint32_t skipped_ticks = 0;