diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-28 18:33:50 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-28 18:33:50 +0300 |
| commit | 33a2d098936cad4e7a8ca0c16187023a78fc4e43 (patch) | |
| tree | cb53af6d0fb6c94ba7037db4d2e74c716a18b550 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | fe589d0e841bf3a6d7c3206a7e48c8e7ae9a91a8 (diff) | |
| parent | 75e08ffe9aaeeca4b110a7f0a6bd6e47eb79a943 (diff) | |
| download | Tango-33a2d098936cad4e7a8ca0c16187023a78fc4e43.tar.gz Tango-33a2d098936cad4e7a8ca0c16187023a78fc4e43.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 | 4 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 9f515062d..2c9467b51 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -72,7 +72,7 @@ typedef struct MillisecMessage{ //uint32_t MotorPosition_Data[NUM_OF_MOTORS] = {0}; //bool MotorBusy_Data[NUM_OF_MOTORS] = {true}; uint32_t Dancer_Data[NUM_OF_DANCERS] = {0}; -uint32_t Speed_Data = 0; +float Speed_Data = 0; bool watchdogCriticalAlarm = false; @@ -454,7 +454,7 @@ void MillisecTask(UArg arg0, UArg arg1) assert (DeviceId < MAX_ADC_DEVICES); return ADC_Data[DeviceId]; }*/ -uint32_t getSensorSpeedData(void) +float getSensorSpeedData(void) { return Speed_Data; } diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h index 77c3a5ef8..f2f7e7e77 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h @@ -27,7 +27,7 @@ uint32_t getMotorSpeedData(int MotorId); uint32_t getTemperatureSensorData(int SensorId); uint32_t getADCData(int DeviceId); */ -uint32_t getSensorSpeedData(void); +float getSensorSpeedData(void); void MillisecInit(void); void MillisecStop(void); void MillisecStart(void); |