diff options
author | David Crocker <dcrocker@eschertech.com> | 2021-12-15 20:10:15 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2021-12-15 20:10:15 +0300 |
commit | 3eac979ffead60714e127b6f6eeef7c43fdbff49 (patch) | |
tree | f3a474ba5cf904d20ab82ebe8d67401ede4f6310 /src | |
parent | 7287c9e66ae49bcdda48e7224161abc2161cd6f5 (diff) |
Removed unused code
Diffstat (limited to 'src')
-rw-r--r-- | src/GCodes/GCodes.cpp | 65 | ||||
-rw-r--r-- | src/GCodes/GCodes.h | 10 |
2 files changed, 0 insertions, 75 deletions
diff --git a/src/GCodes/GCodes.cpp b/src/GCodes/GCodes.cpp index 65ec9d22..c233b5d5 100644 --- a/src/GCodes/GCodes.cpp +++ b/src/GCodes/GCodes.cpp @@ -1174,71 +1174,6 @@ bool GCodes::LowVoltageResume() noexcept #endif -#if HAS_SMART_DRIVERS - -// Pause the print because the specified driver has reported a stall -bool GCodes::PauseOnStall(DriversBitmap stalledDrivers) noexcept -{ - if (!IsReallyPrinting()) - { - return true; // if not printing, acknowledge it but take no action - } - if (!autoPauseGCode->IsCompletelyIdle()) - { - return false; // can't handle it yet - } - if (!LockMovement(*autoPauseGCode)) - { - return false; - } - - String<StringLength50> stallErrorString; - stallErrorString.printf("Stall detected on driver(s)"); - ListDrivers(stallErrorString.GetRef(), stalledDrivers); - DoPause(*autoPauseGCode, PrintPausedReason::stall, GCodeState::pausing1); - platform.SendAlert(GenericMessage, stallErrorString.c_str(), "Printing paused", 1, 0.0, AxesBitmap()); - stallErrorString.cat('\n'); - platform.Message(LogWarn, stallErrorString.c_str()); - return true; -} - -// Re-home and resume the print because the specified driver has reported a stall -bool GCodes::ReHomeOnStall(DriversBitmap stalledDrivers) noexcept -{ - if (!IsReallyPrinting()) - { - return true; // if not printing, acknowledge it but take no action - } - if (!DoEmergencyPause()) - { - return false; // can't handle it yet - } - - // Evaluate which machine axes have stalled and create parameters for them - VariableSet vars; - for (size_t axis = 0; axis < numVisibleAxes; ++axis) - { - const AxisDriversConfig& cfg = platform.GetAxisDriversConfig(axis); - for (unsigned int i = 0; i < cfg.numDrivers; ++i) - { - //TODO handle remote stalled drivers - if (cfg.driverNumbers[i].IsLocal() && stalledDrivers.IsBitSet(cfg.driverNumbers[i].localDriver)) - { - char str[2] = { axisLetters[axis], 0 }; - vars.InsertNewParameter(str, ExpressionValue((int32_t)1)); // create a parameter with value 1 for the axis - break; - } - } - } - - autoPauseGCode->SetState(GCodeState::resuming1); // set up to resume after rehoming - pauseState = PauseState::resuming; - DoFileMacro(*autoPauseGCode, REHOME_G, true, AsyncSystemMacroCode, vars); // run the SD card rehome-and-resume script - return true; -} - -#endif - #if HAS_MASS_STORAGE || HAS_SBC_INTERFACE void GCodes::SaveResumeInfo(bool wasPowerFailure) noexcept diff --git a/src/GCodes/GCodes.h b/src/GCodes/GCodes.h index af4eebbe..90bf7b4b 100644 --- a/src/GCodes/GCodes.h +++ b/src/GCodes/GCodes.h @@ -184,11 +184,6 @@ public: bool LowVoltageResume() noexcept; #endif -#if HAS_SMART_DRIVERS - bool PauseOnStall(DriversBitmap stalledDrivers) noexcept; - bool ReHomeOnStall(DriversBitmap stalledDrivers) noexcept; -#endif - const char *GetAxisLetters() const noexcept { return axisLetters; } // Return a null-terminated string of axis letters indexed by drive size_t GetAxisNumberForLetter(const char axisLetter) const noexcept; MachineType GetMachineType() const noexcept { return machineType; } @@ -308,15 +303,10 @@ public: static constexpr const char* FILAMENT_CHANGE_G = "filament-change.g"; static constexpr const char* DAEMON_G = "daemon.g"; static constexpr const char* RUNONCE_G = "runonce.g"; -#if HAS_SMART_DRIVERS - static constexpr const char* REHOME_G = "rehome.g"; -#endif private: GCodes(const GCodes&) = delete; - enum class HeaterFaultState : uint8_t { noFault, pausePending, timing, stopping, stopped }; - // Resources that can be locked. // To avoid deadlock, if you need multiple resources then you must lock them in increasing numerical order. typedef uint32_t Resource; |