Merge branch '3.3-dev' into 3.4-dev

5 files changed, 7 insertions, 7 deletions

diff --git a/src/Heating/Heat.cpp b/src/Heating/Heat.cpp
index addf6deb..1bbe9a19 100644
--- a/src/Heating/Heat.cpp
+++ b/src/Heating/Heat.cpp
@@ -387,7 +387,7 @@ void Heat::Diagnostics(MessageType mtype) noexcept
 }
 
 // Configure a heater. Invoked by M950.
-GCodeResult Heat::ConfigureHeater(GCodeBuffer& gb, const StringRef& reply)
+GCodeResult Heat::ConfigureHeater(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeException)
 {
 	const size_t heater = gb.GetLimitedUIValue('H', MaxHeaters);
 
@@ -742,7 +742,7 @@ bool Heat::WriteModelParameters(FileStore *f) const noexcept
 #endif
 
 // Process M570
-GCodeResult Heat::ConfigureHeaterMonitoring(size_t heater, GCodeBuffer& gb, const StringRef& reply)
+GCodeResult Heat::ConfigureHeaterMonitoring(size_t heater, GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeException)
 {
 	const auto h = FindHeater(heater);
 	if (h.IsNull())
diff --git a/src/Heating/Heat.h b/src/Heating/Heat.h
index 473f2b80..6bb51e21 100644
--- a/src/Heating/Heat.h
+++ b/src/Heating/Heat.h
@@ -117,8 +117,8 @@ public:
 	HeaterStatus GetStatus(int heater) const noexcept;					// Get the off/standby/active status
 	bool HeaterAtSetTemperature(int heater, bool waitWhenCooling, float tolerance) const noexcept;
 
-	GCodeResult ConfigureHeater(GCodeBuffer& gb, const StringRef& reply);
-	GCodeResult ConfigureHeaterMonitoring(size_t heater, GCodeBuffer& gb, const StringRef& reply);
+	GCodeResult ConfigureHeater(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeException);
+	GCodeResult ConfigureHeaterMonitoring(size_t heater, GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeException);
 
 	void SetActiveTemperature(int heater, float t) THROWS(GCodeException) { SetTemperature(heater, t, true); }
 	void SetStandbyTemperature(int heater, float t) THROWS(GCodeException) { SetTemperature(heater, t, false); }
diff --git a/src/Heating/Sensors/SensorWithPort.h b/src/Heating/Sensors/SensorWithPort.h
index 4705b942..4307d2bf 100644
--- a/src/Heating/Sensors/SensorWithPort.h
+++ b/src/Heating/Sensors/SensorWithPort.h
@@ -19,7 +19,7 @@ protected:
 	~SensorWithPort() noexcept;
 
 	// Try to configure the port
-	bool ConfigurePort(GCodeBuffer& gb, const StringRef& reply, PinAccess access, bool& seen);
+	bool ConfigurePort(GCodeBuffer& gb, const StringRef& reply, PinAccess access, bool& seen) THROWS(GCodeException);
 
 #if SUPPORT_REMOTE_COMMANDS
 	// Try to configure the port
diff --git a/src/Heating/Sensors/SpiTemperatureSensor.h b/src/Heating/Sensors/SpiTemperatureSensor.h
index 5f555479..ca78568c 100644
--- a/src/Heating/Sensors/SpiTemperatureSensor.h
+++ b/src/Heating/Sensors/SpiTemperatureSensor.h
@@ -16,7 +16,7 @@ class SpiTemperatureSensor : public SensorWithPort
 protected:
 	SpiTemperatureSensor(unsigned int sensorNum, const char *name, SpiMode spiMode, uint32_t clockFrequency) noexcept;
 
-	bool ConfigurePort(GCodeBuffer& gb, const StringRef& reply, bool& seen);
+	bool ConfigurePort(GCodeBuffer& gb, const StringRef& reply, bool& seen) THROWS(GCodeException);
 
 #if SUPPORT_REMOTE_COMMANDS
 	bool ConfigurePort(const CanMessageGenericParser& parser, const StringRef& reply, bool& seen) noexcept;
diff --git a/src/Heating/Sensors/TemperatureSensor.h b/src/Heating/Sensors/TemperatureSensor.h
index 8f89e0dc..0503b1b1 100644
--- a/src/Heating/Sensors/TemperatureSensor.h
+++ b/src/Heating/Sensors/TemperatureSensor.h
@@ -32,7 +32,7 @@ public:
 	// If we find any parameters, process them, if successful then initialise the sensor and return GCodeResult::ok.
 	// If an error occurs while processing the parameters, return GCodeResult::error and write an error message to 'reply.
 	// if we find no relevant parameters, report the current parameters to 'reply' and return 'false'.
-	virtual GCodeResult Configure(GCodeBuffer& gb, const StringRef& reply, bool& changed);
+	virtual GCodeResult Configure(GCodeBuffer& gb, const StringRef& reply, bool& changed) THROWS(GCodeException);
 
 #if SUPPORT_REMOTE_COMMANDS
 	// Configure the sensor from M308 parameters.