diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-08-30 10:54:52 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-08-30 10:54:52 +0300 |
| commit | eeaeeca65c5e0a376ca3f164a4921cad995d62ed (patch) | |
| tree | 8c98a4198ca2f97a92bf8896b6ba2c12cfe98c2e /Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h | |
| parent | 8e2e60ef069776aa6c3aab6a12e03ba1b228eea0 (diff) | |
| parent | 4ebd2c0a636596be0e4a2b8eca87e79d17868207 (diff) | |
| download | Tango-eeaeeca65c5e0a376ca3f164a4921cad995d62ed.tar.gz Tango-eeaeeca65c5e0a376ca3f164a4921cad995d62ed.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h index 4339c5312..c3f181b52 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h @@ -9,7 +9,7 @@ #define WINDER_DANCER HARDWARE_DANCER_TYPE__LeftDancer #define POOLER_DANCER HARDWARE_DANCER_TYPE__MiddleDancer #define FEEDER_DANCER HARDWARE_DANCER_TYPE__RightDancer -#define NUM_OF_DANCERS (HARDWARE_DANCER_TYPE__RightDancer+1) +#define NUM_OF_DANCERS NUM_OF_ROTENC //} DANCER_ENUM; typedef enum threadMotorsEnum { @@ -17,6 +17,11 @@ typedef enum threadMotorsEnum DRYER_MOTOR, POOLER_MOTOR, WINDER_MOTOR, +#ifdef FOUR_WINDERS + WINDER_2_MOTOR, + WINDER_3_MOTOR, + WINDER_4_MOTOR, +#endif SCREW_MOTOR, MAX_THREAD_MOTORS_NUM }threadMotorsEnum; |