Fix fwverpy

newaetech · Nov 24, 2024 · e9658e5 · e9658e5
1 parent 0cf057a
commit e9658e5
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/software/chipwhisperer/capture/scopes/OpenADC.py b/software/chipwhisperer/capture/scopes/OpenADC.py
@@ -142,15 +142,17 @@ def __init__(self):
         # self.disable_newattr()
 
     def _getFWPy(self):
+        from ...hardware.firmware.open_fw import fwver
         cw_type = self._getCWType()
-        if cw_type == "cwlite":
-            from ...hardware.firmware.cwlite import fwver
-        elif cw_type == "cw1200":
-            from ...hardware.firmware.cw1200 import fwver # type: ignore
-        elif cw_type in ["cwhusky", "cwhuskyplus"]:
-            from ...hardware.firmware.cwhusky import fwver # type: ignore
-        else:
-            raise ValueError('Unknown cw_type: %s' % cw_type)
+        fwver = fwver(cw_type)
+        # if cw_type == "cwlite":
+        #     from ...hardware.firmware.cwlite import fwver
+        # elif cw_type == "cw1200":
+        #     from ...hardware.firmware.cw1200 import fwver # type: ignore
+        # elif cw_type in ["cwhusky", "cwhuskyplus"]:
+        #     from ...hardware.firmware.cwhusky import fwver # type: ignore
+        # else:
+        #     raise ValueError('Unknown cw_type: %s' % cw_type)
         return fwver
 
     def reload_fpga(self, bitstream=None, reconnect=True, prog_speed=1E6):