Use inline enabled

MarlinFirmware · Apr 28, 2020 · d53d9ff · d53d9ff
1 parent bb30584
commit d53d9ff
Showing 1 changed file with 6 additions and 28 deletions.
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
@@ -67,39 +67,17 @@ void TuneMenu::onRedraw(draw_mode_t what) {
     cmd.colors(normal_btn)
        .font(font_medium)
        .tag(2).button( TEMPERATURE_POS, GET_TEXT_F(MSG_TEMPERATURE))
-       .enabled((!isPrinting()) || isPrintingFromMediaPaused())
+       .enabled(!isPrinting() || isPrintingFromMediaPaused())
        .tag(3).button( FIL_CHANGE_POS,  GET_TEXT_F(MSG_FILAMENTCHANGE))
-       .enabled(
-          #if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
-            1
-          #endif
-       )
+       .enabled(EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR))
        .tag(9).button( FILAMENT_POS, GET_TEXT_F(MSG_FILAMENT))
-       .enabled(
-          #if HAS_BED_PROBE || ENABLED(BABYSTEPPING)
-            1
-          #endif
-        )
-       .tag(4).button( NUDGE_NOZ_POS, GET_TEXT_F(
-          #if ENABLED(BABYSTEPPING)
-            MSG_NUDGE_NOZZLE
-          #else
-            MSG_ZPROBE_ZOFFSET
-          #endif
-       ))
+       .enabled(EITHER(HAS_BED_PROBE, BABYSTEPPING))
+       .tag(4).button( NUDGE_NOZ_POS, GET_TEXT_F(TERN(BABYSTEPPING, MSG_NUDGE_NOZZLE, MSG_ZPROBE_ZOFFSET))
        .tag(5).button( SPEED_POS, GET_TEXT_F(MSG_PRINT_SPEED))
        .tag(isPrintingFromMediaPaused() ? 7 : 6)
-       .enabled(
-          #if ENABLED(SDSUPPORT)
-            isPrintingFromMedia()
-          #endif
-       )
+       .enabled(TERN0(SDSUPPORT, isPrintingFromMedia()))
        .button( PAUSE_POS, isPrintingFromMediaPaused() ? GET_TEXT_F(MSG_RESUME_PRINT) : GET_TEXT_F(MSG_PAUSE_PRINT))
-       .enabled(
-          #if ENABLED(SDSUPPORT)
-            isPrintingFromMedia()
-          #endif
-        )
+       .enabled(TERN0(SDSUPPORT, isPrintingFromMedia()))
       .tag(8).button( STOP_POS, GET_TEXT_F(MSG_STOP_PRINT))
       .tag(1).colors(action_btn)
              .button( BACK_POS, GET_TEXT_F(MSG_BACK));