[Personalrobots-commit] SF.net SVN: personalrobots:[3380] pkg/trunk

[<rob...@us...>]

Revision: 3380
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=3380&view=rev
Author:   rob_wheeler
Date:     2008-08-21 00:02:57 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
Move mechanism control scripts into a common location

Added Paths:
-----------
    pkg/trunk/mechanism/mechanism_control/scripts/controllers.py
    pkg/trunk/mechanism/mechanism_control/scripts/mech.py

Removed Paths:
-------------
    pkg/trunk/controllers/generic_controllers/controllers.py
    pkg/trunk/mechanism/mechanism_control/mech.py

Deleted: pkg/trunk/controllers/generic_controllers/controllers.py
===================================================================
--- pkg/trunk/controllers/generic_controllers/controllers.py	2008-08-20 23:52:08 UTC (rev 3379)
+++ pkg/trunk/controllers/generic_controllers/controllers.py	2008-08-21 00:02:57 UTC (rev 3380)
@@ -1,49 +0,0 @@
-#! /usr/bin/env python
-
-import rostools
-rostools.update_path('mechanism_control')
-rostools.update_path('generic_controllers')
-
-
-import rospy, sys
-from mechanism_control.srv import *
-from generic_controllers.srv import *
-
-def print_usage(exit_code = 0):
-    print '''Commands:
-    ls                         - List controllers
-    set <controller> <command> - Set the contorller's commanded value
-    get <controller>           - Get the contorller's commanded value'''
-    sys.exit(exit_code)
-
-def list_controllers():
-    s = rospy.ServiceProxy('list_controllers', ListControllers)
-    resp = s.call(ListControllersRequest())
-    for t in resp.controllers:
-        print t
-
-def set_controller(controller, command):
-    s = rospy.ServiceProxy(controller + '/set_command', SetCommand)
-    resp = s.call(SetCommandRequest(command))
-    print resp.command
-
-def get_controller(controller):
-    s = rospy.ServiceProxy(controller + '/get_actual', GetActual)
-    resp = s.call(GetActualRequest())
-    print str(resp.time) + ": " + str(resp.command)
-
-if __name__ == '__main__':
-    if len(sys.argv) == 1:
-        print_usage()
-    if sys.argv[1] == 'ls':
-        list_controllers()
-    elif sys.argv[1] == 'set':
-        if len(sys.argv) != 4:
-          print_usage()
-        set_controller(sys.argv[2], float(sys.argv[3]))
-    elif sys.argv[1] == 'get':
-        if len(sys.argv) != 3:
-          print_usage()
-        get_controller(sys.argv[2])
-    else:
-        print_usage(1)

Deleted: pkg/trunk/mechanism/mechanism_control/mech.py
===================================================================
--- pkg/trunk/mechanism/mechanism_control/mech.py	2008-08-20 23:52:08 UTC (rev 3379)
+++ pkg/trunk/mechanism/mechanism_control/mech.py	2008-08-21 00:02:57 UTC (rev 3380)
@@ -1,57 +0,0 @@
-#! /usr/bin/env python
-# Provides quick access to the services exposed by MechanismControlNode
-
-import rostools
-rostools.update_path('mechanism_control')
-
-import rospy, sys
-from mechanism_control.srv import *
-
-def print_usage(exit_code = 0):
-    print '''Commands:
-    lt  - List controller Types
-    lc  - List active controllers
-    sp  - Spawn a controller using the xml passed over stdin
-    kl <name>  - Kills the controller named <name>'''
-    sys.exit(exit_code)
-
-def list_controller_types():
-    s = rospy.ServiceProxy('list_controller_types', ListControllerTypes)
-    resp = s.call(ListControllerTypesRequest())
-    for t in resp.types:
-        print t
-
-def list_controllers():
-    s = rospy.ServiceProxy('list_controllers', ListControllers)
-    resp = s.call(ListControllersRequest())
-    for c in resp.controllers:
-        print c
-
-def spawn_controller():
-    s = rospy.ServiceProxy('spawn_controller', SpawnController)
-    resp = s.call(SpawnControllerRequest(sys.stdin.read()))
-    if resp.ok == 1:
-        print "Spawned successfully"
-    else:
-        print "Error when spawning", resp.ok
-
-def kill_controller(name):
-    s = rospy.ServiceProxy('kill_controller', KillController)
-    resp = s.call(KillControllerRequest(name))
-    if resp.ok == 1:
-        print "Killed %s successfully" % name
-    else:
-        print "Error when killing", resp.ok
-
-if __name__ == '__main__':
-    if len(sys.argv) < 2:
-        print_usage()
-
-    if sys.argv[1] == 'lt':
-        list_controller_types()
-    elif sys.argv[1] == 'lc':
-        list_controllers()
-    elif sys.argv[1] == 'sp':
-        spawn_controller()
-    elif sys.argv[1] == 'kl':
-        kill_controller(sys.argv[2])

Copied: pkg/trunk/mechanism/mechanism_control/scripts/controllers.py (from rev 3365, pkg/trunk/controllers/generic_controllers/controllers.py)
===================================================================
--- pkg/trunk/mechanism/mechanism_control/scripts/controllers.py	                        (rev 0)
+++ pkg/trunk/mechanism/mechanism_control/scripts/controllers.py	2008-08-21 00:02:57 UTC (rev 3380)
@@ -0,0 +1,49 @@
+#! /usr/bin/env python
+
+import rostools
+rostools.update_path('mechanism_control')
+rostools.update_path('generic_controllers')
+
+
+import rospy, sys
+from mechanism_control.srv import *
+from generic_controllers.srv import *
+
+def print_usage(exit_code = 0):
+    print '''Commands:
+    ls                         - List controllers
+    set <controller> <command> - Set the contorller's commanded value
+    get <controller>           - Get the contorller's commanded value'''
+    sys.exit(exit_code)
+
+def list_controllers():
+    s = rospy.ServiceProxy('list_controllers', ListControllers)
+    resp = s.call(ListControllersRequest())
+    for t in resp.controllers:
+        print t
+
+def set_controller(controller, command):
+    s = rospy.ServiceProxy(controller + '/set_command', SetCommand)
+    resp = s.call(SetCommandRequest(command))
+    print resp.command
+
+def get_controller(controller):
+    s = rospy.ServiceProxy(controller + '/get_actual', GetActual)
+    resp = s.call(GetActualRequest())
+    print str(resp.time) + ": " + str(resp.command)
+
+if __name__ == '__main__':
+    if len(sys.argv) == 1:
+        print_usage()
+    if sys.argv[1] == 'ls':
+        list_controllers()
+    elif sys.argv[1] == 'set':
+        if len(sys.argv) != 4:
+          print_usage()
+        set_controller(sys.argv[2], float(sys.argv[3]))
+    elif sys.argv[1] == 'get':
+        if len(sys.argv) != 3:
+          print_usage()
+        get_controller(sys.argv[2])
+    else:
+        print_usage(1)

Copied: pkg/trunk/mechanism/mechanism_control/scripts/mech.py (from rev 3365, pkg/trunk/mechanism/mechanism_control/mech.py)
===================================================================
--- pkg/trunk/mechanism/mechanism_control/scripts/mech.py	                        (rev 0)
+++ pkg/trunk/mechanism/mechanism_control/scripts/mech.py	2008-08-21 00:02:57 UTC (rev 3380)
@@ -0,0 +1,57 @@
+#! /usr/bin/env python
+# Provides quick access to the services exposed by MechanismControlNode
+
+import rostools
+rostools.update_path('mechanism_control')
+
+import rospy, sys
+from mechanism_control.srv import *
+
+def print_usage(exit_code = 0):
+    print '''Commands:
+    lt  - List controller Types
+    lc  - List active controllers
+    sp  - Spawn a controller using the xml passed over stdin
+    kl <name>  - Kills the controller named <name>'''
+    sys.exit(exit_code)
+
+def list_controller_types():
+    s = rospy.ServiceProxy('list_controller_types', ListControllerTypes)
+    resp = s.call(ListControllerTypesRequest())
+    for t in resp.types:
+        print t
+
+def list_controllers():
+    s = rospy.ServiceProxy('list_controllers', ListControllers)
+    resp = s.call(ListControllersRequest())
+    for c in resp.controllers:
+        print c
+
+def spawn_controller():
+    s = rospy.ServiceProxy('spawn_controller', SpawnController)
+    resp = s.call(SpawnControllerRequest(sys.stdin.read()))
+    if resp.ok == 1:
+        print "Spawned successfully"
+    else:
+        print "Error when spawning", resp.ok
+
+def kill_controller(name):
+    s = rospy.ServiceProxy('kill_controller', KillController)
+    resp = s.call(KillControllerRequest(name))
+    if resp.ok == 1:
+        print "Killed %s successfully" % name
+    else:
+        print "Error when killing", resp.ok
+
+if __name__ == '__main__':
+    if len(sys.argv) < 2:
+        print_usage()
+
+    if sys.argv[1] == 'lt':
+        list_controller_types()
+    elif sys.argv[1] == 'lc':
+        list_controllers()
+    elif sys.argv[1] == 'sp':
+        spawn_controller()
+    elif sys.argv[1] == 'kl':
+        kill_controller(sys.argv[2])


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.