diff options
| author | David Crocker <dcrocker@eschertech.com> | 2022-10-03 15:38:52 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2022-10-03 15:38:52 +0300 |
| commit | ed784da4ec5dceff9cdb44124b9b6684ce98fb84 (patch) | |
| tree | a448cf39e300ad8b734403ea05ebb527bbf2c2cb | |
| parent | 695f2bfe86cab38f87c91ee37c49d3d0f5b3e1a5 (diff) | |
| parent | e56a9779fe8c9ce56f0e63a2de8977e249024b2d (diff) | |
Merge branch '3.4-dev' into 3.5-dev
| -rw-r--r-- | src/GCodes/GCodes.cpp | 2 | ||||
| -rw-r--r-- | src/GCodes/GCodes.h | 3 | ||||
| -rw-r--r-- | src/GCodes/GCodes2.cpp | 19 |
3 files changed, 2 insertions, 22 deletions
diff --git a/src/GCodes/GCodes.cpp b/src/GCodes/GCodes.cpp index ee813e0e..18fd99e5 100644 --- a/src/GCodes/GCodes.cpp +++ b/src/GCodes/GCodes.cpp @@ -197,8 +197,6 @@ void GCodes::Init() noexcept laserMaxPower = DefaultMaxLaserPower; laserPowerSticky = false; - heaterFaultTimeout = DefaultHeaterFaultTimeout; - #if SUPPORT_SCANNER reprap.GetScanner().SetGCodeBuffer(UsbGCode()); #endif diff --git a/src/GCodes/GCodes.h b/src/GCodes/GCodes.h index df8ece5c..e495349a 100644 --- a/src/GCodes/GCodes.h +++ b/src/GCodes/GCodes.h @@ -706,9 +706,6 @@ private: float laserMaxPower; bool laserPowerSticky; // true if G1 S parameters are remembered across G1 commands - // Heater fault handler - uint32_t heaterFaultTimeout; // how long we wait for the user to fix it before turning everything off - // Object cancellation ObjectTracker buildObjects; diff --git a/src/GCodes/GCodes2.cpp b/src/GCodes/GCodes2.cpp index 11abc249..b9aa5be3 100644 --- a/src/GCodes/GCodes2.cpp +++ b/src/GCodes/GCodes2.cpp @@ -3580,23 +3580,8 @@ bool GCodes::HandleMcode(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeEx break; case 570: // Set/report heater monitoring - { - bool seen = false; - if (gb.Seen('S')) - { - seen = true; - heaterFaultTimeout = gb.GetUIValue() * (60 * 1000); - } - if (gb.Seen('H')) - { - seen = true; - result = reprap.GetHeat().ConfigureHeaterMonitoring(gb.GetUIValue(), gb, reply); - } - if (!seen) - { - reply.printf("Print will be terminated if a heater fault is not reset within %" PRIu32 " minutes", heaterFaultTimeout/(60 * 1000)); - } - } + gb.MustSee('H'); + result = reprap.GetHeat().ConfigureHeaterMonitoring(gb.GetUIValue(), gb, reply); break; case 571: // Set output on extrude |