diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-16 13:11:06 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-16 13:11:06 +0200 |
| commit | 1ee11bc9771c807c4d0ecb4d73e4bc33b307ae1e (patch) | |
| tree | 90fef091808c78bf8b87e0eabbee050eabb724c4 /Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | |
| parent | afe0b1e7abea7b1694ff0d197e045420df497ceb (diff) | |
| parent | fd181e6c3c9d0f67152243e4657b9e760d9f2c36 (diff) | |
| download | Tango-1ee11bc9771c807c4d0ecb4d73e4bc33b307ae1e.tar.gz Tango-1ee11bc9771c807c4d0ecb4d73e4bc33b307ae1e.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 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 94858cae2..bfd936b5c 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -437,7 +437,7 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) ThreadControlActive = false; SendJobProgress(0.0,0,false, "ReadBreakSensor Error"); SegmentReady(Module_Thread,ModuleFail); - AlarmHandlingSetAlarm(EVENT_TYPE__ThreadBreak,true); + AlarmHandlingSetAlarm(EVENT_TYPE__THREAD_BREAK,true); //EndState(CurrentJob,"ReadBreakSensor Error" ); LOG_ERROR(index, "ReadBreakSensor Error"); return OK; @@ -467,7 +467,7 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) SendJobProgress(0.0,0,false, Message); //EndState(CurrentJob,Message ); SegmentReady(Module_Thread,ModuleFail); - AlarmHandlingSetAlarm(EVENT_TYPE__ThreadTensionControlFailure,true); + AlarmHandlingSetAlarm(EVENT_TYPE__THREAD_TENSION_CONTROL_FAILURE,true); LOG_ERROR (DancerId, "Dancer Failure"); return OK; } @@ -559,8 +559,10 @@ uint32_t ThreadEmptyCBFunction(uint32_t IfIndex, uint32_t ReadValue) TotalProcessedLength = 0.0; PoolerTotalProcessedLength = 0.0; PrepareState = true; - AlarmHandlingSetAlarm(EVENT_TYPE__ThreadBreak,false); - AlarmHandlingSetAlarm(EVENT_TYPE__ThreadTensionControlFailure,false); + AlarmHandlingSetAlarm(EVENT_TYPE__THREAD_BREAK,false); + AlarmHandlingSetAlarm(EVENT_TYPE__THREAD_TENSION_CONTROL_FAILURE,false); + AlarmHandlingSetAlarm(EVENT_TYPE__WINDER_CONE_DOES_NOT_EXIST,false); + //start thread control for all motors for (Motor_i = 0;Motor_i < MAX_THREAD_MOTORS_NUM;Motor_i++) |