diff light.py @ 28:fb2e91f230f4

new wled mode and more lights
author drewp@bigasterisk.com
date Mon, 02 Sep 2024 20:00:53 -0700
parents 33b3eb24506e
children 35affd4d37d4
line wrap: on
line diff
--- a/light.py	Sat Mar 23 15:25:02 2024 -0700
+++ b/light.py	Mon Sep 02 20:00:53 2024 -0700
@@ -6,7 +6,7 @@
 from color import Color
 from color_convert import DeviceColor, brightnessConv, ikeaWhiteConv, oneWhiteConv, relayConv, twoWhitesConv, zbConv
 from mqtt_io import MqttIo
-from protocols import ShellyGen1WebTransport, SonoffRelayTransport, TasmotaWebTransport, Transport, WledTransport, ZigbeeTransport, espColorMessage, zbBrightnessMessage, zbRelayMessage, zbWhiteSpectrumMessage
+from protocols import ShellyGen1WebTransport, SonoffRelayTransport, TasmotaWebTransport, Transport, WledControl, WledTransport, ZigbeeTransport, espColorMessage, zbBrightnessMessage, zbRelayMessage, zbWhiteSpectrumMessage
 
 log = logging.getLogger('lite')
 
@@ -105,8 +105,10 @@
 
 
 def makeWledSingleBulb(name: str, hostname: str) -> Light:
-    return Light(name=name, convertColor=twoWhitesConv, transport=WledTransport(hostname))
+    return Light(name=name, convertColor=twoWhitesConv, transport=WledTransport(hostname, WledControl.wholeStringColor))
 
+def makeWledStringBrightness(name: str, hostname: str) -> Light:
+    return Light(name=name, convertColor=brightnessConv, transport=WledTransport(hostname, WledControl.brightness))
 
 class Lights:
     _d: dict[str, Light] = {}
@@ -120,7 +122,11 @@
         self.add(makeTasmota('do-lamp', 'tasmota-9E2AB7-2743'))
         self.add(makeTasmota('li-high-shelf', 'light-li-ceil'))
         self.add(makeTasmota('tr-door', 'light-tr-door'))
+
         self.add(makeWledSingleBulb('ft-hanging', 'light-ft-ceil'))
+        self.add(makeWledSingleBulb('tr-ball', 'light-tr-ball'))
+        self.add(makeWledStringBrightness('hr-string', 'light-hr-string'))
+        self.add(makeWledStringBrightness('tr-string', 'light-tr-string'))
 
         self.add(makeShellyRGW2('ki-ceiling', 'shellyrgbw2-e868e7f34c35'))
         self.add(makeShellyRGW2('ki-counter', 'shellyrgbw2-e868e7f34cb2'))
@@ -131,6 +137,7 @@
         self.add(makeZbIkeaWhiteTemp(mqtt, 'py', '0x000b57fffeaf42cd'))
         self.add(makeZbIkeaWhiteTemp(mqtt, 'rr-lamp', '0x000b57fffe32e5a5'))
         self.add(makeZbIkeaWhiteTemp(mqtt, 'ft-ceiling', '0xd0cf5efffe28abcf'))
+        self.add(makeZbIkeaWhiteTemp(mqtt, 'di-ceiling', '0x000b57fffe8c0ad4'))
 
         self.add(makeZbBrightness(mqtt, 'go-high', '0x847127fffebb3efa'))