aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2018-08-27 13:38:34 +0300
committerAvi Levkovich <avi@twine-s.com>2018-08-27 13:38:34 +0300
commitf072cd0987b249da65f55e9c30b9069c24d258c2 (patch)
tree0a540222c602bb8f890a456111d470fcf651043a /Software/Embedded_SW/Embedded/Modules/Control
parentffcb06ec20597465cdbe62040bacfb4bfc7d5de0 (diff)
downloadTango-f072cd0987b249da65f55e9c30b9069c24d258c2.tar.gz
Tango-f072cd0987b249da65f55e9c30b9069c24d258c2.zip
Change the Speed Sensor velocity units to float [cm/sec]
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c4
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h2
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);