Merge pull request #1011 from bdring/ResetFromArc

Fix reset from arc
bdring · Sep 2, 2023 · 4faae26 · 4faae26
2 parents 18f7b65 + a79981a
commit 4faae26
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/FluidNC/src/Error.cpp b/FluidNC/src/Error.cpp
@@ -68,6 +68,7 @@ std::map<Error, const char*> ErrorNames = {
     { Error::AuthenticationFailed, "Authentication failed!" },
     { Error::Eol, "End of line" },
     { Error::Eof, "End of file" },
+    { Error::Reset, "System Reset" },
     { Error::AnotherInterfaceBusy, "Another interface is busy" },
     { Error::BadPinSpecification, "Bad Pin Specification" },
     { Error::JogCancelled, "Jog Cancelled" },

diff --git a/FluidNC/src/Error.h b/FluidNC/src/Error.h
@@ -72,6 +72,7 @@ enum class Error : uint8_t {
     AuthenticationFailed        = 110,
     Eol                         = 111,
     Eof                         = 112,  // Not necessarily an error
+    Reset                       = 113,
     AnotherInterfaceBusy        = 120,
     JogCancelled                = 130,
     BadPinSpecification         = 150,

diff --git a/FluidNC/src/GCode.cpp b/FluidNC/src/GCode.cpp
@@ -1620,6 +1620,9 @@ Error gc_execute_line(char* line) {
             // As far as the parser is concerned, the position is now == target. In reality the
             // motion control system might still be processing the action and the real tool position
             // in any intermediate location.
+            if (sys.abort) {
+                return Error::Reset;
+            }
             if (gc_update_pos == GCUpdatePos::Target) {
                 copyAxes(gc_state.position, gc_block.values.xyz);
             } else if (gc_update_pos == GCUpdatePos::System) {