diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-09-10 14:59:57 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-09-10 14:59:57 +0300 |
| commit | 33397d6279fd243b5d6a5fe4040814ca78b421a9 (patch) | |
| tree | fd26991e6d361da7d797dc90f68a7e16865c9281 | |
| parent | 5b02fa6704860b289ae0a711f775a71d7afee8eb (diff) | |
ATE build: M997 no longer turns of EUT power unless target is main board
Also turn off EUT power when doing an emergency stop
| -rw-r--r-- | src/GCodes/GCodes2.cpp | 3 | ||||
| -rw-r--r-- | src/GCodes/GCodes3.cpp | 9 | ||||
| -rw-r--r-- | src/Platform/RepRap.cpp | 4 | ||||
| -rw-r--r-- | src/Version.h | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/src/GCodes/GCodes2.cpp b/src/GCodes/GCodes2.cpp index 10c95dbe..be3ba859 100644 --- a/src/GCodes/GCodes2.cpp +++ b/src/GCodes/GCodes2.cpp @@ -4536,9 +4536,6 @@ bool GCodes::HandleMcode(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeEx #endif case 997: // Perform firmware update -#ifdef DUET3_ATE - Duet3Ate::PowerOffEUT(); -#endif result = UpdateFirmware(gb, reply); break; diff --git a/src/GCodes/GCodes3.cpp b/src/GCodes/GCodes3.cpp index b48ae06b..000da338 100644 --- a/src/GCodes/GCodes3.cpp +++ b/src/GCodes/GCodes3.cpp @@ -41,6 +41,10 @@ # include <Wire.h> #endif +#ifdef DUET3_ATE +# include <Duet3Ate.h> +#endif + #include <cctype> // Deal with G60 @@ -1131,6 +1135,7 @@ GCodeResult GCodes::UpdateFirmware(GCodeBuffer& gb, const StringRef &reply) } } #endif + #if HAS_AUX_DEVICES && ALLOW_ARBITRARY_PANELDUE_PORT // Disabled until we allow PanelDue on another port if (gb.Seen('A')) { @@ -1138,6 +1143,10 @@ GCodeResult GCodes::UpdateFirmware(GCodeBuffer& gb, const StringRef &reply) } #endif +#ifdef DUET3_ATE + Duet3Ate::PowerOffEUT(); +#endif + reprap.GetHeat().SwitchOffAll(true); // turn all heaters off because the main loop may get suspended DisableDrives(); // all motors off diff --git a/src/Platform/RepRap.cpp b/src/Platform/RepRap.cpp index 9137bb14..55b6d239 100644 --- a/src/Platform/RepRap.cpp +++ b/src/Platform/RepRap.cpp @@ -935,6 +935,10 @@ void RepRap::Diagnostics(MessageType mtype) noexcept // Turn off the heaters, disable the motors, and deactivate the Heat and Move classes. Leave everything else working. void RepRap::EmergencyStop() noexcept { +#ifdef DUET3_ATE + Duet3Ate::PowerOffEUT(); +#endif + stopped = true; // a useful side effect of setting this is that it prevents Platform::Tick being called, which is needed when loading IAP into RAM // Do not turn off ATX power here. If the nozzles are still hot, don't risk melting any surrounding parts by turning fans off. diff --git a/src/Version.h b/src/Version.h index 2ca32772..eea0855c 100644 --- a/src/Version.h +++ b/src/Version.h @@ -9,7 +9,7 @@ #define SRC_VERSION_H_ #ifndef VERSION -# define MAIN_VERSION "3.3" +# define MAIN_VERSION "3.3+" # ifdef USE_CAN0 # define VERSION_SUFFIX " (CAN0)" # else |