wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

Special Menu and/or the SD card requirement can be disabled.

Browse Source
This commit is contained in:
Knutwurst
2020-10-13 18:05:49 +02:00
parent d93d3eb867
commit 234be5373f
2 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Configuration.h
View File

@@ -40,6 +40,8 @@
#define ANYCUBIC_TOUCHSCREEN #define ANYCUBIC_TOUCHSCREEN
#define ANYCUBIC_FILAMENT_RUNOUT_SENSOR #define ANYCUBIC_FILAMENT_RUNOUT_SENSOR
#define KNUTWURST_SPECIAL_MENU
#define KNUTWURST_SPECIAL_MENU_WO_SD
//#define ANYCUBIC_TFT_DEBUG //#define ANYCUBIC_TFT_DEBUG
//#define POWER_OUTAGE_TEST //#define POWER_OUTAGE_TEST

44
Marlin/src/lcd/anycubic_touchscreen.cpp
View File

@@ -440,6 +440,7 @@ bool AnycubicTouchscreenClass::CodeSeen(char code)
void AnycubicTouchscreenClass::HandleSpecialMenu() void AnycubicTouchscreenClass::HandleSpecialMenu()
{ {
#if ENABLED(KNUTWURST_SPECIAL_MENU)
#ifdef ANYCUBIC_TFT_DEBUG #ifdef ANYCUBIC_TFT_DEBUG
SERIAL_ECHOPAIR(" DEBUG: Special Menu Selection: ", currentTouchscreenSelection); SERIAL_ECHOPAIR(" DEBUG: Special Menu Selection: ", currentTouchscreenSelection);
SERIAL_EOL(); SERIAL_EOL();
@@ -693,11 +694,13 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
LevelMenu = false; LevelMenu = false;
queue.inject_P(PSTR("G90\nG1 Z10\nG1 X15 Y15 F4000")); queue.inject_P(PSTR("G90\nG1 Z10\nG1 X15 Y15 F4000"));
} }
#endif
} }
void AnycubicTouchscreenClass::PrintList() void AnycubicTouchscreenClass::PrintList()
{ {
#if ENABLED(KNUTWURST_SPECIAL_MENU)
if(MMLMenu) if(MMLMenu)
{ {
switch (filenumber) switch (filenumber)
@@ -842,8 +845,13 @@ void AnycubicTouchscreenClass::PrintList()
break; break;
} }
} }
#endif
#ifdef SDSUPPORT #ifdef SDSUPPORT
#if ENABLED(KNUTWURST_SPECIAL_MENU)
else if (card.isMounted()) else if (card.isMounted())
#else
if (card.isMounted())
#endif
{ {
uint16_t count = filenumber; uint16_t count = filenumber;
uint16_t max_files; uint16_t max_files;
@@ -959,8 +967,10 @@ void AnycubicTouchscreenClass::PrintList()
#endif #endif
else else
{ {
HARDWARE_SERIAL_PROTOCOLLNPGM(SM_SPECIAL_MENU_S); #if ENABLED(KNUTWURST_SPECIAL_MENU_WO_SD)
HARDWARE_SERIAL_PROTOCOLLNPGM(SM_SPECIAL_MENU_L); HARDWARE_SERIAL_PROTOCOLLNPGM(SM_SPECIAL_MENU_S);
HARDWARE_SERIAL_PROTOCOLLNPGM(SM_SPECIAL_MENU_L);
#endif
} }
} }
@@ -1372,17 +1382,27 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
} }
case 8: // A8 GET SD LIST case 8: // A8 GET SD LIST
#ifdef SDSUPPORT #ifdef SDSUPPORT
currentTouchscreenSelection[0] = 0;
if (CodeSeen('S'))
filenumber = CodeValue();
HARDWARE_SERIAL_PROTOCOLPGM("FN "); // Filelist start
HARDWARE_SERIAL_ENTER();
PrintList();
HARDWARE_SERIAL_PROTOCOLPGM("END"); // Filelist stop
HARDWARE_SERIAL_ENTER();
currentTouchscreenSelection[0] = 0;
#if ENABLED(KNUTWURST_SPECIAL_MENU_WO_SD)
if (!IS_SD_INSERTED())
{
HARDWARE_SERIAL_PROTOCOLPGM("J02");
HARDWARE_SERIAL_ENTER();
}
else
#endif
{
if (CodeSeen('S'))
filenumber = CodeValue();
HARDWARE_SERIAL_PROTOCOLPGM("FN "); // Filelist start
HARDWARE_SERIAL_ENTER();
PrintList();
HARDWARE_SERIAL_PROTOCOLPGM("END"); // Filelist stop
HARDWARE_SERIAL_ENTER();
}
#endif #endif
break; break;
case 9: // A9 pause sd print case 9: // A9 pause sd print