X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Finterface.py;fp=research%2FTCS%2Finterface.py;h=4705c9e48d0f66dec3e67e217ef1b823b015a9a6;hb=ebd894f79279423eed1885cc3370f522edb1d402;hp=cfff9d313e9179287bfedd66c02ff5a4398978c1;hpb=91691854b850254e754e68a7d90700e163a572d2;p=matches%2Fhonours.git diff --git a/research/TCS/interface.py b/research/TCS/interface.py index cfff9d31..4705c9e4 100755 --- a/research/TCS/interface.py +++ b/research/TCS/interface.py @@ -35,7 +35,7 @@ calibrate = { } # TODO: Adjust aqcuisition parameters here -aquire = { "DAC_Sweep" : "0.0 + 10.0*int(step)", # DAC Sweep value (t is in STEPS, not seconds!) +aquire = { "DAC_Sweep" : "0.0 + 50.0*int(step)", # DAC Sweep value (t is in STEPS, not seconds!) "ADC_Averages" : 200, #"ADC_Vi" : 5, # ADC channel to read back Vi (set by DAC) through #"ADC_Is" : 4, # ADC channel to read back Is through @@ -48,7 +48,7 @@ aquire = { "DAC_Sweep" : "0.0 + 10.0*int(step)", # DAC Sweep value (t is in STEP #Setup the serial connection parameters ser = serial.Serial( - port="/dev/ttyUSB1", # Modify as needed (note: in linux need to run `sudo chmod a+rw /dev/ttyUSBX' to set permissions) + port="/dev/ttyUSB0", # Modify as needed (note: in linux need to run `sudo chmod a+rw /dev/ttyUSBX' to set permissions) # Do not change the values below here (unless AVR butterfly is reprogrammed to use different values) baudrate=4800, @@ -62,7 +62,7 @@ ser = serial.Serial( #Using an ordered dictionary, so results will be determined (or prompted for) in this order. # Put things that are being changed a lot near the top of the list. parameters = odict.odict([ - ("Chamber Pressure" , None), # Chamber pressure now automatically determined + #("Chamber Pressure" , None), # Chamber pressure now automatically determined ("Venault Voltage" , None), ("Title" , None), ("Comment" , None),