Switch from self._attr__xxx to attr['xxx']

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/fork@1569 b32b6428-25c9-4566-ad07-03861ab6144f

devices/protocols/bugOne/xaal/bugone/nodes/minishield1.py

@@ -5,38 +5,41 @@ from .default import build_dev
 class Node(object):
     def __init__(self,ID,cfg):
         base_addr = cfg["base_addr"][:-1]
+        group = cfg["group"]
     
+        attr = {}
         # first device = bangap
         bg = build_dev(base_addr+'1',"voltage.basic")
         bg.info = "bandgap"
         bg.hw_id = "%s.1" % ID
-        bg.new_attribute("voltage")
+        attr["voltage"] = bg.new_attribute("voltage")
         
         # temp sensor
         temp = build_dev(base_addr+'2',"thermometer.basic")
         temp.info = "SHT21/temp"
         temp.hw_id = "%s.2" % ID
-        temp.new_attribute("temperature")
+        attr["temperature"] = temp.new_attribute("temperature")
         
         # hum sensor
         hum = build_dev(base_addr+'3',"hygrometer.basic")
         hum.info = "SHT21/rh"
         hum.hw_id = "%s.3" % ID
-        hum.new_attribute("humidity")
+        attr["humidity"] = hum.new_attribute("humidity")
 
-        self.devs = {"bg" : bg, "temp":temp, "hum":hum}
-                     
-        for d in self.devs.values():
+        self.devs = [bg,temp,hum]
+        self.attr = attr
+        for d in self.devs:
             d.product_id = 'minishield1'
+            d.group_id = group
 
     def parse(self,pkt):
         try:
-            self.devs["bg"].get_attribute("voltage").value = pkt.values[0][2]/100.0
-            self.devs["temp"].get_attribute("temperature").value = pkt.values[1][2]/10.0
-            self.devs["hum"].get_attribute("humidity").value = int(round(pkt.values[2][2]/10.0))
+            self.attr["voltage"]      = pkt.values[0][2]/100.0
+            self.attr["temperature"]  = pkt.values[1][2]/10.0
+            self.attr["humidity"]     = int(round(pkt.values[2][2]/10.0))
         except IndexError:
             pass
         
         
     def get_devices(self):
-        return self.devs.values()
+        return self.devs

devices/protocols/bugOne/xaal/bugone/nodes/temp1.py

@@ -8,30 +8,35 @@ from .default import build_dev
 class Node(object):
     def __init__(self,ID,cfg):
         base_addr = cfg["base_addr"][:-1]
+        group = cfg["group"]
+
+        attr = {}
         
         # first device = bangap
         bg = build_dev(base_addr+'1',"voltage.basic")
         bg.info = "bandgap"
         bg.hw_id = "%s.1" % ID
-        bg.new_attribute("voltage")
+        attr["voltage"] = bg.new_attribute("voltage")
         
         # temp sensor
         temp = build_dev(base_addr+'2',"thermometer.basic")
         temp.info = "DS18B20"
         temp.hw_id = "%s.2" % ID
-        temp.new_attribute("temperature")
-        
-        self.devs = {"bg" : bg,"temp":temp}
+        attr["temperature"] = temp.new_attribute("temperature")
+
+        self.devs = [bg,temp]
+        self.attr = attr
         
-        for d in self.devs.values():
-            d.product_id = 'temp1'
+        for dev in self.devs:
+            dev.product_id = 'temp1'
+            dev.group_id = group
 
     def parse(self,pkt):
         try:
-            self.devs["bg"].get_attribute("voltage").value = pkt.values[0][2]/100.0
-            self.devs["temp"].get_attribute("temperature").value = pkt.values[1][2]/10.0
+            self.attr["voltage"]     = pkt.values[0][2]/100.0
+            self.attr["temperature"] = pkt.values[1][2]/10.0
         except IndexError:
             pass
     
     def get_devices(self):
-        return self.devs.values()
+        return self.devs

devices/weather/OpenWeatherMap/xaal/owm/dev.py

@@ -13,10 +13,10 @@ def build_dev(dtype,addr):
     dev.address    = addr
     dev.vendor_id  = "IHSEV"
     dev.product_id = "OpenWeatherMap"
-    dev.info       = "%s on %s" % (PACKAGE_NAME,platform.node())
+    dev.info       = "%s@%s" % (PACKAGE_NAME,platform.node())
     return dev
 
-class OWMManager:
+class GW:
     def __init__(self,engine):
         self.eng = engine
         self.cfg = tools.load_cfg_or_die(PACKAGE_NAME)
@@ -24,39 +24,39 @@ class OWMManager:
 
     def setup(self):
         """ create devices, register .."""
-
         cfg = self.cfg['config']
-        
+      
         # create devices
-        devs = {}
         
-        devs['temp'] = build_dev("thermometer.basic",cfg['temperature'])
-        devs['temp'].new_attribute('temperature')
+        attr = {} 
+        
+        temp = build_dev("thermometer.basic",cfg['temperature'])
+        attr['temperature'] = temp.new_attribute('temperature')
         
-        devs['hum'] = build_dev("hygrometer.basic",cfg['humidity'])
-        devs['hum'].new_attribute('humidity')
+        hum = build_dev("hygrometer.basic",cfg['humidity'])
+        attr['humidity'] = hum.new_attribute('humidity')
 
-        devs['press'] = build_dev("barometer.basic",cfg['pressure'])
-        devs['press'].new_attribute('pressure')
+        press = build_dev("barometer.basic",cfg['pressure'])
+        attr['pressure'] = press.new_attribute('pressure')
 
-        self.devs = devs 
-        self.eng.add_devices(devs.values())
+        self.attr = attr
+        self.devs = [temp,hum,press]
+        self.eng.add_devices(self.devs)
+        
         self.eng.add_timer(self.update,RATE)
-
         self.owm = pyowm.OWM(cfg['api_key'])
-        
 
     def update(self):
         place = self.cfg['config']['place']
         weather = self.owm.weather_at_place(place).get_weather()
-        self.devs['press'].get_attribute("pressure").value = weather.get_pressure()['press']            
-        self.devs['temp'].get_attribute("temperature").value = weather.get_temperature(unit='celsius')['temp']
-        self.devs['hum'].get_attribute("humidity").value = weather.get_humidity()
+        self.attr['temperature'].value  = weather.get_temperature(unit='celsius')['temp']
+        self.attr['pressure'].value     = weather.get_pressure()['press']            
+        self.attr['humidity'].value     = weather.get_humidity()
 
             
 def run():
     eng = Engine()    
-    log = OWMManager(eng)
+    log = GW(eng)
     eng.run()