diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-09-06 16:48:22 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-09-06 16:48:22 +0300 |
| commit | 1f63a724d3640eae7e898243c488f9bdbb6bb4fb (patch) | |
| tree | 7e71ef89eafbcfd8cbd2fceb111f01ab3a8b593e /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | 56c8a12029e58d8a218a351097eab6bb958935f2 (diff) | |
| parent | 6bbaf44690579517f955887f50cf10e703676009 (diff) | |
| download | Tango-1f63a724d3640eae7e898243c488f9bdbb6bb4fb.tar.gz Tango-1f63a724d3640eae7e898243c488f9bdbb6bb4fb.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 | 6 |
1 files changed, 5 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..c929fe026 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; } |