after_homing, after_unlock, after_reset macros

bdring · Aug 3, 2023 · 50f06ab · 50f06ab
1 parent 2f02a9f
commit 50f06ab
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/FluidNC/src/Machine/Macros.cpp b/FluidNC/src/Machine/Macros.cpp
@@ -18,7 +18,9 @@ void MacroEvent::run(void* arg) {
 
 std::string Macros::_startup_line[n_startup_lines];
 std::string Macros::_macro[n_macros];
-std::string Macros::_post_homing_line;
+std::string Macros::_after_homing_line;
+std::string Macros::_after_reset_line;
+std::string Macros::_after_unlock_line;
 
 MacroEvent macro0Event { 0 };
 MacroEvent macro1Event { 1 };

diff --git a/FluidNC/src/Machine/Macros.h b/FluidNC/src/Machine/Macros.h
@@ -34,7 +34,9 @@ namespace Machine {
 
     public:
         static std::string _startup_line[n_startup_lines];
-        static std::string _post_homing_line;
+        static std::string _after_homing_line;
+        static std::string _after_reset_line;
+        static std::string _after_unlock_line;
 
         Macros() = default;
 
@@ -52,7 +54,9 @@ namespace Machine {
             handler.item("macro1", _macro[1]);
             handler.item("macro2", _macro[2]);
             handler.item("macro3", _macro[3]);
-            handler.item("post_homing", _post_homing_line);
+            handler.item("after_homing", _after_homing_line);
+            handler.item("after_reset", _after_reset_line);
+            handler.item("after_unlock", _after_unlock_line);
         }
 
         ~Macros() {}

diff --git a/FluidNC/src/ProcessSettings.cpp b/FluidNC/src/ProcessSettings.cpp
@@ -290,7 +290,7 @@ static Error disable_alarm_lock(const char* value, WebUI::AuthenticationLevel au
         report_feedback_message(Message::AlarmUnlock);
         sys.state = State::Idle;
 
-        // Don't run startup script. Prevents stored moves in startup from causing accidents.
+        config->_macros->run_macro(Macros::_after_unlock_line);
     }  // Otherwise, no effect.
     return Error::Ok;
 }
@@ -329,7 +329,7 @@ static Error home(AxisMask axisMask) {
         protocol_execute_realtime();
     } while (sys.state == State::Homing);
 
-    config->_macros->run_macro(Macros::_post_homing_line);
+    config->_macros->run_macro(Macros::_after_homing_line);
 
     return Error::Ok;
 }

diff --git a/FluidNC/src/Protocol.cpp b/FluidNC/src/Protocol.cpp
@@ -386,6 +386,10 @@ static void protocol_do_restart() {
         mc_critical(ExecAlarm::HardLimit);
     } else if (config->_control->startup_check()) {
         send_alarm(ExecAlarm::ControlPin);
+    } else {
+        if (sys.state == State::Idle) {
+            config->_macros->run_macro(Macros::_after_reset_line);
+        }
     }
 }