Browse Source

🎨 Misc. adjustments, spacing

Scott Lahteine 2 years ago
parent
commit
19838d97be

+ 32
- 32
Marlin/Configuration.h View File

2700
 //========================== Extensible UI Displays ===========================
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
 //#define DGUS_LCD_UI_ORIGIN
2735
 //#define DGUS_LCD_UI_ORIGIN
2736
 //#define DGUS_LCD_UI_FYSETC
2736
 //#define DGUS_LCD_UI_FYSETC
2737
 //#define DGUS_LCD_UI_HIPRECY
2737
 //#define DGUS_LCD_UI_HIPRECY

+ 2
- 2
Marlin/src/gcode/host/M876.cpp View File

22
 
22
 
23
 #include "../../inc/MarlinConfig.h"
23
 #include "../../inc/MarlinConfig.h"
24
 
24
 
25
-#if ENABLED(HOST_PROMPT_SUPPORT) && DISABLED(EMERGENCY_PARSER)
25
+#if HAS_GCODE_M876
26
 
26
 
27
 #include "../../feature/host_actions.h"
27
 #include "../../feature/host_actions.h"
28
 #include "../gcode.h"
28
 #include "../gcode.h"
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 View File

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

+ 2
- 0
Marlin/src/lcd/marlinui.cpp View File

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

+ 4
- 0
Marlin/src/lcd/menu/menu_configuration.cpp View File

541
   #if HAS_LCD_CONTRAST && LCD_CONTRAST_MIN < LCD_CONTRAST_MAX
541
   #if HAS_LCD_CONTRAST && LCD_CONTRAST_MIN < LCD_CONTRAST_MAX
542
     EDIT_ITEM_FAST(uint8, MSG_CONTRAST, &ui.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, ui.refresh_contrast, true);
542
     EDIT_ITEM_FAST(uint8, MSG_CONTRAST, &ui.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, ui.refresh_contrast, true);
543
   #endif
543
   #endif
544
+
545
+  //
546
+  // Set display backlight / sleep timeout
547
+  //
544
   #if LCD_BACKLIGHT_TIMEOUT && LCD_BKL_TIMEOUT_MIN < LCD_BKL_TIMEOUT_MAX
548
   #if LCD_BACKLIGHT_TIMEOUT && LCD_BKL_TIMEOUT_MIN < LCD_BKL_TIMEOUT_MAX
545
     EDIT_ITEM(uint16_4, MSG_LCD_BKL_TIMEOUT, &ui.lcd_backlight_timeout, LCD_BKL_TIMEOUT_MIN, LCD_BKL_TIMEOUT_MAX, ui.refresh_backlight_timeout);
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
   #endif
550
   #endif

+ 5
- 5
Marlin/src/module/settings.cpp View File

399
   uint8_t lcd_brightness;                               // M256 B
399
   uint8_t lcd_brightness;                               // M256 B
400
 
400
 
401
   //
401
   //
402
-  // LCD_BACKLIGHT_TIMEOUT
402
+  // Display Sleep
403
   //
403
   //
404
   #if LCD_BACKLIGHT_TIMEOUT
404
   #if LCD_BACKLIGHT_TIMEOUT
405
     uint16_t lcd_backlight_timeout;                     // (G-code needed)
405
     uint16_t lcd_backlight_timeout;                     // (G-code needed)
1142
     }
1142
     }
1143
 
1143
 
1144
     //
1144
     //
1145
-    // LCD Backlight Timeout
1145
+    // LCD Backlight / Sleep Timeout
1146
     //
1146
     //
1147
     #if LCD_BACKLIGHT_TIMEOUT
1147
     #if LCD_BACKLIGHT_TIMEOUT
1148
       EEPROM_WRITE(ui.lcd_backlight_timeout);
1148
       EEPROM_WRITE(ui.lcd_backlight_timeout);
1156
       #if ENABLED(USE_CONTROLLER_FAN)
1156
       #if ENABLED(USE_CONTROLLER_FAN)
1157
         const controllerFan_settings_t &cfs = controllerFan.settings;
1157
         const controllerFan_settings_t &cfs = controllerFan.settings;
1158
       #else
1158
       #else
1159
-        controllerFan_settings_t cfs = controllerFan_defaults;
1159
+        constexpr controllerFan_settings_t cfs = controllerFan_defaults;
1160
       #endif
1160
       #endif
1161
       EEPROM_WRITE(cfs);
1161
       EEPROM_WRITE(cfs);
1162
     }
1162
     }
2091
       }
2091
       }
2092
 
2092
 
2093
       //
2093
       //
2094
-      // LCD Backlight Timeout
2094
+      // LCD Backlight / Sleep Timeout
2095
       //
2095
       //
2096
       #if LCD_BACKLIGHT_TIMEOUT
2096
       #if LCD_BACKLIGHT_TIMEOUT
2097
         EEPROM_READ(ui.lcd_backlight_timeout);
2097
         EEPROM_READ(ui.lcd_backlight_timeout);
3168
   TERN_(HAS_LCD_BRIGHTNESS, ui.brightness = LCD_BRIGHTNESS_DEFAULT);
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
   #if LCD_BACKLIGHT_TIMEOUT
3173
   #if LCD_BACKLIGHT_TIMEOUT
3174
     ui.lcd_backlight_timeout = LCD_BACKLIGHT_TIMEOUT;
3174
     ui.lcd_backlight_timeout = LCD_BACKLIGHT_TIMEOUT;

+ 0
- 4
buildroot/share/PlatformIO/scripts/common-dependencies.h View File

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

+ 1
- 1
platformio.ini View File

217
   -<src/gcode/lcd/M0_M1.cpp>
217
   -<src/gcode/lcd/M0_M1.cpp>
218
   -<src/gcode/lcd/M73.cpp>
218
   -<src/gcode/lcd/M73.cpp>
219
   -<src/gcode/lcd/M117.cpp>
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
   -<src/gcode/lcd/M300.cpp>
221
   -<src/gcode/lcd/M300.cpp>
222
   -<src/gcode/lcd/M414.cpp>
222
   -<src/gcode/lcd/M414.cpp>
223
   -<src/gcode/lcd/M995.cpp>
223
   -<src/gcode/lcd/M995.cpp>

Loading…
Cancel
Save