Apply composite tests

2020-04-23 21:42:38 -05:00
parent 55d66fb897
commit ab2b98e425
53 changed files with 103 additions and 107 deletions
--- a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
@@ -275,7 +275,7 @@ void MarlinUI::set_custom_characters(const HD44780CharSet screen_charset/*=CHARS

  #endif // LCD_PROGRESS_BAR

-  #if ENABLED(SDSUPPORT) && HAS_LCD_MENU
+  #if BOTH(SDSUPPORT, HAS_LCD_MENU)

    // CHARSET_MENU
    const static PROGMEM byte refresh[8] = {
@@ -325,7 +325,7 @@ void MarlinUI::set_custom_characters(const HD44780CharSet screen_charset/*=CHARS
      #endif
        {
          createChar_P(LCD_STR_UPLEVEL[0], uplevel);
-          #if ENABLED(SDSUPPORT) && HAS_LCD_MENU
+          #if BOTH(SDSUPPORT, HAS_LCD_MENU)
            // SD Card sub-menu special characters
            createChar_P(LCD_STR_REFRESH[0], refresh);
            createChar_P(LCD_STR_FOLDER[0], folder);
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@@ -865,7 +865,7 @@
 // Can also be overridden in Configuration_adv.h
 // If you can afford it, try the 3-frame fan animation!
 // Don't compile in the fan animation with no fan
-#if !HAS_FAN0 || (HOTENDS == 5 || (HOTENDS == 4 && BED_OR_CHAMBER) || (ENABLED(STATUS_COMBINE_HEATERS) && HAS_HEATED_CHAMBER))
+#if !HAS_FAN0 || (HOTENDS == 5 || (HOTENDS == 4 && BED_OR_CHAMBER) || BOTH(STATUS_COMBINE_HEATERS, HAS_HEATED_CHAMBER))
  #undef STATUS_FAN_FRAMES
 #elif !STATUS_FAN_FRAMES
  #define STATUS_FAN_FRAMES 2
@@ -1393,7 +1393,7 @@
        ((STATUS_CHAMBER_WIDTH || STATUS_FAN_WIDTH  ||  STATUS_BED_WIDTH) && STATUS_HOTEND_BITMAPS == 4)
    #define STATUS_HEATERS_X 5
  #else
-    #if ENABLED(STATUS_COMBINE_HEATERS) && HAS_HEATED_BED && HOTENDS <= 4
+    #if BOTH(STATUS_COMBINE_HEATERS, HAS_HEATED_BED) && HOTENDS <= 4
      #define STATUS_HEATERS_X 5
    #else
      #define STATUS_HEATERS_X 8 // Like the included bitmaps
@@ -1752,13 +1752,13 @@
 #if HOTENDS && ENABLED(STATUS_HOTEND_ANIM)
  #define ANIM_HOTEND 1
 #endif
-#if DO_DRAW_BED && ENABLED(STATUS_BED_ANIM)
+#if BOTH(DO_DRAW_BED, STATUS_BED_ANIM)
  #define ANIM_BED 1
 #endif
-#if DO_DRAW_CHAMBER && ENABLED(STATUS_CHAMBER_ANIM)
+#if BOTH(DO_DRAW_CHAMBER, STATUS_CHAMBER_ANIM)
  #define ANIM_CHAMBER 1
 #endif
-#if DO_DRAW_CUTTER && ENABLED(STATUS_CUTTER_ANIM)
+#if BOTH(DO_DRAW_CUTTER, STATUS_CUTTER_ANIM)
  #define ANIM_CUTTER 1
 #endif
 #if ANIM_HOTEND || ANIM_BED || ANIM_CHAMBER || ANIM_CUTTER
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -142,7 +142,7 @@ FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t tx, cons
    #elif ANIM_HOTEND && DISABLED(STATUS_HOTEND_INVERTED) && ENABLED(STATUS_HOTEND_NUMBERLESS)
      #define OFF_BMP(N) status_hotend_a_bmp
      #define ON_BMP(N)  status_hotend_b_bmp
-    #elif ANIM_HOTEND && ENABLED(STATUS_HOTEND_INVERTED)
+    #elif BOTH(ANIM_HOTEND, STATUS_HOTEND_INVERTED)
      #define OFF_BMP(N) status_hotend##N##_b_bmp
      #define ON_BMP(N)  status_hotend##N##_a_bmp
    #else
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
@@ -38,7 +38,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
  }

    #ifdef TOUCH_UI_PORTRAIT
-      #if HAS_CASE_LIGHT || ENABLED(SENSORLESS_HOMING)
+      #if EITHER(HAS_CASE_LIGHT, SENSORLESS_HOMING)
        #define GRID_ROWS 9
      #else
        #define GRID_ROWS 8
@@ -59,7 +59,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
      #define BACKLASH_POS            BTN_POS(2,7), BTN_SIZE(1,1)
      #define CASE_LIGHT_POS          BTN_POS(1,8), BTN_SIZE(1,1)
      #define TMC_HOMING_THRS_POS     BTN_POS(2,8), BTN_SIZE(1,1)
-      #if HAS_CASE_LIGHT || ENABLED(SENSORLESS_HOMING)
+      #if EITHER(HAS_CASE_LIGHT, SENSORLESS_HOMING)
        #define BACK_POS              BTN_POS(1,9), BTN_SIZE(2,1)
      #else
        #define BACK_POS              BTN_POS(1,8), BTN_SIZE(2,1)
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_screen.cpp
@@ -21,7 +21,7 @@

 #include "../config.h"

-#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_MESH
+#if BOTH(TOUCH_UI_FTDI_EVE, HAS_MESH)

 #include "screens.h"
 #include "screen_data.h"
@@ -298,4 +298,4 @@ void BedMeshScreen::onMeshUpdate(const int8_t x, const int8_t y, const ExtUI::pr
  BedMeshScreen::onMeshUpdate(x, y, 0);
 }

-#endif // TOUCH_UI_FTDI_EVE
+#endif // TOUCH_UI_FTDI_EVE && HAS_MESH
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
@@ -22,7 +22,7 @@

 #include "../config.h"

-#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_JUNCTION_DEVIATION
+#if BOTH(TOUCH_UI_FTDI_EVE, HAS_JUNCTION_DEVIATION)

 #include "screens.h"

--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
@@ -137,7 +137,7 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
    case 4:  GOTO_SCREEN(MoveAxisScreen);                             break;
    case 5:  injectCommands_P(PSTR("M84"));                           break;
    case 6:  GOTO_SCREEN(TemperatureScreen);                          break;
-    #if ENABLED(TOUCH_UI_COCOA_PRESS) && HAS_CASE_LIGHT
+    #if BOTH(TOUCH_UI_COCOA_PRESS, HAS_CASE_LIGHT)
    case 7:  GOTO_SCREEN(CaseLightScreen);                            break;
    #else
    case 7:  GOTO_SCREEN(ChangeFilamentScreen);                       break;
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
@@ -22,7 +22,7 @@

 #include "../config.h"

-#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_MULTI_HOTEND
+#if BOTH(TOUCH_UI_FTDI_EVE, HAS_MULTI_HOTEND)

 #include "screens.h"

--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
@@ -22,7 +22,7 @@

 #include "../config.h"

-#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_TRINAMIC_CONFIG
+#if BOTH(TOUCH_UI_FTDI_EVE, HAS_TRINAMIC_CONFIG)

 #include "screens.h"

--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
@@ -22,7 +22,7 @@

 #include "../config.h"

-#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_TRINAMIC_CONFIG
+#if BOTH(TOUCH_UI_FTDI_EVE, HAS_TRINAMIC_CONFIG)

 #include "screens.h"

--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
@@ -22,7 +22,7 @@

 #include "../config.h"

-#if ENABLED(TOUCH_UI_FTDI_EVE) && HAS_BED_PROBE
+#if BOTH(TOUCH_UI_FTDI_EVE, HAS_BED_PROBE)

 #include "screens.h"

--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -235,12 +235,14 @@ void menu_cancelobject();

 #if HAS_HOTEND
  DEFINE_PIDTEMP_FUNCS(0);
-  #if HAS_MULTI_HOTEND && ENABLED(PID_PARAMS_PER_HOTEND)
+  #if BOTH(HAS_MULTI_HOTEND, PID_PARAMS_PER_HOTEND)
    REPEAT_S(1, HOTENDS, DEFINE_PIDTEMP_FUNCS)
  #endif
 #endif

-#define SHOW_MENU_ADVANCED_TEMPERATURE ((ENABLED(AUTOTEMP) && HAS_TEMP_HOTEND) || EITHER(PID_AUTOTUNE_MENU, PID_EDIT_MENU))
+#if BOTH(AUTOTEMP, HAS_TEMP_HOTEND) || EITHER(PID_AUTOTUNE_MENU, PID_EDIT_MENU)
+  #define SHOW_MENU_ADVANCED_TEMPERATURE 1
+#endif

 //
 // Advanced Settings > Temperature
@@ -253,7 +255,7 @@ void menu_cancelobject();
    //
    // Autotemp, Min, Max, Fact
    //
-    #if ENABLED(AUTOTEMP) && HAS_TEMP_HOTEND
+    #if BOTH(AUTOTEMP, HAS_TEMP_HOTEND)
      EDIT_ITEM(bool, MSG_AUTOTEMP, &planner.autotemp_enabled);
      EDIT_ITEM(float3, MSG_MIN, &planner.autotemp_min, 0, float(HEATER_0_MAXTEMP) - 15);
      EDIT_ITEM(float3, MSG_MAX, &planner.autotemp_max, 0, float(HEATER_0_MAXTEMP) - 15);
@@ -308,7 +310,7 @@ void menu_cancelobject();
    #endif

    PID_EDIT_MENU_ITEMS(0);
-    #if HAS_MULTI_HOTEND && ENABLED(PID_PARAMS_PER_HOTEND)
+    #if BOTH(HAS_MULTI_HOTEND, PID_PARAMS_PER_HOTEND)
      REPEAT_S(1, HOTENDS, PID_EDIT_MENU_ITEMS)
    #endif

--- a/Marlin/src/lcd/menu/menu_backlash.cpp
+++ b/Marlin/src/lcd/menu/menu_backlash.cpp
@@ -26,7 +26,7 @@

 #include "../../inc/MarlinConfigPre.h"

-#if HAS_LCD_MENU && ENABLED(BACKLASH_GCODE)
+#if BOTH(HAS_LCD_MENU, BACKLASH_GCODE)

 #include "menu.h"

--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -26,7 +26,7 @@

 #include "../../inc/MarlinConfigPre.h"

-#if HAS_LCD_MENU && ENABLED(LEVEL_BED_CORNERS)
+#if BOTH(HAS_LCD_MENU, LEVEL_BED_CORNERS)

 #include "menu.h"
 #include "../../module/motion.h"
--- a/Marlin/src/lcd/menu/menu_cancelobject.cpp
+++ b/Marlin/src/lcd/menu/menu_cancelobject.cpp
@@ -26,7 +26,7 @@

 #include "../../inc/MarlinConfigPre.h"

-#if HAS_LCD_MENU && ENABLED(CANCEL_OBJECTS)
+#if BOTH(HAS_LCD_MENU, CANCEL_OBJECTS)

 #include "menu.h"
 #include "menu_addon.h"
--- a/Marlin/src/lcd/menu/menu_custom.cpp
+++ b/Marlin/src/lcd/menu/menu_custom.cpp
@@ -26,7 +26,7 @@

 #include "../../inc/MarlinConfigPre.h"

-#if HAS_LCD_MENU && ENABLED(CUSTOM_USER_MENUS)
+#if BOTH(HAS_LCD_MENU, CUSTOM_USER_MENUS)

 #include "menu.h"
 #include "../../gcode/queue.h"
@@ -39,9 +39,7 @@

 void _lcd_user_gcode(PGM_P const cmd) {
  queue.inject_P(cmd);
-  #if ENABLED(USER_SCRIPT_AUDIBLE_FEEDBACK) && HAS_BUZZER
-    ui.completion_feedback();
-  #endif
+  TERN_(USER_SCRIPT_AUDIBLE_FEEDBACK, ui.completion_feedback());
  TERN_(USER_SCRIPT_RETURN, ui.return_to_status());
 }

--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -26,7 +26,7 @@

 #include "../../inc/MarlinConfigPre.h"

-#if HAS_LCD_MENU && ENABLED(ADVANCED_PAUSE_FEATURE)
+#if BOTH(HAS_LCD_MENU, ADVANCED_PAUSE_FEATURE)

 #include "menu.h"
 #include "../../module/temperature.h"
--- a/Marlin/src/lcd/menu/menu_info.cpp
+++ b/Marlin/src/lcd/menu/menu_info.cpp
@@ -26,7 +26,7 @@

 #include "../../inc/MarlinConfigPre.h"

-#if HAS_LCD_MENU && ENABLED(LCD_INFO_MENU)
+#if BOTH(HAS_LCD_MENU, LCD_INFO_MENU)

 #include "menu.h"

--- a/Marlin/src/lcd/menu/menu_job_recovery.cpp
+++ b/Marlin/src/lcd/menu/menu_job_recovery.cpp
@@ -26,7 +26,7 @@

 #include "../../inc/MarlinConfigPre.h"

-#if HAS_LCD_MENU && ENABLED(POWER_LOSS_RECOVERY)
+#if BOTH(HAS_LCD_MENU, POWER_LOSS_RECOVERY)

 #include "menu.h"
 #include "../../gcode/queue.h"
--- a/Marlin/src/lcd/menu/menu_led.cpp
+++ b/Marlin/src/lcd/menu/menu_led.cpp
@@ -26,7 +26,7 @@

 #include "../../inc/MarlinConfigPre.h"

-#if HAS_LCD_MENU && ENABLED(LED_CONTROL_MENU)
+#if BOTH(HAS_LCD_MENU, LED_CONTROL_MENU)

 #include "menu.h"
 #include "../../feature/leds/leds.h"
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -203,7 +203,7 @@ void menu_main() {
      GCODES_ITEM(MSG_SWITCH_PS_ON, PSTR("M80"));
  #endif

-  #if HAS_ENCODER_WHEEL && ENABLED(SDSUPPORT)
+  #if BOTH(HAS_ENCODER_WHEEL, SDSUPPORT)

    // *** IF THIS SECTION IS CHANGED, REPRODUCE ABOVE ***

--- a/Marlin/src/lcd/menu/menu_media.cpp
+++ b/Marlin/src/lcd/menu/menu_media.cpp
@@ -26,7 +26,7 @@

 #include "../../inc/MarlinConfigPre.h"

-#if HAS_LCD_MENU && ENABLED(SDSUPPORT)
+#if BOTH(HAS_LCD_MENU, SDSUPPORT)

 #include "menu.h"
 #include "../../sd/cardreader.h"
--- a/Marlin/src/lcd/menu/menu_mixer.cpp
+++ b/Marlin/src/lcd/menu/menu_mixer.cpp
@@ -26,7 +26,7 @@

 #include "../../inc/MarlinConfigPre.h"

-#if HAS_LCD_MENU && ENABLED(MIXING_EXTRUDER)
+#if BOTH(HAS_LCD_MENU, MIXING_EXTRUDER)

 #include "menu.h"
 #include "menu_addon.h"
--- a/Marlin/src/lcd/menu/menu_mmu2.cpp
+++ b/Marlin/src/lcd/menu/menu_mmu2.cpp
@@ -22,7 +22,7 @@

 #include "../../inc/MarlinConfig.h"

-#if HAS_LCD_MENU && ENABLED(MMU2_MENUS)
+#if BOTH(HAS_LCD_MENU, MMU2_MENUS)

 #include "../../feature/mmu2/mmu2.h"
 #include "menu_mmu2.h"
@@ -171,4 +171,4 @@ uint8_t mmu2_choose_filament() {
  return currentTool;
 }

-#endif //  HAS_LCD_MENU && ENABLED(PRUSA_MMU2_MENUS)
+#endif // HAS_LCD_MENU && MMU2_MENUS
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -257,7 +257,7 @@ void menu_move() {
  START_MENU();
  BACK_ITEM(MSG_MOTION);

-  #if HAS_SOFTWARE_ENDSTOPS && ENABLED(SOFT_ENDSTOPS_MENU_ITEM)
+  #if BOTH(HAS_SOFTWARE_ENDSTOPS, SOFT_ENDSTOPS_MENU_ITEM)
    EDIT_ITEM(bool, MSG_LCD_SOFT_ENDSTOPS, &soft_endstops_enabled);
  #endif

--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -26,7 +26,7 @@

 #include "../../inc/MarlinConfigPre.h"

-#if HAS_LCD_MENU && ENABLED(AUTO_BED_LEVELING_UBL)
+#if BOTH(HAS_LCD_MENU, AUTO_BED_LEVELING_UBL)

 #include "menu.h"
 #include "../../gcode/gcode.h"
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -60,7 +60,7 @@ MarlinUI ui;
  constexpr uint8_t MAX_MESSAGE_LENGTH = 63;
 #endif

-#if HAS_SPI_LCD || ENABLED(EXTENSIBLE_UI)
+#if EITHER(HAS_SPI_LCD, EXTENSIBLE_UI)
  uint8_t MarlinUI::alert_level; // = 0
  char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1];
 #endif
@@ -366,7 +366,7 @@ bool MarlinUI::get_blink() {
 ///////////// Keypad Handling //////////////
 ////////////////////////////////////////////

-#if ENABLED(REPRAPWORLD_KEYPAD) && HAS_ENCODER_ACTION
+#if BOTH(REPRAPWORLD_KEYPAD, HAS_ENCODER_ACTION)

  volatile uint8_t MarlinUI::keypad_buttons;

@@ -566,7 +566,7 @@ void MarlinUI::status_screen() {
    if (old_frm != new_frm) {
      feedrate_percentage = new_frm;
      encoderPosition = 0;
-      #if HAS_BUZZER && ENABLED(BEEP_ON_FEEDRATE_CHANGE)
+      #if BOTH(HAS_BUZZER, BEEP_ON_FEEDRATE_CHANGE)
        static millis_t next_beep;
        #ifndef GOT_MS
          const millis_t ms = millis();
@@ -827,7 +827,7 @@ void MarlinUI::update() {
      if (encoderPastThreshold || lcd_clicked) {
        if (encoderPastThreshold) {

-          #if HAS_LCD_MENU && ENABLED(ENCODER_RATE_MULTIPLIER)
+          #if BOTH(HAS_LCD_MENU, ENCODER_RATE_MULTIPLIER)

            int32_t encoderMultiplier = 1;

@@ -888,7 +888,7 @@ void MarlinUI::update() {
      refresh(LCDVIEW_REDRAW_NOW);
    }

-    #if HAS_LCD_MENU && ENABLED(SCROLL_LONG_FILENAMES)
+    #if BOTH(HAS_LCD_MENU, SCROLL_LONG_FILENAMES)
      // If scrolling of long file names is enabled and we are in the sd card menu,
      // cause a refresh to occur until all the text has scrolled into view.
      if (currentScreen == menu_media && !lcd_status_update_delay--) {
@@ -1134,12 +1134,8 @@ void MarlinUI::update() {
          #if HAS_SLOW_BUTTONS
            | slow_buttons
          #endif
-          #if ENABLED(TOUCH_BUTTONS) && HAS_ENCODER_ACTION
-            | (touch_buttons
-              #if HAS_ENCODER_WHEEL
-                & (~(EN_A | EN_B))
-              #endif
-            )
+          #if BOTH(TOUCH_BUTTONS, HAS_ENCODER_ACTION)
+            | (touch_buttons & TERN_(HAS_ENCODER_WHEEL, & ~(EN_A | EN_B)))
          #endif
        );

@@ -1261,7 +1257,7 @@ void MarlinUI::update() {
      next_filament_display = ms + 5000UL; // Show status message for 5s
    #endif

-    #if HAS_SPI_LCD && ENABLED(STATUS_MESSAGE_SCROLLING)
+    #if BOTH(HAS_SPI_LCD, STATUS_MESSAGE_SCROLLING)
      status_scroll_offset = 0;
    #endif

--- a/Marlin/src/lcd/ultralcd.h
+++ b/Marlin/src/lcd/ultralcd.h
@@ -27,7 +27,7 @@
  #include "../libs/buzzer.h"
 #endif

-#if HAS_LCD_MENU || ENABLED(ULTIPANEL_FEEDMULTIPLY)
+#if EITHER(HAS_LCD_MENU, ULTIPANEL_FEEDMULTIPLY)
  #define HAS_ENCODER_ACTION 1
 #endif
 #if (!HAS_ADC_BUTTONS && ENABLED(NEWPANEL)) || BUTTONS_EXIST(EN1, EN2)