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

File list refactoring.

Browse Source
This commit is contained in:
Knutwurst
2023-06-09 13:16:27 +02:00
parent ecdbf477ec
commit a253776044
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/inc/Version.h
View File

@@ -41,10 +41,10 @@
* here we define this default string as the date where the latest release * here we define this default string as the date where the latest release
* version was tagged. * version was tagged.
*/ */
#define CUSTOM_BUILD_VERSION "1.5.1" #define CUSTOM_BUILD_VERSION "1.5.1-pre"
#ifndef STRING_DISTRIBUTION_DATE #ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2023-06-08" #define STRING_DISTRIBUTION_DATE "2023-06-09"
#endif #endif
/** /**

50
Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp
View File

@@ -32,6 +32,8 @@
#include "../../../module/motion.h" #include "../../../module/motion.h"
#include "../../../module/stepper.h" #include "../../../module/stepper.h"
//#define ANYCUBIC_TFT_DEBUG
#ifdef ANYCUBIC_TOUCHSCREEN #ifdef ANYCUBIC_TOUCHSCREEN
#include "./anycubic_touchscreen.h" #include "./anycubic_touchscreen.h"
@@ -644,31 +646,28 @@
void AnycubicTouchscreenClass::RenderCurrentFileList() { void AnycubicTouchscreenClass::RenderCurrentFileList() {
currentFileOrDirectory[0] = 0; currentFileOrDirectory[0] = 0;
uint16_t selectedNumber = 0;
FileList currentFileList;
if (CodeSeen('S')) selectedNumber = CodeValue();
if (SpecialMenu == false) { // Filelist start
SEND_PGM("FN ");
SENDLINE_PGM("");
if (SpecialMenu) {
RenderSpecialMenu(selectedNumber);
} else if (isMediaInserted() && (selectedNumber <= currentFileList.count())) {
currentTouchscreenSelection[0] = 0; currentTouchscreenSelection[0] = 0;
} RenderCurrentFolder(selectedNumber);
} else {
SENDLINE_PGM("FN "); // Filelist start
if (!isMediaInserted() && !SpecialMenu) {
SENDLINE_PGM(SM_SPECIAL_MENU_S); SENDLINE_PGM(SM_SPECIAL_MENU_S);
SENDLINE_PGM(SM_SPECIAL_MENU_L); SENDLINE_PGM(SM_SPECIAL_MENU_L);
} else {
uint16_t selectedNumber = 0;
FileList currentFileList;
if (CodeSeen('S')) {
selectedNumber = CodeValue();
}
if (SpecialMenu) {
RenderSpecialMenu(selectedNumber);
} else if (selectedNumber <= currentFileList.count()) {
RenderCurrentFolder(selectedNumber);
}
} }
SENDLINE_PGM("END"); // Filelist stop
SEND_PGM("END");
SENDLINE_PGM("");
// Filelist stop
} }
void AnycubicTouchscreenClass::RenderSpecialMenu(uint16_t selectedNumber) { void AnycubicTouchscreenClass::RenderSpecialMenu(uint16_t selectedNumber) {
@@ -1169,9 +1168,10 @@ void AnycubicTouchscreenClass::RenderCurrentFolder(uint16_t selectedNumber) {
SENDLINE(ui8tostr3rj(getProgress_percent())); SENDLINE(ui8tostr3rj(getProgress_percent()));
else else
SENDLINE_DBG_PGM("J02", "TFT Serial Debug: No SD Card mounted to return printing status... J02"); SENDLINE_DBG_PGM("J02", "TFT Serial Debug: No SD Card mounted to return printing status... J02");
} else {
SEND_PGM("A6V ---");
} }
else SENDLINE_PGM("");
SENDLINE_PGM("A6V ---");
#endif #endif
break; break;
case 7: // A7 GET PRINTING TIME case 7: // A7 GET PRINTING TIME
@@ -1191,8 +1191,7 @@ void AnycubicTouchscreenClass::RenderCurrentFolder(uint16_t selectedNumber) {
break; break;
case 8: // A8 GET SD LIST case 8: // A8 GET SD LIST
#ifdef SDSUPPORT #ifdef SDSUPPORT
if (SpecialMenu == false) currentTouchscreenSelection[0] = 0;
RenderCurrentFileList(); RenderCurrentFileList();
#endif #endif
break; break;
@@ -1491,7 +1490,8 @@ void AnycubicTouchscreenClass::RenderCurrentFolder(uint16_t selectedNumber) {
case 33: // A33 get version info case 33: // A33 get version info
SEND_PGM("J33 "); SEND_PGM("J33 ");
SEND_PGM("KW-"); SEND_PGM("KW-");
SENDLINE_PGM(MSG_MY_VERSION); SEND_PGM(MSG_MY_VERSION);
SENDLINE_PGM("");
break; break;
#endif #endif
#if ENABLED(KNUTWURST_TFT_LEVELING) #if ENABLED(KNUTWURST_TFT_LEVELING)