diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-04-11 14:32:36 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-04-11 14:32:36 +0300 |
| commit | 086a2400e3ce911b6ff04e50363b633af7d92796 (patch) | |
| tree | 4d4aad9adc1a682e7b323abedf6e27467c0e3bf6 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | f052b13f288eec8f403536d40ed4cb4a4a38f5f9 (diff) | |
| download | Tango-086a2400e3ce911b6ff04e50363b633af7d92796.tar.gz Tango-086a2400e3ce911b6ff04e50363b633af7d92796.zip | |
Some minor changes
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread.h | 7 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h b/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h index 913b38df8..d2675452c 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h @@ -11,6 +11,9 @@ #include "PMR/Printing/JobSpool.pb-c.h" #include "PMR/Printing/JobSpoolType.pb-c.h" +#include "drivers/Motors/Motor.h" +#include "drivers/Danser_SSI/ssi_comm.h" + typedef struct { @@ -59,8 +62,8 @@ typedef enum threadMotorsEnum MAX_THREAD_MOTORS_NUM }threadMotorsEnum; #define MAX_THREAD_FEED_MOTORS WINDER_MOTOR+1 -extern uint32_t ThreadMotorIdToMotorId[MAX_THREAD_MOTORS_NUM]; - +extern TimerMotors_t ThreadMotorIdToMotorId[MAX_THREAD_MOTORS_NUM]; +extern DANCER_ENUM ThreadMotorIdToDancerId[MAX_THREAD_MOTORS_NUM]; extern MotorConfigStruc MotorsCfg[MAX_THREAD_MOTORS_NUM]; extern InternalWinderConfigStruc InternalWinderCfg; diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 366ce827b..250e055dc 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -25,8 +25,8 @@ /////////////////////////////////////////////////////////////////////////////////////////// -uint32_t ThreadMotorIdToMotorId[MAX_THREAD_MOTORS_NUM] = {MOTOR_RDRIVING,MOTOR_DRYER_DRIVING,MOTOR_LDRIVING,MOTOR_WINDER,MOTOR_SCREW}; -uint32_t ThreadMotorIdToDancerId[MAX_THREAD_MOTORS_NUM] = {FEEDER_DANCER,NUM_OF_DANCERS,POOLER_DANCER,WINDER_DANCER,NUM_OF_DANCERS}; +TimerMotors_t ThreadMotorIdToMotorId[MAX_THREAD_MOTORS_NUM] = {MOTOR_RDRIVING,MOTOR_DRYER_DRIVING,MOTOR_LDRIVING,MOTOR_WINDER,MOTOR_SCREW}; +DANCER_ENUM ThreadMotorIdToDancerId[MAX_THREAD_MOTORS_NUM] = {FEEDER_DANCER,NUM_OF_DANCERS,POOLER_DANCER,WINDER_DANCER,NUM_OF_DANCERS}; typedef struct { @@ -120,13 +120,13 @@ uint32_t ThreadControlCBFunction(uint32_t deviceID, uint32_t ReadValue) //******************************************************************************************************************** //******************************************************************************************************************** -#ifdef DEBUG_TEST_FUNCTIONS +/*#ifdef DEBUG_TEST_FUNCTIONS uint32_t Debug_Get_Dancer_Read(uint32_t DancerId, uint32_t Parameter1, uint32_t Parameter2) { return (rand() % (103 + 1 + 103) - 103); } -#endif +#endif*/ uint32_t ThreadInitialTestStub(HardwareMotor * request) { |