Nice spectrum plot looking as it should, including photodiode response compensation.
This commit is contained in:
parent
e3bb458580
commit
ea10cdd1ed
5 changed files with 4945 additions and 21 deletions
File diff suppressed because one or more lines are too long
|
|
@ -14,10 +14,12 @@ if __name__ == '__main__':
|
|||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument('run_name', nargs='?', default='auto')
|
||||
parser.add_argument('buspirate_port', nargs='?', default='/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_AD01W1RF-if00-port0')
|
||||
parser.add_argument('-s', '--steps', type=int, nargs='?', default=100, help='Steps to run through')
|
||||
parser.add_argument('-s', '--steps', type=int, nargs='?', default=400, help='Steps to run through')
|
||||
parser.add_argument('-k', '--skip', type=int, nargs='?', default=2, help='Steps skip between measurements for shorter runtime')
|
||||
parser.add_argument('-d', '--database', default='spectra.sqlite3', help='sqlite3 database file to store results in')
|
||||
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('-w', '--wait', type=float, default=2.0, help='time to wait between samples in seconds')
|
||||
parser.add_argument('-o', '--oversample', type=int, default=32, help='oversampling ratio')
|
||||
parser.add_argument('-c', '--comment', help='run comment')
|
||||
args = parser.parse_args()
|
||||
|
||||
db = sqlite3.connect(args.database)
|
||||
|
|
@ -80,8 +82,8 @@ if __name__ == '__main__':
|
|||
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, timestamp) VALUES (?, ?)',
|
||||
(run_name, time.time()))
|
||||
cur.execute('INSERT INTO runs(name, comment, timestamp) VALUES (?, ?, ?)',
|
||||
(run_name, args.comment, time.time()))
|
||||
run_id = cur.lastrowid
|
||||
|
||||
print('Starting run {} "{}" at {:%y-%m-%d %H:%M:%S:%f}'.format(run_id, run_name, datetime.now()))
|
||||
|
|
@ -92,8 +94,7 @@ if __name__ == '__main__':
|
|||
bp.step()
|
||||
|
||||
bp.stepper_direction('up')
|
||||
for step in range(args.steps):
|
||||
bp.step()
|
||||
for step in range(0, args.steps+args.skip, args.skip): # Run one skip past end to capture both interval boundaries
|
||||
for led_val in [0, 1]:
|
||||
try:
|
||||
bp.led(led_val)
|
||||
|
|
@ -115,8 +116,10 @@ if __name__ == '__main__':
|
|||
raise
|
||||
except TypeError as e:
|
||||
print('Buspirate hiccup, ignoring:', e)
|
||||
for _ in range(args.skip):
|
||||
bp.step()
|
||||
|
||||
bp.stepper_direction('down')
|
||||
for _ in range(args.steps):
|
||||
for _ in range(args.steps+args.skip):
|
||||
bp.step()
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -17,7 +17,7 @@ if __name__ == '__main__':
|
|||
step, = db.execute(
|
||||
'SELECT MAX(step) FROM measurements WHERE run_id = (SELECT MAX(run_id) FROM runs)'
|
||||
).fetchone()
|
||||
return int(step)+1
|
||||
return int(step)
|
||||
|
||||
def step_gen():
|
||||
while True:
|
||||
|
|
@ -28,5 +28,9 @@ if __name__ == '__main__':
|
|||
time.sleep(args.update_delay)
|
||||
|
||||
bar = tqdm.tqdm(total=args.max_step)
|
||||
for step in step_gen():
|
||||
bar.update(step - bar.n)
|
||||
while True:
|
||||
try:
|
||||
for step in step_gen():
|
||||
bar.update(step - bar.n)
|
||||
except:
|
||||
time.sleep(args.update_delay)
|
||||
|
|
|
|||
|
|
@ -27,27 +27,32 @@ if __name__ == '__main__':
|
|||
|
||||
def stepper_step():
|
||||
bp.cs = 1
|
||||
time.sleep(0.005)
|
||||
#time.sleep(0.005)
|
||||
bp.cs = 0
|
||||
time.sleep(0.005)
|
||||
#time.sleep(0.005)
|
||||
|
||||
import curses
|
||||
screen = curses.initscr()
|
||||
curses.noecho()
|
||||
curses.cbreak()
|
||||
screen.keypad(True)
|
||||
i = 0
|
||||
try:
|
||||
while True:
|
||||
key = screen.getch()
|
||||
if key == ord('q'):
|
||||
break
|
||||
|
||||
screen.addstr('{: 4}'.format(i))
|
||||
|
||||
if key == curses.KEY_DOWN:
|
||||
stepper_direction_down()
|
||||
stepper_step()
|
||||
i -= 1
|
||||
elif key == curses.KEY_UP:
|
||||
stepper_direction_up()
|
||||
stepper_step()
|
||||
i += 1
|
||||
|
||||
finally:
|
||||
curses.nocbreak()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue