File tree Expand file tree Collapse file tree 5 files changed +13
-12
lines changed Expand file tree Collapse file tree 5 files changed +13
-12
lines changed Original file line number Diff line number Diff line change @@ -885,7 +885,7 @@ class GcodeSuite {
885
885
static void M250_report (const bool forReplay=true );
886
886
#endif
887
887
888
- #if HAS_DISPLAY_SLEEP
888
+ #if HAS_GCODE_M255
889
889
static void M255 ();
890
890
static void M255_report (const bool forReplay=true );
891
891
#endif
Original file line number Diff line number Diff line change @@ -36,7 +36,7 @@ void GcodeSuite::M255() {
36
36
const int m = parser.value_int ();
37
37
ui.sleep_timeout_minutes = constrain (m, SLEEP_TIMEOUT_MIN, SLEEP_TIMEOUT_MAX);
38
38
#else
39
- const int s = parser.value_int () * 60 ;
39
+ const unsigned int s = parser.value_ushort () * 60 ;
40
40
ui.lcd_backlight_timeout = constrain (s, LCD_BKL_TIMEOUT_MIN, LCD_BKL_TIMEOUT_MAX);
41
41
#endif
42
42
}
Original file line number Diff line number Diff line change 587
587
#define HAS_PRINT_PROGRESS 1
588
588
#endif
589
589
590
+ #if ANY (HAS_MARLINUI_MENU , ULTIPANEL_FEEDMULTIPLY , SOFT_RESET_ON_KILL )
591
+ #define HAS_ENCODER_ACTION 1
592
+ #endif
593
+
590
594
#if STATUS_MESSAGE_TIMEOUT_SEC > 0
591
595
#define HAS_STATUS_MESSAGE_TIMEOUT 1
592
596
#endif
Original file line number Diff line number Diff line change 32
32
#include " tft_io/touch_calibration.h"
33
33
#endif
34
34
35
- #if ANY(HAS_MARLINUI_MENU, ULTIPANEL_FEEDMULTIPLY, SOFT_RESET_ON_KILL)
36
- #define HAS_ENCODER_ACTION 1
37
- #endif
38
-
39
35
#if E_MANUAL > 1
40
36
#define MULTI_E_MANUAL 1
41
37
#endif
@@ -273,8 +269,8 @@ class MarlinUI {
273
269
#endif
274
270
275
271
#if LCD_BACKLIGHT_TIMEOUT
276
- #define LCD_BKL_TIMEOUT_MIN 1
277
- #define LCD_BKL_TIMEOUT_MAX ( 60 * 60 * 18 ) // 18 hours max within uint16_t
272
+ #define LCD_BKL_TIMEOUT_MIN 1u
273
+ #define LCD_BKL_TIMEOUT_MAX UINT16_MAX // Slightly more than 18 hours
278
274
static uint16_t lcd_backlight_timeout;
279
275
static millis_t backlight_off_ms;
280
276
static void refresh_backlight_timeout ();
Original file line number Diff line number Diff line change @@ -206,16 +206,17 @@ opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOO
206
206
exec_test $1 $2 " MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Laser Safety Timeout | Flowmeter | 44780 LCD " " $3 "
207
207
208
208
#
209
- # Test redundant temperature sensors + MAX TC
209
+ # Test redundant temperature sensors + MAX TC + Backlight Timeout
210
210
#
211
211
restore_configs
212
212
opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 1 \
213
213
TEMP_SENSOR_0 -2 TEMP_SENSOR_REDUNDANT -2 \
214
214
TEMP_SENSOR_REDUNDANT_SOURCE E1 TEMP_SENSOR_REDUNDANT_TARGET E0 \
215
- TEMP_0_CS_PIN 11 TEMP_1_CS_PIN 12
216
- opt_enable MPCTEMP
215
+ TEMP_0_CS_PIN 11 TEMP_1_CS_PIN 12 \
216
+ LCD_BACKLIGHT_TIMEOUT 30
217
+ opt_enable MPCTEMP MINIPANEL
217
218
opt_disable PIDTEMP
218
- exec_test $1 $2 " MEGA2560 RAMPS | Redundant temperature sensor | 2x MAX6675" " $3 "
219
+ exec_test $1 $2 " MEGA2560 RAMPS | Redundant temperature sensor | 2x MAX6675 | BL Timeout " " $3 "
219
220
220
221
#
221
222
# Polargraph Config
You can’t perform that action at this time.
0 commit comments