From d1224834c199d8b8e55f2dafe8b7cbcfa6092991 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 13 Dec 2017 16:27:15 +0100 Subject: [PATCH 1/2] init sd card after wizard --- Firmware/Marlin_main.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f495d7f7f..2bfce34ac 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1062,10 +1062,7 @@ void setup() // Enable Toshiba FlashAir SD card / WiFi enahanced card. card.ToshibaFlashAir_enable(eeprom_read_byte((unsigned char*)EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY) == 1); - // Force SD card update. Otherwise the SD card update is done from loop() on card.checkautostart(false), - // but this times out if a blocking dialog is shown in setup(). - card.initsd(); - + if (eeprom_read_dword((uint32_t*)(EEPROM_TOP - 4)) == 0x0ffffffff && eeprom_read_dword((uint32_t*)(EEPROM_TOP - 8)) == 0x0ffffffff && eeprom_read_dword((uint32_t*)(EEPROM_TOP - 12)) == 0x0ffffffff) { @@ -1078,6 +1075,10 @@ void setup() eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); //run wizard } + + // Force SD card update. Otherwise the SD card update is done from loop() on card.checkautostart(false), + // but this times out if a blocking dialog is shown in setup(). + card.initsd(); if (eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT) == 0xff) eeprom_write_byte((uint8_t*)EEPROM_POWER_COUNT, 0); if (eeprom_read_byte((uint8_t*)EEPROM_CRASH_COUNT) == 0xff) From 240922d789e246efee6fad203117ff7989e4cb63 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 13 Dec 2017 16:27:35 +0100 Subject: [PATCH 2/2] build 134 --- Firmware/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index e2000cf06..58aaa7520 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -9,7 +9,7 @@ // Firmware version #define FW_version "3.1.1-RC1" -#define FW_build 133 +#define FW_build 134 //#define FW_build --BUILD-NUMBER-- #define FW_version_build FW_version " b" STR(FW_build)