sv/Marlin
1
1
Fork 0
Code Issues Pull Requests 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
3 changed files with 7 additions and 6 deletions
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;
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

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; }
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);
}