Use device-type in sensor and element listings

helium_commander/element.py

@@ -3,8 +3,11 @@
 
 
 def display_map(cls, client, include=None):
+    def _type(self):
+        return getattr(self.meta, "device_type", None)
+
     def _mac(self):
-        return self.meta.mac
+        return getattr(self.meta, "mac", None)
 
     def _count_sensor(self):
         return len(self.sensors(use_included=True))
@@ -21,7 +24,8 @@ def _name(self):
 
     dict = super(Element, cls).display_map(client, include=include)
     dict.update([
-        ('mac', _mac)
+        ('mac', _mac),
+        ('type', _type)
     ])
 
     if include and Sensor in include:

helium_commander/sensor.py

@@ -3,21 +3,7 @@
 from operator import attrgetter
 
 
-def card_type(card_id, default):
-    return {
-        '2': 'blue',
-        '5': 'green',
-    }.get(card_id, default)
-
-
 def display_map(cls, client, include=None):
-    def _type(self):
-        try:
-            card = str(self.meta.card.get('id'))
-            return card_type(card, card)
-        except AttributeError:
-            return None
-
     def _meta(attr):
         def func(self):
             return getattr(self.meta, attr, None)
@@ -26,7 +12,7 @@ def func(self):
     dict = super(Sensor, cls).display_map(client, include=include)
     dict.update([
         ('mac', _meta('mac')),
-        ('type', _type),
+        ('type', _meta('device_type')),
         ('created', _meta('created')),
         ('seen', _meta('last_seen')),
         ('name', attrgetter('name'))