diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-01-16 12:57:26 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-01-16 12:57:26 +0200 |
| commit | 42c0b9706017b66f2117c2421709905a68d9ea38 (patch) | |
| tree | dee4b8dd5ee0bbfdc6587283965af511ab891ada /Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | |
| parent | 9f6dd0def55b3fc55b84fa5025e41972d36df7ae (diff) | |
| parent | 1af7b84af6fa0a7663013288ca7b28c4774fc846 (diff) | |
| download | Tango-42c0b9706017b66f2117c2421709905a68d9ea38.tar.gz Tango-42c0b9706017b66f2117c2421709905a68d9ea38.zip | |
MERGE
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index 0aff26320..049e64a64 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -647,6 +647,9 @@ // CurrentControlledSpeed[FEEDER_MOTOR] = 1000; //MCU_E2PromProgram(EEPROM_STORAGE_DRYER_CYCLES,LoadArmInfo.LoadArmRounds); + ThreadMotorIdToMotorId[FEEDER_MOTOR] = HARDWARE_MOTOR_TYPE__MOTO_RDRIVING ; + ThreadMotorIdToMotorId[DRYER_MOTOR] = HARDWARE_MOTOR_TYPE__MOTO_DRYER_DRIVING; + MCU_E2PromRead(EEPROM_STORAGE_DRYER_CENTER,&DrierPrevLocation); numberOfCycles = 0; numberOfSteps = MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LOADARM].pulseperround/**LoadArmInfo.LoadArmRounds*/*MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LOADARM].microstep*MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LOADARM].pulleyradius; |