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 <noreply@anthropic.com>
This commit is contained in:
1 parent
08d7277204
commit
97df6e3cbe
4 files changed
+17
-1
No files matched your search
@@ -178,8 +178,20 @@ def apply_device_config(data, settings, presets):
|
|||||||
settings["reversed"] = flag
|
settings["reversed"] = flag
|
||||||
presets.reversed = flag
|
presets.reversed = flag
|
||||||
meta_changed = True
|
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:
|
if not strip_changed and not meta_changed:
|
||||||
return
|
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:
|
if strip_changed:
|
||||||
prev = presets.selected
|
prev = presets.selected
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ esp = init_espnow(settings)
|
|||||||
presets = Presets(settings["led_pin"], settings["num_leds"])
|
presets = Presets(settings["led_pin"], settings["num_leds"])
|
||||||
presets.load(settings)
|
presets.load(settings)
|
||||||
presets.b = settings.get("brightness", 255)
|
presets.b = settings.get("brightness", 255)
|
||||||
|
presets.max_b = settings.get("max_brightness", 255)
|
||||||
presets.debug = bool(settings.get("debug", False))
|
presets.debug = bool(settings.get("debug", False))
|
||||||
gc.collect()
|
gc.collect()
|
||||||
|
|
||||||
|
|||||||
+3
-1
@@ -23,6 +23,8 @@ class Presets:
|
|||||||
self.step = 0
|
self.step = 0
|
||||||
# Global brightness (0–255), controlled via ESPNow {"b": <value>}
|
# Global brightness (0–255), controlled via ESPNow {"b": <value>}
|
||||||
self.b = 255
|
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.reversed = False
|
||||||
|
|
||||||
self.generator = None
|
self.generator = None
|
||||||
@@ -265,7 +267,7 @@ class Presets:
|
|||||||
# Combine per-preset brightness (override) with global brightness self.b
|
# Combine per-preset brightness (override) with global brightness self.b
|
||||||
local = brightness_override if brightness_override is not None else 255
|
local = brightness_override if brightness_override is not None else 255
|
||||||
# Scale preset brightness by global brightness
|
# 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)
|
return tuple(int(c * effective_brightness / 255) for c in color)
|
||||||
|
|
||||||
def fill(self, color=None):
|
def fill(self, color=None):
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ def initialize_runtime():
|
|||||||
presets = Presets(settings["led_pin"], settings["num_leds"])
|
presets = Presets(settings["led_pin"], settings["num_leds"])
|
||||||
presets.load(settings)
|
presets.load(settings)
|
||||||
presets.b = settings.get("brightness", 255)
|
presets.b = settings.get("brightness", 255)
|
||||||
|
presets.max_b = settings.get("max_brightness", 255)
|
||||||
presets.debug = bool(settings.get("debug", False))
|
presets.debug = bool(settings.get("debug", False))
|
||||||
gc.collect()
|
gc.collect()
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user