Add support for all RGB color order permutations (RGB, RBG, GRB, GBR, BRG, BGR)

This commit is contained in:
2025-11-30 18:26:56 +13:00
parent 47837c00e5
commit f53c57f036
2 changed files with 28 additions and 9 deletions

View File

@@ -9,8 +9,21 @@ class Settings(dict):
def __init__(self):
super().__init__()
self.load() # Load settings from file during initialization
if self["color_order"] == "rbg": self.color_order = (1, 5, 3)
else: self.color_order = (1, 3, 5)
self.color_order = self._get_color_order(self.get("color_order", "rgb"))
def _get_color_order(self, order):
"""Convert color order string to tuple of hex string indices.
Hex string format: #RRGGBB where indices are 1, 3, 5 (0-indexed).
Returns tuple (R_index, G_index, B_index) for hex string parsing."""
color_orders = {
"rgb": (1, 3, 5), # Red at 1, Green at 3, Blue at 5
"rbg": (1, 5, 3), # Red at 1, Blue at 5, Green at 3
"grb": (3, 1, 5), # Green at 3, Red at 1, Blue at 5
"gbr": (3, 5, 1), # Green at 3, Blue at 5, Red at 1
"brg": (5, 1, 3), # Blue at 5, Red at 1, Green at 3
"bgr": (5, 3, 1), # Blue at 5, Green at 3, Red at 1
}
return color_orders.get(order.lower(), (1, 3, 5)) # Default to RGB
def set_defaults(self):
self["led_pin"] = 10
@@ -84,8 +97,7 @@ class Settings(dict):
self.save()
machine.reset()
elif key == "color_order":
if value == "rbg": self.color_order = (1, 5, 3)
else: self.color_order = (1, 3, 5)
self.color_order = self._get_color_order(value)
pass
elif key == "id":
pass

View File

@@ -1,4 +1,4 @@
{% args settings, patterns, mac %}
{% args settings, patterns %}
<!doctype html>
<html lang="en">
<head>
@@ -111,13 +111,20 @@
<input type="submit" value="Update Led Pin" />
</form>
<form id="color_order_form">
<label for="rgb">RGB:</label>
<label>Color Order:</label><br>
<input type="radio" id="rgb" name="color_order" value="rgb" {{'checked' if settings["color_order"]=="rgb" else ''}} />
<label for="rbg">RBG</label>
<label for="rgb">RGB</label>
<input type="radio" id="rbg" name="color_order" value="rbg" {{'checked' if settings["color_order"]=="rbg" else ''}}/>
<label for="rbg">RBG</label>
<input type="radio" id="grb" name="color_order" value="grb" {{'checked' if settings["color_order"]=="grb" else ''}}/>
<label for="grb">GRB</label>
<input type="radio" id="gbr" name="color_order" value="gbr" {{'checked' if settings["color_order"]=="gbr" else ''}}/>
<label for="gbr">GBR</label>
<input type="radio" id="brg" name="color_order" value="brg" {{'checked' if settings["color_order"]=="brg" else ''}}/>
<label for="brg">BRG</label>
<input type="radio" id="bgr" name="color_order" value="bgr" {{'checked' if settings["color_order"]=="bgr" else ''}}/>
<label for="bgr">BGR</label>
</form>
<p>Mac address: {{mac}}</p>
</div>
<div id="connection-status"></div>
</body>