diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-09-26 10:01:01 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-09-26 10:01:01 +0300 |
| commit | e99391a32439a4ce5f89fde8237cb68257f36ed0 (patch) | |
| tree | 0552936f6a0994b0a18600b085234b00f649a2c9 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | ba1c45d36da2e15870bae36b3bdfee4271d7292f (diff) | |
| parent | 94b83ea6d7e62534219801dcf1d53ee6e187837d (diff) | |
| download | Tango-e99391a32439a4ce5f89fde8237cb68257f36ed0.tar.gz Tango-e99391a32439a4ce5f89fde8237cb68257f36ed0.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 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index c929fe026..c7d5998c6 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -317,6 +317,9 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) if (ThreadControlActive == false) return OK; + if (PrepareState == true) + return OK; + if (IfIndex>>8 != IfTypeThread) { LOG_ERROR (IfIndex, "Wrong Interface type"); @@ -476,6 +479,9 @@ uint32_t ThreadEmptyCBFunction(uint32_t IfIndex, uint32_t ReadValue) JobCounter = 0; TotalProcessedLength = 0.0; PrepareState = true; + AlarmHandlingSetAlarm(EVENT_TYPE__ThreadBreak,false); + AlarmHandlingSetAlarm(EVENT_TYPE__ThreadTensionControlFailure,false); + //start thread control for all motors for (Motor_i = 0;Motor_i < MAX_THREAD_MOTORS_NUM;Motor_i++) { @@ -581,6 +587,7 @@ uint32_t ThreadPreSegmentState(void *JobDetails) LOG_ERROR (dyeingspeed," job speed zero"); return ERROR; } + LOG_ERROR (dyeingspeed," ThreadPreSegmentState"); SetOriginMotorSpeed(process_speed); ThreadControlActive = true; |