Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 7 insertions, 1 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 8e4a36e62..88877f113 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -85,7 +85,7 @@ uint32_t  Dancer_Data[NUM_OF_DANCERS] = {0};
 float  Speed_Data = 0;
 uint32_t DrawerFansStatus = 0;
 uint32_t SystemFansStatus = 0;
-
+uint8_t Gas_PPM = 0;
 
 bool watchdogCriticalAlarm = false;
 
@@ -514,6 +514,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
         {
             Read_Heaters_Current(Heater_i);
         }
+        Gas_PPM = Calculate_Gas_Power_Consumption();
     }
     if (OneMinute_Tick)
     {
@@ -621,6 +622,11 @@ uint32_t getDrawerFansStatus(void)
 {
     return DrawerFansStatus;
 }
+uint8_t getGasReading(void)
+{
+    return Gas_PPM;
+}
+
 uint32_t getSystemFansStatus(void)
 {
     return SystemFansStatus;