Skip to content

Commit 463363d

Browse files
thinkyheadthinkyhead
committed
✨ EDITABLE_DISPLAY_TIMEOUT
MarlinFirmware/Marlin#26517
1 parent f3638b4 commit 463363d

File tree

354 files changed

+3186
-1770
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

354 files changed

+3186
-1770
lines changed

‎config/default/Configuration_adv.h

+9-5
Original file line numberDiff line numberDiff line change
@@ -1475,11 +1475,6 @@
14751475
#define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
14761476
#endif
14771477

1478-
//
1479-
// LCD Backlight Timeout
1480-
//
1481-
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
1482-
14831478
#if HAS_BED_PROBE && ANY(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
14841479
//#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
14851480
#if ENABLED(PROBE_OFFSET_WIZARD)
@@ -2219,6 +2214,15 @@
22192214
//#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
22202215
#endif
22212216

2217+
//
2218+
// LCD Backlight Timeout
2219+
// Requires a display with a controllable backlight
2220+
//
2221+
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
2222+
#if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS)
2223+
#define EDITABLE_DISPLAY_TIMEOUT // Edit timeout with M255 S<minutes> and a menu item
2224+
#endif
2225+
22222226
//
22232227
// ADC Button Debounce
22242228
//

‎config/examples/3DFabXYZ/Migbot/Configuration_adv.h

+9-5
Original file line numberDiff line numberDiff line change
@@ -1475,11 +1475,6 @@
14751475
#define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
14761476
#endif
14771477

1478-
//
1479-
// LCD Backlight Timeout
1480-
//
1481-
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
1482-
14831478
#if HAS_BED_PROBE && ANY(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
14841479
//#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
14851480
#if ENABLED(PROBE_OFFSET_WIZARD)
@@ -2220,6 +2215,15 @@
22202215
//#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
22212216
#endif
22222217

2218+
//
2219+
// LCD Backlight Timeout
2220+
// Requires a display with a controllable backlight
2221+
//
2222+
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
2223+
#if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS)
2224+
#define EDITABLE_DISPLAY_TIMEOUT // Edit timeout with M255 S<minutes> and a menu item
2225+
#endif
2226+
22232227
//
22242228
// ADC Button Debounce
22252229
//

‎config/examples/ADIMLab/Gantry v1/Configuration_adv.h

+9-5
Original file line numberDiff line numberDiff line change
@@ -1475,11 +1475,6 @@
14751475
#define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
14761476
#endif
14771477

1478-
//
1479-
// LCD Backlight Timeout
1480-
//
1481-
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
1482-
14831478
#if HAS_BED_PROBE && ANY(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
14841479
//#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
14851480
#if ENABLED(PROBE_OFFSET_WIZARD)
@@ -2220,6 +2215,15 @@
22202215
//#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
22212216
#endif
22222217

2218+
//
2219+
// LCD Backlight Timeout
2220+
// Requires a display with a controllable backlight
2221+
//
2222+
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
2223+
#if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS)
2224+
#define EDITABLE_DISPLAY_TIMEOUT // Edit timeout with M255 S<minutes> and a menu item
2225+
#endif
2226+
22232227
//
22242228
// ADC Button Debounce
22252229
//

‎config/examples/ADIMLab/Gantry v2/Configuration_adv.h

+9-5
Original file line numberDiff line numberDiff line change
@@ -1475,11 +1475,6 @@
14751475
#define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
14761476
#endif
14771477

1478-
//
1479-
// LCD Backlight Timeout
1480-
//
1481-
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
1482-
14831478
#if HAS_BED_PROBE && ANY(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
14841479
//#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
14851480
#if ENABLED(PROBE_OFFSET_WIZARD)
@@ -2220,6 +2215,15 @@
22202215
//#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
22212216
#endif
22222217

2218+
//
2219+
// LCD Backlight Timeout
2220+
// Requires a display with a controllable backlight
2221+
//
2222+
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
2223+
#if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS)
2224+
#define EDITABLE_DISPLAY_TIMEOUT // Edit timeout with M255 S<minutes> and a menu item
2225+
#endif
2226+
22232227
//
22242228
// ADC Button Debounce
22252229
//

‎config/examples/Alfawise/U20-bltouch/Configuration_adv.h

+9-5
Original file line numberDiff line numberDiff line change
@@ -1484,11 +1484,6 @@
14841484
#define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
14851485
#endif
14861486

1487-
//
1488-
// LCD Backlight Timeout
1489-
//
1490-
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
1491-
14921487
#if HAS_BED_PROBE && ANY(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
14931488
//#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
14941489
#if ENABLED(PROBE_OFFSET_WIZARD)
@@ -2230,6 +2225,15 @@
22302225
#define TFT_BTOKMENU_COLOR COLOR_BLUE
22312226
#endif
22322227

2228+
//
2229+
// LCD Backlight Timeout
2230+
// Requires a display with a controllable backlight
2231+
//
2232+
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
2233+
#if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS)
2234+
#define EDITABLE_DISPLAY_TIMEOUT // Edit timeout with M255 S<minutes> and a menu item
2235+
#endif
2236+
22332237
//
22342238
// ADC Button Debounce
22352239
//

‎config/examples/Alfawise/U20/Configuration_adv.h

+9-5
Original file line numberDiff line numberDiff line change
@@ -1475,11 +1475,6 @@
14751475
#define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
14761476
#endif
14771477

1478-
//
1479-
// LCD Backlight Timeout
1480-
//
1481-
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
1482-
14831478
#if HAS_BED_PROBE && ANY(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
14841479
//#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
14851480
#if ENABLED(PROBE_OFFSET_WIZARD)
@@ -2221,6 +2216,15 @@
22212216
#define TFT_BTOKMENU_COLOR COLOR_BLUE
22222217
#endif
22232218

2219+
//
2220+
// LCD Backlight Timeout
2221+
// Requires a display with a controllable backlight
2222+
//
2223+
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
2224+
#if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS)
2225+
#define EDITABLE_DISPLAY_TIMEOUT // Edit timeout with M255 S<minutes> and a menu item
2226+
#endif
2227+
22242228
//
22252229
// ADC Button Debounce
22262230
//

‎config/examples/AliExpress/CL-260/Configuration_adv.h

+9-5
Original file line numberDiff line numberDiff line change
@@ -1475,11 +1475,6 @@
14751475
#define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
14761476
#endif
14771477

1478-
//
1479-
// LCD Backlight Timeout
1480-
//
1481-
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
1482-
14831478
#if HAS_BED_PROBE && ANY(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
14841479
//#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
14851480
#if ENABLED(PROBE_OFFSET_WIZARD)
@@ -2220,6 +2215,15 @@
22202215
//#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
22212216
#endif
22222217

2218+
//
2219+
// LCD Backlight Timeout
2220+
// Requires a display with a controllable backlight
2221+
//
2222+
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
2223+
#if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS)
2224+
#define EDITABLE_DISPLAY_TIMEOUT // Edit timeout with M255 S<minutes> and a menu item
2225+
#endif
2226+
22232227
//
22242228
// ADC Button Debounce
22252229
//

‎config/examples/AliExpress/UM2pExt/Configuration_adv.h

+9-5
Original file line numberDiff line numberDiff line change
@@ -1475,11 +1475,6 @@
14751475
#define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
14761476
#endif
14771477

1478-
//
1479-
// LCD Backlight Timeout
1480-
//
1481-
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
1482-
14831478
#if HAS_BED_PROBE && ANY(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
14841479
//#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
14851480
#if ENABLED(PROBE_OFFSET_WIZARD)
@@ -2220,6 +2215,15 @@
22202215
//#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
22212216
#endif
22222217

2218+
//
2219+
// LCD Backlight Timeout
2220+
// Requires a display with a controllable backlight
2221+
//
2222+
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
2223+
#if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS)
2224+
#define EDITABLE_DISPLAY_TIMEOUT // Edit timeout with M255 S<minutes> and a menu item
2225+
#endif
2226+
22232227
//
22242228
// ADC Button Debounce
22252229
//

‎config/examples/Anet/A2/Configuration_adv.h

+9-5
Original file line numberDiff line numberDiff line change
@@ -1475,11 +1475,6 @@
14751475
#define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
14761476
#endif
14771477

1478-
//
1479-
// LCD Backlight Timeout
1480-
//
1481-
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
1482-
14831478
#if HAS_BED_PROBE && ANY(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
14841479
//#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
14851480
#if ENABLED(PROBE_OFFSET_WIZARD)
@@ -2220,6 +2215,15 @@
22202215
//#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
22212216
#endif
22222217

2218+
//
2219+
// LCD Backlight Timeout
2220+
// Requires a display with a controllable backlight
2221+
//
2222+
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
2223+
#if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS)
2224+
#define EDITABLE_DISPLAY_TIMEOUT // Edit timeout with M255 S<minutes> and a menu item
2225+
#endif
2226+
22232227
//
22242228
// ADC Button Debounce
22252229
//

‎config/examples/Anet/A2plus/Configuration_adv.h

+9-5
Original file line numberDiff line numberDiff line change
@@ -1475,11 +1475,6 @@
14751475
#define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
14761476
#endif
14771477

1478-
//
1479-
// LCD Backlight Timeout
1480-
//
1481-
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
1482-
14831478
#if HAS_BED_PROBE && ANY(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
14841479
//#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
14851480
#if ENABLED(PROBE_OFFSET_WIZARD)
@@ -2220,6 +2215,15 @@
22202215
//#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
22212216
#endif
22222217

2218+
//
2219+
// LCD Backlight Timeout
2220+
// Requires a display with a controllable backlight
2221+
//
2222+
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
2223+
#if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS)
2224+
#define EDITABLE_DISPLAY_TIMEOUT // Edit timeout with M255 S<minutes> and a menu item
2225+
#endif
2226+
22232227
//
22242228
// ADC Button Debounce
22252229
//

‎config/examples/Anet/A6/Configuration_adv.h

+9-5
Original file line numberDiff line numberDiff line change
@@ -1475,11 +1475,6 @@
14751475
#define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
14761476
#endif
14771477

1478-
//
1479-
// LCD Backlight Timeout
1480-
//
1481-
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
1482-
14831478
#if HAS_BED_PROBE && ANY(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
14841479
//#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
14851480
#if ENABLED(PROBE_OFFSET_WIZARD)
@@ -2220,6 +2215,15 @@
22202215
//#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
22212216
#endif
22222217

2218+
//
2219+
// LCD Backlight Timeout
2220+
// Requires a display with a controllable backlight
2221+
//
2222+
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
2223+
#if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS)
2224+
#define EDITABLE_DISPLAY_TIMEOUT // Edit timeout with M255 S<minutes> and a menu item
2225+
#endif
2226+
22232227
//
22242228
// ADC Button Debounce
22252229
//

‎config/examples/Anet/A8/Configuration_adv.h

+9-5
Original file line numberDiff line numberDiff line change
@@ -1475,11 +1475,6 @@
14751475
#define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
14761476
#endif
14771477

1478-
//
1479-
// LCD Backlight Timeout
1480-
//
1481-
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
1482-
14831478
#if HAS_BED_PROBE && ANY(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
14841479
//#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
14851480
#if ENABLED(PROBE_OFFSET_WIZARD)
@@ -2220,6 +2215,15 @@
22202215
//#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
22212216
#endif
22222217

2218+
//
2219+
// LCD Backlight Timeout
2220+
// Requires a display with a controllable backlight
2221+
//
2222+
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
2223+
#if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS)
2224+
#define EDITABLE_DISPLAY_TIMEOUT // Edit timeout with M255 S<minutes> and a menu item
2225+
#endif
2226+
22232227
//
22242228
// ADC Button Debounce
22252229
//

‎config/examples/Anet/A8plus/Configuration_adv.h

+9-5
Original file line numberDiff line numberDiff line change
@@ -1475,11 +1475,6 @@
14751475
#define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
14761476
#endif
14771477

1478-
//
1479-
// LCD Backlight Timeout
1480-
//
1481-
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
1482-
14831478
#if HAS_BED_PROBE && ANY(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
14841479
//#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
14851480
#if ENABLED(PROBE_OFFSET_WIZARD)
@@ -2220,6 +2215,15 @@
22202215
//#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
22212216
#endif
22222217

2218+
//
2219+
// LCD Backlight Timeout
2220+
// Requires a display with a controllable backlight
2221+
//
2222+
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
2223+
#if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS)
2224+
#define EDITABLE_DISPLAY_TIMEOUT // Edit timeout with M255 S<minutes> and a menu item
2225+
#endif
2226+
22232227
//
22242228
// ADC Button Debounce
22252229
//

‎config/examples/Anet/A9/Configuration_adv.h

+9-5
Original file line numberDiff line numberDiff line change
@@ -1475,11 +1475,6 @@
14751475
#define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
14761476
#endif
14771477

1478-
//
1479-
// LCD Backlight Timeout
1480-
//
1481-
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
1482-
14831478
#if HAS_BED_PROBE && ANY(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
14841479
//#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu
14851480
#if ENABLED(PROBE_OFFSET_WIZARD)
@@ -2220,6 +2215,15 @@
22202215
//#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
22212216
#endif
22222217

2218+
//
2219+
// LCD Backlight Timeout
2220+
// Requires a display with a controllable backlight
2221+
//
2222+
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
2223+
#if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS)
2224+
#define EDITABLE_DISPLAY_TIMEOUT // Edit timeout with M255 S<minutes> and a menu item
2225+
#endif
2226+
22232227
//
22242228
// ADC Button Debounce
22252229
//

0 commit comments

Comments
 (0)