[BUG] USB flash drive support broken

[DaLiV]

Did you test the latest bugfix-2.1.x code?

Yes, and the problem still exists.

Bug Description

commit 0f7fb5d - breaks USB drive accessiblity

Bug Timeline

No response

Expected behavior

Acessible both USB and SD cards

Actual behavior

USB-Drive not more accessible

Steps to Reproduce

1. apply provided config from test.zip into git source (after 0f7fb5d)
2. pio run
3. if test on device - no USB accessible, only SD content .

as alternative to test on device can also see that against previous commit resulting filesize will be 10Kb less ...
(can treat as indirect sign of not compiled-in code block)
(1.) compiled on commit 428f721
Flash: [== ] 16.0% (used 167948 bytes from 1048576 bytes)
(1.) compiled on commit 0f7fb5d
Flash: [== ] 15.1% (used 158044 bytes from 1048576 bytes)

Version of Marlin Firmware

git-bugfix 2.1.x

Printer model

No response

Electronics

BTT Octopus Pro V1.0

LCD/Controller

No response

Other add-ons

No response

Bed Leveling

None

Your Slicer

None

Host Software

None

Don't forget to include

• A ZIP file containing your Configuration.h and Configuration_adv.h.

Additional information & file uploads

test.zip

[DaLiV]

if forced definition from Configuration.h for
#define MULTI_VOLUME
#define USB_FLASH_DRIVE_SUPPORT

then seems works ... but that configurations are initially placed in Configuration_adv.h, along with other conditionals .
seems that file not always nicely taken in compilation (as in this case)

[DaLiV]

seems need in Conditionals-4-adv.h

--- a/Marlin/src/inc/Conditionals-4-adv.h
+++ b/Marlin/src/inc/Conditionals-4-adv.h
@@ -31,7 +31,6 @@
 //
 #include "MarlinConfigPre-4-adv.h"
 //========================================================
-
 #if ENABLED(MARLIN_SMALL_BUILD)
   #undef EEPROM_CHITCHAT
   #undef CAPABILITIES_REPORT
@@ -1494,3 +1493,13 @@
   #undef AUTO_REPORT_SD_STATUS
   #define AUTO_REPORT_SD_STATUS
 #endif
+
+#if ENABLED(SDSUPPORT)
+  #define HAS_MEDIA 1
+#endif
+#if ENABLED(MULTI_VOLUME)
+  #define HAS_MULTI_VOLUME 1
+#endif
+#if ENABLED(USB_FLASH_DRIVE_SUPPORT)
+  #define HAS_USB_FLASH_DRIVE 1
+#endif

[thisiskeithb]

seems need in
Conditionals-4-adv.h instead of Conditionals-2-LCD.h

Please open a Pull Request with the fix.

[thisiskeithb]

I can confirm that despite MULTI_VOLUME & USB_FLASH_DRIVE_SUPPORT being enabled, they do not show as such in Conditionals-2-LCD.h:

Marlin/Marlin/src/inc/Conditionals-2-LCD.h

Lines 39 to 44 in 26b3f0b

	#if ENABLED(MULTI_VOLUME)
	#define HAS_MULTI_VOLUME 1
	#endif
	#if ENABLED(USB_FLASH_DRIVE_SUPPORT)
	#define HAS_USB_FLASH_DRIVE 1
	#endif

Moving those conditionals to Conditionals-4-adv.h fixes it.

[DaLiV]

i not fully like that same code must be in Conditionals-2-LCD.h and Conditionals-4-adv.h
therefore think pull request will be not the best way ...

why LCD not taken in this case not clearly seems
logically that must be related to Conditionals-4-adv as that meant as initial parser of all that is inside Configuration_adv.h.
Conditionals-LCD seems created for LCD-related mostly.

but additionally - in case if leave that part only in -adv.h and removed from -LCD.h - same problem - USB part not compiled-in also.

P.S. in that dir processing order of files is not so clear/linear () ... seems point for improvement also.

[thinkyhead]

Let us know if the newest code is working, and if so this issue can be closed!

[DaLiV]

updated to latest.
tested - seems ok. but partially

seems exist another bug:
when inserted both (SD+USB) - shown menu "select from media -> USB/SD" and on each can be files selected
when USB us taked off (no matter operating or at boot time) and SD card still in - menu not appears.
si SD card not always accessible
if send over Serial "M21 S" - then SD is shown,
suppose at point where choice for media availability missing point to check "MULTI_VOLUME" case - check Both.
sd card detection seems not working (insert-taking off not detecting in debug)
prior build has next messages, that now shown not:

>>> CardReader::manage_media()  X0.0000 Y0.0000 Z0.0000 A0.0000
Media present: 1 -> 0
echo:SD card released
<<< CardReader::manage_media()  X0.0000 Y0.0000 Z0.0000 A0.0000
>>> CardReader::manage_media()  X0.0000 Y0.0000 Z0.0000 A0.0000
Media present: 0 -> 1
echo:SD card ok
<<< CardReader::manage_media()  X0.0000 Y0.0000 Z0.0000 A0.0000

at boot shown:

echo:EEPROM Initialized
echo:[3247] thermalManager.init()
echo:[3250] print_job_timer.init()
echo:[3250] endstops.init()
echo:[3250] stepper.init()
echo:[3250] hal.watchdog_init()
echo:[3251] test_tmc_connection()
Testing X connection... OK
Testing Y connection... OK
echo:[3268] setup() completed.
>>> CardReader::manage_media()  X0.0000 Y0.0000 Z0.0000 A0.0000
Media present: 2 -> 0
echo:SD card released
<<< CardReader::manage_media()  X0.0000 Y0.0000 Z0.0000 A0.0000
Starting USB host...started. rev unknown.

"SD card released"-however sd card used for firmware update and still in reader ... and works after "M21 S"

pins debug shows pin and card presence:

card in
PIN: PC14        M42 P46          SD_DETECT_PIN                          Input  HIGH
card out
PIN: PC14        M42 P46          SD_DETECT_PIN                          Input  LOW

so defined, but not checked/triggering insertion/release in firmware .

now by insertion of USB drive

USB device inserted
LUN is good
>>> CardReader::manage_media()  X0.0000 Y0.0000 Z0.0000 A0.0000
Media present: 0 -> 1
echo:SD card ok
<<< CardReader::manage_media()  X0.0000 Y0.0000 Z0.0000 A0.0000
USB device removed
>>> CardReader::manage_media()  X0.0000 Y0.0000 Z0.0000 A0.0000
Media present: 1 -> 0
echo:SD card released
<<< CardReader::manage_media()  X0.0000 Y0.0000 Z0.0000 A0.0000

seems related to :
Marlin/src/sd/cardreader.h

#if HAS_USB_FLASH_DRIVE
  #define IS_SD_INSERTED() DiskIODriver_USBFlash::isInserted()
#elif HAS_SD_DETECT
  #define IS_SD_INSERTED() (READ(SD_DETECT_PIN) == SD_DETECT_STATE)
#else
  // No card detect line? Assume the card is inserted.
  #define IS_SD_INSERTED() true
#endif

as only one from choicen are defined - not both SD+USB , board has both HAS_USB_FLASH_DRIVE and HAS_SD_DETECT

[thinkyhead]

I've got to do a little SD card refactoring anyway. I'll post a PR where we can work on clearing up the way media is handled in conjunction with those cosmetic fixes for TFT Color UI.

[thinkyhead]

I'm currently taking copious notes on the current behavior of the "SD Card" / "USB Drive" family of menu items, and they are definitely well out of date in terms of how they can and should behave. I've already found a few things and fixed them in #27815 and I will be adding more to that PR as I work out a much more logical arrangement of menu items for the available / inserted / mounted drives. So let's continue this conversation over there!