Update existing tests to use new waveform generators

bessman · bessman · commit 5ec341c587da · 2020-11-05T21:05:34.000+01:00
diff --git a/tests/test_logic_analyzer.py b/tests/test_logic_analyzer.py
@@ -13,7 +13,7 @@
 import PSL.commands_proto as CP
 from PSL import logic_analyzer
 from PSL import packet_handler
-from PSL import sciencelab
+from PSL.waveform_generator import PWMGenerator
 
 EVENTS = 2495
 FREQUENCY = 1e5
@@ -31,15 +31,13 @@ def la(handler, request):
     In integration test mode, this function also enables the PWM output.
     """
     if not isinstance(handler, packet_handler.MockHandler):
-        psl = sciencelab.connect()
-        psl.H.disconnect()
-        psl.H = handler
-        enable_pwm(psl, request.node.name)
+        pwm = PWMGenerator(handler)
+        enable_pwm(pwm, request.node.name)
         handler._logging = True
     return logic_analyzer.LogicAnalyzer(handler)
 
 
-def enable_pwm(psl: sciencelab.ScienceLab, test_name: str):
+def enable_pwm(pwm: PWMGenerator, test_name: str):
     """Enable PWM output for integration testing."""
     low_frequency_tests = (
         "test_capture_four_low_frequency",
@@ -55,15 +53,11 @@ def enable_pwm(psl: sciencelab.ScienceLab, test_name: str):
     else:
         frequency = FREQUENCY
 
-    psl.sqrPWM(
-        freq=frequency,
-        h0=DUTY_CYCLE,
-        p1=0,
-        h1=DUTY_CYCLE,
-        p2=0,
-        h2=DUTY_CYCLE,
-        p3=0,
-        h3=DUTY_CYCLE,
+    pwm.generate(
+        ["SQ1", "SQ2", "SQ3", "SQ4"],
+        frequency,
+        DUTY_CYCLE,
+        0,
     )
 
 
diff --git a/tests/test_oscilloscope.py b/tests/test_oscilloscope.py
@@ -10,7 +10,7 @@
 
 from PSL import oscilloscope
 from PSL import packet_handler
-from PSL import sciencelab
+from PSL.waveform_generator import WaveformGenerator
 
 FREQUENCY = 1000
 MICROSECONDS = 1e-6
@@ -24,10 +24,8 @@ def scope(handler):
     In integration test mode, this function also enables the analog output.
     """
     if not isinstance(handler, packet_handler.MockHandler):
-        psl = sciencelab.connect()
-        psl.H.disconnect()
-        psl.H = handler
-        psl.set_sine1(FREQUENCY)
+        wave = WaveformGenerator(handler)
+        wave.generate(["SI1", "SI2"], FREQUENCY)
         handler._logging = True
     return oscilloscope.Oscilloscope(handler)
 
