Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

conditional USB mode: first check build_unflags

Browse Source 
* build_unflags have priority over build_flags, so we first check if the flag is already "unflaged"
This finally seems to catch all cases properly :)
This commit is contained in:
Frank
2025-11-16 13:28:28 +01:00
parent 14f0d0a03c
commit 53130f7216
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pio-scripts/conditional_usb_mode.py
View File

@@ -29,8 +29,14 @@ def has_cdc_on_boot_enabled(env):
Returns True if CDC_ON_BOOT=1, False otherwise. Returns True if CDC_ON_BOOT=1, False otherwise.
This is used to identify boards with USB-OTG (native USB) vs UART-to-USB chips. This is used to identify boards with USB-OTG (native USB) vs UART-to-USB chips.
""" """
cpp_defines = env.get('CPPDEFINES', []) build_unflags = env.get('BUILD_UNFLAGS', [])
build_flags = env.get('BUILD_FLAGS', []) build_flags = env.get('BUILD_FLAGS', [])
cpp_defines = env.get('CPPDEFINES', [])
# Check in raw build unflags - unflags have priority over flags
for unflag in build_unflags:
if isinstance(unflag, str) and 'ARDUINO_USB_CDC_ON_BOOT=1' in unflag:
return False
# Check in CPPDEFINES # Check in CPPDEFINES
for define in cpp_defines: for define in cpp_defines:
@@ -51,8 +57,13 @@ def has_usb_mode_enabled(env):
Returns True if USB_MODE=1, False otherwise. Returns True if USB_MODE=1, False otherwise.
""" """
cpp_defines = env.get('CPPDEFINES', []) build_unflags = env.get('BUILD_UNFLAGS', [])
build_flags = env.get('BUILD_FLAGS', []) build_flags = env.get('BUILD_FLAGS', [])
cpp_defines = env.get('CPPDEFINES', [])
# Check in raw build unflags - unflags have priority over flags
for unflag in build_unflags:
if isinstance(unflag, str) and 'ARDUINO_USB_MODE=1' in unflag:
return False
# Check in CPPDEFINES # Check in CPPDEFINES
for define in cpp_defines: for define in cpp_defines: