Skip to content

Commit 9fa3d5e

Browse files
authored
v1.1.2
version 1.1.2
2 parents d01dccd + 74d6929 commit 9fa3d5e

File tree

3 files changed

+31
-6
lines changed

3 files changed

+31
-6
lines changed

pyobs_flipro/fliprocamera.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ async def close(self) -> None:
8484

8585
def _log_device_info(self):
8686
log.info("Device info:")
87-
log.info(f" Friendly Name: {self._device.obj.cFriendlyName}")
88-
log.info(f" Serial No: {self._device.obj.cSerialNo}")
89-
log.info(f" Device Path: {self._device.obj.cDevicePath}")
90-
log.info(f" Conn Type: {self._device.obj.eConnType}")
87+
log.info(f" Friendly Name: {self._device.friendly_name}")
88+
log.info(f" Serial No: {self._device.serial_number}")
89+
log.info(f" Device Path: {self._device.device_path}")
90+
log.info(f" Conn Type: {self._device.conn_type}")
9191
log.info(f" Vendor ID: {self._device.obj.uiVendorId}")
9292
log.info(f" Prod ID: {self._device.obj.uiProdId}")
9393
log.info(f" USB Speed: {self._device.obj.eUSBSpeed}")

pyobs_flipro/fliprodriver.pyx

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,32 @@ cdef class DeviceInfo:
3131
@property
3232
def serial_number(self):
3333
return self.__decode(self.obj.cSerialNo)
34-
34+
35+
@property
36+
def device_path(self):
37+
return self.__decode(self.obj.cDevicePath)
38+
39+
@property
40+
def conn_type(self)
41+
return "USB" if self.obj.eConnType == FPRO_CONNECTION_USB else "FIBRE"
42+
43+
@property
44+
def vendor_id(self):
45+
return self.obj.uiVendorId
46+
47+
@property
48+
def prod_id(self):
49+
return self.obj.uiProdId
50+
51+
@property
52+
def usb_speed(self):
53+
return {
54+
FPRO_USB_FULLSPEED: "FULLSPEED",
55+
FPRO_USB_HIGHSPEED: "HIGHSPEED",
56+
FPRO_USB_SUPERSPEED: "SUPERSPEED"
57+
}[self.obj.eUSBSpeed]
58+
59+
3560
class DeviceCaps:
3661
def __init__(self, obj):
3762
self.uiSize = obj["uiSize"]

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "pyobs-flipro"
3-
version = "1.1.1"
3+
version = "1.1.2"
44
description = "pyobs module for FLIPRO cameras"
55
authors = ["Tim-Oliver Husser <[email protected]>"]
66
license = "MIT"

0 commit comments

Comments
 (0)