diff options
Diffstat (limited to 'eitControl.py')
| -rw-r--r-- | eitControl.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/eitControl.py b/eitControl.py index e9cda92..d4ae123 100644 --- a/eitControl.py +++ b/eitControl.py @@ -18,7 +18,7 @@ import csv import ue9qol from funcGenerator import Sweeper, SinGen, TriangleGen, RampGen, PulseGen -from rfGen import rfGenLMX2487 +import rfGen class Experiment: @@ -55,15 +55,14 @@ class Experiment: if args.test: print("Test mode, run with fake hardware") self.hardware['LabJack'] = ue9qol.UE9qolDummy() + self.hardware['rfGen'] = rfGen.rfGenLMX2487Dummy(port='/dev/ttyUSB0', speed=115200, timeout=1) else: self.hardware['LabJack'] = ue9qol.UE9qol() - - if platform.system() == 'Linux': - rf=rfGenLMX2487(port='/dev/ttyUSB0', speed=115200, timeout=1) - else: - rf=rfGenLMX2487(port='COM5', speed=115200, timeout=1) - self.hardware['rfGen'] = rf - + if platform.system() == 'Linux': + rf=rfGen.rfGenLMX2487(port='/dev/ttyUSB0', speed=115200, timeout=1) + else: + rf=rfGen.rfGenLMX2487(port='COM5', speed=115200, timeout=1) + self.hardware['rfGen'] = rf def guiSetup(self, root): self.cntrlPannel=ttk.LabelFrame(root, text='controls') |