From b313abd7449af357d6815e1116975d5987a39364 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Sun, 8 May 2011 15:43:13 +0200 Subject: digital/*/tools: use robot specific init parameters --- digital/io/tools/dump_usdist.py | 7 ++----- digital/io/tools/io/init.py | 14 ++++++++++---- digital/io/tools/io/io.py | 5 +++-- 3 files changed, 15 insertions(+), 11 deletions(-) (limited to 'digital/io') diff --git a/digital/io/tools/dump_usdist.py b/digital/io/tools/dump_usdist.py index 43e0724e..001a8cc7 100644 --- a/digital/io/tools/dump_usdist.py +++ b/digital/io/tools/dump_usdist.py @@ -1,11 +1,8 @@ -import sys - import io import io.init -import serial +from utils.init_proto import init_proto -fd = serial.Serial (sys.argv[1]) -p = io.Proto (fd, **io.init.target) +p = init_proto ('marcel', io.Proto, io.init) def cb (*val): l = [ ] for v in val: diff --git a/digital/io/tools/io/init.py b/digital/io/tools/io/init.py index 059ea408..ebcb1ec9 100644 --- a/digital/io/tools/io/init.py +++ b/digital/io/tools/io/init.py @@ -1,6 +1,12 @@ """Default parameters for io.""" -host = dict ( - servo_pos = ((1, 255), (255, 1), (1, 255), (1, 255), (1, 255), - (1, 255), (1, 255), (1, 255)), - ) +host = { + 'aquajim': dict ( + servo_pos = ((1, 255), (255, 1), (1, 255), (1, 255), (1, 255), + (1, 255), (1, 255), (1, 255)), + ), + 'marcel': dict ( + ), + 'robospierre': dict ( + ), + } target = host diff --git a/digital/io/tools/io/io.py b/digital/io/tools/io/io.py index 375ad38d..edefbd9d 100644 --- a/digital/io/tools/io/io.py +++ b/digital/io/tools/io/io.py @@ -34,8 +34,9 @@ class Proto: def send_param (self): p = self.param - for i, t in enumerate (p['servo_pos']): - self.proto.send ('p', 'BBB', i, *t) + if ('servo_pos') in p: + for i, t in enumerate (p['servo_pos']): + self.proto.send ('p', 'BBB', i, *t) def write_eeprom (self): self.proto.send ('p', 'cc', 'E', 's') -- cgit v1.2.3