X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Finterface.py;h=eab484bc5ff21e97de268097d6465efb6184a9cb;hb=33f0a3642c7194040b3f8e5e81828ff5b511e0cf;hp=92f990c1bb458d43ece4ded4c5863adbb94affa7;hpb=31db1c97b7be5825cbb0a2e71b9df47757668d76;p=matches%2Fhonours.git

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 92f990c1..eab484bc 100755
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -32,8 +32,8 @@ calibrate = {
 }
 
 # TODO: Adjust aqcuisition parameters here
-aquire = { "DAC_Sweep" : "0.0 + 25.0*int(step/120)", # DAC Sweep value (t is in STEPS, not seconds!)
-	"ADC_Averages" : 200,
+aquire = { "DAC_Sweep" : "0.0 + 50.0*int(step)", # DAC Sweep value (t is in STEPS, not seconds!)
+	"ADC_Averages" : 2000,
 	#"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
@@ -45,7 +45,7 @@ aquire = { "DAC_Sweep" : "0.0 + 25.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,
@@ -77,6 +77,7 @@ parameters = odict.odict([
 	("602 0.001 Battery" , None), 
 	("ADC Regulator" , None),
 	("Sample", None),
+	("Sample Angle", None),
 	("Title" , None),
 	("Comment" , None),
 	("Data" , None),
@@ -206,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([4, 5, 0], getDate()+"/"+str(getTime())+".dat", None, 4000)
 		sweep += 1