diff --git a/cfg/senis3mh6.cfg b/cfg/senis3mh6.cfg index b841ac2..ebefc9b 100644 --- a/cfg/senis3mh6.cfg +++ b/cfg/senis3mh6.cfg @@ -1,12 +1,18 @@ [b] description = '3D hall sensor' class = secop_psi.senis.Teslameter3MH6 -usb = /dev/tty.usbserial-AI02VAD9 +usb = /dev/ttyUSB0 +nsample = 100 x = bx y = by z = bz probe_temp = ptemp box_temp = btemp +x_direct = dbx +y_direct = dby +z_direct = dbz +probe_temp_direct = dptemp +box_temp_direct = dbtemp [bx] description = 'x component' @@ -26,4 +32,24 @@ class = secop_psi.senis.Temperature [btemp] description = 'box temperature' -class = secop_psi.senis.Temperature \ No newline at end of file +class = secop_psi.senis.Temperature + +[dbx] +description = 'x component' +class = secop_psi.senis.Raw + +[dby] +description = 'y component' +class = secop_psi.senis.Raw + +[dbz] +description = 'z component' +class = secop_psi.senis.Raw + +[dptemp] +description = 'probe temperature' +class = secop_psi.senis.Raw + +[dbtemp] +description = 'box temperature' +class = secop_psi.senis.Temperature diff --git a/secop_psi/senis.py b/secop_psi/senis.py index 5dc4d80..ab2b867 100644 --- a/secop_psi/senis.py +++ b/secop_psi/senis.py @@ -275,7 +275,7 @@ class Teslameter3MH6(TeslameterBase): ranges = [self.RANGES[self.read_bytes(1)[0]]] * 3 result = ranges[0] else: - raise ValueError('bad reply to range query') + raise ValueError('bad reply to range query %s' % repr(reply)) self._x.range, self._y.range, self._z.range = ranges return result @@ -306,8 +306,9 @@ class Teslameter3MH6(TeslameterBase): if value < rng * 1.1: break self.write_bytes(b'mr%c' % code) - if self.read_bytes(6) != b'mrng:%c' % code: - status = 'bad reply to manual range command' + reply = self.read_bytes(6) + if reply != b'mrng:%c' % code: + status = 'bad reply to manual range command %s' % repr(reply) continue return rng raise ValueError(status)