Merge pull request #220 from sandialabs/save_metadata_GPIBInstrument

fix json encoder bug for GPIBInstrument objects

Author: rsbrost

pyscan/general/pyscan_json_encoder.py

@@ -2,6 +2,15 @@
 import numpy as np
 from pyscan.general.item_attribute import ItemAttribute
 from pyscan.drivers.instrument_driver import InstrumentDriver
+from pyvisa.resources import (
+    # FirewireInstrument,
+    GPIBInstrument,
+    # PXIInstrument,
+    SerialInstrument,
+    TCPIPInstrument,
+    USBInstrument,
+    # VXIInstrument,
+)
 import inspect
 from pathlib import Path, WindowsPath
 
@@ -70,5 +79,20 @@ def default(self, obj, debug=False):
             return str(obj)
         elif type(obj) is type(iter(range(1))):
             return list(obj)
+        elif isinstance(
+            obj,
+            (
+                # FirewireInstrument,
+                GPIBInstrument,
+                # PXIInstrument,
+                SerialInstrument,
+                TCPIPInstrument,
+                USBInstrument,
+                # VXIInstrument,
+            ),
+        ):
+            if debug is True:
+                print(f"obj {obj} is a pyvisa instrument, returning resource name.")
+            return obj.resource_name
         else:
             return super().default(obj)