use a more sophisticated solid fetch logic

bf6ef84a · Juan David González Cobas · 1b97efa7 · bf6ef84a
Commit bf6ef84a authored Nov 09, 2021 by Juan David González Cobas
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 3 deletions

oautest software/lib/oautest +21 -3

No files found.
--- a/software/lib/oautest
+++ b/software/lib/oautest
@@ -44,14 +44,32 @@ class OauTest(cmd.Cmd):

    def __init__(self):
        cmd.Cmd.__init__(self)
-        self.solib = './liboasis-usb-att.so'
-        self.history = os.path.expanduser('~/.oau_history')
-        self.api = CDLL(self.solib)
+
        self.lun = None
        self.fd = None
        self.nchannels = None
+
+        self.load_solib()
        self.fill_devarray()

+    def load_solib(self):
+        """try to load attn dyn library from script dir or ../lib."""
+
+        self.solib = './liboasis-usb-att.so'
+        scriptdir = os.path.dirname(os.path.realpath(__file__))
+        rootdir = os.path.dirname(scriptdir)
+        libdir = os.path.join(rootdir, 'lib', self.solib)
+        self.history = os.path.expanduser('~/.oau_history')
+        try:
+            self.api = CDLL(self.solib)
+        except OSError as e:
+            pass
+        try:
+            self.api = CDLL(libdir)
+        except OSError as e:
+            print('cannot load oattn solib, exiting')
+            exit()
+
    def fill_devarray(self):
        self.api.oau_get_devarray.restype = POINTER(DevArray)
        self.devarray = self.api.oau_get_devarray(b'1556', b'0443')