separe UHS2 and UHS3 to avoid conflit on build

MarlinFirmware · Dec 29, 2020 · 0c856cd · 0c856cd
1 parent 4ac8cdd
commit 0c856cd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -1333,6 +1333,7 @@
      *   is less tested and is known to interfere with Servos.
      *   [1] This requires USB_INTR_PIN to be interrupt-capable.
      */
+    //#define USE_UHS2_USB
     //#define USE_UHS3_USB
 
     /**

diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
@@ -382,6 +382,10 @@
   #define POLL_JOG
 #endif
 
+#if ENABLED(USB_FLASH_DRIVE_SUPPORT) && NONE(USE_OTG_USB_HOST, USE_UHS3_USB)
+  #define USE_UHS2_USB
+#endif
+
 /**
  * Driver Timings (in nanoseconds)
  * NOTE: Driver timing order is longest-to-shortest duration.

diff --git a/platformio.ini b/platformio.ini
@@ -272,7 +272,8 @@ HAS_DGUS_LCD            = src_filter=+<src/lcd/extui/lib/dgus> +<src/lcd/extui/d
 TOUCH_UI_FTDI_EVE       = src_filter=+<src/lcd/extui/lib/ftdi_eve_touch_ui>
 EXTUI_EXAMPLE           = src_filter=+<src/lcd/extui/example.cpp>
 MALYAN_LCD              = src_filter=+<src/lcd/extui/malyan_lcd.cpp>
-USB_FLASH_DRIVE_SUPPORT = src_filter=+<src/sd/usb_flashdrive/lib-uhs2> +<src/sd/usb_flashdrive/lib-uhs3>
+USE_UHS2_USB            = src_filter=+<src/sd/usb_flashdrive/lib-uhs2>
+USE_UHS3_USB            = src_filter=+<src/sd/usb_flashdrive/lib-uhs3>
 AUTO_BED_LEVELING_BILINEAR = src_filter=+<src/feature/bedlevel/abl>
 AUTO_BED_LEVELING_(3POINT|(BI)?LINEAR) = src_filter=+<src/gcode/bedlevel/abl>
 MESH_BED_LEVELING       = src_filter=+<src/feature/bedlevel/mbl> +<src/gcode/bedlevel/mbl>