Merge pull request #76 from plugwise/fix_types

Fix errors from the previous commits

Author: bouwew

plugwise/__init__.py

@@ -1,6 +1,6 @@
 """Plugwise module."""
 
-__version__ = "0.9.4a7"
+__version__ = "0.9.4a8"
 
 from plugwise.smile import Smile
 from plugwise.stick import stick

plugwise/helper.py

@@ -380,18 +380,14 @@ def appliance_info_finder(self, appliance, appl):
 
     def appliance_types_finder(self, appliance, appl):
         """Determine type(s) per appliance."""
-        # For legacy Anna gateway and heater_central is the same device
-        if self._smile_legacy and self.smile_type == "thermostat":
-            self.gateway_id = self.heater_id
-
-        # Preset all types applicable to home
-        appl.types = self._loc_data[self._home_location]["types"]
-
         # Appliance with location (i.e. a device)
         if appliance.find("location") is not None:
             appl.location = appliance.find("location").attrib["id"]
             for appl_type in types_finder(appliance):
                 appl.types.add(appl_type)
+        else:
+            # Preset all types applicable to home
+            appl.types = self._loc_data[self._home_location]["types"]
 
         # Determine appliance_type from functionality
         relay_func = appliance.find(".//actuator_functionalities/relay_functionality")
@@ -476,6 +472,10 @@ def all_appliances(self):
                 "vendor": appl.v_name,
             }
 
+        # For legacy Anna gateway and heater_central is the same device
+        if self._smile_legacy and self.smile_type == "thermostat":
+            self.gateway_id = self.heater_id
+
     def match_locations(self):
         """Update locations with present appliance-types."""
         matched_locations = {}