Skip to content

Commit 652b20c

Browse files
thinkyheadEvilGremlin
authored andcommitted
🩹 Patches for MSC SD (MarlinFirmware#26332)
1 parent f6a9e6f commit 652b20c

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

Marlin/src/HAL/STM32/msc_sd.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ class Sd2CardUSBMscHandler : public USBMscHandler {
7171
bool done = false;
7272
for (uint16_t rcount = SD_MULTIBLOCK_RETRY_CNT; !done && rcount--;) {
7373
uint8_t *cBuf = pBuf;
74-
sd2card->writeStart(blkAddr);
74+
sd2card->writeStart(blkAddr, blkLen);
7575
bool okay = true; // Assume success
76-
for (uint32 i = blkLen; i--;) {
76+
for (uint32_t i = blkLen; i--;) {
7777
hal.watchdog_refresh();
7878
if (!sd2card->writeData(cBuf)) { // Write. Did it fail?
7979
sd2card->writeStop(); // writeStop for new writeStart
@@ -103,7 +103,7 @@ class Sd2CardUSBMscHandler : public USBMscHandler {
103103
uint8_t *cBuf = pBuf;
104104
sd2card->readStart(blkAddr);
105105
bool okay = true; // Assume success
106-
for (uint32 i = blkLen; i--;) {
106+
for (uint32_t i = blkLen; i--;) {
107107
hal.watchdog_refresh();
108108
if (!sd2card->readData(cBuf)) { // Read. Did it fail?
109109
sd2card->readStop(); // readStop for new readStart

Marlin/src/lcd/dogm/u8g_fontutf8.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ static font_group_t g_fontgroup_root = { nullptr, 0 };
121121
*/
122122
static inline bool uxg_Utf8FontIsInited() { return flag_fontgroup_was_inited; }
123123

124-
int uxg_SetUtf8Fonts (const uxg_fontinfo_t * fntinfo, int number) {
125-
flag_fontgroup_was_inited = 1;
124+
int uxg_SetUtf8Fonts(const uxg_fontinfo_t *fntinfo, int number) {
125+
flag_fontgroup_was_inited = true;
126126
return fontgroup_init(&g_fontgroup_root, fntinfo, number);
127127
}
128128

buildroot/tests/STM32F103RE_btt_USB

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ set -e
1111
#
1212
restore_configs
1313
opt_set MOTHERBOARD BOARD_BTT_SKR_E3_DIP SERIAL_PORT 1 SERIAL_PORT_2 -1
14+
opt_enable SDSUPPORT EMERGENCY_PARSER
1415
exec_test $1 $2 "BigTreeTech SKR E3 DIP v1.0 - Basic Configuration" "$3"
1516

1617
restore_configs
1718
opt_set MOTHERBOARD BOARD_BTT_SKR_CR6 SERIAL_PORT -1 SERIAL_PORT_2 2 TEMP_SENSOR_BED 1
18-
opt_enable CR10_STOCKDISPLAY FAN_SOFT_PWM \
19+
opt_enable CR10_STOCKDISPLAY SDSUPPORT EMERGENCY_PARSER FAN_SOFT_PWM \
1920
NOZZLE_AS_PROBE Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN Z_SAFE_HOMING \
2021
PROBE_ACTIVATION_SWITCH PROBE_TARE PROBE_TARE_ONLY_WHILE_INACTIVE \
2122
PROBING_HEATERS_OFF PREHEAT_BEFORE_PROBING

0 commit comments

Comments
 (0)