Author: gwadavel
Date: 2009-09-14 17:26:39 +0200 (Mon, 14 Sep 2009)
New Revision: 5382
Modified:
software_suite_v3/software/plugin/plugin-battery/trunk/executables/plugin-battery.py
software_suite_v3/software/plugin/plugin-charger/trunk/executables/plugin-charger.py
Log:
use tgp_startedBy env variable for test server port, user port = 64321 else
port = 270
Modified:
software_suite_v3/software/plugin/plugin-battery/trunk/executables/plugin-battery.py
===================================================================
---
software_suite_v3/software/plugin/plugin-battery/trunk/executables/plugin-battery.py
2009-09-14 14:35:41 UTC (rev 5381)
+++
software_suite_v3/software/plugin/plugin-battery/trunk/executables/plugin-battery.py
2009-09-14 15:26:39 UTC (rev 5382)
@@ -44,15 +44,14 @@
"""
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.tgp_language = "en"
+ self.tgp_ip = "127.0.0.1"
+ self.tgp_port = 270
+
self.plugin = plug
# Test language, ip, port
@@ -62,17 +61,20 @@
if "tgp_ip" in os.environ:
self.tgp_ip = os.environ["tgp_ip"]
+ if "tgp_startedBy" in os.environ:
+ if os.environ["tgp_startedBy"] == "user":
+ self.tgp_port = 54321
+
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)
+
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)
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 14:35:41 UTC (rev 5381)
+++
software_suite_v3/software/plugin/plugin-charger/trunk/executables/plugin-charger.py
2009-09-14 15:26:39 UTC (rev 5382)
@@ -61,22 +61,21 @@
if "tgp_ip" in os.environ:
self.tgp_ip = os.environ["tgp_ip"]
+ if "tgp_startedBy" in os.environ:
+ if os.environ["tgp_startedBy"] == "user":
+ self.tgp_port = 54321
+
if "tgp_port" in os.environ:
self.tgp_port = int(os.environ["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, 'chargerstate',
'plugin-charger')
self.tux.server.waitConnected(5.0)
self.tux.dongle.waitConnected(5.0)
self.tux.radio.waitConnected(5.0)
@@ -85,29 +84,25 @@
def getState(self):
"""
- Return Battery State
+ Return Charger State
"""
-
return self.tux.charger.getState()
def start(self):
"""
"""
-
if self.tuxConnect():
if not self.tux.radio.getConnected():
plugin.throwTrace("I can't find my fish. Please, make sure I'm
connected.")
else:
plugin.throwMessage("The charger state is {0}",
self.getState())
- self.stop()
def stop(self):
"""
"""
-
self.tux.access.release()
self.tux.server.disconnect()
self.tux.destroy()
@@ -117,7 +112,6 @@
"""This class override the SimplePlugin class to make easy
the plugin coding.
"""
-
def __init__(self):
"""Initialization of the class.
"""
@@ -140,9 +134,15 @@
def onPluginStop(self):
"""Callback on plugin stop.
"""
- # Stop the fake daemon loop
self.scharger.stop()
-
+
+ def onPluginEvent(self, eventName, eventValues):
+ """Callback on plugin event.
+ @param eventName: Event name.
+ @param eventValues: Event values.
+ """
+ pass
+
if __name__ == "__main__":
plugin = ChargerPlugin()
plugin.boot(sys.argv[1:], SimplePluginConfiguration())
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
