Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Duet3D/RepRapFirmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Crocker <dcrocker@eschertech.com>2021-03-10 14:50:44 +0300
committerDavid Crocker <dcrocker@eschertech.com>2021-03-10 14:50:44 +0300
commit2dab154f58e8387547b671ba77d8a565452de31c (patch)
treebf30fec90414c6144d12085d4d4c3c9dc8eac9c7 /src/GCodes/GCodes4.cpp
parent08c611c79cb08510c8b8c20eba72a1928f8bd577 (diff)
Fix for DSF
Diffstat (limited to 'src/GCodes/GCodes4.cpp')
-rw-r--r--src/GCodes/GCodes4.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/GCodes/GCodes4.cpp b/src/GCodes/GCodes4.cpp
index 0d335899..5e570a39 100644
--- a/src/GCodes/GCodes4.cpp
+++ b/src/GCodes/GCodes4.cpp
@@ -365,7 +365,7 @@ void GCodes::RunStateMachine(GCodeBuffer& gb, const StringRef& reply) noexcept
gb.AdvanceState();
if (AllAxesAreHomed())
{
- DoFileMacro(gb, PAUSE_G, true, SystemMacroCode);
+ DoFileMacro(gb, PAUSE_G, true, SystemHelperMacroCode);
}
}
break;
@@ -376,9 +376,9 @@ void GCodes::RunStateMachine(GCodeBuffer& gb, const StringRef& reply) noexcept
gb.AdvanceState();
if (AllAxesAreHomed())
{
- if (!DoFileMacro(gb, FILAMENT_CHANGE_G, false, SystemMacroCode))
+ if (!DoFileMacro(gb, FILAMENT_CHANGE_G, false, AsyncSystemMacroCode))
{
- DoFileMacro(gb, PAUSE_G, true, SystemMacroCode);
+ DoFileMacro(gb, PAUSE_G, true, AsyncSystemMacroCode);
}
}
}
@@ -392,11 +392,11 @@ void GCodes::RunStateMachine(GCodeBuffer& gb, const StringRef& reply) noexcept
{
String<StringLength20> macroName;
macroName.printf(FILAMENT_ERROR "%u.g", gb.LatestMachineState().stateParameter);
- if (!DoFileMacro(gb, macroName.c_str(), false, SystemMacroCode))
+ if (!DoFileMacro(gb, macroName.c_str(), false, AsyncSystemMacroCode))
{
- if (!DoFileMacro(gb, FILAMENT_ERROR ".g", false, SystemMacroCode))
+ if (!DoFileMacro(gb, FILAMENT_ERROR ".g", false, AsyncSystemMacroCode))
{
- DoFileMacro(gb, PAUSE_G, true, SystemMacroCode);
+ DoFileMacro(gb, PAUSE_G, true, AsyncSystemMacroCode);
}
}
}