summaryrefslogtreecommitdiff
path: root/digital/io/tools/test_simu_control.py
diff options
context:
space:
mode:
authorNicolas Schodet2010-04-01 23:57:20 +0200
committerNicolas Schodet2010-04-01 23:57:20 +0200
commit80b3da91dac28a5895a8cb9f0477a7008365dd56 (patch)
treec1f0f544676df83c81ed185fa90f1e832be8dabb /digital/io/tools/test_simu_control.py
parent811125a12c40ab0d7d90da8da2142c382a7301cc (diff)
digital/io: wipe-out old robot code, closes #112
Diffstat (limited to 'digital/io/tools/test_simu_control.py')
-rw-r--r--digital/io/tools/test_simu_control.py38
1 files changed, 2 insertions, 36 deletions
diff --git a/digital/io/tools/test_simu_control.py b/digital/io/tools/test_simu_control.py
index a3c5fd49..b3123492 100644
--- a/digital/io/tools/test_simu_control.py
+++ b/digital/io/tools/test_simu_control.py
@@ -21,7 +21,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# }}}
-from test_simu_aquajim import TestSimu
+from test_simu import TestSimu
from Tkinter import *
import math
@@ -36,25 +36,6 @@ class TestSimuControl (TestSimu):
self.control_frame = Frame (self)
self.control_frame.pack (side = 'left', before = self.table_view,
fill = 'y')
- self.cylinder_button = Button (self.control_frame, text = 'Cylinder',
- command = self.cylinder_command)
- self.cylinder_button.pack ()
- self.door_var = IntVar ()
- self.door_button = Checkbutton (self.control_frame, text = 'Door',
- indicatoron = False,
- variable = self.door_var, command = self.door_command)
- self.door_button.pack ()
- self.finger_var = IntVar ()
- self.finger_button = Checkbutton (self.control_frame, text = 'Finger',
- indicatoron = False,
- variable = self.finger_var, command = self.finger_command)
- self.finger_button.pack ()
- self.elevator_door_var = IntVar ()
- self.elevator_door_button = Checkbutton (self.control_frame,
- text = 'Elevator Door', indicatoron = False,
- variable = self.elevator_door_var,
- command = self.elevator_door_command)
- self.elevator_door_button.pack ()
self.table_view.bind ('<1>', self.move)
self.table_view.bind ('<3>', self.orient)
@@ -69,25 +50,10 @@ class TestSimuControl (TestSimu):
a = math.atan2 (y - robot_pos[1], x - robot_pos[0])
self.asserv.goto_angle (a)
- def cylinder_command (self):
- self.asserv.speed_pos ('a0', 5333 / 3)
-
- def door_command (self):
- door_pos = self.door_var.get ()
- self.io.servo_pos (0, door_pos)
-
- def finger_command (self):
- finger_pos = self.finger_var.get ()
- self.io.servo_pos (1, finger_pos)
-
- def elevator_door_command (self):
- elevator_door_pos = self.elevator_door_var.get ()
- self.io.pwm_set (elevator_door_pos == 1 and 512 or -512, 225)
-
def change_color (self, *dummy):
pass
if __name__ == '__main__':
app = TestSimuControl (('../../asserv/src/asserv/asserv.host', '-m9',
- 'aquajim'), ('../src/io.host'))
+ 'marcel'), ('../src/io.host'))
app.mainloop ()