From 6c994002af1ef13004490b5e15501e6cdc70dd88 Mon Sep 17 00:00:00 2001
From: Bob Kuhn <bob.kuhn@att.net>
Date: Tue, 26 May 2020 00:44:12 -0500
Subject: [PATCH] No SD_CHECK_AND_RETRY with USE_USB_COMPOSITE (STM32F103 +
SDIO) (#18108)
* disable SD_CHECK_AND_RETRY when USE_USB_COMPOSITE is enabled
* Update Sd2Card.cpp
* Disable SD_CHECK_AND_RETRY with USE_USB_COMPOSITE
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h | 5 +++++
Marlin/src/sd/Sd2Card.cpp | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h b/Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h
index 0285c52ee3..4e3b8903dd 100644
--- a/Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h
@@ -20,3 +20,8 @@
*
*/
#pragma once
+
+#if ENABLED(USE_USB_COMPOSITE)
+ //#warning "SD_CHECK_AND_RETRY isn't needed with USE_USB_COMPOSITE."
+ #undef SD_CHECK_AND_RETRY
+#endif
diff --git a/Marlin/src/sd/Sd2Card.cpp b/Marlin/src/sd/Sd2Card.cpp
index ba233d36f6..e21662afc1 100644
--- a/Marlin/src/sd/Sd2Card.cpp
+++ b/Marlin/src/sd/Sd2Card.cpp
@@ -575,7 +575,7 @@ bool Sd2Card::writeData(const uint8_t* src) {
// Send one block of data for write block or write multiple blocks
bool Sd2Card::writeData(const uint8_t token, const uint8_t* src) {
- uint16_t crc =
+ const uint16_t crc =
#if ENABLED(SD_CHECK_AND_RETRY)
CRC_CCITT(src, 512)
#else
--
GitLab