diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-08-17 10:05:52 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-08-17 10:05:52 +0300 |
| commit | 17aa17776eed59ef62d800654ab238ae59be49db (patch) | |
| tree | 1ed85608875a603099746b4804cbf4840fbf36c3 /Software/Embedded_SW/Embedded/Modules | |
| parent | 7d232db20da74279dbb691beae2e771c290c038e (diff) | |
| download | Tango-17aa17776eed59ef62d800654ab238ae59be49db.tar.gz Tango-17aa17776eed59ef62d800654ab238ae59be49db.zip | |
warning removals
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
3 files changed, 14 insertions, 4 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c index 08e9f7bbe..af7d3bdf0 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c @@ -1220,8 +1220,11 @@ uint32_t IDSCheckSegmentData(void *SegmentDetails, int SegmentId) uint32_t status = OK; JobDescriptionFileBrushStop * tFileBrushStop; int Brush_i; + Task_Stat statbuf; //check and close previous segment + RemoveControlCallback(BrushStopControlId,IDSBrushStopRestartCallback); + BrushStopControlId = 0xFF; if (PrevSegment) { if (JobBrushStopId<PrevSegment->brushstopscount) //we did not finish reading the brushstops of the previous segment @@ -1241,6 +1244,10 @@ uint32_t IDSCheckSegmentData(void *SegmentDetails, int SegmentId) } else { + Task_stat(Task_self(),&statbuf); + Report("Unhandled BrushStopRead Error",__FILE__,statbuf.used,(int)statbuf.stackSize,RpWarning,(int)statbuf.stackHeap,0); + //JobEndReason = JOB_OUT_OF_DYE; + //SegmentReady(Module_IDS,ModuleFail); Report("Unhandled brushstops ERROR",__FILE__,__LINE__,(int)tFileBrushStop,RpWarning,(int)PrevSegment->brushstopscount,0); status = ERROR; break; @@ -1527,7 +1534,7 @@ uint32_t IDSBrushStopRestartCallback(uint32_t IfIndex, uint32_t readValue) Task_Stat statbuf; if(BrushStopStartTime+BrushStopLength+100 < msec_millisecondCounter ) { - Report("!!!!!!!!!!!!Overtime!",__FILE__,msec_millisecondCounter,(int)BrushStopStartTime,RpWarning,(int)BrushStopLength,0); + Report("!!!!!!!!!!!!Overtime!",__FILE__,msec_millisecondCounter,(int)BrushStopStartTime,RpWarning,(int)BrushStopLength,0); } if(++BrushStopCounter < BrushStopTime) @@ -1537,6 +1544,11 @@ uint32_t IDSBrushStopRestartCallback(uint32_t IfIndex, uint32_t readValue) BrushStopCounter = 0; BrushStopStartTime = msec_millisecondCounter; + if (BrushStopControlId == 0xFF) + { + Report("!!!BrushStopControlId = 0xFF",__FILE__,msec_millisecondCounter,(int)BrushStopStartTime,RpWarning,(int)BrushStopLength,0); + return OK; + } if (JobEndSequence == true) { diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index 6ce7ebfea..931400aaa 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -1469,7 +1469,7 @@ uint32_t ThreadLoadingReport(void) uint32_t TryThreadLoadingFunc(MessageContainer* requestContainer) { - TryThreadLoadingRequest *request = continue_thread_loading_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); + TryThreadLoadingRequest *request = try_thread_loading_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); TryThreadLoadingResponse Cresponse = TRY_THREAD_LOADING_RESPONSE__INIT; MessageContainer responseContainer; MessageState = 2; diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c index c0e51a143..222b618d2 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c @@ -526,6 +526,4 @@ uint32_t Waste_Prepare(void) //PrepareReady(Module_Waste,ModuleFail); return JOB_OTHER_ALARM; } - return; - } |