diff options
author | David Crocker <dcrocker@eschertech.com> | 2019-12-24 13:14:45 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2019-12-24 13:14:45 +0300 |
commit | be8bf5da39b36e46d769b93e4f423d347abc23ba (patch) | |
tree | f8d1e579cf47554b800b982995600779997cbec1 /src/Fans | |
parent | ecbc545743695c73791ed8420bb4ad97266bec28 (diff) |
Exception handling now working
Diffstat (limited to 'src/Fans')
-rw-r--r-- | src/Fans/Fan.cpp | 2 | ||||
-rw-r--r-- | src/Fans/Fan.h | 2 | ||||
-rw-r--r-- | src/Fans/FansManager.cpp | 4 | ||||
-rw-r--r-- | src/Fans/FansManager.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/Fans/Fan.cpp b/src/Fans/Fan.cpp index d9453398..7f35515f 100644 --- a/src/Fans/Fan.cpp +++ b/src/Fans/Fan.cpp @@ -28,7 +28,7 @@ Fan::Fan(unsigned int fanNum) noexcept // Exceptions: // 1. Only process the S parameter if other values were processed. // 2. Don't process the R parameter, but if it is present don't print the existing configuration. -bool Fan::Configure(unsigned int mcode, size_t fanNum, GCodeBuffer& gb, const StringRef& reply, bool& error) noexcept +bool Fan::Configure(unsigned int mcode, size_t fanNum, GCodeBuffer& gb, const StringRef& reply, bool& error) { bool seen = false; if (mcode == 106) diff --git a/src/Fans/Fan.h b/src/Fans/Fan.h index 12a088f0..25ebda3c 100644 --- a/src/Fans/Fan.h +++ b/src/Fans/Fan.h @@ -38,7 +38,7 @@ public: // then search for parameters used to configure the fan. If any are found, perform appropriate actions and return true. // If errors were discovered while processing parameters, put an appropriate error message in 'reply' and set 'error' to true. // If no relevant parameters are found, print the existing ones to 'reply' and return false. - bool Configure(unsigned int mcode, size_t fanNum, GCodeBuffer& gb, const StringRef& reply, bool& error) noexcept; + bool Configure(unsigned int mcode, size_t fanNum, GCodeBuffer& gb, const StringRef& reply, bool& error); bool IsConfigured() const noexcept { return isConfigured && IsEnabled(); } float GetConfiguredPwm() const noexcept { return val; } // returns the configured PWM. Actual PWM may be different, e.g. due to blipping or for thermostatic fans. diff --git a/src/Fans/FansManager.cpp b/src/Fans/FansManager.cpp index 721c4260..e92acfe0 100644 --- a/src/Fans/FansManager.cpp +++ b/src/Fans/FansManager.cpp @@ -88,7 +88,7 @@ bool FansManager::WriteFanSettings(FileStore *f) const noexcept #endif // This is called by M950 to create a fan or change its PWM frequency -GCodeResult FansManager::ConfigureFanPort(uint32_t fanNum, GCodeBuffer& gb, const StringRef& reply) noexcept +GCodeResult FansManager::ConfigureFanPort(uint32_t fanNum, GCodeBuffer& gb, const StringRef& reply) { if (fanNum < MaxFans) { @@ -151,7 +151,7 @@ GCodeResult FansManager::ConfigureFanPort(uint32_t fanNum, GCodeBuffer& gb, cons // then search for parameters used to configure the fan. If any are found, perform appropriate actions and return true. // If errors were discovered while processing parameters, put an appropriate error message in 'reply' and set 'error' to true. // If no relevant parameters are found, print the existing ones to 'reply' and return false. -bool FansManager::ConfigureFan(unsigned int mcode, size_t fanNum, GCodeBuffer& gb, const StringRef& reply, bool& error) noexcept +bool FansManager::ConfigureFan(unsigned int mcode, size_t fanNum, GCodeBuffer& gb, const StringRef& reply, bool& error) { auto fan = FindFan(fanNum); if (fan.IsNull()) diff --git a/src/Fans/FansManager.h b/src/Fans/FansManager.h index 5e30b123..617e61cd 100644 --- a/src/Fans/FansManager.h +++ b/src/Fans/FansManager.h @@ -28,8 +28,8 @@ public: void Init() noexcept; bool CheckFans() noexcept; size_t GetHighestUsedFanNumber() const noexcept; - GCodeResult ConfigureFanPort(uint32_t fanNum, GCodeBuffer& gb, const StringRef& reply) noexcept; - bool ConfigureFan(unsigned int mcode, size_t fanNum, GCodeBuffer& gb, const StringRef& reply, bool& error) noexcept; + GCodeResult ConfigureFanPort(uint32_t fanNum, GCodeBuffer& gb, const StringRef& reply); + bool ConfigureFan(unsigned int mcode, size_t fanNum, GCodeBuffer& gb, const StringRef& reply, bool& error); float GetFanValue(size_t fanNum) const noexcept; GCodeResult SetFanValue(size_t fanNum, float speed, const StringRef& reply) noexcept; void SetFanValue(size_t fanNum, float speed) noexcept; |