jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Archim2 USB Hang Fix

Browse Source
This commit is contained in:
InsanityAutomation
2022-06-08 19:43:34 -04:00
parent e7c505d415
commit 9c1366ed99
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/Configuration_adv.h
+2
View File
@@ -1655,6 +1655,8 @@
#define USE_UHS2_USB
//#define USE_UHS3_USB
#define DISABLE_DUE_SD_MMC // Disable USB Host access to USB Drive to prevent hangs on block access for DUE platform
/**
* Native USB Host supported by some boards (USB OTG)
*/
Marlin/src/pins/sam/pins_ARCHIM2.h
+6 -2
View File
@@ -237,7 +237,7 @@
//
// LCD / Controller
//
#if ANY(HAS_WIRED_LCD, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE)
#if ANY(HAS_WIRED_LCD, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE, USB_FLASH_DRIVE_SUPPORT)
#define BEEPER_PIN 23 // D24 PA15_CTS1
#define LCD_PINS_RS 17 // D17 PA12_RXD1
#define LCD_PINS_ENABLE 24 // D23 PA14_RTS1
@@ -249,9 +249,13 @@
#define SD_DETECT_PIN 2 // D2 PB25_TIOA0
#endif
#if ANY(IS_ULTIPANEL, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE)
#if ANY(IS_ULTIPANEL, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE, USB_FLASH_DRIVE_SUPPORT)
// Buttons on AUX-2
#define BTN_EN1 60 // D60 PA3_TIOB1
#define BTN_EN2 13 // D13 PB27_TIOB0
#define BTN_ENC 16 // D16 PA13_TXD1 // the click
#endif
#if ENABLED(USB_FLASH_DRIVE_SUPPORT)
#define DISABLE_DUE_SD_MMC
#endif
Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
+10 -10
View File
@@ -161,16 +161,16 @@ void DiskIODriver_USBFlash::idle() {
laststate = task_state;
#define UHS_USB_DEBUG(x) case UHS_STATE(x): SERIAL_ECHOLNPGM(#x); break
switch (task_state) {
UHS_USB_DEBUG(IDLE);
UHS_USB_DEBUG(RESET_DEVICE);
UHS_USB_DEBUG(RESET_NOT_COMPLETE);
UHS_USB_DEBUG(DEBOUNCE);
UHS_USB_DEBUG(DEBOUNCE_NOT_COMPLETE);
UHS_USB_DEBUG(WAIT_SOF);
UHS_USB_DEBUG(ERROR);
UHS_USB_DEBUG(CONFIGURING);
UHS_USB_DEBUG(CONFIGURING_DONE);
UHS_USB_DEBUG(RUNNING);
SERIAL_ECHOLNPGM("IDLE");
SERIAL_ECHOLNPGM("RESET_DEVICE");
SERIAL_ECHOLNPGM("RESET_NOT_COMPLETE");
SERIAL_ECHOLNPGM("DEBOUNCE");
SERIAL_ECHOLNPGM("DEBOUNCE_NOT_COMPLETE");
SERIAL_ECHOLNPGM("WAIT_SOF");
SERIAL_ECHOLNPGM("ERROR");
SERIAL_ECHOLNPGM("CONFIGURING");
SERIAL_ECHOLNPGM("CONFIGURING_DONE");
SERIAL_ECHOLNPGM("RUNNING");
default:
SERIAL_ECHOLNPGM("UHS_USB_HOST_STATE: ", task_state);
break;