From 97df6e3cbef6e3a112bc778ddf1bc0dd67ab434b Mon Sep 17 00:00:00 2001 From: jimmy Date: Tue, 10 Nov 2026 01:48:42 +1300 Subject: [PATCH] feat: max_brightness ceiling set from the controller's device config Neither the global nor a preset's brightness goes above max_brightness; a change redraws a static pattern under the new ceiling. Co-Authored-By: Claude Sonnet 5.5 --- src/controller_messages.py | 12 ++++++++++++ src/main.py | 1 + src/presets.py | 4 +++- src/startup.py | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/controller_messages.py b/src/controller_messages.py index bb95482..ee379fe 100644 --- a/src/controller_messages.py +++ b/src/controller_messages.py @@ -178,8 +178,20 @@ def apply_device_config(data, settings, presets): settings["reversed"] = flag presets.reversed = flag meta_changed = True + max_changed = False + if "max_brightness" in dc: + try: + mb = max(0, min(255, int(dc["max_brightness"]))) + max_changed = presets.max_b != mb + settings["max_brightness"] = mb + presets.max_b = mb + meta_changed = True + except (TypeError, ValueError): + pass if not strip_changed and not meta_changed: return + if max_changed and not strip_changed and presets.selected in presets.presets: + presets.select(presets.selected) # redraw static patterns under the new ceiling if strip_changed: prev = presets.selected try: diff --git a/src/main.py b/src/main.py index 6a5c4bf..b3c9a37 100644 --- a/src/main.py +++ b/src/main.py @@ -33,6 +33,7 @@ esp = init_espnow(settings) presets = Presets(settings["led_pin"], settings["num_leds"]) presets.load(settings) presets.b = settings.get("brightness", 255) +presets.max_b = settings.get("max_brightness", 255) presets.debug = bool(settings.get("debug", False)) gc.collect() diff --git a/src/presets.py b/src/presets.py index d87ea05..44d4881 100644 --- a/src/presets.py +++ b/src/presets.py @@ -23,6 +23,8 @@ class Presets: self.step = 0 # Global brightness (0–255), controlled via ESPNow {"b": } self.b = 255 + # Ceiling for the effective brightness (0–255): neither the global nor a preset's brightness goes above it + self.max_b = 255 self.reversed = False self.generator = None @@ -265,7 +267,7 @@ class Presets: # Combine per-preset brightness (override) with global brightness self.b local = brightness_override if brightness_override is not None else 255 # Scale preset brightness by global brightness - effective_brightness = int(local * self.b / 255) + effective_brightness = min(int(local * self.b / 255), self.max_b) return tuple(int(c * effective_brightness / 255) for c in color) def fill(self, color=None): diff --git a/src/startup.py b/src/startup.py index f3cf85c..09f59ed 100644 --- a/src/startup.py +++ b/src/startup.py @@ -21,6 +21,7 @@ def initialize_runtime(): presets = Presets(settings["led_pin"], settings["num_leds"]) presets.load(settings) presets.b = settings.get("brightness", 255) + presets.max_b = settings.get("max_brightness", 255) presets.debug = bool(settings.get("debug", False)) gc.collect()