Version 1.5.1.1 remove VOC alarm until end of mechanic testing. remove old VOC code

5 files changed, 21 insertions, 20 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
index a18588c72..08dc68781 100644
--- a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
+++ b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
@@ -20,7 +20,7 @@ typedef struct
 } TangoVersion_t;
 
 
-TangoVersion_t _gTangoVersion = {1,5,1,0};
+TangoVersion_t _gTangoVersion = {1,5,1,1};
 #define BUILD_DATE __DATE__
 char Dat[50] = BUILD_DATE; 
 
diff --git a/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC.c b/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC.c
index 627ad45b9..f9092c889 100644
--- a/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC.c
+++ b/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC.c
@@ -430,14 +430,14 @@ void ADCAcquireStop(void)
 double VPressure_0 = 0;
 double A_offset =-2.429, B_slope_coefficient  = 0.267;//A - offset, B  - slope coefficient
 
-double  Calculate_Pitot_Pressure(bool flow ) // WHS - AN_AIRPRESS_1
+/*double  Calculate_Pitot_Pressure(bool flow ) // WHS - AN_AIRPRESS_1
 {
 
 
     //MPXV7002 (NXP)
     uint32_t VsampleInBits;
 
-    double Pressure = 0.0, temp, /*PKpa,PBar,*/VADC = 0.0 ,VSensor/*,PMicroBar*/;
+    double Pressure = 0.0, temp, /`*PKpa,PBar,*`/VADC = 0.0 ,VSensor/`*,PMicroBar*`/;
 
     VsampleInBits = ADC_GetReading(ADC_AIR_PRESSURE_1);
 
@@ -465,18 +465,18 @@ double  Calculate_Pitot_Pressure(bool flow ) // WHS - AN_AIRPRESS_1
     {
         Pressure = A_offset + B_slope_coefficient * (sqrt(VSensor - VPressure_0));
 
-    /*
+    /`*
         PKpa = 5 * VSensor;
             // ---- P[Kpa] -> BAR ----
 
         PBar = PKpa / 100.0;
 
         PMicroBar = PBar/1000;
-        Pressure = PMicroBar;*/
+        Pressure = PMicroBar;*`/
 
         return Pressure;
     }
-}
+}*/
 
 uint32_t Read_Dryer_Heaters_Current(HEATERS_CURRENT Heater_ID) //
 {
diff --git a/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC.h b/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC.h
index d7efd45d4..0dc1523fa 100644
--- a/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC.h
+++ b/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC.h
@@ -60,8 +60,8 @@ void ADCAcquireStop(void);
 
 void ADC0SS0Handler(void);
 
-double  Calculate_Pitot_Pressure(bool flow ) ;
-uint8_t  Calculate_Gas_Power_Consumption();
+//double  Calculate_Pitot_Pressure(bool flow ) ;
+//uint8_t  Calculate_Gas_Power_Consumption();
 
 uint32_t Read_Dryer_Heaters_Current(HEATERS_CURRENT Heater_ID);
 void CheckAcInputVoltage();
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 6ffb9949f..ea2f5a050 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
@@ -31,9 +31,9 @@ void VOCAlarmsInit(void)
     memset(Gas_PPM,0,sizeof(Gas_PPM));
 }
 
-void CalculateVOCAlarms(void)
+/*void CalculateVOCAlarms(void)
 {
-    int i,slope1=0,/*slope2=0,*/slopeindex=0;
+    int i,slope1=0,/`*slope2=0,*`/slopeindex=0;
     double a;
     bool alarmstate = false;
     for (i = 0; i< MAX_VOC_SAMPLES; i++)
@@ -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);
-    }*/
+    }*`/
 
 }
 
@@ -84,14 +84,14 @@ uint8_t  Calculate_Gas_Power_Consumption() // WHS
     // TGS 2602 (FIGARO)
 
 
-/*       Concentrtion  Sensor
+/`*       Concentrtion  Sensor
             [ppm]      [v]
               0      0.353
              18      0.438
              33      2.919
             100      4.196
             316      4.571
-*/
+*`/
 
     double VOC_Vsensor[]  =
     {
@@ -182,3 +182,4 @@ uint8_t  Calculate_Gas_Power_Consumption() // WHS
 return 0xFF;//out of scale
 
 }
+*/
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index 0d5d60af0..959f69ca4 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -559,7 +559,7 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
         response.progress = Power_Step_01_Mode(((request->delay &0x00FF00)>>8), request->delay &0x0000FF);
         response.has_progress = true;
     }
-    else
+    /*else
     if((request->amount == 0xAB) && (request->delay == 0xAB)) //Get pressure with flow (orifice flow meter)
     {
         response.progress = Calculate_Pitot_Pressure(true);
@@ -572,7 +572,7 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
         response.progress = Calculate_Pitot_Pressure(false);
         response.has_progress = true;
 
-    }
+    }*/
     else
     if((request->amount == 0xAC) && (request->delay == 0xAC)) //VAC
     {
@@ -918,13 +918,13 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
         ROM_WatchdogReloadSet(WATCHDOG0_BASE, timeout);
 #endif
     }
-    else
+    /*else
     if((request->amount == 0x0C) && (request->delay == 0x0C)) //Get Gas Sensor
     {
         response.progress = (double)Calculate_Gas_Power_Consumption();
         response.has_progress = true;
 
-    }
+    }*/
     else
     if((request->amount == 0xDD) && (request->delay == 0xDD)) //Read Input Voltage
     {