Fix NEOPIXEL_LED compile w/out PRINTER_EVENT_LEDS (MarlinFirmware#18824)

walterp1982 · Aug 15, 2022 · 48ebec7 · 48ebec7
1 parent 8ed16f8
commit 48ebec7
Showing 1 changed file with 3 additions and 195 deletions.
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
@@ -1447,201 +1447,9 @@
   #define EXTRUDE_MINTEMP 170
 #endif
 
-#if ANY(PID_DEBUG, PID_BED_DEBUG, PID_CHAMBER_DEBUG)
-  #define HAS_PID_DEBUG 1
-#endif
-
-/**
- * TFT Displays
- *
- * Configure parameters for TFT displays:
- *  - TFT_DEFAULT_ORIENTATION
- *  - TFT_DRIVER
- *  - TFT_WIDTH
- *  - TFT_HEIGHT
- *  - TFT_INTERFACE_(SPI|FSMC)
- *  - TFT_COLOR
- *  - GRAPHICAL_TFT_UPSCALE
- */
-#if EITHER(MKS_TS35_V2_0, BTT_TFT35_SPI_V1_0)                                 // ST7796
-  #define TFT_DEFAULT_DRIVER ST7796
-  #define TFT_DEFAULT_ORIENTATION TFT_EXCHANGE_XY
-  #define TFT_RES_480x320
-  #define TFT_INTERFACE_SPI
-#elif EITHER(LERDGE_TFT35, ANET_ET5_TFT35)                                    // ST7796
-  #define TFT_DEFAULT_ORIENTATION TFT_EXCHANGE_XY
-  #define TFT_RES_480x320
-  #define TFT_INTERFACE_FSMC
-#elif ANY(ANET_ET4_TFT28, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32)  // ST7789
-  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
-  #define TFT_RES_320x240
-  #define TFT_INTERFACE_FSMC
-#elif ANY(MKS_ROBIN_TFT35, TFT_TRONXY_X5SA, ANYCUBIC_TFT35)                   // ILI9488
-  #define TFT_DRIVER ILI9488
-  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
-  #define TFT_RES_480x320
-  #define TFT_INTERFACE_FSMC
-#elif ENABLED(MKS_ROBIN_TFT43)
-  #define TFT_DRIVER SSD1963
-  #define TFT_DEFAULT_ORIENTATION 0
-  #define TFT_RES_480x272
-  #define TFT_INTERFACE_FSMC
-#elif EITHER(MKS_ROBIN_TFT_V1_1R, LONGER_LK_TFT28)                            // ILI9328 or R61505
-  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
-  #define TFT_RES_320x240
-  #define TFT_INTERFACE_FSMC
-#elif ENABLED(BIQU_BX_TFT70)                                                  // RGB
-  #define TFT_DEFAULT_ORIENTATION TFT_EXCHANGE_XY
-  #define TFT_RES_1024x600
-  #define TFT_INTERFACE_LTDC
-  #if ENABLED(TOUCH_SCREEN)
-    #define TFT_TOUCH_DEVICE_GT911
-  #endif
-#elif ENABLED(TFT_GENERIC)
-  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
-  #if NONE(TFT_RES_320x240, TFT_RES_480x272, TFT_RES_480x320)
-    #define TFT_RES_320x240
-  #endif
-  #if NONE(TFT_INTERFACE_FSMC, TFT_INTERFACE_SPI)
-    #define TFT_INTERFACE_SPI
-  #endif
-#endif
-
-#if ENABLED(TFT_RES_320x240)
-  #define TFT_WIDTH  320
-  #define TFT_HEIGHT 240
-  #define GRAPHICAL_TFT_UPSCALE 2
-#elif ENABLED(TFT_RES_480x272)
-  #define TFT_WIDTH  480
-  #define TFT_HEIGHT 272
-  #define GRAPHICAL_TFT_UPSCALE 2
-#elif ENABLED(TFT_RES_480x320)
-  #define TFT_WIDTH  480
-  #define TFT_HEIGHT 320
-  #define GRAPHICAL_TFT_UPSCALE 3
-#elif ENABLED(TFT_RES_1024x600)
-  #define TFT_WIDTH  1024
-  #define TFT_HEIGHT 600
-  #if ENABLED(TOUCH_SCREEN)
-    #define GRAPHICAL_TFT_UPSCALE 6
-    #define TFT_PIXEL_OFFSET_X 120
-  #else
-    #define GRAPHICAL_TFT_UPSCALE 8
-    #define TFT_PIXEL_OFFSET_X 0
-  #endif
-#endif
-
-// FSMC/SPI TFT Panels using standard HAL/tft/tft_(fsmc|spi|ltdc).h
-#if ENABLED(TFT_INTERFACE_FSMC)
-  #define HAS_FSMC_TFT 1
-  #if TFT_SCALED_DOGLCD
-    #define HAS_FSMC_GRAPHICAL_TFT 1
-  #elif HAS_TFT_LVGL_UI
-    #define HAS_TFT_LVGL_UI_FSMC 1
-  #endif
-#elif ENABLED(TFT_INTERFACE_SPI)
-  #define HAS_SPI_TFT 1
-  #if TFT_SCALED_DOGLCD
-    #define HAS_SPI_GRAPHICAL_TFT 1
-  #elif HAS_TFT_LVGL_UI
-    #define HAS_TFT_LVGL_UI_SPI 1
-  #endif
-#elif ENABLED(TFT_INTERFACE_LTDC)
-  #define HAS_LTDC_TFT 1
-  #if TFT_SCALED_DOGLCD
-    #define HAS_LTDC_GRAPHICAL_TFT 1
-  #elif HAS_TFT_LVGL_UI
-    #define HAS_TFT_LVGL_UI_LTDC 1
-  #endif
-#endif
-
-#if ENABLED(TFT_COLOR_UI)
-  #if TFT_HEIGHT == 240
-    #if ENABLED(TFT_INTERFACE_SPI)
-      #define TFT_320x240_SPI
-    #elif ENABLED(TFT_INTERFACE_FSMC)
-      #define TFT_320x240
-    #endif
-  #elif TFT_HEIGHT == 320
-    #if ENABLED(TFT_INTERFACE_SPI)
-      #define TFT_480x320_SPI
-    #elif ENABLED(TFT_INTERFACE_FSMC)
-      #define TFT_480x320
-    #endif
-  #elif TFT_HEIGHT == 272
-    #if ENABLED(TFT_INTERFACE_SPI)
-      #define TFT_480x272_SPI
-    #elif ENABLED(TFT_INTERFACE_FSMC)
-      #define TFT_480x272
-    #endif
-  #elif TFT_HEIGHT == 600
-    #if ENABLED(TFT_INTERFACE_LTDC)
-      #define TFT_1024x600_LTDC
-    #endif
-  #endif
-#endif
-
-#if EITHER(TFT_320x240, TFT_320x240_SPI)
-  #define HAS_UI_320x240 1
-#elif EITHER(TFT_480x320, TFT_480x320_SPI)
-  #define HAS_UI_480x320 1
-#elif EITHER(TFT_480x272, TFT_480x272_SPI)
-  #define HAS_UI_480x272 1
-#elif defined(TFT_1024x600_LTDC)
-  #define HAS_UI_1024x600 1
-#endif
-#if ANY(HAS_UI_320x240, HAS_UI_480x320, HAS_UI_480x272)
-  #define LCD_HEIGHT TERN(TOUCH_SCREEN, 6, 7)   // Fewer lines with touch buttons onscreen
-#elif HAS_UI_1024x600
-  #define LCD_HEIGHT TERN(TOUCH_SCREEN, 12, 13) // Fewer lines with touch buttons onscreen
-#endif
-
-// This emulated DOGM has 'touch/xpt2046', not 'tft/xpt2046'
-#if ENABLED(TOUCH_SCREEN)
-  #if TOUCH_IDLE_SLEEP
-    #define HAS_TOUCH_SLEEP 1
-  #endif
-  #if NONE(TFT_TOUCH_DEVICE_GT911, TFT_TOUCH_DEVICE_XPT2046)
-    #define TFT_TOUCH_DEVICE_XPT2046          // ADS7843/XPT2046 ADC Touchscreen such as ILI9341 2.8
-  #endif
-  #if ENABLED(TFT_TOUCH_DEVICE_GT911)         // GT911 Capacitive touch screen such as BIQU_BX_TFT70
-    #undef TOUCH_SCREEN_CALIBRATION
-    #undef TOUCH_CALIBRATION_AUTO_SAVE
-  #endif
-  #if !HAS_GRAPHICAL_TFT
-    #undef TOUCH_SCREEN
-    #if ENABLED(TFT_CLASSIC_UI)
-      #define HAS_TOUCH_BUTTONS 1
-      #if ENABLED(TFT_TOUCH_DEVICE_GT911)
-        #define HAS_CAP_TOUCH_BUTTONS 1
-      #else
-        #define HAS_RES_TOUCH_BUTTONS 1
-      #endif
-    #endif
-  #endif
-#endif
-
-// XPT2046_** Compatibility
-#if !(defined(TOUCH_CALIBRATION_X) || defined(TOUCH_CALIBRATION_Y) || defined(TOUCH_OFFSET_X) || defined(TOUCH_OFFSET_Y) || defined(TOUCH_ORIENTATION))
-  #if defined(XPT2046_X_CALIBRATION) && defined(XPT2046_Y_CALIBRATION) && defined(XPT2046_X_OFFSET) && defined(XPT2046_Y_OFFSET)
-    #define TOUCH_CALIBRATION_X  XPT2046_X_CALIBRATION
-    #define TOUCH_CALIBRATION_Y  XPT2046_Y_CALIBRATION
-    #define TOUCH_OFFSET_X       XPT2046_X_OFFSET
-    #define TOUCH_OFFSET_Y       XPT2046_Y_OFFSET
-    #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
-  #endif
-#endif
-
-#if X_HOME_DIR || (HAS_Y_AXIS && Y_HOME_DIR) || (HAS_Z_AXIS && Z_HOME_DIR) || (HAS_I_AXIS && I_HOME_DIR) || (HAS_J_AXIS && J_HOME_DIR) || (HAS_K_AXIS && K_HOME_DIR)
-  #define HAS_ENDSTOPS 1
-  #define COORDINATE_OKAY(N,L,H) WITHIN(N,L,H)
-#else
-  #define COORDINATE_OKAY(N,L,H) true
-#endif
-
 /**
- * LED Backlight INDEX END
+ * To check if we need the folder src/features/leds
  */
-#if defined(NEOPIXEL_BKGD_INDEX_FIRST) && !defined(NEOPIXEL_BKGD_INDEX_LAST)
-  #define NEOPIXEL_BKGD_INDEX_LAST NEOPIXEL_BKGD_INDEX_FIRST
+#if ANY(TEMP_STAT_LEDS, HAS_COLOR_LEDS, HAS_CASE_LIGHT, PRINTER_EVENT_LEDS, LED_BACKLIGHT_TIMEOUT, PCA9632_BUZZER, LED_CONTROL_MENU)
+  #define HAS_LED_FEATURE 1
 #endif