Block homing with certain control switches

Door, Hold, E-Stop and fault control switches block homing.
bdring · Dec 12, 2024 · 2d569cd · 2d569cd
1 parent 7e73b08
commit 2d569cd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/FluidNC/src/Control.cpp b/FluidNC/src/Control.cpp
@@ -42,6 +42,16 @@ std::string Control::report_status() {
     return ret;
 }
 
+bool Control::pins_block_reset() {
+    std::string blockers("DHFE"); // Door, Hold, Fault, E-Stop block reset and homing
+    for (auto pin : _pins) {
+        if (pin->get()  && blockers.find(pin->letter()) != std::string::npos) {
+            return true;
+        }
+    }
+    return false;
+}
+
 bool Control::stuck() {
     for (auto pin : _pins) {
         if (pin->get()) {

diff --git a/FluidNC/src/Control.h b/FluidNC/src/Control.h
@@ -22,6 +22,7 @@ class Control : public Configuration::Configurable {
 
     bool stuck();
     bool safety_door_ajar();
+    bool pins_block_reset();
 
     std::string report_status();
 

diff --git a/FluidNC/src/ProcessSettings.cpp b/FluidNC/src/ProcessSettings.cpp
@@ -377,6 +377,10 @@ static Error cmd_log_verbose(const char* value, AuthenticationLevel auth_level,
     return Error::Ok;
 }
 static Error home(AxisMask axisMask, Channel& out) {
+    // see if blocking control switches are active
+    if (config->_control->pins_block_reset()) {
+        return Error::CheckControlPins;
+    }
     if (axisMask != Machine::Homing::AllCycles) {  // if not AllCycles we need to make sure the cycle is not prohibited
         // if there is a cycle it is the axis from $H<axis>
         auto n_axis = Axes::_numberAxis;