Merge pull request MarlinFirmware#51 from makerbase-mks/master

LS
qw3rtrun · Mar 17, 2021 · 54ee1a9 · 54ee1a9
2 parents 201ddff + a7af0a1
commit 54ee1a9
Show file tree

Hide file tree

Showing 10 changed files with 1,392 additions and 134 deletions.
diff --git a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
@@ -315,6 +315,7 @@
     uint8_t retryCnt = SDIO_READ_RETRIES;
     bool status;
     for (;;) {
+      TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
       status = (bool) HAL_SD_WriteBlocks(&hsd, (uint8_t*)src, block, 1, 500);  // write one 512 byte block with 500mS timeout
       status |= (bool) HAL_SD_GetCardState(&hsd);     // make sure all is OK
       if (!status) break;       // return passing status

diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp
@@ -130,6 +130,10 @@ void tft_lvgl_init() {
     OUT_WRITE(PB0, LOW);  // HE1
   #endif
 
+  #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
+    OUT_WRITE(USB_POWER_CONTROL_PIN, HIGH);
+  #endif
+
   // Init TFT first!
   SPI_TFT.spi_init(SPI_FULL_SPEED);
   SPI_TFT.LCD_init();