Gas sensor - Add stub + fix bug

2 files changed, 12 insertions, 2 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC.c b/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC.c
index b9d8ee1f6..4e8dcb3c7 100644
--- a/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC.c
+++ b/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC.c
@@ -539,10 +539,12 @@ uint8_t  Calculate_Gas_Power_Consumption() // WHS
     {
         if(VSensor <= VOC_Vsensor[i])
         {
-            PPM = i;
+            return i;//PPM
         }
     }
-    return PPM;
+
+return 0xFF;//out of scale
+
 }
 
 uint32_t Read_Dryer_Heaters_Current(HEATERS_CURRENT Heater_ID) //
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index 34cb61e27..c6f2526db 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -11,6 +11,7 @@
 
 #include "drivers/Flash_Memory/FATFS/ff.h"
 #include "drivers/Flash_Memory/FATFS/Control_File_System.h"
+#include "drivers/adc_sampling/adc.h"
 
 //#include "graphics_adapter.h"
 
@@ -33,6 +34,13 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
             assert(iFResult);
         }
     }
+    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 == 0xDF) && (request->delay == 0xDF)) //Power off
     {
         PowerOffInit();