kai/pounder_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

frontend: cleanup

Browse Source
This commit is contained in:
Robert Jördens 2019-05-28 09:49:07 +00:00
parent 6d927f99d9
commit cdb57d72fa
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
stabilizer.py
View File

@ -1,6 +1,6 @@
import json import json
import asyncio import asyncio
from collections import OrderedDict from collections import OrderedDict as OD
import logging import logging
import numpy as np import numpy as np
@ -17,14 +17,14 @@ class StabilizerConfig:
self.reader, self.writer = await asyncio.open_connection(host, port) self.reader, self.writer = await asyncio.open_connection(host, port)
async def set(self, channel, iir): async def set(self, channel, iir):
up = OrderedDict([("channel", channel), ("iir", iir.as_dict())]) up = OD([("channel", channel), ("iir", iir.as_dict())])
s = json.dumps(up, separators=(",", ":")) s = json.dumps(up, separators=(",", ":"))
assert "\n" not in s assert "\n" not in s
logger.debug("send %s", s) logger.debug("send %s", s)
self.writer.write(s.encode() + b"\n") self.writer.write(s.encode() + b"\n")
r = (await self.reader.readline()).decode() r = (await self.reader.readline()).decode()
logger.debug("recv %s", r) logger.debug("recv %s", r)
ret = json.loads(r, object_pairs_hook=OrderedDict) ret = json.loads(r, object_pairs_hook=OD)
if ret["code"] != 200: if ret["code"] != 200:
raise StabilizerError(ret) raise StabilizerError(ret)
return ret return ret
@ -40,7 +40,7 @@ class IIR:
self.y_max = float(1 << 15) - 1 self.y_max = float(1 << 15) - 1
def as_dict(self): def as_dict(self):
iir = OrderedDict() iir = OD()
iir["ba"] = [float(_) for _ in self.ba] iir["ba"] = [float(_) for _ in self.ba]
iir["y_offset"] = self.y_offset iir["y_offset"] = self.y_offset
iir["y_min"] = self.y_min iir["y_min"] = self.y_min
@ -70,7 +70,7 @@ class IIR:
self.ba[4] = 0. self.ba[4] = 0.
def set_x_offset(self, o): def set_x_offset(self, o):
b = self.ba[:3].sum() b = self.ba[:3].sum()*((1 << 15) - 1)
self.y_offset = b*o self.y_offset = b*o
@ -81,11 +81,12 @@ if __name__ == "__main__":
p.add_argument("-c", "--channel", default=0, type=int, p.add_argument("-c", "--channel", default=0, type=int,
help="Stabilizer channel to configure") help="Stabilizer channel to configure")
p.add_argument("-o", "--offset", default=0., type=float, p.add_argument("-o", "--offset", default=0., type=float,
help="X offset, in ADC LSB") help="input offset, in units of full scale")
p.add_argument("-p", "--proportional-gain", default=1., type=float, p.add_argument("-p", "--proportional-gain", default=1., type=float,
help="Proportional gain, in DAC LSB/ADC LSB") help="Proportional gain, in units of 1")
p.add_argument("-i", "--integral-gain", default=0., type=float, p.add_argument("-i", "--integral-gain", default=0., type=float,
help="Integral gain, in DAC LSB/(ADC LSB*s)") help="Integral gain, in units of Hz, "
"sign taken from proportional-gain")
args = p.parse_args() args = p.parse_args()
@ -99,6 +100,6 @@ if __name__ == "__main__":
i.set_x_offset(args.offset) i.set_x_offset(args.offset)
s = StabilizerConfig() s = StabilizerConfig()
await s.connect(args.stabilizer) await s.connect(args.stabilizer)
r = await s.set(0, i) r = await s.set(args.channel, i)
loop.run_until_complete(main()) loop.run_until_complete(main())