diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-08-30 20:29:58 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-08-30 20:29:58 +0300 |
| commit | d4ae04f8922ce04c1dbaf375176677a91afba386 (patch) | |
| tree | 61f909f8894cb747dcfb9b9045835af357bfb819 /Software/Embedded_SW/Embedded/StateMachines | |
| parent | b76f8564a5fc2904c8de299e1650b41af40a49ae (diff) | |
| download | Tango-d4ae04f8922ce04c1dbaf375176677a91afba386.tar.gz Tango-d4ae04f8922ce04c1dbaf375176677a91afba386.zip | |
improve firmware activation, diagnostics, job end reasons according to the new PROTOBUF
Diffstat (limited to 'Software/Embedded_SW/Embedded/StateMachines')
3 files changed, 8 insertions, 4 deletions
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c index 8bce76ccf..14da2e78a 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c @@ -89,7 +89,8 @@ JobEndReasonEnum JobEndReason = JOB_OK; ErrorCode JobError_to_ErrorCode[JOB_ERRORS_MAX+1] = {ERROR_CODE__NONE,ERROR_CODE__JOB_UNSPECIFIED_ERROR,ERROR_CODE__JOB_THREAD_BREAK,ERROR_CODE__JOB_WINDER_DANCER_FAIL, ERROR_CODE__JOB_POOLER_DANCER_FAIL,ERROR_CODE__JOB_FEEDER_DANCER_FAIL,ERROR_CODE__JOB_OUT_OF_DYE,ERROR_CODE__JOB_OTHER_ALARM, ERROR_CODE__JOB_TEMPERATURE_ALARM,ERROR_CODE__JOB_LS_ALARM,ERROR_CODE__JOB_PRESSURE_ALARM,ERROR_CODE__JOB_CURRENT_ALARM, - ERROR_CODE__JOB_MOTOR_ALARM,ERROR_CODE__JOB_LIDS_OPEN,ERROR_CODE__JOB_LIDS_OPEN,ERROR_CODE__JOB_ABORTED_BY_USER,ERROR_CODE__JOB_SAFETY_ALARM}; + ERROR_CODE__JOB_MOTOR_ALARM,ERROR_CODE__JOB_LIDS_OPEN,ERROR_CODE__JOB_LIDS_OPEN,ERROR_CODE__JOB_ABORTED_BY_USER,ERROR_CODE__JOB_SAFETY_ALARM, ERROR_CODE__JOB_NO_ALARM_FILE, + ERROR_CODE__JOB_FILE_PROBLEM,ERROR_CODE__JOB_WASTE_HANDLING_PROBLEM}; JobTicket *CurrentJob = NULL; JobRequest *CurrentRequest = NULL; diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c index 52aac94f5..177fac0b2 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c @@ -751,7 +751,7 @@ void PrintSTMMsgHandler(void * msg) //rewind file if (RewindJobFile() != FR_OK) { - JobEndReason = JOB_OTHER_ALARM; + JobEndReason = JOB_FILE_PROBLEM; if (dryerbufferlength <= 0.1) EndState(CurrentJob, "Job Ended"); else @@ -790,7 +790,7 @@ void PrintSTMMsgHandler(void * msg) } else { - JobEndReason = JOB_OTHER_ALARM; + JobEndReason = JOB_FILE_PROBLEM; if (dryerbufferlength <= 0.1) EndState(CurrentJob, "Job Ended"); else @@ -809,7 +809,7 @@ void PrintSTMMsgHandler(void * msg) if ((Segment == NULL)||(Segment->length <0.1)) { Report("SegmentLoading failed",__FILE__,__LINE__, Segment,RpMessage,(int)(Segment->length*100),0); - JobEndReason = JOB_OTHER_ALARM; + JobEndReason = JOB_FILE_PROBLEM; if (dryerbufferlength <= 0.1) EndState(CurrentJob, "Job Ended"); else diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.h b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.h index 9c282d0f0..9fdd7b85f 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.h +++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.h @@ -100,6 +100,9 @@ typedef enum JOB_LIDS_OPEN, JOB_ABORTED_BY_USER, JOB_SAFETY_CRITICAL_ALARM, + JOB_NO_ALARM_FILE, + JOB_FILE_PROBLEM, + JOB_WASTE_HANDLING_PROBLEM, JOB_ERRORS_MAX }JobEndReasonEnum; extern JobEndReasonEnum JobEndReason; |