Fixed incoming dynet traffic handling

Author: troykelly

dynalite_lib/__version__.py

@@ -1,4 +1,4 @@
 """Version of package."""
-VERSION = (0, 1, 10)
+VERSION = (0, 1, 12)
 
 __version__ = '.'.join(map(str, VERSION))

dynalite_lib/dynalite.py

@@ -116,11 +116,11 @@ def __init__(self, name=None, value=None, fade=2, logger=None, broadcastFunction
             self.broadcastFunction(
                 Event(eventType='newpreset', data=broadcastData))
 
-    def turnOn(self, send=True):
+    def turnOn(self, sendDynet=True, sendMQTT=True):
         self.active = True
         if self.area:
             self.area.activePreset = self.value
-        if self.broadcastFunction:
+        if sendMQTT and self.broadcastFunction:
             broadcastData = {
                 'area': self.area.value,
                 'preset': self.value,
@@ -129,17 +129,17 @@ def turnOn(self, send=True):
             }
             self.broadcastFunction(
                 Event(eventType='preset', data=broadcastData))
-        if send and self._control:
+        if sendDynet and self._control:
             self._control.areaPreset(
                 area=self.area.value, preset=self.value, fade=self.fade)
         for preset in self.area.preset:
             if self.value != preset:
                 if self.area.preset[preset].active:
-                    self.area.preset[preset].turnOff(send=False)
+                    self.area.preset[preset].turnOff(sendDynet=False, sendMQTT=True)
 
-    def turnOff(self, send=True):
+    def turnOff(self, sendDynet=True, sendMQTT=True):
         self.active = False
-        if self.broadcastFunction:
+        if sendMQTT and self.broadcastFunction:
             broadcastData = {
                 'area': self.area.value,
                 'preset': self.value,
@@ -148,7 +148,7 @@ def turnOff(self, send=True):
             }
             self.broadcastFunction(
                 Event(eventType='preset', data=broadcastData))
-        if send and self._control:
+        if sendDynet and self._control:
             self._control.areaOff(area=self.area.value, fade=self.fade)
 
 
@@ -181,17 +181,17 @@ def __init__(self, name=None, value=None, fade=2, areaPresets=None, defaultPrese
                     self.preset[int(presetValue)] = DynalitePreset(
                         name=presetName, value=presetValue, fade=presetFade, logger=self._logger, broadcastFunction=self.broadcastFunction, area=self, dynetControl=self._dynetControl)
 
-    def presetOn(self, preset, send=True):
+    def presetOn(self, preset, sendDynet=True, sendMQTT=True):
         if preset not in self.preset:
             self.preset[preset] = DynalitePreset(
                 value=preset, fade=self.fade, logger=self._logger, broadcastFunction=self.broadcastFunction, area=self, dynetControl=self._dynetControl)
-        self.preset[preset].turnOn(send=send)
+        self.preset[preset].turnOn(sendDynet=sendDynet, sendMQTT=sendMQTT)
 
-    def presetOff(self, preset, send=True):
+    def presetOff(self, preset, sendDynet=True, sendMQTT=True):
         if preset not in self.preset:
             self.preset[preset] = DynalitePreset(
                 value=preset, fade=self.fade, logger=self._logger, broadcastFunction=self.broadcastFunction, area=self, dynetControl=self._dynetControl)
-        self.preset[preset].turnOff(send=send)
+        self.preset[preset].turnOff(sendDynet=sendDynet, sendMQTT=sendMQTT)
 
 class Dynalite(object):
 
@@ -224,9 +224,9 @@ def processTraffic(self, event):
 
     @asyncio.coroutine
     def _processTraffic(self, event):
-        if event.eventType == 'PRESET':
-            self.devices['area'][event.data['area']].presetOn(event.data['preset'],send=False)
         self.broadcast(event)
+        if event.eventType == 'PRESET':
+            self.devices['area'][event.data['area']].presetOn(event.data['preset'],sendDynet=False, sendMQTT=False)
 
     @asyncio.coroutine
     def _connect(self):

dynalite_lib/inbound.py

@@ -8,6 +8,7 @@
 
 import json
 
+
 class DynetEvent(object):
 
     def __init__(self, eventType=None, message=None, data={}, direction=None):
@@ -35,7 +36,7 @@ def preset(self, packet):
             packet.preset = packet.command
         packet.preset = (packet.preset + (packet.data[2] * 8)) + 1
         packet.fade = (packet.data[0] + (packet.data[1] * 256)) * 0.02
-        return DynetEvent(eventType='PRESET', message=("Area %d Preset %d Fade %d seconds." % (packet.area, packet.preset, packet.fade)), data={'area': packet.area, 'preset': packet.preset, 'fade': packet.fade, 'join': packet.join}, direction="IN")
+        return DynetEvent(eventType='PRESET', message=("Area %d Preset %d Fade %d seconds." % (packet.area, packet.preset, packet.fade)), data={'area': packet.area, 'preset': packet.preset, 'fade': packet.fade, 'join': packet.join, 'state': 'ON'}, direction="IN")
 
     def preset_1(self, packet):
         return self.preset(packet)
@@ -66,10 +67,9 @@ def request_preset(self, packet):
 
     def report_preset(self, packet):
         packet.preset = packet.data[0] + 1
-        # packet.fade = (packet.data[1] + (packet.data[2] * 256)) * 0.02
-        return DynetEvent(eventType='PRESET', message=("Current Area %d Preset is %d" % (packet.area, packet.preset)), data={'area': packet.area, 'preset': packet.preset, 'join': packet.join}, direction="IN")
+        return DynetEvent(eventType='PRESET', message=("Current Area %d Preset is %d" % (packet.area, packet.preset)), data={'area': packet.area, 'preset': packet.preset, 'join': packet.join, 'state': 'ON'}, direction="IN")
 
     def linear_preset(self, packet):
         packet.preset = packet.data[0] + 1
         packet.fade = (packet.data[1] + (packet.data[2] * 256)) * 0.02
-        return DynetEvent(eventType='PRESET', message=("Area %d Preset %d Fade %d seconds." % (packet.area, packet.preset, packet.fade)), data={'area': packet.area, 'preset': packet.preset, 'fade': packet.fade, 'join': packet.join}, direction="IN")
+        return DynetEvent(eventType='PRESET', message=("Area %d Preset %d Fade %d seconds." % (packet.area, packet.preset, packet.fade)), data={'area': packet.area, 'preset': packet.preset, 'fade': packet.fade, 'join': packet.join, 'state': 'ON'}, direction="IN")

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="dynalite",
-    version="0.1.10",
+    version="0.1.12",
     author="Troy Kelly",
     author_email="[email protected]",
     description="An unofficial Dynalite DyNET interface",