diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2020-01-15 10:43:49 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2020-01-15 10:43:49 +0200 |
| commit | 4e739ecb88185867e2c9ca05fda661eb8e0c6f10 (patch) | |
| tree | eda9da2805121ac9141070ced352558dc3308727 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | ca24ced88f1905066c8b69e86b9e453d4eae394a (diff) | |
| parent | 5615cfe5029be4b6db306bdf76d6abc0e6cb96f8 (diff) | |
| download | Tango-4e739ecb88185867e2c9ca05fda661eb8e0c6f10.tar.gz Tango-4e739ecb88185867e2c9ca05fda661eb8e0c6f10.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 26616c141..1c3326336 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -500,7 +500,7 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) { TranslatedReadValue = 0x3FFF- TranslatedReadValue; //overcome zero environment } - if (index == POOLER_MOTOR) + if ((index == POOLER_MOTOR)||((index == FEEDER_MOTOR)&&(DancersCfg[DancerId].assemblydirectionright == true))) { //pooler dancer is right sided: data is opposite TranslatedReadValue = (-1*TranslatedReadValue); @@ -909,8 +909,13 @@ uint32_t ThreadDryerRampUp(uint32_t IfIndex, uint32_t BusyFlag) InitialDryerSpeed = OriginalMotorSpd_2PPS[DRYER_MOTOR]; SafeRemoveControlCallback(ControlIdtoMotorId[DRYER_MOTOR], ThreadDryerRampUp ); ControlIdtoMotorId[DRYER_MOTOR] = 0xFF; + //ReportWithPackageFilter(ThreadFilter,"ThreadDryerRampUp end",__FILE__,ControlIdtoMotorId[DRYER_MOTOR],(int)InitialDryerSpeed,RpWarning,(int)OriginalMotorSpd_2PPS[DRYER_MOTOR],0); + } + if (InitialDryerSpeed == 0) + { + //ReportWithPackageFilter(ThreadFilter,"ThreadDryerRampUp Stopped",__FILE__,ControlIdtoMotorId[DRYER_MOTOR],(int)InitialDryerSpeed,RpWarning,(int)OriginalMotorSpd_2PPS[DRYER_MOTOR],0); + return OK; } - MotorSetSpeed(ThreadMotorIdToMotorId[DRYER_MOTOR],InitialDryerSpeed ); //ReportWithPackageFilter(ThreadFilter,"ThreadDryerRampUp",__FILE__,ControlIdtoMotorId[DRYER_MOTOR],(int)InitialDryerSpeed,RpWarning,(int)OriginalMotorSpd_2PPS[DRYER_MOTOR],0); |