Update inc files for parity with 1.1.x

Marlin/src/inc/Conditionals_LCD.h

@@ -71,18 +71,18 @@
   #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
 
   #if ENABLED(miniVIKI)
-    #define LCD_CONTRAST_MIN  75
-    #define LCD_CONTRAST_MAX 115
-    #define DEFAULT_LCD_CONTRAST 95
+    #define LCD_CONTRAST_MIN      75
+    #define LCD_CONTRAST_MAX     115
+    #define DEFAULT_LCD_CONTRAST  95
     #define U8GLIB_ST7565_64128N
   #elif ENABLED(VIKI2)
-    #define LCD_CONTRAST_MIN 0
-    #define LCD_CONTRAST_MAX 255
+    #define LCD_CONTRAST_MIN       0
+    #define LCD_CONTRAST_MAX     255
     #define DEFAULT_LCD_CONTRAST 140
     #define U8GLIB_ST7565_64128N
   #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
-    #define LCD_CONTRAST_MIN  90
-    #define LCD_CONTRAST_MAX 130
+    #define LCD_CONTRAST_MIN      90
+    #define LCD_CONTRAST_MAX     130
     #define DEFAULT_LCD_CONTRAST 110
     #define U8GLIB_LM6059_AF
     #define SD_DETECT_INVERTED
@@ -317,7 +317,7 @@
   #define LCD_STR_FILAM_DIA   "\xf8"
   #define LCD_STR_FILAM_MUL   "\xa4"
 #else
-  /* Custom characters defined in the first 8 characters of the LCD */
+  // Custom characters defined in the first 8 characters of the LCD
   #define LCD_BEDTEMP_CHAR     0x00  // Print only as a char. This will have 'unexpected' results when used in a string!
   #define LCD_DEGREE_CHAR      0x01
   #define LCD_STR_THERMOMETER "\x02" // Still used with string concatenation

Marlin/src/inc/Conditionals_post.h

@@ -96,7 +96,7 @@
     #define CORE_AXIS_1 B_AXIS
     #define CORE_AXIS_2 C_AXIS
   #endif
-  #if (ENABLED(COREYX) || ENABLED(COREZX) || ENABLED(COREZY))
+  #if ENABLED(COREYX) || ENABLED(COREZX) || ENABLED(COREZY)
     #define CORESIGN(n) (-(n))
   #else
     #define CORESIGN(n) (n)
@@ -985,7 +985,7 @@
 #define HAS_LEVELING   (HAS_ABL || ENABLED(MESH_BED_LEVELING))
 #define HAS_AUTOLEVEL  (HAS_ABL && DISABLED(PROBE_MANUALLY))
 #define HAS_MESH       (ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(MESH_BED_LEVELING))
-#define PLANNER_LEVELING      (OLDSCHOOL_ABL || ENABLED(MESH_BED_LEVELING))
+#define PLANNER_LEVELING      (OLDSCHOOL_ABL || ENABLED(MESH_BED_LEVELING) || UBL_SEGMENTED || ENABLED(SKEW_CORRECTION))
 #define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
 #if HAS_PROBING_PROCEDURE
   #define PROBE_BED_WIDTH abs(RIGHT_PROBE_BED_POSITION - (LEFT_PROBE_BED_POSITION))

Marlin/src/inc/SanityCheck.h

@@ -1262,7 +1262,7 @@ static_assert(1 >= 0
   #if !(PIN_EXISTS(NEOPIXEL) && NEOPIXEL_PIXELS > 0)
     #error "NEOPIXEL_LED requires NEOPIXEL_PIN and NEOPIXEL_PIXELS."
   #endif
-#elif ENABLED(PRINTER_EVENT_LEDS) && DISABLED(BLINKM) && DISABLED(PCA9632)
+#elif ENABLED(PRINTER_EVENT_LEDS) && DISABLED(BLINKM) && DISABLED(PCA9632) && DISABLED(NEOPIXEL_LED)
   #error "PRINTER_EVENT_LEDS requires BLINKM, PCA9632, RGB_LED, RGBW_LED or NEOPIXEL_LED."
 #endif
 
@@ -1466,7 +1466,7 @@ static_assert(1 >= 0
     || ENABLED( E1_IS_TMC2208 ) \
     || ENABLED( E2_IS_TMC2208 ) \
     || ENABLED( E3_IS_TMC2208 ) )
-  #error "Choose at least one TMC2208 stepper."
+  #error "HAVE_TMC2208 requires at least one TMC2208 stepper to be set."
 #endif
 
 #if ENABLED(HYBRID_THRESHOLD) && DISABLED(STEALTHCHOP)