diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-04-30 14:37:25 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-04-30 14:37:25 +0300 |
| commit | 500c6eb865dcb1cc246874da5c187424ffc5dc51 (patch) | |
| tree | b17c623c183b477d0b9cdd54508528a8ccae71a4 /src/Fans/Fan.h | |
| parent | 6f912e9ca47930d7b91d504c0e9c8be31251284a (diff) | |
Various changes for 3.01-RC11
Changes for new interface to Bitmap::Iterate
Duet3 expansion boards now report fan PWM
Increased SBC SPI connection timeout to 8 seconds
Pass G29 commands to SBC
Diffstat (limited to 'src/Fans/Fan.h')
| -rw-r--r-- | src/Fans/Fan.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Fans/Fan.h b/src/Fans/Fan.h index 2539ed5a..1444aa0b 100644 --- a/src/Fans/Fan.h +++ b/src/Fans/Fan.h @@ -14,7 +14,7 @@ #include "GCodes/GCodeResult.h" #if SUPPORT_CAN_EXPANSION -# include "CanId.h" +# include <CanMessageFormats.h> #endif class GCodeBuffer; @@ -30,9 +30,10 @@ public: virtual GCodeResult SetPwmFrequency(PwmFrequency freq, const StringRef& reply) noexcept = 0; virtual bool IsEnabled() const noexcept = 0; virtual int32_t GetRPM() const noexcept = 0; + virtual float GetPwm() const noexcept = 0; virtual GCodeResult ReportPortDetails(const StringRef& str) const noexcept = 0; #if SUPPORT_CAN_EXPANSION - virtual void UpdateRpmFromRemote(CanAddress src, int32_t rpm) noexcept = 0; + virtual void UpdateFromRemote(CanAddress src, const FanReport& report) noexcept = 0; #endif // Set or report the parameters for this fan @@ -55,7 +56,7 @@ public: protected: DECLARE_OBJECT_MODEL - static constexpr uint32_t RpmReadingTimeout = 2000; // any reading older than this number of milliseconds is considered unreliable + static constexpr uint32_t FanReportTimeout = 2000; // any reading older than this number of milliseconds is considered unreliable virtual GCodeResult Refresh(const StringRef& reply) noexcept = 0; virtual bool UpdateFanConfiguration(const StringRef& reply) noexcept = 0; @@ -64,7 +65,6 @@ protected: // Variables that control the fan float val; // the value requested in the M106 command - float lastVal; // the last PWM value we sent to the fan, not allowing for blipping, or -1 if we don't know it float minVal; float maxVal; float triggerTemperatures[2]; |