PavelSindler 7 years ago
parent
commit
5a77113fb5
4 changed files with 7 additions and 1 deletions
  1. 4 0
      Firmware/Configuration.h
  2. 1 1
      Firmware/Marlin_main.cpp
  3. 1 0
      Firmware/SdBaseFile.cpp
  4. 1 0
      Firmware/ultralcd.cpp

+ 4 - 0
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

+ 1 - 1
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.

+ 1 - 0
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);

+ 1 - 0
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;
 }