fix device id/enumeration on linux

LJMUAstroecology · May 18, 2020 · 8368009 · 8368009
1 parent 9a35fb1
commit 8368009
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/flirpy/camera/boson.py b/flirpy/camera/boson.py
@@ -163,15 +163,15 @@ def find_video_device(self):
             path = "/sys/class/video4linux/"
             video_devices = [os.path.join(path, device) for device in os.listdir(path)]
             dev = []
-            for i, device in enumerate(video_devices):
+            for device in video_devices:
                 udev = pyudev.Devices.from_path(context, device)
 
                 try:
                     vid= udev.properties['ID_VENDOR_ID']
                     pid = udev.properties['ID_MODEL_ID']
 
-                    if vid.lower() == "09cb" and pid == "4007":
-                        dev.append(i)
+                    if vid.lower() == "09cb" and pid.lower() == "4007":
+                        dev.append(int(device.split('video')[-1]))
                 except KeyError:
                     pass
 

diff --git a/flirpy/camera/lepton.py b/flirpy/camera/lepton.py
@@ -55,15 +55,15 @@ def find_video_device(self):
             path = "/sys/class/video4linux/"
             video_devices = [os.path.join(path, device) for device in os.listdir(path)]
             dev = []
-            for i, device in enumerate(video_devices):
+            for device in video_devices:
                 udev = pyudev.Devices.from_path(context, device)
 
                 try:
                     vid= udev.properties['ID_VENDOR_ID']
                     pid = udev.properties['ID_MODEL_ID']
 
                     if vid.lower() == "1e4e" and pid.lower() == "0100":
-                        dev.append(i)
+                        dev.append(int(device.split('video')[-1]))
                 except KeyError:
                     pass