From ef3c8d9a2c52c13c8c00b46257f80f8b06cfc1f6 Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Mon, 23 Dec 2024 10:40:23 -0500 Subject: [PATCH 1/2] Add Entec RGBW --- dmx.py | 15 ++++++++++++--- foobaz.py | 6 ++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dmx.py b/dmx.py index 453d116..e01d8f4 100644 --- a/dmx.py +++ b/dmx.py @@ -21,9 +21,13 @@ class RGB: def rgb(self, color): (r, g, b) = color - self.dmx.set(self.slot + self.offset + 0, ledlog(r)) - self.dmx.set(self.slot + self.offset + 1, ledlog(g)) - self.dmx.set(self.slot + self.offset + 2, ledlog(b)) + try: + self.dmx.set(self.slot + self.offset + 0, ledlog(r)) + self.dmx.set(self.slot + self.offset + 1, ledlog(g)) + self.dmx.set(self.slot + self.offset + 2, ledlog(b)) + except Exception as e: + print(f'slot={self.slot}, offset={self.offset}') + raise(e) class Bar252(RGB): @@ -57,6 +61,11 @@ class ZhennbyPar(RGB): dmx.set(self.slot + 6, 0) +class Entec6RGBW(RGB): + def __init__(self, dmx, slot=1): + super(Entec6RGBW, self).__init__(dmx, slot) + + class DMX: def __init__(self, host, port=0x1936, universe=1, maxchan=512): self._host = host diff --git a/foobaz.py b/foobaz.py index 7e0812b..b1b5d01 100644 --- a/foobaz.py +++ b/foobaz.py @@ -7,7 +7,7 @@ from typing import Tuple from bottle import post, request, route, run, static_file, view from animation import Off -from dmx import DMX, Bar252, StairvilleLedPar56, REDSpot18RGB, ZhennbyPar +from dmx import DMX, Bar252, StairvilleLedPar56, REDSpot18RGB, ZhennbyPar, Entec6RGBW room = '' @@ -56,7 +56,7 @@ def main(args): args = parser.parse_args(args) print(f"Starting DMX via Art-Net to {args.artnet}", file=sys.stderr) - dmx = DMX(args.artnet, maxchan=128, universe=args.universe) + dmx = DMX(args.artnet, maxchan=512, universe=args.universe) if args.room == "shop": dmx._rgbs = [ @@ -83,6 +83,8 @@ def main(args): ZhennbyPar(dmx, 15), ZhennbyPar(dmx, 22), ] + elif args.room == "defrag": + dmx._rgbs = [Entec6RGBW(dmx, 300 + i*4) for i in range(19)] else: print(f"Unknown room {args.room}", file=sys.stderr) sys.exit(64) From 2c4a0b2524b8943ebbb28c69c858b3f86c238049 Mon Sep 17 00:00:00 2001 From: rhandos Date: Sun, 23 Nov 2025 17:48:53 +0100 Subject: [PATCH 2/2] added media query for use in club assistant --- static/main.css | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/static/main.css b/static/main.css index be452d9..8d44788 100644 --- a/static/main.css +++ b/static/main.css @@ -76,3 +76,33 @@ input.button_color { background-color: #ff00ff; color: #000000; } + +/* adjustments for display in club assistant. hacky WIP but should fix most display problems. +TODO: better recognition than max-width, full design parity to ha/lovelace*/ +@media only screen and (max-width: 600px) { + :root { + --bg-color: #1c1c1c; + --primary-color: #e1e1e1; + } + body { + width: 100%; + padding: 0px; + margin: 0px; + font-family: Roboto,Noto,sans-serif; + } + h1 { + display: none; + } + label { + display: inline; + } + .buttons { + width: 30%; + } + .colors { + width: 70%; + } + .controls { + width: 100%; + } +} \ No newline at end of file