Added check for presence of second module before querying its model type

eez-open · Nov 19, 2020 · b9c10db · b9c10db
1 parent 618b1df
commit b9c10db
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/scripts/CapReform/CapReform.py b/scripts/CapReform/CapReform.py
@@ -200,15 +200,16 @@ def main():
     scpi('SYST:DIGITAL:PIN4:POLARITY POS')
     scpi('SYST:DIG:OUTP:DATA 4,0')
 
-    # TODO: check & setup stuff
-    # set maximum values, check channel/module types/configure serial if possible....
-    ch1Model = scpi("SYSTem:CHANnel:MODel? ch1")
-    ch2Model = scpi("SYSTem:CHANnel:MODel? ch2")
-    if ch1Model.startswith("DCP405") and ch2Model.startswith("DCP405"):
+    if scpi("SYSTem:CHANnel:COUNt?") >= 2:
+      ch1Model = scpi("SYSTem:CHANnel:MODel? ch1")
+      ch2Model = scpi("SYSTem:CHANnel:MODel? ch2")
+      if ch1Model.startswith("DCP405") and ch2Model.startswith("DCP405"):
         scpi("INST:COUP:TRAC SER")
-    else:
+      else:
         scpi("INST:COUP:TRAC NONE")
-
+    else:
+      scpi("INST:COUP:TRAC NONE")
+
     scpi("INST ch1")
     module_max_volt = float(scpi("VOLT? MAX"))
     scpi("OUTP 0")