Split BMP180 and VCNL4000 into component sensors.

Author: jburhenn

myDevices/devices/i2c.py

@@ -45,10 +45,10 @@
 SLAVES = [None for i in range(128)]
 
 class I2C(Bus):
-    def __init__(self, slave):
+    def __init__(self, slave, allow_duplicates=False):
         global SLAVES
 
-        if SLAVES[slave] != None:
+        if SLAVES[slave] != None and not allow_duplicates:
             raise Exception("SLAVE_ADDRESS_USED")
 
         self.channel = 0
@@ -63,7 +63,12 @@ def __init__(self, slave):
         if fcntl.ioctl(self.fd, I2C_SLAVE, self.slave):
             raise Exception("Error binding I2C slave 0x%02X" % self.slave)
 
-        SLAVES[self.slave] = self
+        # Since we now allow duplicates, e.g. BMP180_TEMPERATURE & BMP180_PRESSURE, we might need to 
+        # change the SLAVES list to store a reference count or base class name as a way of making sure
+        # only the same base sensor type is duplicated. That doesn't seem to be an issue currently though
+        # so for now we just ignore the SLAVES check.
+        if not allow_duplicates:
+            SLAVES[self.slave] = self
 
     def __str__(self):
         return "I2C(slave=0x%02X)" % self.slave

myDevices/devices/sensor/__init__.py

@@ -187,10 +187,10 @@ def getHumidityPercent(self):
         return self.__getHumidity__() * 100
 
 DRIVERS = {}
-DRIVERS["bmp085"] = ["BMP085", "BMP180"]
+DRIVERS["bmp085"] = ["BMP085", "BMP180", "BMP180_TEMPERATURE", "BMP180_PRESSURE"]
 DRIVERS["onewiretemp"] = ["DS1822", "DS1825", "DS18B20", "DS18S20", "DS28EA00"]
 DRIVERS["tmpXXX"] = ["TMP36", "TMP75", "TMP102", "TMP275"]
 DRIVERS["tslXXXX"] = ["TSL2561", "TSL2561CS", "TSL2561T", "TSL4531", "TSL45311", "TSL45313", "TSL45315", "TSL45317"]
-DRIVERS["vcnl4000"] = ["VCNL4000"]
+DRIVERS["vcnl4000"] = ["VCNL4000", "VCNL4000_LUMINOSITY", "VCNL4000_DISTANCE"]
 DRIVERS["hytXXX"] = ["HYT221"]
 

myDevices/devices/sensor/bmp085.py

@@ -18,9 +18,12 @@
 from myDevices.devices.sensor import Temperature, Pressure
 
 class BMP085(I2C, Temperature, Pressure):
-    def __init__(self, altitude=0, external=None):
-        I2C.__init__(self, 0x77)
-        Pressure.__init__(self, altitude, external)
+    def __init__(self, altitude=0, external=None, temperature=True, pressure=True):
+        self.temperature = temperature
+        self.pressure = pressure
+        I2C.__init__(self, 0x77, True)
+        if self.pressure:
+            Pressure.__init__(self, altitude, external)
 
         self.ac1 = self.readSignedInteger(0xAA)
         self.ac2 = self.readSignedInteger(0xAC)
@@ -38,7 +41,12 @@ def __str__(self):
         return "BMP085"
 
     def __family__(self):
-        return [Temperature.__family__(self), Pressure.__family__(self)]
+        family = []
+        if self.temperature:
+            family.append(Temperature.__family__(self))
+        if self.pressure:
+            family.append(Pressure.__family__(self))
+        return family
 
     def readUnsignedInteger(self, address):
         d = self.readRegisters(address, 2)
@@ -100,9 +108,22 @@ def __getPascal__(self):
         return int(p)
 
 class BMP180(BMP085):
-    def __init__(self, altitude=0, external=None):
-        BMP085.__init__(self, altitude, external)
+    def __init__(self, altitude=0, external=None, temperature=True, pressure=True):
+        BMP085.__init__(self, altitude, external, temperature, pressure)
 
     def __str__(self):
         return "BMP180"
 
+class BMP180_TEMPERATURE(BMP180):
+    def __init__(self, altitude=0, external=None):
+        BMP180.__init__(self, altitude, external, temperature=True, pressure=False)
+
+    def __str__(self):
+        return "BMP180_TEMPERATURE"
+
+class BMP180_PRESSURE(BMP180):
+    def __init__(self, altitude=0, external=None):
+        BMP180.__init__(self, altitude, external, temperature=False, pressure=True)
+
+    def __str__(self):
+        return "BMP180_PRESSURE"

myDevices/devices/sensor/vcnl4000.py

@@ -23,7 +23,7 @@
 from myDevices.devices.i2c import I2C
 from myDevices.devices.sensor import Luminosity, Distance
 from myDevices.utils.types import toint
-from myDevices.utils.logger import debug 
+from myDevices.utils.logger import debug
 
 class VCNL4000(I2C, Luminosity, Distance):
     REG_COMMAND           = 0x80
@@ -52,8 +52,10 @@ class VCNL4000(I2C, Luminosity, Distance):
     MASK_PROX_READY      = 0b00100000
     MASK_AMB_READY       = 0b01000000
 
-    def __init__(self, slave=0b0010011, current=20, frequency=781, prox_threshold=15, prox_cycles=10, cal_cycles= 5):
-        I2C.__init__(self, toint(slave))
+    def __init__(self, slave=0b0010011, current=20, frequency=781, prox_threshold=15, prox_cycles=10, cal_cycles=5, luminosity=True, distance=True):
+        self.luminosity = luminosity
+        self.distance = distance
+        I2C.__init__(self, toint(slave), True)
         self.setCurrent(toint(current))
         self.setFrequency(toint(frequency))
         self.prox_threshold = toint(prox_threshold)
@@ -68,7 +70,12 @@ def __str__(self):
         return "VCNL4000(slave=0x%02X)" % self.slave
 
     def __family__(self):
-        return [Luminosity.__family__(self), Distance.__family__(self)]
+        family = []
+        if self.luminosity:
+            family.append(Luminosity.__family__(self))
+        if self.distance:
+            family.append(Distance.__family__(self))
+        return family
 
     def __setProximityTiming__(self):
         self.writeRegister(self.REG_PROX_ADJUST, self.VAL_MOD_TIMING_DEF)
@@ -85,12 +92,10 @@ def calibrate(self):
         self.offset = self.__measureOffset__()
         debug ("VCNL4000: offset = %d" % (self.offset))
         return self.offset
-
 
     def setCurrent(self, current):
         self.current = current
         self.__setCurrent__()
-        
 
     def getCurrent(self):
         return self.__getCurrent__()
@@ -141,9 +146,20 @@ def __getCurrent__(self):
         return bits_current * 10
 
     def __getLux__(self):
-        self.writeRegister(self.REG_COMMAND, self.VAL_START_AMB)
-        while not (self.readRegister(self.REG_COMMAND) & self.MASK_AMB_READY):
-            time.sleep(0.001)
+        count = 0
+        while count < 5:
+            # This try catch loop is a hacky fix for issues when making an initial ambient light reading
+            # using a VCNL4010 sensor. It should be removed when true VCNL4010 support is added.
+            try:
+                self.writeRegister(self.REG_COMMAND, self.VAL_START_AMB)
+                while not (self.readRegister(self.REG_COMMAND) & self.MASK_AMB_READY):
+                    time.sleep(0.001)
+                count = 10
+            except OSError as ex:
+                count = count + 1
+                time.sleep(0.05)
+                if count >= 5:
+                    raise ex
         light_bytes = self.readRegisters(self.REG_AMB_RESULT_HIGH, 2)
         light_word = light_bytes[0] << 8 | light_bytes[1]
         return self.__calculateLux__(light_word)
@@ -206,6 +222,19 @@ def __readProximityCounts__(self):
         while not (self.readRegister(self.REG_COMMAND) & self.MASK_PROX_READY):
             time.sleep(0.001)
         proximity_bytes = self.readRegisters(self.REG_PROX_RESULT_HIGH, 2)
-        debug ("VCNL4000: prox raw value = %d" % (proximity_bytes[0] << 8 | proximity_bytes[1]))
+        debug("VCNL4000: prox raw value = %d" % (proximity_bytes[0] << 8 | proximity_bytes[1]))
         return (proximity_bytes[0] << 8 | proximity_bytes[1])
-    
+    
+class VCNL4000_LUMINOSITY(VCNL4000):
+    def __init__(self):
+        VCNL4000.__init__(self, luminosity=True, distance=False)
+
+    def __str__(self):
+        return "VCNL4000_LUMINOSITY"
+
+class VCNL4000_DISTANCE(VCNL4000):
+    def __init__(self):
+        VCNL4000.__init__(self, luminosity=False, distance=True)
+
+    def __str__(self):
+        return "VCNL4000_DISTANCE"