Merge branch 'master' into python312

Author: davet2001

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

etc/99-tempsensor.rules

@@ -1,2 +1,3 @@
 SUBSYSTEMS=="usb", ACTION=="add", ATTRS{idVendor}=="0c45", ATTRS{idProduct}=="7401", MODE="666"
 SUBSYSTEMS=="usb", ACTION=="add", ATTRS{idVendor}=="0c45", ATTRS{idProduct}=="7402", MODE="666"
+SUBSYSTEMS=="usb", ACTION=="add", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="e025", MODE="666"

temperusb/device_library.py

@@ -59,6 +59,11 @@ def __init__(
         hum_sens_offsets=[4],
         type=TemperType.SI7021,
     ),
+    "TEMPerHumiV1.0": TemperConfig(
+        temp_sens_offsets=[2],
+        hum_sens_offsets=[4],
+        type=TemperType.FM75,
+    ),
     "TEMPerHumiV1.1": TemperConfig(
         temp_sens_offsets=[2],
         hum_sens_offsets=[4],
@@ -79,6 +84,11 @@ def __init__(
         hum_sens_offsets=None,
         type=TemperType.FM75,
     ),
+    "TEMPer2_V3.7": TemperConfig(
+        temp_sens_offsets=[2, 10],
+        hum_sens_offsets=None,
+        type=TemperType.FM75,
+    ),
     "TEMPer2V1.4": TemperConfig(
         temp_sens_offsets=[2],
         hum_sens_offsets=None,

temperusb/temper.py

@@ -19,6 +19,7 @@
 VIDPIDS = [
     (0x0c45, 0x7401),
     (0x0c45, 0x7402),
+    (0x1a86, 0xe025),
 ]
 REQ_INT_LEN = 8
 ENDPOINT = 0x82
@@ -193,6 +194,12 @@ def set_sensor_count(self, count):
 
         self._sensor_count = int(count)
 
+    def get_product(self):
+        """
+        Get device product name.
+        """
+        return self._device.product
+
     def get_ports(self):
         """
         Get device USB ports.

tests/test_temper.py

@@ -87,7 +87,17 @@
             [87.6],
         ],
         [
-            "TEMPer1F_H1_V1.4",
+            "TEMPerHumiV1.0",
+            0x0C45,
+            0x7401,
+            1,
+            b"\x01\x80\x33\x01\x00\x00\x00\x00",
+            b"\x00\x00\x20\x1A\x0C\x0C",  # 0x201A,0x0C0C converts to 32.1C,98.7% (fm75)
+            [32.1],
+            [98.7],
+        ],
+        [
+            "TEMPerHumiV1.1",
             0x0C45,
             0x7401,
             1,