Skip to content

Commit 19838d9

Browse files
committed
🎨 Misc. adjustments, spacing
1 parent c4873a6 commit 19838d9

File tree

8 files changed

+50
-44
lines changed

8 files changed

+50
-44
lines changed

Marlin/Configuration.h

+32-32
Original file line numberDiff line numberDiff line change
@@ -2700,38 +2700,38 @@
27002700
//========================== Extensible UI Displays ===========================
27012701
//=============================================================================
27022702

2703-
//
2704-
// DGUS Touch Display with DWIN OS. (Choose one.)
2705-
// ORIGIN : https://www.aliexpress.com/item/32993409517.html
2706-
// FYSETC : https://www.aliexpress.com/item/32961471929.html
2707-
// MKS : https://www.aliexpress.com/item/1005002008179262.html
2708-
//
2709-
// Flash display with DGUS Displays for Marlin:
2710-
// - Format the SD card to FAT32 with an allocation size of 4kb.
2711-
// - Download files as specified for your type of display.
2712-
// - Plug the microSD card into the back of the display.
2713-
// - Boot the display and wait for the update to complete.
2714-
//
2715-
// ORIGIN (Marlin DWIN_SET)
2716-
// - Download https://github.com/coldtobi/Marlin_DGUS_Resources
2717-
// - Copy the downloaded DWIN_SET folder to the SD card.
2718-
//
2719-
// FYSETC (Supplier default)
2720-
// - Download https://github.com/FYSETC/FYSTLCD-2.0
2721-
// - Copy the downloaded SCREEN folder to the SD card.
2722-
//
2723-
// HIPRECY (Supplier default)
2724-
// - Download https://github.com/HiPrecy/Touch-Lcd-LEO
2725-
// - Copy the downloaded DWIN_SET folder to the SD card.
2726-
//
2727-
// MKS (MKS-H43) (Supplier default)
2728-
// - Download https://github.com/makerbase-mks/MKS-H43
2729-
// - Copy the downloaded DWIN_SET folder to the SD card.
2730-
//
2731-
// RELOADED (T5UID1)
2732-
// - Download https://github.com/Desuuuu/DGUS-reloaded/releases
2733-
// - Copy the downloaded DWIN_SET folder to the SD card.
2734-
//
2703+
/**
2704+
* DGUS Touch Display with DWIN OS. (Choose one.)
2705+
* ORIGIN : https://www.aliexpress.com/item/32993409517.html
2706+
* FYSETC : https://www.aliexpress.com/item/32961471929.html
2707+
* MKS : https://www.aliexpress.com/item/1005002008179262.html
2708+
*
2709+
* Flash display with DGUS Displays for Marlin:
2710+
* - Format the SD card to FAT32 with an allocation size of 4kb.
2711+
* - Download files as specified for your type of display.
2712+
* - Plug the microSD card into the back of the display.
2713+
* - Boot the display and wait for the update to complete.
2714+
*
2715+
* ORIGIN (Marlin DWIN_SET)
2716+
* - Download https://github.com/coldtobi/Marlin_DGUS_Resources
2717+
* - Copy the downloaded DWIN_SET folder to the SD card.
2718+
*
2719+
* FYSETC (Supplier default)
2720+
* - Download https://github.com/FYSETC/FYSTLCD-2.0
2721+
* - Copy the downloaded SCREEN folder to the SD card.
2722+
*
2723+
* HIPRECY (Supplier default)
2724+
* - Download https://github.com/HiPrecy/Touch-Lcd-LEO
2725+
* - Copy the downloaded DWIN_SET folder to the SD card.
2726+
*
2727+
* MKS (MKS-H43) (Supplier default)
2728+
* - Download https://github.com/makerbase-mks/MKS-H43
2729+
* - Copy the downloaded DWIN_SET folder to the SD card.
2730+
*
2731+
* RELOADED (T5UID1)
2732+
* - Download https://github.com/Desuuuu/DGUS-reloaded/releases
2733+
* - Copy the downloaded DWIN_SET folder to the SD card.
2734+
*/
27352735
//#define DGUS_LCD_UI_ORIGIN
27362736
//#define DGUS_LCD_UI_FYSETC
27372737
//#define DGUS_LCD_UI_HIPRECY

Marlin/src/gcode/host/M876.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include "../../inc/MarlinConfig.h"
2424

25-
#if ENABLED(HOST_PROMPT_SUPPORT) && DISABLED(EMERGENCY_PARSER)
25+
#if HAS_GCODE_M876
2626

2727
#include "../../feature/host_actions.h"
2828
#include "../gcode.h"
@@ -37,4 +37,4 @@ void GcodeSuite::M876() {
3737

3838
}
3939

40-
#endif // HOST_PROMPT_SUPPORT && !EMERGENCY_PARSER
40+
#endif // HAS_GCODE_M876

Marlin/src/inc/Conditionals_adv.h

+4
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,10 @@
701701
#undef SERIAL_XON_XOFF
702702
#endif
703703

704+
#if ENABLED(HOST_PROMPT_SUPPORT) && DISABLED(EMERGENCY_PARSER)
705+
#define HAS_GCODE_M876
706+
#endif
707+
704708
#if ENABLED(HOST_ACTION_COMMANDS)
705709
#ifndef ACTION_ON_PAUSE
706710
#define ACTION_ON_PAUSE "pause"

Marlin/src/lcd/marlinui.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,14 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
184184
#endif
185185

186186
#if LCD_BACKLIGHT_TIMEOUT
187+
187188
uint16_t MarlinUI::lcd_backlight_timeout; // Initialized by settings.load()
188189
millis_t MarlinUI::backlight_off_ms = 0;
189190
void MarlinUI::refresh_backlight_timeout() {
190191
backlight_off_ms = lcd_backlight_timeout ? millis() + lcd_backlight_timeout * 1000UL : 0;
191192
WRITE(LCD_BACKLIGHT_PIN, HIGH);
192193
}
194+
193195
#endif
194196

195197
void MarlinUI::init() {

Marlin/src/lcd/menu/menu_configuration.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,10 @@ void menu_configuration() {
541541
#if HAS_LCD_CONTRAST && LCD_CONTRAST_MIN < LCD_CONTRAST_MAX
542542
EDIT_ITEM_FAST(uint8, MSG_CONTRAST, &ui.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, ui.refresh_contrast, true);
543543
#endif
544+
545+
//
546+
// Set display backlight / sleep timeout
547+
//
544548
#if LCD_BACKLIGHT_TIMEOUT && LCD_BKL_TIMEOUT_MIN < LCD_BKL_TIMEOUT_MAX
545549
EDIT_ITEM(uint16_4, MSG_LCD_BKL_TIMEOUT, &ui.lcd_backlight_timeout, LCD_BKL_TIMEOUT_MIN, LCD_BKL_TIMEOUT_MAX, ui.refresh_backlight_timeout);
546550
#endif

Marlin/src/module/settings.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ typedef struct SettingsDataStruct {
399399
uint8_t lcd_brightness; // M256 B
400400

401401
//
402-
// LCD_BACKLIGHT_TIMEOUT
402+
// Display Sleep
403403
//
404404
#if LCD_BACKLIGHT_TIMEOUT
405405
uint16_t lcd_backlight_timeout; // (G-code needed)
@@ -1142,7 +1142,7 @@ void MarlinSettings::postprocess() {
11421142
}
11431143

11441144
//
1145-
// LCD Backlight Timeout
1145+
// LCD Backlight / Sleep Timeout
11461146
//
11471147
#if LCD_BACKLIGHT_TIMEOUT
11481148
EEPROM_WRITE(ui.lcd_backlight_timeout);
@@ -1156,7 +1156,7 @@ void MarlinSettings::postprocess() {
11561156
#if ENABLED(USE_CONTROLLER_FAN)
11571157
const controllerFan_settings_t &cfs = controllerFan.settings;
11581158
#else
1159-
controllerFan_settings_t cfs = controllerFan_defaults;
1159+
constexpr controllerFan_settings_t cfs = controllerFan_defaults;
11601160
#endif
11611161
EEPROM_WRITE(cfs);
11621162
}
@@ -2091,7 +2091,7 @@ void MarlinSettings::postprocess() {
20912091
}
20922092

20932093
//
2094-
// LCD Backlight Timeout
2094+
// LCD Backlight / Sleep Timeout
20952095
//
20962096
#if LCD_BACKLIGHT_TIMEOUT
20972097
EEPROM_READ(ui.lcd_backlight_timeout);
@@ -3168,7 +3168,7 @@ void MarlinSettings::reset() {
31683168
TERN_(HAS_LCD_BRIGHTNESS, ui.brightness = LCD_BRIGHTNESS_DEFAULT);
31693169

31703170
//
3171-
// LCD Backlight Timeout
3171+
// LCD Backlight / Sleep Timeout
31723172
//
31733173
#if LCD_BACKLIGHT_TIMEOUT
31743174
ui.lcd_backlight_timeout = LCD_BACKLIGHT_TIMEOUT;

buildroot/share/PlatformIO/scripts/common-dependencies.h

-4
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@
4545
#define HAS_SAVED_POSITIONS
4646
#endif
4747

48-
#if ENABLED(HOST_PROMPT_SUPPORT) && DISABLED(EMERGENCY_PARSER)
49-
#define HAS_GCODE_M876
50-
#endif
51-
5248
#if ENABLED(DUET_SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
5349
#define HAS_SMART_EFF_MOD
5450
#endif

platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
217217
-<src/gcode/lcd/M0_M1.cpp>
218218
-<src/gcode/lcd/M73.cpp>
219219
-<src/gcode/lcd/M117.cpp>
220-
-<src/gcode/lcd/M250.cpp> -<src/gcode/lcd/M256.cpp>
220+
-<src/gcode/lcd/M250.cpp> -<src/gcode/lcd/M255.cpp> -<src/gcode/lcd/M256.cpp>
221221
-<src/gcode/lcd/M300.cpp>
222222
-<src/gcode/lcd/M414.cpp>
223223
-<src/gcode/lcd/M995.cpp>

0 commit comments

Comments
 (0)