Fix not feeding the watchdog in time

makerbase-mks · Oct 25, 2021 · d5f3546 · d5f3546
1 parent fd0f0f9
commit d5f3546
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -1827,7 +1827,7 @@
 #define EEPROM_CHITCHAT       // Give feedback on EEPROM commands. Disable to save PROGMEM.
 #define EEPROM_BOOT_SILENT    // Keep M503 quiet and only give errors during first load
 #if ENABLED(EEPROM_SETTINGS)
-  //#define EEPROM_AUTO_INIT  // Init EEPROM automatically on any errors.
+  #define EEPROM_AUTO_INIT  // Init EEPROM automatically on any errors.
 #endif
 
 //

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -1490,7 +1490,7 @@
    *
    * [1] On AVR an interrupt-capable pin is best for UHS3 compatibility.
    */
-  #define USB_FLASH_DRIVE_SUPPORT
+  // #define USB_FLASH_DRIVE_SUPPORT
   #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
     /**
      * USB Host Shield Library
@@ -1508,7 +1508,7 @@
     /**
      * Native USB Host supported by some boards (USB OTG)
      */
-    #define USE_OTG_USB_HOST
+    // #define USE_OTG_USB_HOST
 
     #if DISABLED(USE_OTG_USB_HOST)
       #define USB_CS_PIN    SDSS
@@ -1550,7 +1550,7 @@
   //#define NO_SD_DETECT
 
   // Multiple volume support - EXPERIMENTAL.
-  #define MULTI_VOLUME
+  // #define MULTI_VOLUME
   #if ENABLED(MULTI_VOLUME)
     #define VOLUME_SD_ONBOARD       1
     #define VOLUME_USB_FLASH_DRIVE  2

diff --git a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
@@ -564,7 +564,7 @@ void Pic_Read(uint8_t *Pname, uint8_t *P_Rbuff) {
     do {
       W25QXX.SPI_FLASH_BufferRead(&PIC.name[j], PIC_NAME_ADDR + tmp_cnt, 1);
       tmp_cnt++;
-    } while (PIC.name[j++] != '\0');
+    } while (PIC.name[j++] != '\0' && j <= 50);  // fix-1025
     // pic size
     W25QXX.SPI_FLASH_BufferRead(PIC.size.bytes, PIC_SIZE_ADDR + i * 4, 4);
 

diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -153,7 +153,9 @@ void tft_lvgl_init() {
     } while((!card.media_driver_usbFlash.isInserted()) && (usb_flash_loop--));
     card.mount();
   #elif HAS_LOGO_IN_FLASH
-    delay(2000);
+    delay(1000);
+    watchdog_refresh(); 
+    delay(1000);
   #endif
 
   watchdog_refresh();     // LVGL init takes time
@@ -164,11 +166,6 @@ void tft_lvgl_init() {
     TERN_(MKS_TEST, mks_test_get());
   #endif
 
-  #if ENABLED(MULTI_VOLUME)
-    // card.changeMedia(&card.media_driver_usbFlash);
-    // card.mount();
-  #endif
-
   touch.Init();
 
   lv_init();