aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-03-19 18:11:46 +0200
committerShlomo Hecht <shlomo@twine-s.com>2019-03-19 18:11:46 +0200
commit69a41da59eb41a681e644505d5e7814c2c4f6973 (patch)
tree0910d22fc6003c5f75c433f93d2bff1e4803751d /Software/Embedded_SW/Embedded/Modules/Control
parent3c459e837e3fcf9030a20fe47dee9dd27bbfa21a (diff)
downloadTango-69a41da59eb41a681e644505d5e7814c2c4f6973.tar.gz
Tango-69a41da59eb41a681e644505d5e7814c2c4f6973.zip
VOC Gas sensor polling
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c8
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h1
2 files changed, 8 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;
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);