diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-11-19 17:08:09 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-11-19 17:08:09 +0200 |
| commit | 4956386d558374286e14591f91dff4da558a275b (patch) | |
| tree | 8441e0a2210ce44abb76fdf64b8482936a81cd1f /Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | |
| parent | 7ad2943a64a3844e6b1261a11ac7e6bd23f213ce (diff) | |
| parent | e4032e8a133a582dd213b35101d208e0d54a3328 (diff) | |
| download | Tango-4956386d558374286e14591f91dff4da558a275b.tar.gz Tango-4956386d558374286e14591f91dff4da558a275b.zip | |
MERGE.
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 7 |
1 files changed, 5 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 41d98e892..9d408a4a6 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -883,9 +883,10 @@ void ThreadPreSegmentEnded(void) } #define DRYER_RAMPUP 1 #ifdef DRYER_RAMPUP +int DrierDivider = 10; uint32_t ThreadDryerRampUp(uint32_t IfIndex, uint32_t BusyFlag) { - InitialDryerSpeed += (OriginalMotorSpd_2PPS[DRYER_MOTOR]/10); + InitialDryerSpeed += (OriginalMotorSpd_2PPS[DRYER_MOTOR]/DrierDivider); if (InitialDryerSpeed >= OriginalMotorSpd_2PPS[DRYER_MOTOR]) { InitialDryerSpeed = OriginalMotorSpd_2PPS[DRYER_MOTOR]; @@ -924,7 +925,9 @@ uint32_t ThreadPreSegmentState(void *SegmentDetails, uint32_t SegmentId) #ifndef DRYER_RAMPUP MotorSetSpeed(HARDWARE_MOTOR_TYPE__MOTO_DRYER_DRIVING, OriginalMotorSpd_2PPS[DRYER_MOTOR]); #else - InitialDryerSpeed = OriginalMotorSpd_2PPS[DRYER_MOTOR]/10; + DrierDivider = dyeingspeed/5; //ramp up drier in 5 cm/sec steps + Report("Drier ramp up",__FILE__,__LINE__,(int)dyeingspeed,RpWarning,(int)DrierDivider,0); + InitialDryerSpeed = OriginalMotorSpd_2PPS[DRYER_MOTOR]/DrierDivider; MotorSetSpeed(HARDWARE_MOTOR_TYPE__MOTO_DRYER_DRIVING,InitialDryerSpeed ); ControlIdtoMotorId[DRYER_MOTOR] = AddControlCallback("DryerRampUp",ThreadDryerRampUp, 200,TemplateDataReadCBFunction,0,0,0); #endif |