Conditional GCode fixes and exception specifiers

Loops are now working
Added noexcept specifiers to omst of the remaining C++ source files

1 files changed, 53 insertions, 53 deletions

diff --git a/src/Endstops/ZProbe.h b/src/Endstops/ZProbe.h
index 1253ae03..2dc76f90 100644
--- a/src/Endstops/ZProbe.h
+++ b/src/Endstops/ZProbe.h
@@ -14,47 +14,47 @@
 class ZProbe : public EndstopOrZProbe
 {
 public:
-	ZProbe(unsigned int num, ZProbeType p_type);
-
-	virtual void SetIREmitter(bool on) const = 0;
-	virtual uint16_t GetRawReading() const = 0;
-	virtual void SetProbing(bool isProbing) const = 0;
-	virtual GCodeResult AppendPinNames(const StringRef& str) const = 0;
-	virtual GCodeResult Configure(GCodeBuffer& gb, const StringRef& reply, bool& seen);		// 'seen' is an in-out parameter
-	virtual GCodeResult SendProgram(const uint32_t zProbeProgram[], size_t len, const StringRef& reply);
-
-	EndStopHit Stopped() const override;
-	EndstopHitDetails CheckTriggered(bool goingSlow) override;
-	bool Acknowledge(EndstopHitDetails what) override;
-
-	void SetDefaults();
-
-	ZProbeType GetProbeType() const { return type; }
-	float GetXOffset() const { return xOffset; }
-	float GetYOffset() const { return yOffset; }
-	float GetConfiguredTriggerHeight() const { return triggerHeight; }
-	float GetActualTriggerHeight() const;
-	float GetDiveHeight() const { return diveHeight; }
-	float GetStartingHeight() const { return diveHeight + GetActualTriggerHeight(); }
-	float GetProbingSpeed() const { return probeSpeed; }
-	float GetTravelSpeed() const { return travelSpeed; }
-	float GetRecoveryTime() const { return recoveryTime; }
-	float GetTolerance() const { return tolerance; }
-	bool GetTurnHeatersOff() const { return misc.parts.turnHeatersOff; }
-	bool GetSaveToConfigOverride() const { return misc.parts.saveToConfigOverride; }
-	int GetAdcValue() const { return adcValue; }
+	ZProbe(unsigned int num, ZProbeType p_type) noexcept;
+
+	virtual void SetIREmitter(bool on) const noexcept = 0;
+	virtual uint16_t GetRawReading() const noexcept = 0;
+	virtual void SetProbing(bool isProbing) const noexcept = 0;
+	virtual GCodeResult AppendPinNames(const StringRef& str) const noexcept = 0;
+	virtual GCodeResult Configure(GCodeBuffer& gb, const StringRef& reply, bool& seen) THROWS_PARSE_ERROR;		// 'seen' is an in-out parameter
+	virtual GCodeResult SendProgram(const uint32_t zProbeProgram[], size_t len, const StringRef& reply) noexcept;
+
+	EndStopHit Stopped() const noexcept override;
+	EndstopHitDetails CheckTriggered(bool goingSlow) noexcept override;
+	bool Acknowledge(EndstopHitDetails what) noexcept override;
+
+	void SetDefaults() noexcept;
+
+	ZProbeType GetProbeType() const noexcept { return type; }
+	float GetXOffset() const noexcept { return xOffset; }
+	float GetYOffset() const noexcept { return yOffset; }
+	float GetConfiguredTriggerHeight() const noexcept { return triggerHeight; }
+	float GetActualTriggerHeight() const noexcept;
+	float GetDiveHeight() const noexcept { return diveHeight; }
+	float GetStartingHeight() const noexcept { return diveHeight + GetActualTriggerHeight(); }
+	float GetProbingSpeed() const noexcept { return probeSpeed; }
+	float GetTravelSpeed() const noexcept { return travelSpeed; }
+	float GetRecoveryTime() const noexcept { return recoveryTime; }
+	float GetTolerance() const noexcept { return tolerance; }
+	bool GetTurnHeatersOff() const noexcept { return misc.parts.turnHeatersOff; }
+	bool GetSaveToConfigOverride() const noexcept { return misc.parts.saveToConfigOverride; }
+	int GetAdcValue() const noexcept { return adcValue; }
 	unsigned int GetMaxTaps() const { return misc.parts.maxTaps; }
-	void SetProbingAway(const bool probingAway) { misc.parts.probingAway = probingAway; }
+	void SetProbingAway(const bool probingAway) noexcept { misc.parts.probingAway = probingAway; }
 
-	int GetReading() const;
-	int GetSecondaryValues(int& v1, int& v2);
+	int GetReading() const noexcept;
+	int GetSecondaryValues(int& v1, int& v2) noexcept;
 
-	GCodeResult HandleG31(GCodeBuffer& gb, const StringRef& reply);
-	void SetTriggerHeight(float height) { triggerHeight = height; }
-	void SetSaveToConfigOverride() { misc.parts.saveToConfigOverride = true; }
+	GCodeResult HandleG31(GCodeBuffer& gb, const StringRef& reply) THROWS_PARSE_ERROR;
+	void SetTriggerHeight(float height) noexcept { triggerHeight = height; }
+	void SetSaveToConfigOverride() noexcept { misc.parts.saveToConfigOverride = true; }
 
 #if HAS_MASS_STORAGE
-	bool WriteParameters(FileStore *f, unsigned int probeNumber) const;
+	bool WriteParameters(FileStore *f, unsigned int probeNumber) const noexcept;
 #endif
 
 	static constexpr unsigned int MaxTapsLimit = 31;	// must be low enough to fit in the maxTaps field
@@ -91,15 +91,15 @@ protected:
 class MotorStallZProbe final : public ZProbe
 {
 public:
-	void* operator new(size_t sz) { return Allocate<MotorStallZProbe>(); }
-	void operator delete(void* p) { Release<MotorStallZProbe>(p); }
+	void* operator new(size_t sz) noexcept { return Allocate<MotorStallZProbe>(); }
+	void operator delete(void* p) noexcept { Release<MotorStallZProbe>(p); }
 
-	MotorStallZProbe(unsigned int num) : ZProbe(num, ZProbeType::zMotorStall) { }
-	~MotorStallZProbe() override { }
-	void SetIREmitter(bool on) const override { }
-	uint16_t GetRawReading() const override { return 4000; }
-	void SetProbing(bool isProbing) const override { }
-	GCodeResult AppendPinNames(const StringRef& str) const override { return GCodeResult::ok; }
+	MotorStallZProbe(unsigned int num) noexcept : ZProbe(num, ZProbeType::zMotorStall) { }
+	~MotorStallZProbe() noexcept override { }
+	void SetIREmitter(bool on) const noexcept override { }
+	uint16_t GetRawReading() const noexcept override { return 4000; }
+	void SetProbing(bool isProbing) const noexcept override { }
+	GCodeResult AppendPinNames(const StringRef& str) const noexcept override { return GCodeResult::ok; }
 
 private:
 };
@@ -108,15 +108,15 @@ private:
 class DummyZProbe final : public ZProbe
 {
 public:
-	void* operator new(size_t sz) { return Allocate<DummyZProbe>(); }
-	void operator delete(void* p) { Release<DummyZProbe>(p); }
-
-	DummyZProbe(unsigned int num) : ZProbe(num, ZProbeType::none) { }
-	~DummyZProbe() override { }
-	void SetIREmitter(bool on) const override { }
-	uint16_t GetRawReading() const override { return 4000; }
-	void SetProbing(bool isProbing) const override { }
-	GCodeResult AppendPinNames(const StringRef& str) const override { return GCodeResult::ok; }
+	void* operator new(size_t sz) noexcept { return Allocate<DummyZProbe>(); }
+	void operator delete(void* p) noexcept { Release<DummyZProbe>(p); }
+
+	DummyZProbe(unsigned int num) noexcept : ZProbe(num, ZProbeType::none) { }
+	~DummyZProbe() noexcept override { }
+	void SetIREmitter(bool on) const noexcept override { }
+	uint16_t GetRawReading() const noexcept override { return 4000; }
+	void SetProbing(bool isProbing) const noexcept override { }
+	GCodeResult AppendPinNames(const StringRef& str) const noexcept override { return GCodeResult::ok; }
 
 private:
 };