try a fix for #2

gluap · May 5, 2019 · 7dffba4 · 7dffba4
1 parent cabe03d
commit 7dffba4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/README.rst b/README.rst
@@ -166,6 +166,9 @@ commands instead of buying a weather station.
 
 Changelog
 =========
+**0.25.2**
+- try to fix https://github.com/gluap/pyduofern/issues/2
+
 **0.25.1**
 - changed custom component to fix bug in switch implementation accidentally introduced
   recently.

diff --git a/examples/homeassistant/custom_components/duofern/__init__.py b/examples/homeassistant/custom_components/duofern/__init__.py
@@ -11,7 +11,7 @@
 # Import the device class from the component that you want to support
 
 # Home Assistant depends on 3rd party packages for API specific code.
-REQUIREMENTS = ['pyduofern==0.25']
+REQUIREMENTS = ['pyduofern==0.25.2']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -81,7 +81,6 @@ def clean_config(call):
     hass.services.register(DOMAIN, 'sync_devices', sync_devices)
     hass.services.register(DOMAIN, 'clean_config', clean_config)
 
-
     def refresh(call):
         _LOGGER.warning(call)
         for _component in DUOFERN_COMPONENTS:

diff --git a/pyduofern/__init__.py b/pyduofern/__init__.py
@@ -22,7 +22,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the Free Software Foundation,
 #   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-__version__ = "0.25"
+__version__ = "0.25.2"
 
 __all__ = ['DuofernException', 'DuofernStick', 'DuofernStickAsync', 'duoACK']
 

diff --git a/pyduofern/duofern.py b/pyduofern/duofern.py
@@ -518,12 +518,12 @@ def parse(self, msg):
             if id not in sensorMsg:
                 logger.warning("unknown message {}".format(msg))
 
-            chan = msg[sensorMsg['id']['chan'] * 2 + 2:sensorMsg['id']['chan'] * 2 + 4]
+            chan = msg[sensorMsg[id]['chan'] * 2 + 2:sensorMsg[id]['chan'] * 2 + 4]
             if code[0:2] in ("61", "70", "71"):
                 chan = "01"
 
             chans = []
-            if (sensorMsg['id'][chan] == 5):
+            if (sensorMsg[id][chan] == 5):
                 chanCount = 4 if (code[0:2] == "73") else 5
                 for x in range(0, chanCount):
                     if ((0x01 << x) & int(chan, 16)):
@@ -545,19 +545,19 @@ def parse(self, msg):
             for chan in chans:
                 if id[2:4] in ("1a", "18", "19", "01", "02", "03"):
                     if (id[2:4] == "1a") or (id[0:2] == "0e") or (code[0:2] in ("a0", "a2")):
-                        self.update_state(code, "state", sensorMsg['id']['state'] + "." + chan, "1")
+                        self.update_state(code, "state", sensorMsg[id]['state'] + "." + chan, "1")
                     else:
-                        self.update_state(code, "state", sensorMsg['id']['state'], "1")
+                        self.update_state(code, "state", sensorMsg[id]['state'], "1")
 
-                    self.update_state(code, "channelchan", sensorMsg['id']['name'], "1")
+                    self.update_state(code, "channelchan", sensorMsg[id]['name'], "1")
                 else:
                     if (code[0:2] not in ("69", "73")) or (id[2:4] in ("11", "12")):
                         chan = ""
                     if code[0:2] in ("65", "a5", "aa", "ab"):
-                        self.update_state(code, "state", sensorMsg['id']['state'], "1")
+                        self.update_state(code, "state", sensorMsg[id]['state'], "1")
 
-                    self.update_state(code, "event", sensorMsg['id']['name'] + "." + chan, "1")
-                    DoTrigger(hash["name"], sensorMsg['id'][name] + "." + chan)
+                    self.update_state(code, "event", sensorMsg[id]['name'] + "." + chan, "1")
+                    DoTrigger(hash["name"], sensorMsg[id][name] + "." + chan)