diff options
| author | Christian Hammacher <bmasterc@gmail.com> | 2021-06-03 22:16:09 +0300 |
|---|---|---|
| committer | Christian Hammacher <bmasterc@gmail.com> | 2021-06-03 22:16:09 +0300 |
| commit | c2896dbc1f7738ad9c412aa8a57166e0e54548fc (patch) | |
| tree | 7590ba491c8f16820bd57d9e3ef1c1d0a63e4eae /src/GCodes/GCodes.cpp | |
| parent | 60b1fd9c28ba7a49bdd45e4f983bc72c1d641a60 (diff) | |
| parent | be278a6c0b6a1670d63651e808457a60f5afd25e (diff) | |
Merge remote-tracking branch 'origin/3.3-dev' into v3-chrishamm
Diffstat (limited to 'src/GCodes/GCodes.cpp')
| -rw-r--r-- | src/GCodes/GCodes.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/GCodes/GCodes.cpp b/src/GCodes/GCodes.cpp index 8887534c..83f2bb62 100644 --- a/src/GCodes/GCodes.cpp +++ b/src/GCodes/GCodes.cpp @@ -3968,7 +3968,7 @@ GCodeResult GCodes::RetractFilament(GCodeBuffer& gb, bool retract) } // Load the specified filament into a tool -GCodeResult GCodes::LoadFilament(GCodeBuffer& gb, const StringRef& reply) +GCodeResult GCodes::LoadFilament(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeException) { Tool * const tool = reprap.GetCurrentTool(); if (tool == nullptr) @@ -4031,7 +4031,7 @@ GCodeResult GCodes::LoadFilament(GCodeBuffer& gb, const StringRef& reply) } // Unload the current filament from a tool -GCodeResult GCodes::UnloadFilament(GCodeBuffer& gb, const StringRef& reply) +GCodeResult GCodes::UnloadFilament(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeException) { Tool * const tool = reprap.GetCurrentTool(); if (tool == nullptr) @@ -4617,7 +4617,7 @@ void GCodes::GenerateTemperatureReport(const StringRef& reply) const noexcept // Check whether we need to report temperatures or status. // 'reply' is a convenient buffer that is free for us to use. -void GCodes::CheckReportDue(GCodeBuffer& gb, const StringRef& reply) const +void GCodes::CheckReportDue(GCodeBuffer& gb, const StringRef& reply) const noexcept { if (&gb == usbGCode) { |