add job end error codes. turn off safety alarms when cleared.improve idle/power on/off sequences

1 files changed, 4 insertions, 1 deletions

diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c
index 67e86397c..285c6ee74 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c
@@ -89,6 +89,7 @@ uint32_t PowerOffInit(void)
     PowerOffMachineState++;
     StopInitSequence();
     setmachineActive(true);
+    PowerIdleOutOfIdleState();
     PowerOffInProcess = true;
     PowerOffControlId = AddControlCallback("PowerOff", PowerOffScheduler, eOneSecond, TemplateDataReadCBFunction,0,0, 0 );
     SetMachineStatus(MACHINE_STATE__PowerOff);
@@ -114,7 +115,7 @@ uint32_t PowerOffHeadCleanCallback(uint32_t DispenserId, uint32_t ReadValue)
            SafeRemoveControlCallback(PowerOffHeadCleanControlId, PowerOffHeadCleanCallback );
            PowerOffHeadCleanControlId = 0xFF;
            PowerOffMachineState++;
-
+           SetMachineStatus(MACHINE_STATE__PowerOff);
        }
     return OK;
 }
@@ -139,6 +140,7 @@ uint32_t PowerOffHeadClean(void)
     {
         LOG_ERROR(0,"Clean job failed");
         PowerOffMachineState++;
+        SetMachineStatus(MACHINE_STATE__PowerOff);
     }
 //    if ( PowerOffHeadCleanControlId == 0xFF)
 //        return ERROR;
@@ -311,6 +313,7 @@ uint32_t PowerOffStopRunningJob(void)
     if (JobIsActive())
     {
         REPORT_MSG (PowerOffMachineState, "Stop running job");
+        JobEndReason = JOB_ABORTED_BY_USER;
         AbortJob("Power off pressed");
     }
     PowerOffMachineState++;