diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-09-06 16:48:22 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-09-06 16:48:22 +0300 |
| commit | 1f63a724d3640eae7e898243c488f9bdbb6bb4fb (patch) | |
| tree | 7e71ef89eafbcfd8cbd2fceb111f01ab3a8b593e /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 56c8a12029e58d8a218a351097eab6bb958935f2 (diff) | |
| parent | 6bbaf44690579517f955887f50cf10e703676009 (diff) | |
| download | Tango-1f63a724d3640eae7e898243c488f9bdbb6bb4fb.tar.gz Tango-1f63a724d3640eae7e898243c488f9bdbb6bb4fb.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 122afaea8..177a3678f 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -466,7 +466,7 @@ float getSensorSpeedData(void) return Speed_Data; } -float getDrawerFansStatus(void) +uint32_t getDrawerFansStatus(void) { return DrawerFansStatus; } diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h index f2f7e7e77..1c1989c1e 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h @@ -28,6 +28,8 @@ uint32_t getTemperatureSensorData(int SensorId); uint32_t getADCData(int DeviceId); */ float getSensorSpeedData(void); +uint32_t getDrawerFansStatus(void); + void MillisecInit(void); void MillisecStop(void); void MillisecStart(void); |