[tuxdroid-svn] r5380 - software_suite_v3/software/plugin/plugin-charger/trunk/executables

[gwadavel <c2m...@c2...>]

Author: gwadavel
Date: 2009-09-14 16:01:16 +0200 (Mon, 14 Sep 2009)
New Revision: 5380

Modified:
   software_suite_v3/software/plugin/plugin-charger/trunk/executables/plugin-charger.py
Log:
plugin-charger, updated for working with server user mode

Modified: software_suite_v3/software/plugin/plugin-charger/trunk/executables/plugin-charger.py
===================================================================
--- software_suite_v3/software/plugin/plugin-charger/trunk/executables/plugin-charger.py	2009-09-14 12:21:56 UTC (rev 5379)
+++ software_suite_v3/software/plugin/plugin-charger/trunk/executables/plugin-charger.py	2009-09-14 14:01:16 UTC (rev 5380)
@@ -44,17 +44,16 @@
     """
     Manage the battery.
     """
-
-    tgp_language = "en"
-    tgp_ip = "127.0.0.1"
-    tgp_port = 270
-    tux = TuxAPI("127.0.0.1", 270)
     
     def __init__(self, plug):
         '''
         '''
-        self.plugin = plug 
+        self.tgp_language = "en"
+        self.tgp_ip = "127.0.0.1"
+        self.tgp_port = 270        
 
+        self.plugin = plug   
+
         # Test language, ip, port
         if "tgp_language" in os.environ:
             self.tgp_language = os.environ["tgp_language"]
@@ -65,15 +64,19 @@
         if "tgp_port" in os.environ:
             self.tgp_port = int(os.environ["tgp_port"])
 
-        tux = TuxAPI(self.tgp_ip, self.tgp_port)
-      
-        
+        self.tux = TuxAPI(self.tgp_ip, self.tgp_port)
+
+        self.tux.server.autoConnect(CLIENT_LEVEL_RESTRICTED, 'batterylevel', 'plugin-battery')
+        if not self.tux.server.getConnected():
+            self.tgp_port = 54321         
+            self.tux = TuxAPI(self.tgp_ip, self.tgp_port)   
+            self.tux.server.autoConnect(CLIENT_LEVEL_RESTRICTED, 'batterylevel', 'plugin-battery')
+
     def tuxConnect(self):
         '''
         Wait connected
         '''
-
-        self.tux.server.autoConnect(CLIENT_LEVEL_RESTRICTED, 'batterylevel', 'plugin-battery')
+        
         self.tux.server.waitConnected(5.0)
         self.tux.dongle.waitConnected(5.0)
         self.tux.radio.waitConnected(5.0)