diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-06-20 20:10:45 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-06-20 20:10:45 +0300 |
| commit | e146b0bebe4905bda100b357d3e904b1430c8039 (patch) | |
| tree | e9c2146cc382557ff66f1df46a1d31ff4ccd6cae /Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | |
| parent | e6c909c6d72d827175f75f77b2b7ed0f3a6feb71 (diff) | |
| parent | 0087c3567ff7322869fa6871e16372a49c382f38 (diff) | |
| download | Tango-e146b0bebe4905bda100b357d3e904b1430c8039.tar.gz Tango-e146b0bebe4905bda100b357d3e904b1430c8039.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index e9cc3ddde..444a9fb5d 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -523,12 +523,14 @@ void ThreadDistanceToSpoolEnded(void) { } +double seglength = 0.0; //******************************************************************************************************************** uint32_t ThreadSegmentState(void *JobDetails, int SegmentId) { JobTicket* JobTicket = JobDetails; + seglength = JobTicket->segments[SegmentId]->length; CurrentSegmentId = SegmentId; - ThreadUpdateProcessLength (JobTicket->segments[SegmentId]->length,(void *)ThreadSegmentEnded); + ThreadUpdateProcessLength (seglength,(void *)ThreadSegmentEnded); return OK; } @@ -536,9 +538,13 @@ uint32_t ThreadSegmentState(void *JobDetails, int SegmentId) uint32_t ThreadEndState(void *JobDetails) { int Motor_i; + ThreadUpdateProcessLength (0.0,(void *)NULL); + SetOriginMotorSpeed(0); + if (SpeedControlId != 0xFF) { RemoveControlCallback(SpeedControlId,ThreadLengthCBFunction); + SpeedControlId == 0xFF; } for ( Motor_i = 0;Motor_i < MAX_THREAD_MOTORS_NUM;Motor_i++) { |