浏览代码

Update DOGLCD conditions

Scott Lahteine 5 年前
父节点
当前提交
d4be970c8b
共有 3 个文件被更改,包括 6 次插入6 次删除
  1. 1
    1
      Marlin/src/HAL/HAL_LINUX/spi_pins.h
  2. 1
    1
      Marlin/src/inc/Conditionals_post.h
  3. 4
    4
      Marlin/src/inc/SanityCheck.h

+ 1
- 1
Marlin/src/HAL/HAL_LINUX/spi_pins.h 查看文件

@@ -24,7 +24,7 @@
24 24
 #include "../../core/macros.h"
25 25
 #include "../../inc/MarlinConfigPre.h"
26 26
 
27
-#if BOTH(SDSUPPORT, DOGLCD) && (LCD_PINS_D4 == SCK_PIN || LCD_PINS_ENABLE == MOSI_PIN || DOGLCD_SCK == SCK_PIN || DOGLCD_MOSI == MOSI_PIN)
27
+#if HAS_GRAPHICAL_LCD && ENABLED(SDSUPPORT) && (LCD_PINS_D4 == SCK_PIN || LCD_PINS_ENABLE == MOSI_PIN || DOGLCD_SCK == SCK_PIN || DOGLCD_MOSI == MOSI_PIN)
28 28
   #define LPC_SOFTWARE_SPI  // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
29 29
                             // needed due to the speed and mode requred for communicating with each device being different.
30 30
                             // This requirement can be removed if the SPI access to these devices is updated to use

+ 1
- 1
Marlin/src/inc/Conditionals_post.h 查看文件

@@ -1551,7 +1551,7 @@
1551 1551
 /**
1552 1552
  * Make sure DOGLCD_SCK and DOGLCD_MOSI are defined.
1553 1553
  */
1554
-#if ENABLED(DOGLCD)
1554
+#if HAS_GRAPHICAL_LCD
1555 1555
   #ifndef DOGLCD_SCK
1556 1556
     #define DOGLCD_SCK  SCK_PIN
1557 1557
   #endif

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

@@ -554,7 +554,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
554 554
 /**
555 555
  * Custom Boot and Status screens
556 556
  */
557
-#if DISABLED(DOGLCD) && EITHER(SHOW_CUSTOM_BOOTSCREEN, CUSTOM_STATUS_SCREEN_IMAGE)
557
+#if EITHER(SHOW_CUSTOM_BOOTSCREEN, CUSTOM_STATUS_SCREEN_IMAGE) && !HAS_GRAPHICAL_LCD
558 558
   #error "Graphical LCD is required for SHOW_CUSTOM_BOOTSCREEN and CUSTOM_STATUS_SCREEN_IMAGE."
559 559
 #endif
560 560
 
@@ -619,7 +619,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
619 619
     #error "MESH_BED_LEVELING and BABYSTEP_ZPROBE_OFFSET is not a valid combination"
620 620
   #elif ENABLED(BABYSTEP_ZPROBE_OFFSET) && !HAS_BED_PROBE
621 621
     #error "BABYSTEP_ZPROBE_OFFSET requires a probe."
622
-  #elif ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) && DISABLED(DOGLCD)
622
+  #elif ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) && !HAS_GRAPHICAL_LCD
623 623
     #error "BABYSTEP_ZPROBE_GFX_OVERLAY requires a Graphical LCD."
624 624
   #elif ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) && DISABLED(BABYSTEP_ZPROBE_OFFSET)
625 625
     #error "BABYSTEP_ZPROBE_GFX_OVERLAY requires a BABYSTEP_ZPROBE_OFFSET."
@@ -951,7 +951,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
951 951
 /**
952 952
  * Required LCD language
953 953
  */
954
-#if DISABLED(DOGLCD) && ENABLED(ULTRA_LCD) && !defined(DISPLAY_CHARSET_HD44780)
954
+#if HAS_CHARACTER_LCD && !defined(DISPLAY_CHARSET_HD44780)
955 955
   #error "You must set DISPLAY_CHARSET_HD44780 to JAPANESE, WESTERN or CYRILLIC for your LCD controller."
956 956
 #endif
957 957
 
@@ -1254,7 +1254,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
1254 1254
   #error "G26_MESH_VALIDATION requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, or AUTO_BED_LEVELING_UBL."
1255 1255
 #endif
1256 1256
 
1257
-#if ENABLED(MESH_EDIT_GFX_OVERLAY) && !BOTH(AUTO_BED_LEVELING_UBL, DOGLCD)
1257
+#if ENABLED(MESH_EDIT_GFX_OVERLAY) && !(ENABLED(AUTO_BED_LEVELING_UBL) && HAS_GRAPHICAL_LCD)
1258 1258
   #error "MESH_EDIT_GFX_OVERLAY requires AUTO_BED_LEVELING_UBL and a Graphical LCD."
1259 1259
 #endif
1260 1260
 

正在加载...
取消
保存