From fab80f4e4eec3a0112eee2c1c282477765482412 Mon Sep 17 00:00:00 2001 From: Will Miles Date: Fri, 28 Mar 2025 20:15:36 -0400 Subject: [PATCH] Fix up usermod dep checking scripts --- usermods/PWM_fan/setup_deps.py | 3 +-- usermods/seven_segment_display_reloaded/setup_deps.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/usermods/PWM_fan/setup_deps.py b/usermods/PWM_fan/setup_deps.py index 2f76ba857..b8f7276c5 100644 --- a/usermods/PWM_fan/setup_deps.py +++ b/usermods/PWM_fan/setup_deps.py @@ -7,6 +7,5 @@ if "Temperature" in usermods: env.Append(CPPDEFINES=[("USERMOD_DALLASTEMPERATURE")]) elif "sht" in usermods: env.Append(CPPDEFINES=[("USERMOD_SHT")]) -else: +elif "PWM_fan" in usermods: # The script can be run if this module was previously selected raise RuntimeError("PWM_fan usermod requires Temperature or sht to be enabled") - diff --git a/usermods/seven_segment_display_reloaded/setup_deps.py b/usermods/seven_segment_display_reloaded/setup_deps.py index 0c663d824..dd28f5fe9 100644 --- a/usermods/seven_segment_display_reloaded/setup_deps.py +++ b/usermods/seven_segment_display_reloaded/setup_deps.py @@ -5,5 +5,5 @@ usermods = env.GetProjectOption("custom_usermods","").split() # Check for partner usermods if "SN_Photoresistor" in usermods: env.Append(CPPDEFINES=[("USERMOD_SN_PHOTORESISTOR")]) -if "BH1750_v2" in usermods: +if any(mod in ("BH1750_v2", "BH1750") for mod in usermods): env.Append(CPPDEFINES=[("USERMOD_BH1750")])