Skip to content

Commit 0c856cd

Browse files
committed
separe UHS2 and UHS3 to avoid conflit on build
1 parent 4ac8cdd commit 0c856cd

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

Marlin/Configuration_adv.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,6 +1333,7 @@
13331333
* is less tested and is known to interfere with Servos.
13341334
* [1] This requires USB_INTR_PIN to be interrupt-capable.
13351335
*/
1336+
//#define USE_UHS2_USB
13361337
//#define USE_UHS3_USB
13371338

13381339
/**

Marlin/src/inc/Conditionals_adv.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,10 @@
382382
#define POLL_JOG
383383
#endif
384384

385+
#if ENABLED(USB_FLASH_DRIVE_SUPPORT) && NONE(USE_OTG_USB_HOST, USE_UHS3_USB)
386+
#define USE_UHS2_USB
387+
#endif
388+
385389
/**
386390
* Driver Timings (in nanoseconds)
387391
* NOTE: Driver timing order is longest-to-shortest duration.

platformio.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,8 @@ HAS_DGUS_LCD = src_filter=+<src/lcd/extui/lib/dgus> +<src/lcd/extui/d
272272
TOUCH_UI_FTDI_EVE = src_filter=+<src/lcd/extui/lib/ftdi_eve_touch_ui>
273273
EXTUI_EXAMPLE = src_filter=+<src/lcd/extui/example.cpp>
274274
MALYAN_LCD = src_filter=+<src/lcd/extui/malyan_lcd.cpp>
275-
USB_FLASH_DRIVE_SUPPORT = src_filter=+<src/sd/usb_flashdrive/lib-uhs2> +<src/sd/usb_flashdrive/lib-uhs3>
275+
USE_UHS2_USB = src_filter=+<src/sd/usb_flashdrive/lib-uhs2>
276+
USE_UHS3_USB = src_filter=+<src/sd/usb_flashdrive/lib-uhs3>
276277
AUTO_BED_LEVELING_BILINEAR = src_filter=+<src/feature/bedlevel/abl>
277278
AUTO_BED_LEVELING_(3POINT|(BI)?LINEAR) = src_filter=+<src/gcode/bedlevel/abl>
278279
MESH_BED_LEVELING = src_filter=+<src/feature/bedlevel/mbl> +<src/gcode/bedlevel/mbl>

0 commit comments

Comments
 (0)