From 6a313661146ecd208312504823b55610dadf0c88 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Tue, 15 Jan 2019 18:32:25 +0200 Subject: Version 1.3.2.0 - Machine Studio 4 - new inerface (alarms). new over/under temperature alarms, tamper alarms preperation, cone alarm, warnings removed. --- Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c') 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++) -- cgit v1.3.1