diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-01 18:50:44 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-01 18:50:44 +0300 |
| commit | 9e979a9b18727fdc9f128da5a7d2347dff2d0705 (patch) | |
| tree | a74f7e1b4da57063046177139a5e2db188b13f48 /Software/Embedded_SW/Embedded/Modules/Thread/Thread.h | |
| parent | 44728b1223a0e90785fe67f4e5782bee0683ed09 (diff) | |
| parent | 4bbece442e2699e88a090de1df07e2295d4fdad8 (diff) | |
| download | Tango-9e979a9b18727fdc9f128da5a7d2347dff2d0705.tar.gz Tango-9e979a9b18727fdc9f128da5a7d2347dff2d0705.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread.h')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h b/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h index 7780287fb..3a0b25ba8 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h @@ -29,16 +29,6 @@ typedef struct }InternalWinderConfigStruc; -typedef enum threadMotorsEnum -{ - FEEDER_MOTOR, - DRYER_MOTOR, - POOLER_MOTOR, - WINDER_MOTOR, - SCREW_MOTOR, - MAX_THREAD_MOTORS_NUM -}threadMotorsEnum; - #define MAX_THREAD_FEED_MOTORS WINDER_MOTOR+1 #define MAX_SYSTEM_DANCERS HARDWARE_DANCER_TYPE__RightDancer+1 @@ -50,6 +40,7 @@ extern HardwareMotor MotorsCfg[NUM_OF_MOTORS]; extern HardwarePidControl MotorsControl[MAX_THREAD_MOTORS_NUM]; //extern InternalWinderConfigStruc InternalWinderCfg; extern HardwareDancer DancersCfg[MAX_SYSTEM_DANCERS]; +extern uint32_t CurrentControlledSpeed[MAX_THREAD_MOTORS_NUM]; #define MAX_CONTROL_SAMPLES 10 extern int32_t MotorSamples[MAX_THREAD_MOTORS_NUM][MAX_CONTROL_SAMPLES]; |