WIP: hopefully the server works

This commit is contained in:
Brendan Haines 2020-03-02 15:54:00 -07:00
parent 2ad585c0fb
commit 62952cfd5e

View File

@ -20,21 +20,15 @@ if __name__ == "__main__":
mux_io[2] = digitalio.DigitalInOut(board.D22) mux_io[2] = digitalio.DigitalInOut(board.D22)
mux_io[3] = digitalio.DigitalInOut(board.D23) mux_io[3] = digitalio.DigitalInOut(board.D23)
print("a")
for ii, io in enumerate(mux_io): for ii, io in enumerate(mux_io):
io.switch_to_output() io.switch_to_output()
print("b")
i2c = busio.I2C(board.SCL, board.SDA) i2c = busio.I2C(board.SCL, board.SDA)
adc = ADS.ADS1015(i2c) adc = ADS.ADS1015(i2c)
adc_mux = AnalogIn(adc, ADS.P0) adc_mux = AnalogIn(adc, ADS.P0)
white_cal = [0]*8 white_cal = [0]*8
black_cal = [5]*8 black_cal = [5]*8
print("c")
def get_reflectivity(chan): def get_reflectivity(chan):
chan = int(chan) chan = int(chan)
global mux_io global mux_io
@ -44,82 +38,49 @@ if __name__ == "__main__":
io.value = mux[ii] io.value = mux[ii]
return adc_mux.voltage return adc_mux.voltage
print("d")
def get_normalized_reflectivity(chan): def get_normalized_reflectivity(chan):
global white_cal global white_cal
global black_cal global black_cal
return (get_reflectivity(chan) - black_cal[chan]) / (white_cal[chan] - black_cal[chan]) return (get_reflectivity(chan) - black_cal[chan]) / (white_cal[chan] - black_cal[chan])
print("e")
brightness_idx = np.arange(8) brightness_idx = np.arange(8)
brightness = [get_normalized_reflectivity(c) for c in range(8)] brightness = [get_normalized_reflectivity(c) for c in range(8)]
print("f")
plt_source = ColumnDataSource(data=dict(x=brightness_idx, y=brightness)) plt_source = ColumnDataSource(data=dict(x=brightness_idx, y=brightness))
print("g")
# Set up plot # Set up plot
plot = figure(plot_height=400, plot_width=400, title="my sine wave", plot = figure(plot_height=400, plot_width=400, title="my sine wave",
tools="save", tools="save",
x_range=[0, 7], y_range=[0, 5]) x_range=[0, 7], y_range=[0, 5])
print("h")
plot.line('x', 'y', source=plt_source, line_width=3, line_alpha=0.6) plot.line('x', 'y', source=plt_source, line_width=3, line_alpha=0.6)
print("i")
def update_data(*args, **kwargs): def update_data(*args, **kwargs):
brightness = [get_normalized_reflectivity(c) for c in range(8)] brightness = [get_normalized_reflectivity(c) for c in range(8)]
plt_source.data = dict(x=brightness_idx, y=brightness) plt_source.data = dict(x=brightness_idx, y=brightness)
print("j") # def cal_white(*args, **kwargs):
# global white_cal
# white_cal = [get_reflectivity(c) for c in range(8)]
# update_data()
def cal_white(*args, **kwargs): # def cal_black(*args, **kwargs):
global white_cal # global black_cal
white_cal = [get_reflectivity(c) for c in range(8)] # black_cal = [get_reflectivity(c) for c in range(8)]
update_data() # update_data()
print("k") # cal_white_button = Button(label="Cal White")
# cal_white_button.on_click(cal_white)
# cal_black_button = Button(label="Cal Black")
# cal_black_button.on_click(cal_black)
def cal_black(*args, **kwargs): # controls = column(cal_white_button, cal_black_button)
global black_cal
black_cal = [get_reflectivity(c) for c in range(8)]
update_data()
print("l")
cal_white_button = Button(label="Cal White")
print("m")
cal_white_button.on_click(cal_white)
print("n")
cal_black_button = Button(label="Cal Black")
cal_black_button.on_click(cal_black)
print("o")
controls = column(cal_white_button, cal_black_button)
print("p")
curdoc().add_root(row(controls, plot, width=800))
print("r")
# curdoc().add_root(row(controls, plot, width=800))
curdoc().add_root(row(plot, width=800))
curdoc().title = "test" curdoc().title = "test"
print("s")
# while True: # while True:
# time.sleep(0.1) # time.sleep(0.1)
# update_data() # update_data()