浏览代码

🎨 Misc. adjustments, spacing

Scott Lahteine 2 年前
父节点
当前提交
19838d97be

+ 32
- 32
Marlin/Configuration.h 查看文件

@@ -2700,38 +2700,38 @@
2700 2700
 //========================== Extensible UI Displays ===========================
2701 2701
 //=============================================================================
2702 2702
 
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
+ */
2735 2735
 //#define DGUS_LCD_UI_ORIGIN
2736 2736
 //#define DGUS_LCD_UI_FYSETC
2737 2737
 //#define DGUS_LCD_UI_HIPRECY

+ 2
- 2
Marlin/src/gcode/host/M876.cpp 查看文件

@@ -22,7 +22,7 @@
22 22
 
23 23
 #include "../../inc/MarlinConfig.h"
24 24
 
25
-#if ENABLED(HOST_PROMPT_SUPPORT) && DISABLED(EMERGENCY_PARSER)
25
+#if HAS_GCODE_M876
26 26
 
27 27
 #include "../../feature/host_actions.h"
28 28
 #include "../gcode.h"
@@ -37,4 +37,4 @@ void GcodeSuite::M876() {
37 37
 
38 38
 }
39 39
 
40
-#endif // HOST_PROMPT_SUPPORT && !EMERGENCY_PARSER
40
+#endif // HAS_GCODE_M876

+ 4
- 0
Marlin/src/inc/Conditionals_adv.h 查看文件

@@ -701,6 +701,10 @@
701 701
   #undef SERIAL_XON_XOFF
702 702
 #endif
703 703
 
704
+#if ENABLED(HOST_PROMPT_SUPPORT) && DISABLED(EMERGENCY_PARSER)
705
+  #define HAS_GCODE_M876
706
+#endif
707
+
704 708
 #if ENABLED(HOST_ACTION_COMMANDS)
705 709
   #ifndef ACTION_ON_PAUSE
706 710
     #define ACTION_ON_PAUSE   "pause"

+ 2
- 0
Marlin/src/lcd/marlinui.cpp 查看文件

@@ -184,12 +184,14 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
184 184
 #endif
185 185
 
186 186
 #if LCD_BACKLIGHT_TIMEOUT
187
+
187 188
   uint16_t MarlinUI::lcd_backlight_timeout; // Initialized by settings.load()
188 189
   millis_t MarlinUI::backlight_off_ms = 0;
189 190
   void MarlinUI::refresh_backlight_timeout() {
190 191
     backlight_off_ms = lcd_backlight_timeout ? millis() + lcd_backlight_timeout * 1000UL : 0;
191 192
     WRITE(LCD_BACKLIGHT_PIN, HIGH);
192 193
   }
194
+
193 195
 #endif
194 196
 
195 197
 void MarlinUI::init() {

+ 4
- 0
Marlin/src/lcd/menu/menu_configuration.cpp 查看文件

@@ -541,6 +541,10 @@ void menu_configuration() {
541 541
   #if HAS_LCD_CONTRAST && LCD_CONTRAST_MIN < LCD_CONTRAST_MAX
542 542
     EDIT_ITEM_FAST(uint8, MSG_CONTRAST, &ui.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, ui.refresh_contrast, true);
543 543
   #endif
544
+
545
+  //
546
+  // Set display backlight / sleep timeout
547
+  //
544 548
   #if LCD_BACKLIGHT_TIMEOUT && LCD_BKL_TIMEOUT_MIN < LCD_BKL_TIMEOUT_MAX
545 549
     EDIT_ITEM(uint16_4, MSG_LCD_BKL_TIMEOUT, &ui.lcd_backlight_timeout, LCD_BKL_TIMEOUT_MIN, LCD_BKL_TIMEOUT_MAX, ui.refresh_backlight_timeout);
546 550
   #endif

+ 5
- 5
Marlin/src/module/settings.cpp 查看文件

@@ -399,7 +399,7 @@ typedef struct SettingsDataStruct {
399 399
   uint8_t lcd_brightness;                               // M256 B
400 400
 
401 401
   //
402
-  // LCD_BACKLIGHT_TIMEOUT
402
+  // Display Sleep
403 403
   //
404 404
   #if LCD_BACKLIGHT_TIMEOUT
405 405
     uint16_t lcd_backlight_timeout;                     // (G-code needed)
@@ -1142,7 +1142,7 @@ void MarlinSettings::postprocess() {
1142 1142
     }
1143 1143
 
1144 1144
     //
1145
-    // LCD Backlight Timeout
1145
+    // LCD Backlight / Sleep Timeout
1146 1146
     //
1147 1147
     #if LCD_BACKLIGHT_TIMEOUT
1148 1148
       EEPROM_WRITE(ui.lcd_backlight_timeout);
@@ -1156,7 +1156,7 @@ void MarlinSettings::postprocess() {
1156 1156
       #if ENABLED(USE_CONTROLLER_FAN)
1157 1157
         const controllerFan_settings_t &cfs = controllerFan.settings;
1158 1158
       #else
1159
-        controllerFan_settings_t cfs = controllerFan_defaults;
1159
+        constexpr controllerFan_settings_t cfs = controllerFan_defaults;
1160 1160
       #endif
1161 1161
       EEPROM_WRITE(cfs);
1162 1162
     }
@@ -2091,7 +2091,7 @@ void MarlinSettings::postprocess() {
2091 2091
       }
2092 2092
 
2093 2093
       //
2094
-      // LCD Backlight Timeout
2094
+      // LCD Backlight / Sleep Timeout
2095 2095
       //
2096 2096
       #if LCD_BACKLIGHT_TIMEOUT
2097 2097
         EEPROM_READ(ui.lcd_backlight_timeout);
@@ -3168,7 +3168,7 @@ void MarlinSettings::reset() {
3168 3168
   TERN_(HAS_LCD_BRIGHTNESS, ui.brightness = LCD_BRIGHTNESS_DEFAULT);
3169 3169
 
3170 3170
   //
3171
-  // LCD Backlight Timeout
3171
+  // LCD Backlight / Sleep Timeout
3172 3172
   //
3173 3173
   #if LCD_BACKLIGHT_TIMEOUT
3174 3174
     ui.lcd_backlight_timeout = LCD_BACKLIGHT_TIMEOUT;

+ 0
- 4
buildroot/share/PlatformIO/scripts/common-dependencies.h 查看文件

@@ -45,10 +45,6 @@
45 45
   #define HAS_SAVED_POSITIONS
46 46
 #endif
47 47
 
48
-#if ENABLED(HOST_PROMPT_SUPPORT) && DISABLED(EMERGENCY_PARSER)
49
-  #define HAS_GCODE_M876
50
-#endif
51
-
52 48
 #if ENABLED(DUET_SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
53 49
   #define HAS_SMART_EFF_MOD
54 50
 #endif

+ 1
- 1
platformio.ini 查看文件

@@ -217,7 +217,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
217 217
   -<src/gcode/lcd/M0_M1.cpp>
218 218
   -<src/gcode/lcd/M73.cpp>
219 219
   -<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>
221 221
   -<src/gcode/lcd/M300.cpp>
222 222
   -<src/gcode/lcd/M414.cpp>
223 223
   -<src/gcode/lcd/M995.cpp>

正在加载...
取消
保存