From 99ae9707de2557785db57a60f2a712457c03a87f Mon Sep 17 00:00:00 2001 From: bubnikv Date: Thu, 1 Sep 2016 16:52:46 +0200 Subject: [PATCH] Fixed a missing SD card error on start up, if the setup was blocked by some dialog for an extended period of time. Increased version to 3.0.8 final. --- Firmware/Configuration.h | 2 +- Firmware/Marlin_main.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 196cb719..b654e97e 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -5,7 +5,7 @@ #include "Configuration_prusa.h" // Firmware version -#define FW_version "3.0.8-alpha" +#define FW_version "3.0.8" #define FW_PRUSA3D_MAGIC "PRUSA3DFW" #define FW_PRUSA3D_MAGIC_LEN 10 diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 146a2b88..4d9993ae 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1021,6 +1021,9 @@ 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 &&