bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Creality Ender 3 v2 (#17719)

Browse Source
This commit is contained in:
Scott Lahteine
2020-06-16 01:45:27 -05:00
committed by GitHub
parent 642112d3eb
commit f4c258dc23
37 changed files with 5379 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Marlin/src/sd/cardreader.cpp
View File

@ -28,6 +28,11 @@
#include "../MarlinCore.h"
#include "../lcd/ultralcd.h"
#if ENABLED(DWIN_CREALITY_LCD)
#include "../lcd/dwin/dwin.h"
#endif
#include "../module/planner.h" // for synchronize
#include "../module/printcounter.h"
#include "../gcode/queue.h"
@ -385,7 +390,11 @@ void CardReader::mount() {
void CardReader::manage_media() {
static uint8_t prev_stat = TERN(INIT_SDCARD_ON_BOOT, 2, 0);
uint8_t stat = uint8_t(IS_SD_INSERTED());
if (stat != prev_stat && ui.detected()) {
if (stat == prev_stat) return;
flag.workDirIsRoot = true; // Return to root on mount/release
if (ui.detected()) {
uint8_t old_stat = prev_stat;
prev_stat = stat; // Change now to prevent re-entry
@ -420,6 +429,8 @@ void CardReader::manage_media() {
void CardReader::release() {
endFilePrint();
flag.mounted = false;
flag.workDirIsRoot = true;
nrFiles = 0;
}
void CardReader::openAndPrintFile(const char *name) {
@ -440,6 +451,7 @@ void CardReader::startFileprint() {
void CardReader::endFilePrint(TERN_(SD_RESORT, const bool re_sort/*=false*/)) {
TERN_(ADVANCED_PAUSE_FEATURE, did_pause_print = 0);
TERN_(DWIN_CREALITY_LCD, HMI_flag.print_finish = flag.sdprinting);
flag.sdprinting = flag.abort_sd_printing = false;
if (isFileOpen()) file.close();
TERN_(SD_RESORT, if (re_sort) presort());
@ -944,7 +956,7 @@ void CardReader::cdroot() {
#if HAS_FOLDER_SORTING
const uint16_t bit = i & 0x07, ind = i >> 3;
if (bit == 0) isDir[ind] = 0x00;
if (flag.filenameIsDir) isDir[ind] |= _BV(bit);
if (flag.filenameIsDir) SBI(isDir[ind], bit);
#endif
#endif
}
@ -972,7 +984,7 @@ void CardReader::cdroot() {
#if HAS_FOLDER_SORTING
#if ENABLED(SDSORT_USES_RAM)
// Folder sorting needs an index and bit to test for folder-ness.
#define _SORT_CMP_DIR(fs) IS_DIR(o1) == IS_DIR(o2) ? _SORT_CMP_NODIR() : IS_DIR(fs > 0 ? o1 : o2)
#define _SORT_CMP_DIR(fs) (IS_DIR(o1) == IS_DIR(o2) ? _SORT_CMP_NODIR() : IS_DIR(fs > 0 ? o1 : o2))
#else
#define _SORT_CMP_DIR(fs) ((dir1 == flag.filenameIsDir) ? _SORT_CMP_NODIR() : (fs > 0 ? dir1 : !dir1))
#endif
@ -1062,13 +1074,14 @@ void CardReader::cdroot() {
#endif // SDCARD_SORT_ALPHA
uint16_t CardReader::get_num_Files() {
return
#if ENABLED(SDCARD_SORT_ALPHA) && SDSORT_USES_RAM && SDSORT_CACHE_NAMES
if (!isMounted()) return 0;
return (
#if ALL(SDCARD_SORT_ALPHA, SDSORT_USES_RAM, SDSORT_CACHE_NAMES)
nrFiles // no need to access the SD card for filenames
#else
countFilesInWorkDir()
#endif
;
);
}
//
@ -1084,9 +1097,7 @@ void CardReader::fileHasFinished() {
startFileprint();
}
else {
endFilePrint();
TERN_(SDCARD_SORT_ALPHA, presort());
endFilePrint(TERN_(SD_RESORT, true));
marlin_state = MF_SD_COMPLETE;
}

1
Marlin/src/sd/cardreader.h
View File

@ -152,6 +152,7 @@ public:
static inline bool isFileOpen() { return isMounted() && file.isOpen(); }
static inline uint32_t getIndex() { return sdpos; }
static inline uint32_t getFileSize() { return filesize; }
static inline bool eof() { return sdpos >= filesize; }
static inline void setIndex(const uint32_t index) { sdpos = index; file.seekSet(index); }
static inline char* getWorkDirName() { workDir.getDosName(filename); return filename; }