@@ -143,25 +143,27 @@ void _draw_axis_value(const AxisEnum axis, const char *value, const bool blink,
143143
144144#endif // LCD_SHOW_E_TOTAL
145145
146- //
147- // Fan Icon and Percentage
148- //
149- FORCE_INLINE void _draw_fan_status (const uint16_t x, const uint16_t y) {
150- const uint16_t fanx = (4 * STATUS_CHR_WIDTH - STATUS_FAN_WIDTH) / 2 ;
151- const bool fan_on = !!thermalManager.scaledFanSpeed (0 );
152- if (fan_on) {
153- DWIN_ICON_Animation (0 , fan_on, ICON, ICON_Fan0, ICON_Fan3, x + fanx, y, 25 );
154- dwin_string.set (i8tostr3rj (thermalManager.scaledFanSpeedPercent (0 )));
155- dwin_string.add (' %' );
156- DWIN_Draw_String (true , font14x28, Color_White, Color_Bg_Black, x, y + STATUS_FAN_HEIGHT, S (dwin_string.string ()));
157- }
158- else {
159- DWIN_ICON_AnimationControl (0x0000 ); // disable all icon animations (this is the only one)
160- DWIN_ICON_Show (ICON, ICON_Fan0, x + fanx, y);
161- dwin_string.set (F (" " ));
162- DWIN_Draw_String (true , font14x28, Color_White, Color_Bg_Black, x, y + STATUS_FAN_HEIGHT, S (dwin_string.string ()));
146+ #if HAS_FAN
147+ //
148+ // Fan Icon and Percentage
149+ //
150+ FORCE_INLINE void _draw_fan_status (const uint16_t x, const uint16_t y) {
151+ const uint16_t fanx = (4 * STATUS_CHR_WIDTH - STATUS_FAN_WIDTH) / 2 ;
152+ const bool fan_on = !!thermalManager.scaledFanSpeed (0 );
153+ if (fan_on) {
154+ DWIN_ICON_Animation (0 , fan_on, ICON, ICON_Fan0, ICON_Fan3, x + fanx, y, 25 );
155+ dwin_string.set (i8tostr3rj (thermalManager.scaledFanSpeedPercent (0 )));
156+ dwin_string.add (' %' );
157+ DWIN_Draw_String (true , font14x28, Color_White, Color_Bg_Black, x, y + STATUS_FAN_HEIGHT, S (dwin_string.string ()));
158+ }
159+ else {
160+ DWIN_ICON_AnimationControl (0x0000 ); // disable all icon animations (this is the only one)
161+ DWIN_ICON_Show (ICON, ICON_Fan0, x + fanx, y);
162+ dwin_string.set (F (" " ));
163+ DWIN_Draw_String (true , font14x28, Color_White, Color_Bg_Black, x, y + STATUS_FAN_HEIGHT, S (dwin_string.string ()));
164+ }
163165 }
164- }
166+ # endif
165167
166168/* *
167169 * Draw a single heater icon with current and target temperature, at the given XY
@@ -300,7 +302,6 @@ void MarlinUI::draw_status_screen() {
300302 #if HAS_HEATED_BED
301303 _draw_heater_status (H_BED, hx, STATUS_HEATERS_Y);
302304 #endif
303-
304305 #if HAS_FAN
305306 _draw_fan_status (LCD_PIXEL_WIDTH - STATUS_CHR_WIDTH * 5 , STATUS_FAN_Y);
306307 #endif
0 commit comments