|
@@ -29,10 +29,6 @@
|
29
|
29
|
|
30
|
30
|
#include "../archim2-flash/flash_storage.h"
|
31
|
31
|
|
32
|
|
-#if BOTH(SDSUPPORT, LULZBOT_MANUAL_USB_STARTUP)
|
33
|
|
- #include "../../../../../sd/cardreader.h"
|
34
|
|
-#endif
|
35
|
|
-
|
36
|
32
|
using namespace FTDI;
|
37
|
33
|
using namespace Theme;
|
38
|
34
|
|
|
@@ -283,24 +279,16 @@ void StatusScreen::draw_interaction_buttons(draw_mode_t what) {
|
283
|
279
|
CommandProcessor cmd;
|
284
|
280
|
cmd.colors(normal_btn)
|
285
|
281
|
.font(Theme::font_medium)
|
286
|
|
- #if BOTH(SDSUPPORT, LULZBOT_MANUAL_USB_STARTUP)
|
287
|
|
- .enabled(!Sd2Card::ready() || has_media)
|
288
|
|
- #else
|
289
|
|
- .enabled(has_media)
|
290
|
|
- #endif
|
|
282
|
+ .enabled(has_media)
|
291
|
283
|
.colors(has_media ? action_btn : normal_btn)
|
292
|
|
- #ifdef TOUCH_UI_PORTRAIT
|
293
|
|
- .tag(3).button( BTN_POS(1,8), BTN_SIZE(2,1),
|
294
|
|
- #else
|
295
|
|
- .tag(3).button( BTN_POS(1,7), BTN_SIZE(2,2),
|
296
|
|
- #endif
|
297
|
|
- isPrintingFromMedia() ? GET_TEXTF(PRINTING) :
|
298
|
|
- #if BOTH(SDSUPPORT, LULZBOT_MANUAL_USB_STARTUP)
|
299
|
|
- (!Sd2Card::ready() ? GET_TEXTF(ENABLE_MEDIA) :
|
300
|
|
- #else
|
301
|
|
- GET_TEXTF(MEDIA))
|
302
|
|
- #endif
|
303
|
|
- .colors(!has_media ? action_btn : normal_btn)
|
|
284
|
+ .tag(3).button(
|
|
285
|
+ #ifdef TOUCH_UI_PORTRAIT
|
|
286
|
+ BTN_POS(1,8), BTN_SIZE(2,1),
|
|
287
|
+ #else
|
|
288
|
+ BTN_POS(1,7), BTN_SIZE(2,2),
|
|
289
|
+ #endif
|
|
290
|
+ isPrintingFromMedia() ? GET_TEXTF(PRINTING) : GET_TEXTF(MEDIA)
|
|
291
|
+ ).colors(!has_media ? action_btn : normal_btn)
|
304
|
292
|
#ifdef TOUCH_UI_PORTRAIT
|
305
|
293
|
.tag(4).button( BTN_POS(3,8), BTN_SIZE(2,1), GET_TEXTF(MENU));
|
306
|
294
|
#else
|
|
@@ -407,18 +395,7 @@ bool StatusScreen::onTouchEnd(uint8_t tag) {
|
407
|
395
|
using namespace ExtUI;
|
408
|
396
|
|
409
|
397
|
switch (tag) {
|
410
|
|
- case 3:
|
411
|
|
- #if BOTH(SDSUPPORT, LULZBOT_MANUAL_USB_STARTUP)
|
412
|
|
- if (!Sd2Card::ready()) {
|
413
|
|
- StatusScreen::setStatusMessage(GET_TEXTF(INSERT_MEDIA));
|
414
|
|
- Sd2Card::usbStartup();
|
415
|
|
- } else {
|
416
|
|
- GOTO_SCREEN(FilesScreen);
|
417
|
|
- }
|
418
|
|
- #else
|
419
|
|
- GOTO_SCREEN(FilesScreen);
|
420
|
|
- #endif
|
421
|
|
- break;
|
|
398
|
+ case 3: GOTO_SCREEN(FilesScreen); break;
|
422
|
399
|
case 4:
|
423
|
400
|
if (isPrinting()) {
|
424
|
401
|
GOTO_SCREEN(TuneMenu);
|