X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Finterface.py;h=55538015be8f729e8df69feec2b54cdf3a7dafe1;hb=99ba9c4410dd508341c7069ce00bab5aac444f09;hp=5eb431c4766b2f6bb118e2f2c8a35208762763e7;hpb=91a05d0f816b5f8ccb1f123ae1dcbc3c853afb17;p=matches%2Fhonours.git

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 5eb431c4..55538015 100755
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -32,12 +32,12 @@ calibrate = {
 }
 
 # TODO: Adjust aqcuisition parameters here
-aquire = { "DAC_Sweep" : "0.0 + 10.0*int(step/120)", # DAC Sweep value (t is in STEPS, not seconds!)
+aquire = { "DAC_Sweep" : "0.0 + 10.0*int(step/10)", # 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
 	#"ADC_Ie" : 4, # ADC channel to read back Ie through
-	"DAC_Settle" : 0.0, # Time in seconds to wait for DAC to stabilise
+	"DAC_Settle" : 2.0, # Time in seconds to wait for DAC to stabilise
 	#"response_wait" : 0.2, # Time to wait in seconds between sending data and reading back
 	"start_date" : None,
 	"open_files" : []
@@ -45,7 +45,7 @@ aquire = { "DAC_Sweep" : "0.0 + 10.0*int(step/120)", # DAC Sweep value (t is in
 
 #Setup the serial connection parameters
 ser = serial.Serial(
-	port="/dev/ttyUSB0", # Modify as needed (note: in linux need to run `sudo chmod a+rw /dev/ttyUSBX' to set permissions)
+	port="/dev/ttyUSB1", # 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,
@@ -207,7 +207,7 @@ def main():
 	sweep = 1
 	while True:
 		os.system("mkdir -p " + getDate())
-		record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, 4000)
+		record_data([5, 0], getDate()+"/"+str(getTime())+".dat", None, 4000)
 		sweep += 1