Automatic commit. Thu Sep 13 12:00:07 WST 2012

[matches/honours.git] / research / TCS / interface.py

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index b008284..5e8430e 100755 (executable)
--- 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 + 50.0*int(step)", # DAC Sweep value (t is in STEPS, not seconds!)
+aquire = { "DAC_Sweep" : "0.0 + 10.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 + 50.0*int(step)", # DAC Sweep value (t is in STEP
 
 #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,
@@ -218,8 +218,8 @@ def main():
        # Experiment
        # TODO: Modify data to record here
        sweep = 1
-       for i in range(0,5):
-       #while True:
+       #for i in range(0,5):
+       while True:
                os.system("mkdir -p " + getDate())
                record_data([5], getDate()+"/"+str(getTime())+".dat", None, 4001)
                sweep += 1