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

2 files changed, 12 insertions, 4 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 5fe242436..738f59686 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;
 
@@ -474,6 +474,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
     if (Hundred_msTick)
     {
         Speed_Data = Calculate_Speed_Sensor_Velocity();
+        Read_Buttons_Reg();
         for (Sensor_i = 0;Sensor_i < MAX_TEMPERATURE_SENSOR_ID;Sensor_i++)
         {
             MillisecReadFromTempSensor(Sensor_i, NULL);
@@ -499,9 +500,9 @@ uint32_t MillisecLowLoop(uint32_t tick)
             //Read_MidTank_Pressure_Sensor(Disp_i);
         }
         FPGA_GetAllDispensersValveBusyOCD();
-        /*temp = Read_Fans_Tacho();
+        temp = Read_Fans_Tacho();
         DrawerFansStatus = temp & 0x1F;
-        SystemFansStatus = temp & 0xE0;*/
+        SystemFansStatus = temp & 0xE0;
         KeepAliveOneSecondCall();
         for (Motor_i = 0;Motor_i < NUM_OF_MOTORS;Motor_i++)
         {
@@ -510,10 +511,11 @@ uint32_t MillisecLowLoop(uint32_t tick)
             if (isMotorConfigured(Motor_i))
                 MotorGetStatusFromFPGA(Motor_i);
         }
-        for (Heater_i = 0;Heater_i < NUM_OF_HEATERS;Heater_i++)
+        for (Heater_i = 0;Heater_i < NUM_OF_CURRENT_HEATERS;Heater_i++)
         {
             Read_Heaters_Current(Heater_i);
         }
+        Gas_PPM = Calculate_Gas_Power_Consumption();
     }
     if (OneMinute_Tick)
     {
@@ -621,6 +623,11 @@ uint32_t getDrawerFansStatus(void)
 {
     return DrawerFansStatus;
 }
+uint8_t getGasReading(void)
+{
+    return Gas_PPM;
+}
+
 uint32_t getSystemFansStatus(void)
 {
     return SystemFansStatus;
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h
index 7e2af1079..064302685 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h
@@ -32,6 +32,7 @@ uint32_t getADCData(int DeviceId);
 float getSensorSpeedData(void);
 uint32_t getDrawerFansStatus(void);
 uint32_t getSystemFansStatus(void);
+uint8_t getGasReading(void);
 
 void MillisecInit(void);
 void MillisecStop(void);