Refactored JDS6600 tests, serial connection is no longer used

1 files changed, 23 insertions, 15 deletions

diff --git a/lab_control/jds6600.py b/lab_control/jds6600.py
index 32f12af..5f072af 100644
--- a/lab_control/jds6600.py
+++ b/lab_control/jds6600.py
@@ -2,9 +2,8 @@
 Implements partial support for Joy-IT JDS6600 function generator.
 """
 
-import serial
-
 from lab_control.function_generator import FunctionGenerator
+from lab_control.connection.serial_connection import SerialConnection
 
 def _checkChannel(channel: int):
     assert channel in JDS6600.AVAILABLE_CHANNELS, f"JDS6600: Invalid channel {channel}"
@@ -23,32 +22,41 @@ class JDS6600(FunctionGenerator):
     """
     AVAILABLE_CHANNELS = [1, 2]
 
-    def __init__(self, portName):
+    # TODO type hints
+    def __init__(self, portName: str, overrideConnection=None):
         super().__init__()
-        self._port = serial.Serial(portName)
-        self._port.baudrate = 115200
-        self._port.bytesize = serial.EIGHTBITS
-        self._port.stopbits = serial.STOPBITS_ONE
-        self._port.parity = serial.PARITY_NONE
+
+        config = {
+            "baudrate" : 115200,
+            "bytesize" : 8,
+            "stopbits" : 1,
+            "parity" : "N"
+        }
+
+        if overrideConnection is not None:
+            self._connection = overrideConnection
+        else:
+            self._connection = SerialConnection(portName)
+
+        self._connection.configure(config)
 
     def closePort(self) -> None:
         """
         Close the serial port. Instances of this class
         are no longer usable after this is called.
         """
-        self._port.close()
+        self._connection.close()
+
+    def _sendRequest(self, opcode: str, args: str="") -> str:
+        request = f":{opcode}={args}.\r\n"
+        response = self._connection.send(request)
+        return response.strip()
 
     def _query(self, opcode: str) -> list[str]:
         # response format: ":{opcode}={v1},{v2}."
         response = self._sendRequest(opcode)
         return response[5:-1].split(",")
 
-    def _sendRequest(self, opcode: str, args: str="") -> str:
-        request = f":{opcode}={args}.\r\n"
-        self._port.write(request.encode())
-        responseRaw = self._port.readline()
-        return responseRaw.decode().strip()
-
     def setOn(self, channel: int) -> None:
         _checkChannel(channel)