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>2020-11-09 22:52:13 +0300
committerDavid Crocker <dcrocker@eschertech.com>2020-11-09 22:52:13 +0300
commit7c99da590fbc00b558ef5f39690ceac111a8690f (patch)
treef0fb871702cb7610db26032656f2046f4a807068 /src/FilamentMonitors
parent1a21482fec82f6f40c14384def139a2f0f0b786a (diff)
Fixed crash when using M591 command with no quoted string after 'C'
Diffstat (limited to 'src/FilamentMonitors')
-rw-r--r--src/FilamentMonitors/FilamentMonitor.cpp2
-rw-r--r--src/FilamentMonitors/FilamentMonitor.h2
-rw-r--r--src/FilamentMonitors/LaserFilamentMonitor.cpp2
-rw-r--r--src/FilamentMonitors/PulsedFilamentMonitor.cpp2
-rw-r--r--src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp2
-rw-r--r--src/FilamentMonitors/SimpleFilamentMonitor.cpp2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/FilamentMonitors/FilamentMonitor.cpp b/src/FilamentMonitors/FilamentMonitor.cpp
index 5868817c..cc2b225d 100644
--- a/src/FilamentMonitors/FilamentMonitor.cpp
+++ b/src/FilamentMonitors/FilamentMonitor.cpp
@@ -71,7 +71,7 @@ void FilamentMonitor::Disable() noexcept
// Try to get the pin number from the GCode command in the buffer, setting Seen if a pin number was provided and returning true if error.
// Also attaches the ISR.
// For a remote filament monitor, this does the full configuration or query of the remote object instead, and we always return seen true because we don't need to report local status.
-GCodeResult FilamentMonitor::CommonConfigure(GCodeBuffer& gb, const StringRef& reply, InterruptMode interruptMode, bool& seen) noexcept
+GCodeResult FilamentMonitor::CommonConfigure(GCodeBuffer& gb, const StringRef& reply, InterruptMode interruptMode, bool& seen) THROWS(GCodeException)
{
#if SUPPORT_CAN_EXPANSION
// Check that the port (if given) is on the same board as the extruder
diff --git a/src/FilamentMonitors/FilamentMonitor.h b/src/FilamentMonitors/FilamentMonitor.h
index 1e06e79a..454a0fc9 100644
--- a/src/FilamentMonitors/FilamentMonitor.h
+++ b/src/FilamentMonitors/FilamentMonitor.h
@@ -107,7 +107,7 @@ public:
protected:
FilamentMonitor(unsigned int extruder, unsigned int t) noexcept;
- GCodeResult CommonConfigure(GCodeBuffer& gb, const StringRef& reply, InterruptMode interruptMode, bool& seen) noexcept;
+ GCodeResult CommonConfigure(GCodeBuffer& gb, const StringRef& reply, InterruptMode interruptMode, bool& seen) THROWS(GCodeException);
const IoPort& GetPort() const noexcept { return port; }
bool HaveIsrStepsCommanded() const noexcept { return haveIsrStepsCommanded; }
diff --git a/src/FilamentMonitors/LaserFilamentMonitor.cpp b/src/FilamentMonitors/LaserFilamentMonitor.cpp
index 676bcc13..8e3db8f8 100644
--- a/src/FilamentMonitors/LaserFilamentMonitor.cpp
+++ b/src/FilamentMonitors/LaserFilamentMonitor.cpp
@@ -98,7 +98,7 @@ float LaserFilamentMonitor::MeasuredSensitivity() const noexcept
}
// Configure this sensor, returning true if error and setting 'seen' if we processed any configuration parameters
-GCodeResult LaserFilamentMonitor::Configure(GCodeBuffer& gb, const StringRef& reply, bool& seen)
+GCodeResult LaserFilamentMonitor::Configure(GCodeBuffer& gb, const StringRef& reply, bool& seen) THROWS(GCodeException)
{
const GCodeResult rslt = CommonConfigure(gb, reply, INTERRUPT_MODE_CHANGE, seen);
if (rslt <= GCodeResult::warning)
diff --git a/src/FilamentMonitors/PulsedFilamentMonitor.cpp b/src/FilamentMonitors/PulsedFilamentMonitor.cpp
index 37b0053f..e1c1b1be 100644
--- a/src/FilamentMonitors/PulsedFilamentMonitor.cpp
+++ b/src/FilamentMonitors/PulsedFilamentMonitor.cpp
@@ -97,7 +97,7 @@ float PulsedFilamentMonitor::MeasuredSensitivity() const noexcept
}
// Configure this sensor, returning true if error and setting 'seen' if we processed any configuration parameters
-GCodeResult PulsedFilamentMonitor::Configure(GCodeBuffer& gb, const StringRef& reply, bool& seen)
+GCodeResult PulsedFilamentMonitor::Configure(GCodeBuffer& gb, const StringRef& reply, bool& seen) THROWS(GCodeException)
{
const GCodeResult rslt = CommonConfigure(gb, reply, INTERRUPT_MODE_RISING, seen);
if (rslt <= GCodeResult::warning)
diff --git a/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp b/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp
index 5938d152..20f8a32d 100644
--- a/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp
+++ b/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp
@@ -100,7 +100,7 @@ float RotatingMagnetFilamentMonitor::MeasuredSensitivity() const noexcept
}
// Configure this sensor, returning true if error and setting 'seen' if we processed any configuration parameters
-GCodeResult RotatingMagnetFilamentMonitor::Configure(GCodeBuffer& gb, const StringRef& reply, bool& seen)
+GCodeResult RotatingMagnetFilamentMonitor::Configure(GCodeBuffer& gb, const StringRef& reply, bool& seen) THROWS(GCodeException)
{
const GCodeResult rslt = CommonConfigure(gb, reply, INTERRUPT_MODE_CHANGE, seen);
if (rslt <= GCodeResult::warning)
diff --git a/src/FilamentMonitors/SimpleFilamentMonitor.cpp b/src/FilamentMonitors/SimpleFilamentMonitor.cpp
index 1f3071ed..dd65d5cd 100644
--- a/src/FilamentMonitors/SimpleFilamentMonitor.cpp
+++ b/src/FilamentMonitors/SimpleFilamentMonitor.cpp
@@ -39,7 +39,7 @@ SimpleFilamentMonitor::SimpleFilamentMonitor(unsigned int extruder, unsigned int
}
// Configure this sensor, returning true if error and setting 'seen' if we processed any configuration parameters
-GCodeResult SimpleFilamentMonitor::Configure(GCodeBuffer& gb, const StringRef& reply, bool& seen)
+GCodeResult SimpleFilamentMonitor::Configure(GCodeBuffer& gb, const StringRef& reply, bool& seen) THROWS(GCodeException)
{
const GCodeResult rslt = CommonConfigure(gb, reply, INTERRUPT_MODE_NONE, seen);
if (rslt <= GCodeResult::warning)