From ca6a4353cfe9c36350bd9c3b6abe96eaa5d38e89 Mon Sep 17 00:00:00 2001 From: jaseg Date: Tue, 24 Apr 2018 10:07:25 +0200 Subject: More pretty graphs, and initial correction calculation --- firmware/offset_test.py | 51 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 17 deletions(-) (limited to 'firmware/offset_test.py') diff --git a/firmware/offset_test.py b/firmware/offset_test.py index fca565b..63fd6ba 100644 --- a/firmware/offset_test.py +++ b/firmware/offset_test.py @@ -11,25 +11,17 @@ if __name__ == '__main__': import argparse parser = argparse.ArgumentParser() - parser.add_argument('channels', type=str, help='olsndot channels to test, format: 0-3,5,7,8-10') - parser.add_argument('run_name', nargs='?', default=None) + parser.add_argument('run_name', nargs='?', default='auto') parser.add_argument('olsndot_port', nargs='?', default='/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_A50285BI-if00-port0') parser.add_argument('buspirate_port', nargs='?', default='/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_AD01W1RF-if00-port0') + parser.add_argument('-c', '--channels', nargs='?', default='auto', help='olsndot channels to test, format: 0-3,5,7,8-10') parser.add_argument('-d', '--database', default='results.sqlite3', help='sqlite3 database file to store results in') parser.add_argument('-m', '--mac', type=int, default=0xDEBE10BB, help='olsndot MAC address') parser.add_argument('-w', '--wait', type=float, default=0.1, help='time to wait between samples in seconds') parser.add_argument('-o', '--oversample', type=int, default=16, help='oversampling ratio') + parser.add_argument('-b', '--bits', type=int, default=None, help='number of bits to sample') args = parser.parse_args() - def parse_channels(channels): - for spec in channels.split(','): - if str.isnumeric(spec): - yield int(spec) - else: - low, high = spec.split('-') - yield from range(int(low), int(high)+1) - channels = list(parse_channels(args.channels)) - db = sqlite3.connect(args.database) db.execute(""" CREATE TABLE IF NOT EXISTS runs ( @@ -55,18 +47,43 @@ if __name__ == '__main__': uut = Olsndot(args.mac) d = Driver(args.olsndot_port, devices=[uut]) - uut.send_framebuf([0]*uut.nchannels) print('Connected to uut:', uut) run_name = args.run_name - if args.run_name is None: - names = [ n[4:] for n, in db.execute('SELECT name FROM runs WHERE name LIKE "test%"').fetchall() ] - run_name = 'test{}'.format(1+max(int(n) if str.isnumeric(n) else 0 for n in names)) + if not str.isnumeric(args.run_name[-1]): + names = [ n[len(run_name):] for n, in db.execute( + 'SELECT name FROM runs WHERE name LIKE ?||"%"', (run_name,)).fetchall() ] + names.append('0') # in case we get no results + run_name += str(1+max(int(n) if str.isnumeric(n) else 0 for n in names)) with db: cur = db.cursor() cur.execute('INSERT INTO runs(name, uut_mac, timestamp) VALUES (?, ?, ?)', (run_name, args.mac, time.time())) run_id = cur.lastrowid + + nbits = args.bits if args.bits is not None else uut.nbits + + def parse_channels(channels): + for spec in channels.split(','): + if str.isnumeric(spec): + yield int(spec) + else: + low, high = spec.split('-') + yield from range(int(low), int(high)+1) + if args.channels == 'auto': + for i in range(uut.nchannels): + fb = [0]*uut.nchannels + fb[i] = 0xffff; + uut.send_framebuf(fb) + time.sleep(0.2) + if bp.adc_value > 0.5: + break; + else: + raise ValueError('Cannot find active channel') + channels = [i] + else: + channels = list(parse_channels(args.channels)) + print('Starting run {} "{}" at {:%y-%m-%d %H:%M:%S:%f}'.format(run_id, run_name, datetime.now())) print('mac={:08x} channels={}'.format(args.mac, ','.join('{:02d}'.format(ch) for ch in channels))) print('[measurement id] " " [hex setpoint value] "(" [float duty cycle] ")" " " [reading (V)]') @@ -84,7 +101,7 @@ if __name__ == '__main__': print('Zero cal: {:5.4f}V stdev={:5.4f}V'.format(mean, stdev)) for ch in channels: - for i in range(uut.nbits): + for i in range(nbits): fb = [0]*uut.nchannels val = 1<