diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index e6a4981b..130b5875 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -77,6 +77,10 @@ #define EEPROM_FERROR_COUNT (EEPROM_UVLO_MESH_BED_LEVELING-16) // Power loss errors #define EEPROM_POWER_COUNT (EEPROM_UVLO_MESH_BED_LEVELING-17) +#define UVLO_DIR_LEVEL (EEPROM_POWER_COUNT-1) +#define UVLO_FIRST_LEVEL_FOLDER (EEPROM_FOLDER_LEVEL-8) +#define UVLO_SECOND_LEVEL_FOLDER (EEPROM_FIRST_LEVEL-8) +#define UVLO_THIRD_LEVEL_FOLDER (EEPROM_SECOND_LEVEL-8) //TMC2130 configuration #define EEPROM_TMC_AXIS_SIZE //axis configuration block size diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 0c6c3ba5..74fb22e1 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1091,7 +1091,7 @@ void setup() if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) { lcd_wizard(0); } - else if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 0) { //dont show calibration status messages if wizard is currently active + if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 0) { //dont show calibration status messages if wizard is currently active if (calibration_status() == CALIBRATION_STATUS_ASSEMBLED || calibration_status() == CALIBRATION_STATUS_UNKNOWN) { // Reset the babystepping values, so the printer will not move the Z axis up when the babystepping is enabled. diff --git a/Firmware/SdBaseFile.cpp b/Firmware/SdBaseFile.cpp index be04ab1a..e29b216f 100644 --- a/Firmware/SdBaseFile.cpp +++ b/Firmware/SdBaseFile.cpp @@ -284,6 +284,7 @@ bool SdBaseFile::getFilename(char* name) { name[0] = '/'; name[1] = '\0'; return true; + dir_level = 0; } // cache entry dir_t* p = cacheDirEntry(SdVolume::CACHE_FOR_READ); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d491381c..69b5f3dc 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6136,6 +6136,7 @@ static void menu_action_sdfile(const char* filename, char* longFilename) } static void menu_action_sddirectory(const char* filename, char* longFilename) { + MYSERIAL.println(filename); card.chdir(filename); encoderPosition = 0; }