correction to be compliant to v0.5

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

gateways/xaal-grovepi/src/xaalgrovepi/__main__.py

@@ -54,14 +54,14 @@ def loadConfig(filename,confDir):
     """
     global logger
 
-    configFile = xAAL.tools.getConfigFile(filename,confDir)
+    configFile = xAAL.tools.get_cfg_file(filename,confDir)
 
-    cfg = xAAL.tools.loadConfigFile(configFile)
+    cfg = xAAL.tools.load_cfg_file(configFile)
 
     devName='gateway'
 
     if cfg == None:
-        cfg = xAAL.tools.newDefaultConfigFile(configFile,devName)
+        cfg = xAAL.tools.new_cfg(configFile,devName)
         cfg.set(devName,'logfile','/var/log/xaal/grovepi')
         cfg.set(devName,'loglevel','info')
         f = open(configFile,'w')
@@ -71,13 +71,13 @@ def loadConfig(filename,confDir):
     logfile = cfg.get(devName,'logfile')
     loglevel = cfg.get(devName,'loglevel')
      
-    logger = xAAL.tools.getLogger(__name__,loglevel.upper(),'%s.log'%logfile)
+    logger = xAAL.tools.get_logger(__name__,loglevel.upper(),'%s.log'%logfile)
     logger.info("Config. file loaded : %s" % configFile)
     logger.info("Log filename : %s" % logfile)
 
     gw=GrovepiGateway(address=xaalAddr)       
-    gw.setAlivePeriod(400)
-    logger.debug('loading gateway %s with xaaladdr %s'%(gw.__class__.__name__,gw.getAddress()))
+    gw.set_alive_period(400)
+    logger.debug('loading gateway %s with xaaladdr %s'%(gw.__class__.__name__,gw.get_address()))
 
     for section in cfg.sections():
         dev = None
@@ -90,10 +90,10 @@ def loadConfig(filename,confDir):
             
             dev = DeviceName(xaalAddr=xaalAddr,portAddr=portAddr)
     
-            logger.debug('loading device %s with xaaladdr %s'%(dev.__class__.__name__,dev.getAddress()))
+            logger.debug('loading device %s with xaaladdr %s'%(dev.__class__.__name__,dev.get_address()))
             
-            gw.addDevice(dev)
-            dev.setAlivePeriod(400)
+            gw.add_device(dev)
+            dev.set_alive_period(400)
 
     return gw
 
@@ -101,7 +101,7 @@ def main():
     try:
         gw=loadConfig(GrovepiGateway.__name__,xAAL.config.CONF_DIR) 
         eng=xAAL.core.Engine()
-        eng.registerDevices([gw,] + gw.getDevices())
+        eng.register_devices([gw,] + gw.get_devices())
         #gw.start()
         #gw.info()
         eng.start()

gateways/xaal-grovepi/src/xaalgrovepi/device.py

@@ -24,9 +24,9 @@ import xAAL
 class GrovepiDevice(xAAL.devices.Device):
 
     def __init__(self,xaalAddr,portAddr,devType="grovepi.basic",parent=None):
-        xAAL.devices.Device.__init__(self,devType=devType,addr=xaalAddr,parent=parent)
-        self.setVendorID("IHSEV")
-        self.setProductID("Unknown")
+        xAAL.devices.Device.__init__(self,devtype=devType,addr=xaalAddr,parent=parent)
+        self.set_vendor_id("IHSEV")
+        self.set_product_id("Unknown")
         self.setPortAddr(portAddr)
    
     def setPortAddr(self,value):

gateways/xaal-grovepi/src/xaalgrovepi/gateway.py

@@ -27,17 +27,16 @@ UPDATE_INTERVAL = 60/2
 
 class GrovepiGateway(xAAL.devices.Gateway):
     
-    def __init__(self,address=None):
-        xAAL.devices.Gateway.__init__(self,address=address)
-        self.setType('gateway.basic')
-        self.setVendorID("IHSEV")
-        self.setProductID("Gateway GrovePi")
+    def __init__(self,address):
+        xAAL.devices.Gateway.__init__(self,addr=address)
+        self.set_vendor_id("IHSEV")
+        self.set_product_id("Gateway GrovePi")
         self._lastTime = time.time()
 
     def loop(self):
         t1 = time.time()
         if (self._lastTime + UPDATE_INTERVAL) < t1:
-            for dev in self.getDevices():
+            for dev in self.get_devices():
                 dev.update()
             self._lastTime = time.time()