brightness control as pubsub

Author: gmorell

aqi/main.py

@@ -122,7 +122,6 @@ def remove_config(self):
     @inlineCallbacks
     def aqi_herald(self):
         """Herald AQI Data (WIP)"""
-        """ Herald line data (wip)"""
         options = PublishOptions(retain=True)
         for key, res_list in self.aqi_results.items():
             for res in res_list:
@@ -158,7 +157,7 @@ def ticker_update_aqi(self):
             self.do_update_aqi(ur)
 
         for k in other_results:
-            self.log.info(f"Updating {ur}")
+            self.log.info(f"Updating {k}")
             self.do_update_aqi(k)
 
 

compat.py

@@ -135,6 +135,10 @@ def __init__(self, config=None):
         self.brightness_ticker = LoopingCall(self.ticker_brightness_ctrl)
         self.brightness_ticker.start(.1)
 
+        self.brightness_pub_ticker = LoopingCall(self.global_brightness_publish)
+        self.brightness_pub_ticker.start(5)
+
+    # brightness control via pubsub listeners, unlike original la4 machine which is/was an rpc call
     def ticker_brightness_ctrl(self):
         if self.brightness_act != self.brightness_tgt.value:
             if self.brightness_act < self.brightness_tgt.value:
@@ -152,33 +156,34 @@ def run_brightness_on_val(self, val):
 
         return res
 
-    # brightness control (todo, rework this overall interface)
     @inlineCallbacks
     def global_brightness_publish(self):
-        yield self.publish("com.lambentri.edge.la4.machine.gb", brightness=self.brightness_tgt.value)
-
-    @wamp.register("com.lambentri.edge.la4.machine.gb.up", options=RegisterOptions())
-    def global_brightness_value_up(self):
-        """Move the global brightness up a single tick"""
-        self.brightness_tgt = self.brightness_tgt.next_up(self.brightness_tgt)
-        self.global_brightness_publish()
-        return {"brightness": self.brightness_tgt.value}
-
-    @wamp.register("com.lambentri.edge.la4.machine.gb.dn")
-    def global_brightness_value_dn(self):
-        """Move the global brightness down a single tick"""
-        self.brightness_tgt = self.brightness_tgt.next_dn(self.brightness_tgt)
-        self.global_brightness_publish()
-        return {"brightness": self.brightness_tgt.value}
-
-    @wamp.register("com.lambentri.edge.la4.machine.gb.set")
-    def global_brightness_value_set(self, value: int):
-        """Set the global brightness"""
-        self.brightness_tgt = BrightnessEnum(value)
-        self.global_brightness_publish()
-        return {"brightness": self.brightness_tgt.value}
-
-    @wamp.register("com.lambentri.edge.la4.machine.gb.get")
-    def global_brightness_value_get(self):
+        yield self.publish("com.lambentri.edge.la4.machine.gb",
+                           brightness=self.brightness_tgt.value,
+                           cls=self.cconfig.machine_name)
+
+    @wamp.subscribe("com.lambentri.edge.la4.machine.gb.up")
+    def brightness_value_up(self, cls: str, globl: bool = False):
+        """Move the brightness up a single tick"""
+        if cls == self.cconfig.machine_name or globl:
+            self.brightness_tgt = self.brightness_tgt.next_up(self.brightness_tgt)
+            self.global_brightness_publish()
+
+    @wamp.subscribe("com.lambentri.edge.la4.machine.gb.dn")
+    def brightness_value_dn(self, cls: str, globl: bool = False):
+        """Move the brightness down a single tick"""
+        if cls == self.cconfig.machine_name or globl:
+            self.brightness_tgt = self.brightness_tgt.next_dn(self.brightness_tgt)
+            self.global_brightness_publish()
+
+    @wamp.subscribe("com.lambentri.edge.la4.machine.gb.set")
+    def brightness_value_set(self, cls: str, value: int, globl: bool = False):
+        """Set the brightness"""
+        if cls == self.cconfig.machine_name or globl:
+            self.brightness_tgt = BrightnessEnum(value)
+            self.global_brightness_publish()
+
+    @wamp.subscribe("com.lambentri.edge.la4.machine.gb.get")
+    def brightness_value_get(self):
         """get the global brightness"""
-        return {"brightness": self.brightness_tgt.value}
+        return {"brightness": self.brightness_tgt.value, "cls": self.cconfig.machine_name}