diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-11-01 11:21:46 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-11-01 11:21:46 +0200 |
| commit | 8a0e31c1bfbe460795b9653c0dff0acdd4742e7d (patch) | |
| tree | 66a8b57c3762e9555ded84cf2a334fdeda084647 /Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c | |
| parent | 5738bf3ad93aa101ff87375938b9a283234ed23d (diff) | |
| download | Tango-8a0e31c1bfbe460795b9653c0dff0acdd4742e7d.tar.gz Tango-8a0e31c1bfbe460795b9653c0dff0acdd4742e7d.zip | |
machine status -after jogging,do not go to "Ready" if still heating up.
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c | 6 |
1 files changed, 4 insertions, 2 deletions
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(); |