From 9cd341c2c3b2ea4e38852325bec98c349addf7f8 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 8 Oct 2023 18:09:49 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20Patches=20for=20MSC=20SD=20(#263?= =?UTF-8?q?32)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/HAL/STM32/msc_sd.cpp | 6 +++--- Marlin/src/lcd/dogm/u8g_fontutf8.cpp | 4 ++-- buildroot/tests/STM32F103RE_btt_USB | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Marlin/src/HAL/STM32/msc_sd.cpp b/Marlin/src/HAL/STM32/msc_sd.cpp index f03f533a71..d7652abdc2 100644 --- a/Marlin/src/HAL/STM32/msc_sd.cpp +++ b/Marlin/src/HAL/STM32/msc_sd.cpp @@ -71,9 +71,9 @@ public: bool done = false; for (uint16_t rcount = SD_MULTIBLOCK_RETRY_CNT; !done && rcount--;) { uint8_t *cBuf = pBuf; - sd2card->writeStart(blkAddr); + sd2card->writeStart(blkAddr, blkLen); bool okay = true; // Assume success - for (uint32 i = blkLen; i--;) { + for (uint32_t i = blkLen; i--;) { hal.watchdog_refresh(); if (!sd2card->writeData(cBuf)) { // Write. Did it fail? sd2card->writeStop(); // writeStop for new writeStart @@ -103,7 +103,7 @@ public: uint8_t *cBuf = pBuf; sd2card->readStart(blkAddr); bool okay = true; // Assume success - for (uint32 i = blkLen; i--;) { + for (uint32_t i = blkLen; i--;) { hal.watchdog_refresh(); if (!sd2card->readData(cBuf)) { // Read. Did it fail? sd2card->readStop(); // readStop for new readStart diff --git a/Marlin/src/lcd/dogm/u8g_fontutf8.cpp b/Marlin/src/lcd/dogm/u8g_fontutf8.cpp index 79fabfd805..5d9ef627c9 100644 --- a/Marlin/src/lcd/dogm/u8g_fontutf8.cpp +++ b/Marlin/src/lcd/dogm/u8g_fontutf8.cpp @@ -121,8 +121,8 @@ static font_group_t g_fontgroup_root = { nullptr, 0 }; */ static inline bool uxg_Utf8FontIsInited() { return flag_fontgroup_was_inited; } -int uxg_SetUtf8Fonts (const uxg_fontinfo_t * fntinfo, int number) { - flag_fontgroup_was_inited = 1; +int uxg_SetUtf8Fonts(const uxg_fontinfo_t *fntinfo, int number) { + flag_fontgroup_was_inited = true; return fontgroup_init(&g_fontgroup_root, fntinfo, number); } diff --git a/buildroot/tests/STM32F103RE_btt_USB b/buildroot/tests/STM32F103RE_btt_USB index 7b264ea283..0bf5f616e4 100755 --- a/buildroot/tests/STM32F103RE_btt_USB +++ b/buildroot/tests/STM32F103RE_btt_USB @@ -11,11 +11,12 @@ set -e # restore_configs opt_set MOTHERBOARD BOARD_BTT_SKR_E3_DIP SERIAL_PORT 1 SERIAL_PORT_2 -1 +opt_enable SDSUPPORT EMERGENCY_PARSER exec_test $1 $2 "BigTreeTech SKR E3 DIP v1.0 - Basic Configuration" "$3" restore_configs opt_set MOTHERBOARD BOARD_BTT_SKR_CR6 SERIAL_PORT -1 SERIAL_PORT_2 2 TEMP_SENSOR_BED 1 -opt_enable CR10_STOCKDISPLAY FAN_SOFT_PWM \ +opt_enable CR10_STOCKDISPLAY SDSUPPORT EMERGENCY_PARSER FAN_SOFT_PWM \ NOZZLE_AS_PROBE Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN Z_SAFE_HOMING \ PROBE_ACTIVATION_SWITCH PROBE_TARE PROBE_TARE_ONLY_WHILE_INACTIVE \ PROBING_HEATERS_OFF PREHEAT_BEFORE_PROBING