Selaa lähdekoodia

🔧 Sanity checks for Ender 3 V2

Scott Lahteine 3 vuotta sitten
vanhempi
commit
b0a91073b2
2 muutettua tiedostoa jossa 22 lisäystä ja 5 poistoa
  1. 21
    4
      Marlin/src/inc/SanityCheck.h
  2. 1
    1
      Marlin/src/lcd/e3v2/creality/dwin.cpp

+ 21
- 4
Marlin/src/inc/SanityCheck.h Näytä tiedosto

@@ -1750,8 +1750,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
1750 1750
  * LCD_BED_LEVELING requirements
1751 1751
  */
1752 1752
 #if ENABLED(LCD_BED_LEVELING)
1753
-  #if !HAS_LCD_MENU
1754
-    #error "LCD_BED_LEVELING requires a programmable LCD controller."
1753
+  #if NONE(HAS_LCD_MENU, DWIN_CREALITY_LCD)
1754
+    #error "LCD_BED_LEVELING is not supported by the selected LCD controller."
1755 1755
   #elif !(ENABLED(MESH_BED_LEVELING) || HAS_ABL_NOT_UBL)
1756 1756
     #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or AUTO_BED_LEVELING."
1757 1757
   #elif ENABLED(MESH_EDIT_MENU) && !HAS_MESH
@@ -2656,8 +2656,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
2656 2656
   + (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \
2657 2657
   + COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35) \
2658 2658
   + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS) \
2659
-  + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY, DWIN_CREALITY_LCD) \
2660
-  + COUNT_ENABLED(DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
2659
+  + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \
2660
+  + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
2661 2661
   + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1, FYSETC_GENERIC_12864_1_1) \
2662 2662
   + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
2663 2663
   + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
@@ -2751,6 +2751,23 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
2751 2751
 #endif
2752 2752
 
2753 2753
 /**
2754
+ * Ender 3 V2 controller has some limitations
2755
+ */
2756
+#if ENABLED(DWIN_CREALITY_LCD)
2757
+  #if DISABLED(SDSUPPORT)
2758
+    #error "DWIN_CREALITY_LCD requires SDSUPPORT to be enabled."
2759
+  #elif ENABLED(PID_EDIT_MENU)
2760
+    #error "DWIN_CREALITY_LCD does not support PID_EDIT_MENU."
2761
+  #elif ENABLED(PID_AUTOTUNE_MENU)
2762
+    #error "DWIN_CREALITY_LCD does not support PID_AUTOTUNE_MENU."
2763
+  #elif ENABLED(LEVEL_BED_CORNERS)
2764
+    #error "DWIN_CREALITY_LCD does not support LEVEL_BED_CORNERS."
2765
+  #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
2766
+    #error "DWIN_CREALITY_LCD does not support LCD_BED_LEVELING with PROBE_MANUALLY."
2767
+  #endif
2768
+#endif
2769
+
2770
+/**
2754 2771
  * Some boards forbid the use of -1 Native USB
2755 2772
  */
2756 2773
 #if ENABLED(BOARD_NO_NATIVE_USB)

+ 1
- 1
Marlin/src/lcd/e3v2/creality/dwin.cpp Näytä tiedosto

@@ -30,7 +30,7 @@
30 30
 
31 31
 #include "dwin.h"
32 32
 
33
-#if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT) && DISABLED(PROBE_MANUALLY)
33
+#if ENABLED(LCD_BED_LEVELING) && DISABLED(PROBE_MANUALLY) && ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
34 34
   #define HAS_ONESTEP_LEVELING 1
35 35
 #endif
36 36
 

Loading…
Peruuta
Tallenna