Bladeren bron

🐛 Fix Archim2 USB Hang (#24314)

InsanityAutomation 1 jaar geleden
bovenliggende
commit
aacc2d3dc5
No account linked to committer's email address

+ 2
- 0
Marlin/Configuration_adv.h Bestand weergeven

@@ -1605,6 +1605,8 @@
1605 1605
     //#define USE_UHS2_USB
1606 1606
     //#define USE_UHS3_USB
1607 1607
 
1608
+    #define DISABLE_DUE_SD_MMC // Disable USB Host access to USB Drive to prevent hangs on block access for DUE platform
1609
+
1608 1610
     /**
1609 1611
      * Native USB Host supported by some boards (USB OTG)
1610 1612
      */

+ 7
- 2
Marlin/src/pins/sam/pins_ARCHIM2.h Bestand weergeven

@@ -245,8 +245,6 @@
245 245
   #define LCD_PINS_D5                         54  // D54 PA16_SCK1
246 246
   #define LCD_PINS_D6                         68  // D68 PA1_CANRX0
247 247
   #define LCD_PINS_D7                         34  // D34 PC2_PWML0
248
-
249
-  #define SD_DETECT_PIN                        2  // D2  PB25_TIOA0
250 248
 #endif
251 249
 
252 250
 #if ANY(IS_ULTIPANEL, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE)
@@ -255,3 +253,10 @@
255 253
   #define BTN_EN2                             13  // D13 PB27_TIOB0
256 254
   #define BTN_ENC                             16  // D16 PA13_TXD1 // the click
257 255
 #endif
256
+
257
+#if ANY(HAS_WIRED_LCD, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE, USB_FLASH_DRIVE_SUPPORT)
258
+  #define SD_DETECT_PIN                        2  // D2  PB25_TIOA0
259
+  #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
260
+    #define DISABLE_DUE_SD_MMC
261
+  #endif
262
+#endif

+ 11
- 11
Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp Bestand weergeven

@@ -159,18 +159,18 @@ void DiskIODriver_USBFlash::idle() {
159 159
       static uint8_t laststate = 232;
160 160
       if (task_state != laststate) {
161 161
         laststate = task_state;
162
-        #define UHS_USB_DEBUG(x) case UHS_STATE(x): SERIAL_ECHOLNPGM(#x); break
162
+        #define UHS_USB_DEBUG(x,y) case UHS_STATE(x): SERIAL_ECHOLNPGM(y); break
163 163
         switch (task_state) {
164
-          UHS_USB_DEBUG(IDLE);
165
-          UHS_USB_DEBUG(RESET_DEVICE);
166
-          UHS_USB_DEBUG(RESET_NOT_COMPLETE);
167
-          UHS_USB_DEBUG(DEBOUNCE);
168
-          UHS_USB_DEBUG(DEBOUNCE_NOT_COMPLETE);
169
-          UHS_USB_DEBUG(WAIT_SOF);
170
-          UHS_USB_DEBUG(ERROR);
171
-          UHS_USB_DEBUG(CONFIGURING);
172
-          UHS_USB_DEBUG(CONFIGURING_DONE);
173
-          UHS_USB_DEBUG(RUNNING);
164
+          UHS_USB_DEBUG(IDLE, "IDLE");
165
+          UHS_USB_DEBUG(RESET_DEVICE, "RESET_DEVICE");
166
+          UHS_USB_DEBUG(RESET_NOT_COMPLETE, "RESET_NOT_COMPLETE");
167
+          UHS_USB_DEBUG(DEBOUNCE, "DEBOUNCE");
168
+          UHS_USB_DEBUG(DEBOUNCE_NOT_COMPLETE, "DEBOUNCE_NOT_COMPLETE");
169
+          UHS_USB_DEBUG(WAIT_SOF, "WAIT_SOF");
170
+          UHS_USB_DEBUG(ERROR, "ERROR");
171
+          UHS_USB_DEBUG(CONFIGURING, "CONFIGURING");
172
+          UHS_USB_DEBUG(CONFIGURING_DONE, "CONFIGURING_DONE");
173
+          UHS_USB_DEBUG(RUNNING, "RUNNING");
174 174
           default:
175 175
             SERIAL_ECHOLNPGM("UHS_USB_HOST_STATE: ", task_state);
176 176
             break;

Laden…
Annuleren
Opslaan