Fix up conditions, comments

Marlin/src/inc/SanityCheck.h

@@ -39,26 +39,20 @@
 #define TEST2 1
 #define TEST3 0
 #define TEST4 true
-#if ENABLED(TEST0)
+#if ENABLED(TEST0) || !ENABLED(TEST2) || ENABLED(TEST3)
   #error "ENABLED is borked!"
 #endif
-#if DISABLED(TEST1)
+#if BOTH(TEST0, TEST1)
-  #error "DISABLED is borked!"
+  #error "BOTH is borked!"
-#endif
-#if !ENABLED(TEST2)
-  #error "ENABLED is borked!"
 #endif
-#if ENABLED(TEST3)
+#if DISABLED(TEST1) || !DISABLED(TEST3) || DISABLED(TEST4) || DISABLED(TEST0, TEST1, TEST2, TEST4) || !DISABLED(TEST0, TEST3)
-  #error "ENABLED is borked!"
-#endif
-#if DISABLED(TEST4)
   #error "DISABLED is borked!"
 #endif
 #if !ANY(TEST1, TEST2, TEST3, TEST4) || ANY(TEST0, TEST3)
   #error "ANY is borked!"
 #endif
-#if DISABLED(TEST0, TEST1, TEST2, TEST4)
+#if NONE(TEST0, TEST1, TEST2, TEST4) || !NONE(TEST0, TEST3)
-  #error "DISABLED is borked!"
+  #error "NONE is borked!"
 #endif
 #undef TEST1
 #undef TEST2
@@ -2202,7 +2196,7 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
   + (ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(IS_RRD_FG_SC)) \
   + (ENABLED(ULTRA_LCD) && DISABLED(IS_ULTRA_LCD)) \
   + (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \
-  + (ENABLED(MINIPANEL) && DISABLED(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \
+  + (ENABLED(MINIPANEL) && NONE(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \
   + (ENABLED(MKS_MINI_12864) && DISABLED(MKS_LCD12864)) \
   + (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \
   + (ENABLED(ULTIPANEL) && DISABLED(IS_ULTIPANEL)) \

Marlin/src/pins/ramps/pins_RAMPS_PLUS.h

@@ -74,7 +74,7 @@
 #undef E0_CS_PIN
 #undef E1_CS_PIN
 
-#if ENABLED(ULTRA_LCD, REPRAPWORLD_GRAPHICAL_LCD, CR10_STOCKDISPLAY) && !BOTH(NEWPANEL, PANEL_ONE)
+#if ENABLED(ULTRA_LCD) && NONE(REPRAPWORLD_GRAPHICAL_LCD, CR10_STOCKDISPLAY) && !BOTH(NEWPANEL, PANEL_ONE)
   #if DISABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306)
     #undef LCD_PINS_RS
     #define LCD_PINS_RS                       42  // 3DYMY boards pin 16 -> 42

Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h

@@ -174,7 +174,7 @@
   #define LCD_PINS_D6                         32
   #define LCD_PINS_D7                         30
 
-#elif ENABLED(BOARD_REV_1_5, ULTRA_LCD)
+#elif BOTH(BOARD_REV_1_5, ULTRA_LCD)
 
   #define BEEPER_PIN                          18
 

buildroot/share/vscode/avrdude.conf

@@ -151,7 +151,7 @@
 #
 # INSTRUCTION FORMATS
 #
-#    Instruction formats are specified as a comma seperated list of
+#    Instruction formats are specified as a comma separated list of
 #    string values containing information (bit specifiers) about each
 #    of the 32 bits of the instruction.  Bit specifiers may be one of
 #    the following formats:

buildroot/share/vscode/avrdude_linux.conf

@@ -151,7 +151,7 @@
 #
 # INSTRUCTION FORMATS
 #
-#    Instruction formats are specified as a comma seperated list of
+#    Instruction formats are specified as a comma separated list of
 #    string values containing information (bit specifiers) about each
 #    of the 32 bits of the instruction.  Bit specifiers may be one of
 #    the following formats:

buildroot/share/vscode/avrdude_macOS.conf

@@ -151,7 +151,7 @@
 #
 # INSTRUCTION FORMATS
 #
-#    Instruction formats are specified as a comma seperated list of
+#    Instruction formats are specified as a comma separated list of
 #    string values containing information (bit specifiers) about each
 #    of the 32 bits of the instruction.  Bit specifiers may be one of
 #    the following formats: