diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-09-17 10:20:51 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-09-17 10:20:51 +0300 |
| commit | 69f1e1add69d94b1455c135b9eb235cd39b47ee1 (patch) | |
| tree | a5cdfc882f4cbc217964ec3eb2171a8afa76e3ec /Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | |
| parent | 27c2a7ab4d6959dfb4483045c8b0bb88e5f3c9ec (diff) | |
| parent | 871eedf7a346206c670f8032c85b4f90872f490f (diff) | |
| download | Tango-69f1e1add69d94b1455c135b9eb235cd39b47ee1.tar.gz Tango-69f1e1add69d94b1455c135b9eb235cd39b47ee1.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 | 9 |
1 files changed, 8 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 69eafe152..0272255a5 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -14,6 +14,7 @@ #include "PMR/Hardware/HardwareDancerType.pb-c.h" #include "PMR/Printing/JobSegment.pb-c.h" #include "PMR/Printing/JobTicket.pb-c.h" +#include <PMR/Diagnostics/EventType.pb-c.h> #include <utils/ustdlib.h> @@ -28,6 +29,7 @@ #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h" #include "modules/heaters/heaters.h" #include "modules/General/process.h" +#include "Modules/AlarmHandling/AlarmHandling.h" #include "Control/MillisecTask.h" ////////////////////////////////State machine operation//////////////////////////////////// @@ -381,7 +383,8 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) ThreadControlActive = false; SendJobProgress(0.0,0,false, "ReadBreakSensor Error"); SegmentReady(Module_Thread,ModuleFail); - //EndState(CurrentJob,"ReadBreakSensor Error" ); + AlarmHandlingSetAlarm(EVENT_TYPE__ThreadBreak,true); + //EndState(CurrentJob,"ReadBreakSensor Error" ); LOG_ERROR(index, "ReadBreakSensor Error"); return OK; } @@ -399,6 +402,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); LOG_ERROR (index, "Dancer Failure"); return OK; } @@ -472,6 +476,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++) { |