bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Improvements and fixes to Lulzbot UI (#15490)

Browse Source
This commit is contained in:
Marcio Teixeira
2019-10-09 18:44:49 -06:00
committed by Scott Lahteine
parent e6055dce76
commit dc14d4a13c
20 changed files with 191 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/module/temperature.h
View File

@ -476,12 +476,16 @@ class Temperature {
#if ENABLED(ADAPTIVE_FAN_SLOWING)
static uint8_t fan_speed_scaler[FAN_COUNT];
#else
static constexpr uint8_t fan_speed_scaler[FAN_COUNT] = ARRAY_N(FAN_COUNT, 128, 128, 128, 128, 128, 128);
#endif
static inline uint8_t scaledFanSpeed(const uint8_t target, const uint8_t fs) {
return (fs * uint16_t(fan_speed_scaler[target])) >> 7;
return (fs * uint16_t(
#if ENABLED(ADAPTIVE_FAN_SLOWING)
fan_speed_scaler[target]
#else
128
#endif
)) >> 7;
}
static inline uint8_t scaledFanSpeed(const uint8_t target) {