Author: remi
Date: 2009-03-13 00:11:05 +0100 (Fri, 13 Mar 2009)
New Revision: 4039
Modified:
software_suite_v2/tuxware/tuxdroidserver/trunk/data/others/gadgetFrameWorkBridge/bridge-gadget-framework-0.0.1.jar
software_suite_v2/tuxware/tuxdroidserver/trunk/data/others/gadgetFrameWorkBridge/tuxdroid-gadget-framework-0.0.3-bridge.jar
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceGadgetFramework.py
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/03_advanced_api/resourceTestGadgetMessage.py
Log:
* updated jar dependencies for the gadget framework
* updated the server with the gadget instances
Modified:
software_suite_v2/tuxware/tuxdroidserver/trunk/data/others/gadgetFrameWorkBridge/bridge-gadget-framework-0.0.1.jar
===================================================================
(Binary files differ)
Modified:
software_suite_v2/tuxware/tuxdroidserver/trunk/data/others/gadgetFrameWorkBridge/tuxdroid-gadget-framework-0.0.3-bridge.jar
===================================================================
(Binary files differ)
Modified:
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceGadgetFramework.py
===================================================================
---
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceGadgetFramework.py
2009-03-12 22:50:57 UTC (rev 4038)
+++
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceGadgetFramework.py
2009-03-12 23:11:05 UTC (rev 4039)
@@ -225,36 +225,34 @@
if args[1] == "ERROR":
self.__publishEvents(False, ST_NAME_FW_GADGET_ERROR, args[2:])
if self.__onGadgetErrorCallback != None:
- self.__onGadgetErrorCallback(args[2], args[3:])
+ self.__onGadgetErrorCallback(args[2], args[3], args[4:])
elif args[1] == "NOTIFICATION":
self.__publishEvents(False, ST_NAME_FW_GADGET_NOTIFICATION,
args[2:])
if self.__onGadgetNotificationCallback != None:
self.__onGadgetNotificationCallback(args[2], args[3],
- args[4], args[5], args[6:])
+ args[4], args[5], args[5], args[6:])
elif args[1] == "STARTING":
- self.__publishEvents(True, ST_NAME_FW_GADGET_STARTING,
- [args[2],])
+ self.__publishEvents(True, ST_NAME_FW_GADGET_STARTING,
args[2:])
if self.__onGadgetStartingCallback != None:
- self.__onGadgetStartingCallback(args[2])
+ self.__onGadgetStartingCallback(args[2], args[3])
elif args[1] == "STOPPED":
# TODO : Don't send this event at this place. In effect, the
true
# stop of a gadget is not the framework one but when all pushed
# TTS sentences are finished or aborted.
- self.__publishEvents(True, ST_NAME_FW_GADGET_STOPPED,
- [args[2],])
+ self.__publishEvents(True, ST_NAME_FW_GADGET_STOPPED, args[2:])
if self.__onGagdetStoppedCallback != None:
- self.__onGagdetStoppedCallback(args[2])
+ self.__onGagdetStoppedCallback(args[2], args[3])
elif args[1] == "TRACE":
self.__publishEvents(False, ST_NAME_FW_GADGET_TRACE, args[2:])
if self.__onGadgetTraceCallback != None:
- self.__onGadgetTraceCallback(args[2], args[3:])
+ self.__onGadgetTraceCallback(args[2], args[3], args[4:])
def __publishEvents(self, sendToClients, eventName, eventValues = []):
def async():
values = ""
for value in eventValues:
- values += value + "|"
+ values += value + ":"
if len(values) > 0:
values = values[:-1]
eventStruct = {
@@ -436,7 +434,7 @@
"""Set a callback function to the event "gadget error"
@param funct: Function pointer.
function prototype:
- def onGadgetError(gadgetUuid, messagesList):
+ def onGadgetError(gadgetUuid, instanceUuid, messagesList):
"""
self.__onGadgetErrorCallback = funct
@@ -444,7 +442,7 @@
"""Set a callback function to the event "gadget trace"
@param funct: Function pointer.
function prototype:
- def onGadgetTrace(gadgetUuid, messagesList):
+ def onGadgetTrace(gadgetUuid, instanceUuid, messagesList):
"""
self.__onOnGadgetTraceCallback = funct
@@ -452,8 +450,8 @@
"""Set a callback function to the event "gadget notification"
@param funct: Function pointer.
function prototype:
- def onGadgetNotification(gadgetUuid, gadgetTtsLocutor, gadgetTtsPitch,
- notificationType, messagesList):
+ def onGadgetNotification(gadgetUuid, instanceUuid, gadgetTtsLocutor,
+ gadgetTtsPitch, notificationType, messagesList):
"""
self.__onGadgetNotificationCallback = funct
@@ -461,7 +459,7 @@
"""Set a callback function to the event "gadget starting"
@param funct: Function pointer.
function prototype:
- def onGadgetStarting(gadgetUuid):
+ def onGadgetStarting(gadgetUuid, instanceUuid):
"""
self.__onGadgetStartingCallback = funct
@@ -469,7 +467,7 @@
"""Set a callback function to the event "gadget stopped"
@param funct: Function pointer.
function prototype:
- def onGagdetStopped(gadgetUuid):
+ def onGagdetStopped(gadgetUuid, instanceUuid):
"""
self.__onGagdetStoppedCallback = funct
@@ -621,7 +619,7 @@
args.append(key)
args.append(parameters[key])
ret = self.__gadgetFramework.sendCommand(cmd, subCmd, args)
- if ret[0] != "SUCCESS":
+ if ret[0] == "FAILED":
return False
else:
return True
@@ -646,7 +644,7 @@
args.append(key)
args.append(parameters[key])
ret = self.__gadgetFramework.sendCommand(cmd, subCmd, args)
- if ret[0] != "SUCCESS":
+ if ret[0] == "FAILED":
return False
else:
return True
Modified:
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/03_advanced_api/resourceTestGadgetMessage.py
===================================================================
---
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/03_advanced_api/resourceTestGadgetMessage.py
2009-03-12 22:50:57 UTC (rev 4038)
+++
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/03_advanced_api/resourceTestGadgetMessage.py
2009-03-12 23:11:05 UTC (rev 4039)
@@ -27,7 +27,7 @@
# Private methods
#
--------------------------------------------------------------------------
- def __onGadgetNotification(self, gadgetUuid, gadgetTtsLocutor,
+ def __onGadgetNotification(self, gadgetUuid, instanceUuid,
gadgetTtsLocutor,
gadgetTtsPitch, notificationType, messagesList):
text = ""
for message in messagesList:
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
