diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-09-06 13:13:05 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-09-06 13:13:05 +0300 |
| commit | f6d9dfef6f39577589d2e637bba1e47ea484cc32 (patch) | |
| tree | 0c4d20a51fba7e5a6762429feab2667c56b018d9 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 21e6dd4d1c756930622042f5f2b0d7f56ef8425f (diff) | |
| parent | 635028c74afebb2bedc30881065c1671c2510c67 (diff) | |
| download | Tango-f6d9dfef6f39577589d2e637bba1e47ea484cc32.tar.gz Tango-f6d9dfef6f39577589d2e637bba1e47ea484cc32.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 67b93f05e..122afaea8 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -73,6 +73,7 @@ typedef struct MillisecMessage{ //bool MotorBusy_Data[NUM_OF_MOTORS] = {true}; uint32_t Dancer_Data[NUM_OF_DANCERS] = {0}; float Speed_Data = 0; +uint32_t DrawerFansStatus = 0; bool watchdogCriticalAlarm = false; @@ -402,6 +403,7 @@ uint32_t MillisecLoop(uint32_t tick) { Control_WD(ENABLE,50); //activate heaters/dispenser watchdog, 5 seconds } + DrawerFansStatus = Read_Fans_Tacho(); } //ROM_IntMasterEnable(); @@ -464,5 +466,7 @@ float getSensorSpeedData(void) return Speed_Data; } - - +float getDrawerFansStatus(void) +{ + return DrawerFansStatus; +} |
