diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-07-27 15:42:31 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-07-27 15:42:31 +0300 |
| commit | 1b6f16b111b4a7f660acb1abf94b47bc739f7f29 (patch) | |
| tree | 4e29fb0af48e72585b6976b5be1fdaca7be3df27 /src/Heating | |
| parent | e39a8ddb5110a25656388ca52bb0e6b5c5d54f71 (diff) | |
| parent | 448c585f89bb48fcb1b1e728001a0b2f4ca32197 (diff) | |
Merge branch '3.4-dev' into 3.4-input-shaping
Diffstat (limited to 'src/Heating')
| -rw-r--r-- | src/Heating/FOPDT.cpp | 4 | ||||
| -rw-r--r-- | src/Heating/FOPDT.h | 2 | ||||
| -rw-r--r-- | src/Heating/Heat.cpp | 4 | ||||
| -rw-r--r-- | src/Heating/Heat.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/Heating/FOPDT.cpp b/src/Heating/FOPDT.cpp index 3ffee68d..a4021864 100644 --- a/src/Heating/FOPDT.cpp +++ b/src/Heating/FOPDT.cpp @@ -7,7 +7,7 @@ #include "FOPDT.h" -#if HAS_MASS_STORAGE +#if HAS_MASS_STORAGE || HAS_LINUX_INTERFACE # include "Storage/FileStore.h" #endif @@ -146,7 +146,7 @@ void FopDt::SetM301PidParameters(const M301PidParameters& pp) noexcept pidParametersOverridden = true; } -#if HAS_MASS_STORAGE +#if HAS_MASS_STORAGE || HAS_LINUX_INTERFACE // Write the model parameters to file returning true if no error bool FopDt::WriteParameters(FileStore *f, size_t heater) const noexcept diff --git a/src/Heating/FOPDT.h b/src/Heating/FOPDT.h index 84ac8123..7edee12a 100644 --- a/src/Heating/FOPDT.h +++ b/src/Heating/FOPDT.h @@ -72,7 +72,7 @@ public: return (forLoadChange) ? loadChangeParams : setpointChangeParams; } -#if HAS_MASS_STORAGE +#if HAS_MASS_STORAGE || HAS_LINUX_INTERFACE bool WriteParameters(FileStore *f, size_t heater) const noexcept; // erite the model parameters to file returning true if no error #endif diff --git a/src/Heating/Heat.cpp b/src/Heating/Heat.cpp index fe5c1ef4..a7ec0ac9 100644 --- a/src/Heating/Heat.cpp +++ b/src/Heating/Heat.cpp @@ -730,7 +730,7 @@ float Heat::GetHighestTemperatureLimit() const noexcept return limit; } -#if HAS_MASS_STORAGE +#if HAS_MASS_STORAGE || HAS_LINUX_INTERFACE // Write heater model parameters to file returning true if no error bool Heat::WriteModelParameters(FileStore *f) const noexcept @@ -1096,7 +1096,7 @@ void Heat::InsertSensor(TemperatureSensor *newSensor) noexcept } } -#if HAS_MASS_STORAGE +#if HAS_MASS_STORAGE || HAS_LINUX_INTERFACE // Save some resume information returning true if successful. // We assume that the bed and chamber heaters are either on and active, or off (not on standby). diff --git a/src/Heating/Heat.h b/src/Heating/Heat.h index 2b13ca3a..7402eae2 100644 --- a/src/Heating/Heat.h +++ b/src/Heating/Heat.h @@ -128,7 +128,7 @@ public: void SwitchOff(int heater) noexcept; // Turn off a specific heater void FeedForwardAdjustment(unsigned int heater, float fanPwmChange, float extrusionChange) const noexcept; -#if HAS_MASS_STORAGE +#if HAS_MASS_STORAGE || HAS_LINUX_INTERFACE bool WriteModelParameters(FileStore *f) const noexcept; // Write heater model parameters to file returning true if no error bool WriteBedAndChamberTempSettings(FileStore *f) const noexcept; // Save some resume information #endif |