diff --git a/sensor_docs/.~lock.spektralni_odziv.ods# b/sensor_docs/.~lock.spektralni_odziv.ods# deleted file mode 100644 index e671e39..0000000 --- a/sensor_docs/.~lock.spektralni_odziv.ods# +++ /dev/null @@ -1 +0,0 @@ -,root,ryzenshine-kali,09.01.2019 18:42,file:///root/.config/libreoffice/4; \ No newline at end of file diff --git a/utils/getcdata.py b/utils/getcdata.py index 9314837..bd535ec 100644 --- a/utils/getcdata.py +++ b/utils/getcdata.py @@ -10,17 +10,18 @@ uartpath = '/dev/ttyUSB0' uartbaud = 115200 uarttout = 5 +wl = [410, 435, 460, 485, 510, 535, 560, 585, 610, 645, 680, 705, 730, 760, 810, 860, 900, 940] +responseorder = [i for i in 'RSTUVWGHIJKLABCDEF'] # works, do NOT touch! +realorder = [i for i in 'ABCDEFGHRISJTUVWKL'] + print('getcdata') print('This utility is part of the TeraHz project') -wavelens = pd.Series([410, 435, 460, 485, 510, 535, 560, 585, 610, 645, 680, 705, 730, 760, 810, 860, 900, 940], - ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'R', 'I', 'S', 'J', 'T', 'U', 'V', 'W', 'K', 'L']) +wavelens = pd.Series(realorder) wavetable = pd.DataFrame(columns=wavelens) with ser.Serial(uartpath, uartbaud, timeout=uarttout) as sensor: sensor.write(b'ATCDATA\n') - response = sensor.readline() - print(response.decode()) - parsed = parse('{:f}, {:f}, {:f}, {:f}, {:f}, {:f}, {:f}, {:f}, {:f}, {:f}, {:f}, {:f}, {:f}, {:f}, {:f}, {:f}, {:f}, {:f}, {:f} OK', response.decode()) - print(parsed) + response = pd.Series([float (i) for i in sensor.readline().decode()[:-3].split(',')]) # works, do not touch! + print(response)