aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-10-28 12:11:58 +0200
committerShlomo Hecht <shlomo@twine-s.com>2020-10-28 12:11:58 +0200
commit110bb042f060516a18e0b1bf64fb544dc69687e2 (patch)
tree4dbe7d1bcf3fd3d7a4db5e51f8cff317e10c5706 /Software/Embedded_SW
parent72e0ba40b5cb8ba81610e2f7bcb18b8797fe8a30 (diff)
downloadTango-110bb042f060516a18e0b1bf64fb544dc69687e2.tar.gz
Tango-110bb042f060516a18e0b1bf64fb544dc69687e2.zip
waste block actions on LP machine. VOC logs
Diffstat (limited to 'Software/Embedded_SW')
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c2
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c
index 57ccd0747..aef2be5fe 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c
@@ -594,6 +594,8 @@ void WHS_Start_Blower_Control_Closed_Loop ()
return; //do not start before controller is initialized and running
if (EnableControlLoop == false)
return; //do not start loop
+ if (WHS_Type == WHS_TYPE_NEW)
+ return; //do not start loop
if (count == close_loop_time)
{
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
index 1e3d4f79a..75cd2fcb2 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
@@ -623,6 +623,7 @@ bool WHS_IsVocPpmOverAlarmLimit()
if( ( Latest_Gas_Sens_PPM > VocPpmAlarmLimit ) || //PPM
( (Latest_Gas_Sens_PPM > VocPpmAlarmLimit90Percent) && (ReadingVocEverySec == true) ) ) //Hysteresis
{
+ Report("VOC nearing alarm state", __FILE__, (int)(Latest_Gas_Sens_PPM*100), VocPpmAlarmLimit, RpMessage, counter, 0);
//reading every sec
ReadingVocEverySec = true;
if(counter < 0xFF)