From 8a0e31c1bfbe460795b9653c0dff0acdd4742e7d Mon Sep 17 00:00:00 2001 From: Avi Levkovich Date: Sun, 1 Nov 2020 11:21:46 +0200 Subject: machine status -after jogging,do not go to "Ready" if still heating up. --- Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c') diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c index d277d38af..a0b1b30c2 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c +++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c @@ -40,8 +40,9 @@ MachineState StoredMachineStatus = MACHINE_STATE__PowerUp; bool SetMAchineStateProblem = false; -void SetMachineStatus (MachineState State) +void SetMachineStatus (MachineState New_state) { + MachineState State = New_state; if (StoredMachineStatus == MACHINE_STATE__PowerOff) { ReportWithPackageFilter(GeneralFilter,"not changing MachineStatus while on power down",__FILE__,__LINE__,State,RpWarning,StoredMachineStatus, 0); @@ -53,9 +54,10 @@ void SetMachineStatus (MachineState State) { ReportWithPackageFilter(GeneralFilter,"SetMachineStatus problem",__FILE__,__LINE__,State,RpWarning,GetMachineState(), 0); SetMAchineStateProblem = true; + State = MACHINE_STATE__PowerUp; } } - ReportWithPackageFilter(GeneralFilter,"SetMachineStatus",__FILE__,__LINE__,State,RpWarning,StoredMachineStatus, 0); + ReportWithPackageFilter(GeneralFilter,"SetMachineStatus",__FILE__,GetMachineState(),State,RpWarning,StoredMachineStatus, 0); StoredMachineStatus = State; MachineUpdateResponseFunc(); -- cgit v1.3.1