Ver código fonte

Update TOUCH_UI_LULZBOT_BIO wrappers

Scott Lahteine 4 anos atrás
pai
commit
e38abef720

+ 3
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp Ver arquivo

22
 
22
 
23
 #include "../config.h"
23
 #include "../config.h"
24
 
24
 
25
-#if ENABLED(TOUCH_UI_FTDI_EVE) && !defined(TOUCH_UI_LULZBOT_BIO)
25
+#if ENABLED(TOUCH_UI_FTDI_EVE) && DISABLED(TOUCH_UI_LULZBOT_BIO)
26
 
26
 
27
 #include "screens.h"
27
 #include "screens.h"
28
 
28
 
152
   }
152
   }
153
   return true;
153
   return true;
154
 }
154
 }
155
-#endif // TOUCH_UI_FTDI_EVE
155
+
156
+#endif // TOUCH_UI_FTDI_EVE && !TOUCH_UI_LULZBOT_BIO

+ 2
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp Ver arquivo

22
 
22
 
23
 #include "../config.h"
23
 #include "../config.h"
24
 
24
 
25
-#if ENABLED(TOUCH_UI_FTDI_EVE) && defined(TOUCH_UI_LULZBOT_BIO)
25
+#if BOTH(TOUCH_UI_FTDI_EVE, TOUCH_UI_LULZBOT_BIO)
26
 
26
 
27
 #include "screens.h"
27
 #include "screens.h"
28
 
28
 
134
   return true;
134
   return true;
135
 }
135
 }
136
 
136
 
137
-#endif // TOUCH_UI_FTDI_EVE
137
+#endif // TOUCH_UI_FTDI_EVE && TOUCH_UI_LULZBOT_BIO

+ 3
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp Ver arquivo

22
 
22
 
23
 #include "../config.h"
23
 #include "../config.h"
24
 
24
 
25
-#if ENABLED(TOUCH_UI_FTDI_EVE) && defined(TOUCH_UI_LULZBOT_BIO)
25
+#if BOTH(TOUCH_UI_FTDI_EVE, TOUCH_UI_LULZBOT_BIO)
26
 
26
 
27
 #include "screens.h"
27
 #include "screens.h"
28
 
28
 
53
   }
53
   }
54
   return true;
54
   return true;
55
 }
55
 }
56
-#endif // TOUCH_UI_FTDI_EVE
56
+
57
+#endif // TOUCH_UI_FTDI_EVE && TOUCH_UI_LULZBOT_BIO

+ 3
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp Ver arquivo

22
 
22
 
23
 #include "../config.h"
23
 #include "../config.h"
24
 
24
 
25
-#if ENABLED(TOUCH_UI_FTDI_EVE) && defined(TOUCH_UI_LULZBOT_BIO)
25
+#if BOTH(TOUCH_UI_FTDI_EVE, TOUCH_UI_LULZBOT_BIO)
26
 
26
 
27
 #include "screens.h"
27
 #include "screens.h"
28
 
28
 
52
   }
52
   }
53
   return true;
53
   return true;
54
 }
54
 }
55
-#endif // TOUCH_UI_FTDI_EVE
55
+
56
+#endif // TOUCH_UI_FTDI_EVE && TOUCH_UI_LULZBOT_BIO

+ 2
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp Ver arquivo

22
 
22
 
23
 #include "../config.h"
23
 #include "../config.h"
24
 
24
 
25
-#if ENABLED(TOUCH_UI_FTDI_EVE) && defined(TOUCH_UI_LULZBOT_BIO)
25
+#if BOTH(TOUCH_UI_FTDI_EVE, TOUCH_UI_LULZBOT_BIO)
26
 
26
 
27
 #include "screens.h"
27
 #include "screens.h"
28
 
28
 
85
   return true;
85
   return true;
86
 }
86
 }
87
 
87
 
88
-#endif // TOUCH_UI_FTDI_EVE
88
+#endif // TOUCH_UI_FTDI_EVE && TOUCH_UI_LULZBOT_BIO

+ 3
- 7
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp Ver arquivo

22
 
22
 
23
 #include "../config.h"
23
 #include "../config.h"
24
 
24
 
25
-#if ENABLED(TOUCH_UI_FTDI_EVE) && defined(TOUCH_UI_LULZBOT_BIO)
25
+#if BOTH(TOUCH_UI_FTDI_EVE, TOUCH_UI_LULZBOT_BIO)
26
 
26
 
27
 #include "screens.h"
27
 #include "screens.h"
28
 
28
 
78
        .font(font_medium)
78
        .font(font_medium)
79
        .colors(isPrinting() ? action_btn : normal_btn)
79
        .colors(isPrinting() ? action_btn : normal_btn)
80
        .tag(2).button(BTN_POS(1,9), BTN_SIZE(1,1), F("Menu"))
80
        .tag(2).button(BTN_POS(1,9), BTN_SIZE(1,1), F("Menu"))
81
-        #if ENABLED(SDSUPPORT)
82
-          .enabled(isPrinting() ? isPrintingFromMedia() : 1)
83
-        #else
84
-          .enabled(isPrinting() ? 0 : 1)
85
-        #endif
81
+       .enabled(isPrinting() ? TERN0(SDSUPPORT, isPrintingFromMedia()) : 1)
86
        .tag(3)
82
        .tag(3)
87
        .colors(isPrinting() ? normal_btn : action_btn)
83
        .colors(isPrinting() ? normal_btn : action_btn)
88
        .button( BTN_POS(2,9), BTN_SIZE(1,1), isPrinting() ? F("Cancel") : F("Back"));
84
        .button( BTN_POS(2,9), BTN_SIZE(1,1), isPrinting() ? F("Cancel") : F("Back"));
152
   GOTO_SCREEN(BioPrintingDialogBox);
148
   GOTO_SCREEN(BioPrintingDialogBox);
153
 }
149
 }
154
 
150
 
155
-#endif // TOUCH_UI_FTDI_EVE
151
+#endif // TOUCH_UI_FTDI_EVE && TOUCH_UI_LULZBOT_BIO

+ 2
- 2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp Ver arquivo

22
 
22
 
23
 #include "../config.h"
23
 #include "../config.h"
24
 
24
 
25
-#if ENABLED(TOUCH_UI_FTDI_EVE) && defined(TOUCH_UI_LULZBOT_BIO)
25
+#if BOTH(TOUCH_UI_FTDI_EVE, TOUCH_UI_LULZBOT_BIO)
26
 
26
 
27
 #include "screens.h"
27
 #include "screens.h"
28
 
28
 
76
   return true;
76
   return true;
77
 }
77
 }
78
 
78
 
79
-#endif // TOUCH_UI_FTDI_EVE
79
+#endif // TOUCH_UI_FTDI_EVE && TOUCH_UI_LULZBOT_BIO

+ 6
- 26
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp Ver arquivo

23
 
23
 
24
 #include "../config.h"
24
 #include "../config.h"
25
 
25
 
26
-#if ENABLED(TOUCH_UI_FTDI_EVE) && !defined(TOUCH_UI_LULZBOT_BIO)
26
+#if ENABLED(TOUCH_UI_FTDI_EVE) && DISABLED(TOUCH_UI_LULZBOT_BIO)
27
 
27
 
28
 #include "screens.h"
28
 #include "screens.h"
29
 
29
 
75
              1
75
              1
76
            #endif
76
            #endif
77
          )
77
          )
78
-       .tag(3).button( CLEAN_NOZZLE_POS, GET_TEXT_F(
79
-         #if ENABLED(TOUCH_UI_COCOA_PRESS)
80
-            MSG_PREHEAT_1
81
-         #else
82
-            MSG_CLEAN_NOZZLE
83
-         #endif
84
-       ))
78
+       .tag(3).button( CLEAN_NOZZLE_POS,     GET_TEXT_F(TERN(TOUCH_UI_COCOA_PRESS, MSG_PREHEAT_1, MSG_CLEAN_NOZZLE)))
85
        .tag(4).button( MOVE_AXIS_POS,        GET_TEXT_F(MSG_MOVE_AXIS))
79
        .tag(4).button( MOVE_AXIS_POS,        GET_TEXT_F(MSG_MOVE_AXIS))
86
        .tag(5).button( DISABLE_STEPPERS_POS, GET_TEXT_F(MSG_DISABLE_STEPPERS))
80
        .tag(5).button( DISABLE_STEPPERS_POS, GET_TEXT_F(MSG_DISABLE_STEPPERS))
87
        .tag(6).button( TEMPERATURE_POS,      GET_TEXT_F(MSG_TEMPERATURE))
81
        .tag(6).button( TEMPERATURE_POS,      GET_TEXT_F(MSG_TEMPERATURE))
88
-       .enabled(
89
-           #if DISABLED(TOUCH_UI_LULZBOT_BIO)
90
-             1
91
-           #endif
92
-         )
93
-       .tag(7).button( FILAMENTCHANGE_POS, GET_TEXT_F(
94
-         #if ENABLED(TOUCH_UI_COCOA_PRESS)
95
-             MSG_CASE_LIGHT
96
-         #else
97
-             MSG_FILAMENTCHANGE
98
-         #endif
99
-        ))
82
+       .enabled(IF_DISABLED(TOUCH_UI_LULZBOT_BIO, 1))
83
+       .tag(7).button( FILAMENTCHANGE_POS,   GET_TEXT_F(TERN(TOUCH_UI_COCOA_PRESS, MSG_CASE_LIGHT, MSG_FILAMENTCHANGE))
100
        .tag(8).button( ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
84
        .tag(8).button( ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
101
-       .enabled(
102
-         #ifdef HAS_LEVELING
103
-           1
104
-         #endif
105
-        )
85
+       .enabled(TERN_(HAS_LEVELING, 1))
106
        .tag(9).button( LEVELING_POS, GET_TEXT_F(MSG_LEVELING))
86
        .tag(9).button( LEVELING_POS, GET_TEXT_F(MSG_LEVELING))
107
        .tag(10).button( ABOUT_PRINTER_POS, GET_TEXT_F(MSG_INFO_MENU))
87
        .tag(10).button( ABOUT_PRINTER_POS, GET_TEXT_F(MSG_INFO_MENU))
108
        .colors(action_btn)
88
        .colors(action_btn)
140
   return true;
120
   return true;
141
 }
121
 }
142
 
122
 
143
-#endif // TOUCH_UI_FTDI_EVE
123
+#endif // TOUCH_UI_FTDI_EVE && !TOUCH_UI_LULZBOT_BIO

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp Ver arquivo

22
 
22
 
23
 #include "../config.h"
23
 #include "../config.h"
24
 
24
 
25
-#if ENABLED(TOUCH_UI_FTDI_EVE) && !defined(TOUCH_UI_LULZBOT_BIO)
25
+#if ENABLED(TOUCH_UI_FTDI_EVE) && DISABLED(TOUCH_UI_LULZBOT_BIO)
26
 
26
 
27
 #include "screens.h"
27
 #include "screens.h"
28
 
28
 

Carregando…
Cancelar
Salvar