From 3ca8992ee4e193b2599d787c4bc623d5df2d9407 Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Wed, 28 Oct 2020 12:31:08 +0200
Subject: cancel VOC alarms

---
 .../Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC_VOC_Sensor.c    | 8 ++++----
 Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c         | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'Software/Embedded_SW/Embedded')

diff --git a/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC_VOC_Sensor.c b/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC_VOC_Sensor.c
index e6a20904e..6ffb9949f 100644
--- a/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC_VOC_Sensor.c
+++ b/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC_VOC_Sensor.c
@@ -46,13 +46,13 @@ void CalculateVOCAlarms(void)
             if ((slope1>0)&&(slope1 > VOC_Slope))
             {
                 slopeindex++;
-                if (slopeindex>=VOC_Slope_Time)
+                /*if (slopeindex>=VOC_Slope_Time)
                 {
                     AlarmHandlingSetAlarm(EVENT_TYPE__VOC_SENSOR_ALARM_SLOPE,true);
                     Report("CalculateVOCAlarms slope on",__FILE__,__LINE__,(int)slope1,RpWarning,slopeindex,0);
                     alarmstate = true;
                     VOC_SlopeAlarm = true;
-                }
+                }*/
             }
             else
             {
@@ -67,7 +67,7 @@ void CalculateVOCAlarms(void)
         AlarmHandlingSetAlarm(EVENT_TYPE__VOC_SENSOR_ALARM_SLOPE,false);
     }
 
-    if (a/MAX_VOC_SAMPLES > VOC_AverageLimit)
+    /*if (a/MAX_VOC_SAMPLES > VOC_AverageLimit)
     {
         AlarmHandlingSetAlarm(EVENT_TYPE__VOC_SENSOR_ALARM_TIME,true);
         Report("CalculateVOCAlarms time on",__FILE__,__LINE__,(int)a,RpWarning,VOC_AverageLimit,0);
@@ -75,7 +75,7 @@ void CalculateVOCAlarms(void)
     else if (VOC_TimeAlarm == true)
     {
         AlarmHandlingSetAlarm(EVENT_TYPE__VOC_SENSOR_ALARM_TIME,false);
-    }
+    }*/
 
 }
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
index 75cd2fcb2..6c2709fcd 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
@@ -631,11 +631,11 @@ bool WHS_IsVocPpmOverAlarmLimit()
             counter++;
         }
 
-        if(counter > VocPpmLimitForXSec)//Sec
+        /*if(counter > VocPpmLimitForXSec)//Sec
         {
             AlarmHandlingSetAlarm(EVENT_TYPE__VOC_SENSOR_ALARM_SLOPE,true);
             return true;//Buzzer ON if defined
-        }
+        }*/
     }
     else
     {
-- 
cgit v1.3.1