Parcourir la source

🔧 HAS_LCDPRINT conditional

Scott Lahteine il y a 3 ans
Parent
révision
cf013a7f3e
3 fichiers modifiés avec 7 ajouts et 3 suppressions
  1. 4
    0
      Marlin/src/inc/Conditionals_LCD.h
  2. 2
    2
      Marlin/src/lcd/lcdprint.cpp
  3. 1
    1
      ini/features.ini

+ 4
- 0
Marlin/src/inc/Conditionals_LCD.h Voir le fichier

517
   #define HAS_DISPLAY 1
517
   #define HAS_DISPLAY 1
518
 #endif
518
 #endif
519
 
519
 
520
+#if HAS_WIRED_LCD && !HAS_GRAPHICAL_TFT && !IS_DWIN_MARLINUI
521
+  #define HAS_LCDPRINT 1
522
+#endif
523
+
520
 #if ANY(HAS_DISPLAY, HAS_DWIN_E3V2, GLOBAL_STATUS_MESSAGE)
524
 #if ANY(HAS_DISPLAY, HAS_DWIN_E3V2, GLOBAL_STATUS_MESSAGE)
521
   #define HAS_STATUS_MESSAGE 1
525
   #define HAS_STATUS_MESSAGE 1
522
 #endif
526
 #endif

+ 2
- 2
Marlin/src/lcd/lcdprint.cpp Voir le fichier

26
 
26
 
27
 #include "../inc/MarlinConfigPre.h"
27
 #include "../inc/MarlinConfigPre.h"
28
 
28
 
29
-#if HAS_WIRED_LCD && !HAS_GRAPHICAL_TFT && !IS_DWIN_MARLINUI
29
+#if HAS_LCDPRINT
30
 
30
 
31
 #include "marlinui.h"
31
 #include "marlinui.h"
32
 #include "lcdprint.h"
32
 #include "lcdprint.h"
103
   return n * MENU_FONT_WIDTH;
103
   return n * MENU_FONT_WIDTH;
104
 }
104
 }
105
 
105
 
106
-#endif // HAS_WIRED_LCD
106
+#endif // HAS_LCDPRINT

+ 1
- 1
ini/features.ini Voir le fichier

34
 USES_LIQUIDCRYSTAL                     = LiquidCrystal=https://github.com/MarlinFirmware/New-LiquidCrystal/archive/1.5.1.zip
34
 USES_LIQUIDCRYSTAL                     = LiquidCrystal=https://github.com/MarlinFirmware/New-LiquidCrystal/archive/1.5.1.zip
35
 USES_LIQUIDCRYSTAL_I2C                 = marcoschwartz/LiquidCrystal_I2C@1.1.4
35
 USES_LIQUIDCRYSTAL_I2C                 = marcoschwartz/LiquidCrystal_I2C@1.1.4
36
 USES_LIQUIDTWI2                        = LiquidTWI2@1.2.7
36
 USES_LIQUIDTWI2                        = LiquidTWI2@1.2.7
37
-HAS_WIRED_LCD                          = src_filter=+<src/lcd/lcdprint.cpp>
37
+HAS_LCDPRINT                           = src_filter=+<src/lcd/lcdprint.cpp>
38
 HAS_MARLINUI_HD44780                   = src_filter=+<src/lcd/HD44780>
38
 HAS_MARLINUI_HD44780                   = src_filter=+<src/lcd/HD44780>
39
 HAS_MARLINUI_U8GLIB                    = U8glib-HAL@~0.5.0
39
 HAS_MARLINUI_U8GLIB                    = U8glib-HAL@~0.5.0
40
                                          src_filter=+<src/lcd/dogm>
40
                                          src_filter=+<src/lcd/dogm>

Chargement…
Annuler
Enregistrer