3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-29 23:07:42 +00:00
Code Issues Releases Wiki Activity

🩹 Patches for MSC SD (#26332)

Browse Source
This commit is contained in:
Scott Lahteine 2023-10-08 18:09:49 -05:00 committed by GitHub
parent f0ad1e9b70
commit 9cd341c2c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/HAL/STM32/msc_sd.cpp
View File

@ -71,9 +71,9 @@ public:
bool done = false; bool done = false;
for (uint16_t rcount = SD_MULTIBLOCK_RETRY_CNT; !done && rcount--;) { for (uint16_t rcount = SD_MULTIBLOCK_RETRY_CNT; !done && rcount--;) {
uint8_t *cBuf = pBuf; uint8_t *cBuf = pBuf;
sd2card->writeStart(blkAddr); sd2card->writeStart(blkAddr, blkLen);
bool okay = true; // Assume success bool okay = true; // Assume success
for (uint32 i = blkLen; i--;) { for (uint32_t i = blkLen; i--;) {
hal.watchdog_refresh(); hal.watchdog_refresh();
if (!sd2card->writeData(cBuf)) { // Write. Did it fail? if (!sd2card->writeData(cBuf)) { // Write. Did it fail?
sd2card->writeStop(); // writeStop for new writeStart sd2card->writeStop(); // writeStop for new writeStart
@ -103,7 +103,7 @@ public:
uint8_t *cBuf = pBuf; uint8_t *cBuf = pBuf;
sd2card->readStart(blkAddr); sd2card->readStart(blkAddr);
bool okay = true; // Assume success bool okay = true; // Assume success
for (uint32 i = blkLen; i--;) { for (uint32_t i = blkLen; i--;) {
hal.watchdog_refresh(); hal.watchdog_refresh();
if (!sd2card->readData(cBuf)) { // Read. Did it fail? if (!sd2card->readData(cBuf)) { // Read. Did it fail?
sd2card->readStop(); // readStop for new readStart sd2card->readStop(); // readStop for new readStart

4
Marlin/src/lcd/dogm/u8g_fontutf8.cpp
View File

@ -121,8 +121,8 @@ static font_group_t g_fontgroup_root = { nullptr, 0 };
*/ */
static inline bool uxg_Utf8FontIsInited() { return flag_fontgroup_was_inited; } static inline bool uxg_Utf8FontIsInited() { return flag_fontgroup_was_inited; }
int uxg_SetUtf8Fonts (const uxg_fontinfo_t * fntinfo, int number) { int uxg_SetUtf8Fonts(const uxg_fontinfo_t *fntinfo, int number) {
flag_fontgroup_was_inited = 1; flag_fontgroup_was_inited = true;
return fontgroup_init(&g_fontgroup_root, fntinfo, number); return fontgroup_init(&g_fontgroup_root, fntinfo, number);
} }

3
buildroot/tests/STM32F103RE_btt_USB
View File

@ -11,11 +11,12 @@ set -e
# #
restore_configs restore_configs
opt_set MOTHERBOARD BOARD_BTT_SKR_E3_DIP SERIAL_PORT 1 SERIAL_PORT_2 -1 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" exec_test $1 $2 "BigTreeTech SKR E3 DIP v1.0 - Basic Configuration" "$3"
restore_configs restore_configs
opt_set MOTHERBOARD BOARD_BTT_SKR_CR6 SERIAL_PORT -1 SERIAL_PORT_2 2 TEMP_SENSOR_BED 1 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 \ NOZZLE_AS_PROBE Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN Z_SAFE_HOMING \
PROBE_ACTIVATION_SWITCH PROBE_TARE PROBE_TARE_ONLY_WHILE_INACTIVE \ PROBE_ACTIVATION_SWITCH PROBE_TARE PROBE_TARE_ONLY_WHILE_INACTIVE \
PROBING_HEATERS_OFF PREHEAT_BEFORE_PROBING PROBING_HEATERS_OFF PREHEAT_BEFORE_PROBING