Merge branch 'ps-jay-auto-detect-sensors-and-offset'

warper · warper · commit 4bac10cfdaeb · 2016-06-12T15:11:40.000+02:00
diff --git a/README.md b/README.md
@@ -282,6 +282,6 @@ The `snmp_passpersist` mode is Python 2 only because the upstream package is not
 * Calibration code by Joji Monma (@GM3D on Github)
 * Munin plugin by Alexander Schier (@allo- on Github)
 * PyPI package work and rewrite to `libusb1` by James Stewart (@amorphic on Github)
-* Reduced kernel messages and support multiple sensors by Philip Jay (@ps-jay on Github)
+* Reduced kernel messages, support multiple sensors, and support TEMPer1F_V1.3 by Philip Jay (@ps-jay on Github)
 * Python 3 compatibility and rewrite of cli.py to use argparse by Will Furnass (@willfurnass on Github)
 * TEMPerV1.4 support by Christian von Roques (@roques on Github)
diff --git a/temperusb/cli.py b/temperusb/cli.py
@@ -20,16 +20,10 @@ def parse_args():
     parser.add_argument("-s", "--sensor_ids", choices=['0', '1', 'all'],
                         help="IDs of sensors to use on the device " +
                         "(multisensor devices only)", default='0')
-    parser.add_argument("-S", "--sensor_count", choices=[1, 2], type=int,
-                        help="Specify the number of sensors on the device",
-                        default='1')
+    parser.add_argument("-S", "--sensor_count", type=int,
+                        help="Override auto-detected number of sensors on the device")
     args = parser.parse_args()
 
-    if args.sensor_ids == 'all':
-        args.sensor_ids = range(args.sensor_count)
-    else:
-        args.sensor_ids = [int(args.sensor_ids)]
-
     return args
 
 
@@ -47,8 +41,16 @@ def main():
     readings = []
 
     for dev in devs:
-        dev.set_sensor_count(args.sensor_count)
-        readings.append(dev.get_temperatures(sensors=args.sensor_ids))
+        if args.sensor_count is not None:
+            # Override auto-detection from args
+            dev.set_sensor_count(int(args.sensor_count))
+
+        if args.sensor_ids == 'all':
+            sensors = range(dev.get_sensor_count())
+        else:
+            sensors = [int(args.sensor_ids)]
+
+        readings.append(dev.get_temperatures(sensors=sensors))
 
     for i, reading in enumerate(readings):
         output = ''
diff --git a/temperusb/temper.py b/temperusb/temper.py
@@ -86,6 +86,7 @@ def __init__(self, device, sensor_count=1):
         if self._ports == None:
             self._ports = find_ports(device)
         self.set_calibration_data()
+        self.set_sensor_count(self.lookup_sensor_count())
         LOGGER.debug('Found device | Bus:{0} Ports:{1}'.format(
             self._bus, self._ports))
 
@@ -119,6 +120,35 @@ def set_calibration_data(self, scale=None, offset=None):
         else:
             raise RuntimeError("Must set both scale and offset, or neither")
 
+    def lookup_offset(self, sensor):
+        """
+        Lookup the number of sensors on the device by product name.
+        """
+        if self._device.product == 'TEMPer1F_V1.3':
+            # Has only 1 sensor, and it's at offset = 4
+            return 4
+
+        # All others follow this pattern - if not, contribute here: https://github.com/padelt/temper-python/issues
+        # Sensor 0 = Offset 2
+        # Sensor 1 = Offset 4
+        return (sensor + 1) * 2
+
+    def lookup_sensor_count(self):
+        """
+        Lookup the number of sensors on the device by product name.
+        """
+        if self._device.product == 'TEMPer1F_V1.3':
+            return 1
+
+        # All others are two - if not the case, contribute here: https://github.com/padelt/temper-python/issues
+        return 2
+
+    def get_sensor_count(self):
+        """
+        Get number of sensors on the device.
+        """
+        return self._sensor_count
+
     def set_sensor_count(self, count):
         """
         Set number of sensors on the device.
@@ -127,7 +157,7 @@ def set_sensor_count(self, count):
         """
         # Currently this only supports 1 and 2 sensor models.
         # If you have the 8 sensor model, please contribute to the
-        # discussion here: https://github.com/padelt/temper-python/issues/19
+        # discussion here: https://github.com/padelt/temper-python/issues
         if count not in [1, 2,]:
             raise ValueError('Only sensor_count of 1 or 2 supported')
 
@@ -261,7 +291,7 @@ def get_temperatures(self, sensors=None):
 
         # Interpret device response
         for sensor in _sensors:
-            offset = (sensor + 1) * 2
+            offset = self.lookup_offset(sensor)
             celsius = data[offset] + data[offset+1] / 256.0
             celsius = celsius * self._scale + self._offset
             results[sensor] = {
