summaryrefslogtreecommitdiffhomepage
path: root/digital/asserv
diff options
context:
space:
mode:
authorNicolas Schodet2008-05-01 04:45:58 +0200
committerNicolas Schodet2008-05-01 04:45:58 +0200
commit93578ed2d09bf7c4e1a491fced4fab5b80e7b369 (patch)
treef1b9960aa2a553c654ac18da6e603ae8c38307e5 /digital/asserv
parent16736b57761fc62479d3e82a3af98bdb68d2b74a (diff)
* digital/asserv/tools:
- fixed parameter bugs. - added sleep after eeprom write.
Diffstat (limited to 'digital/asserv')
-rw-r--r--digital/asserv/tools/asserv.py2
-rw-r--r--digital/asserv/tools/init.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/digital/asserv/tools/asserv.py b/digital/asserv/tools/asserv.py
index 55bdf125..1f7c449b 100644
--- a/digital/asserv/tools/asserv.py
+++ b/digital/asserv/tools/asserv.py
@@ -197,12 +197,14 @@ class Asserv:
self.proto.send ('p', 'BH', ord ('a'), p['a0a'] * 256)
self.proto.send ('p', 'BBBBB', ord ('s'), p['tsm'], p['asm'],
p['tss'], p['ass'])
+ self.proto.send ('p', 'BBB', ord ('s'), p['a0sm'], p['a0ss'])
self.proto.send ('p', 'BL', ord ('c'), p['c'] * 256 * 256 * 256)
self.proto.send ('p', 'BH', ord ('f'), p['f'])
self.proto.send ('p', 'BH', ord ('l'), p['l'])
def write_eeprom (self):
self.proto.send ('p', 'BB', ord ('E'), 1)
+ time.sleep (1)
self.wait (lambda: True)
def handle_stats (self, stat, *args):
diff --git a/digital/asserv/tools/init.py b/digital/asserv/tools/init.py
index c774060e..bdaa2a87 100644
--- a/digital/asserv/tools/init.py
+++ b/digital/asserv/tools/init.py
@@ -2,7 +2,7 @@
host = dict (
scale = 0.0395840674352314, f = 0xdd1,
tkp = 1, tkd = 16, akp = 2, akd = 16,
- a0p = 1, a0d = 16,
+ a0kp = 1, a0kd = 16,
E = 0x3ff, D = 0x1ff,
ta = 0.5, aa = 0.5, tsm = 0x60, tss = 0x40, asm = 0x60, ass = 0x40,
a0a = 0.5, a0sm = 0x10, a0ss = 0x05,
@@ -11,7 +11,7 @@ target = dict (
scale = 0.0413530725332892, f = 0xcfa,
c = float (0xffefbe) / (1 << 24),
tkp = 1, tkd = 16, akp = 2, akd = 16,
- a0p = 0.8, a0i = 0.05, a0d = 0.05,
+ a0kp = 0.8, a0ki = 0.05, a0kd = 0.05,
E = 0x3ff, D = 0x1ff, I = 0x1fff,
ta = 0.5, aa = 0.5, tsm = 0x60, tss = 0x40, asm = 0x60, ass = 0x40,
a0a = 0.5, a0sm = 0x10, a0ss = 0x05,