Merge branch 'development' into feature/plugins

Author: jburhenn

myDevices/__init__.py

@@ -1,4 +1,5 @@
 """
 This package contains the Cayenne agent, which is a full featured client for the Cayenne IoT project builder: https://cayenne.mydevices.com. It sends system information as well as sensor and actuator data and responds to actuator messages initiated from the Cayenne dashboard and mobile apps.
 """
-__version__ = '2.0.2'
+__version__ = '2.0.3'
+

myDevices/devices/digital/gpio.py

@@ -40,6 +40,8 @@
 class NativeGPIO(Singleton, GPIOPort):
     IN = 0
     OUT = 1
+    OUT_LOW = 2
+    OUT_HIGH = 3
 
     ASUS_GPIO = 44
 
@@ -310,11 +312,9 @@ def __setFunction__(self, channel, value):
         self.checkDigitalChannelExported(channel)
         self.checkPostingFunctionAllowed()
         try:
-            if value == self.IN:
-                value = 'in'
-            else:
-                value = 'out'
-            try:               
+            value_dict = {self.IN: 'in', self.OUT: 'out', self.OUT_LOW: 'low', self.OUT_HIGH: 'high'}
+            value = value_dict[value]
+            try:
                 self.functionFile[channel].write(value)
                 self.functionFile[channel].seek(0)
             except:

myDevices/devices/digital/helper.py

@@ -71,9 +71,17 @@ def __str__(self):
         return "MotionSensor"
 
 class DigitalActuator(DigitalSensor):
-    def __init__(self, gpio, channel, invert=False):
+    def __init__(self, gpio, channel, invert=False, last_state=None):
         DigitalSensor.__init__(self, gpio, channel, invert)
-        self.gpio.setFunction(self.channel, GPIO.OUT)
+        function = GPIO.OUT
+        if gpio == 'GPIO' and last_state is not None:
+            if self.invert:
+                last_state = int(not last_state)
+            if last_state == 1:
+                function = GPIO.OUT_HIGH
+            elif last_state == 0:
+                function = GPIO.OUT_LOW
+        self.gpio.setFunction(self.channel, function)
 
     def __str__(self):
         return "DigitalActuator"
@@ -90,30 +98,29 @@ def write(self, value):
         return self.read()
 
 class LightSwitch(DigitalActuator):        
-    def __init__(self, gpio, channel, invert=False):
-        DigitalActuator.__init__(self, gpio, channel, invert)
+    def __init__(self, gpio, channel, invert=False, last_state=None):
+        DigitalActuator.__init__(self, gpio, channel, invert, last_state)
 
     def __str__(self):
         return "LightSwitch"
 
 class MotorSwitch(DigitalActuator):        
-    def __init__(self, gpio, channel, invert=False):
-        DigitalActuator.__init__(self, gpio, channel, invert)
+    def __init__(self, gpio, channel, invert=False, last_state=None):
+        DigitalActuator.__init__(self, gpio, channel, invert, last_state)
 
     def __str__(self):
         return "MotorSwitch"
 
 class RelaySwitch(DigitalActuator):        
-    def __init__(self, gpio, channel, invert=False):
-        DigitalActuator.__init__(self, gpio, channel, invert)
+    def __init__(self, gpio, channel, invert=False, last_state=None):
+        DigitalActuator.__init__(self, gpio, channel, invert, last_state)
 
     def __str__(self):
         return "RelaySwitch"
 
 class ValveSwitch(DigitalActuator):        
-    def __init__(self, gpio, channel, invert=False):
-        DigitalActuator.__init__(self, gpio, channel, invert)
+    def __init__(self, gpio, channel, invert=False, last_state=None):
+        DigitalActuator.__init__(self, gpio, channel, invert, last_state)
 
     def __str__(self):
         return "ValveSwitch"
-

myDevices/devices/manager.py

@@ -8,14 +8,20 @@
 from myDevices.utils.config import Config
 from myDevices.devices import serial, digital, analog, sensor
 from myDevices.devices.instance import DEVICES
-from myDevices.devices.onewire import detectOneWireDevices
+from myDevices.devices.onewire import detectOneWireDevices, deviceExists, FAMILIES
 
 PACKAGES = [serial, digital, analog, sensor]
 DYNAMIC_DEVICES  = {}
 DEVICES_JSON_FILE = "/etc/myDevices/devices.json"
 
 mutex = RLock()
 
+def missingOneWireDevice(device):
+    if device['class'] in FAMILIES.values() and ('slave' not in device['args'] or not deviceExists(device['args']['slave'])):
+        logger.info('1-wire device does not exist: {}, {}'.format(device['class'], device['args']['slave']))
+        return True
+    return False
+
 def deviceDetector():
     logger.debug('deviceDetector')
     try:
@@ -30,6 +36,9 @@ def deviceDetector():
             if not found:
                 if addDevice(dev['name'], dev['device'], dev['description'], dev['args'], "auto") > 0:
                     saveDevice(dev['name'], int(time()))
+        missing = [key for key, value in DEVICES.items() if missingOneWireDevice(value)]
+        for dev in missing:
+            removeDevice(dev)
     except Exception as e:
         logger.error("Device detector: %s" % e)
 
@@ -49,7 +58,7 @@ def findDeviceClass(name):
                     return getattr(module, name)
     return None
 
-def saveDevice(name, install_date):
+def saveDevice(name, install_date=None):
     with mutex:
         logger.debug('saveDevice: ' + str(name))
         if name not in DEVICES:
@@ -58,7 +67,8 @@ def saveDevice(name, install_date):
         if DEVICES[name]['origin'] == 'manual':
             return
         DYNAMIC_DEVICES[name] = DEVICES[name]
-        DEVICES[name]['install_date'] = install_date
+        if install_date:
+            DEVICES[name]['install_date'] = install_date
         json_devices = getJSON(DYNAMIC_DEVICES)
         with open(DEVICES_JSON_FILE, 'w') as outfile:
             outfile.write(json_devices)
@@ -129,12 +139,27 @@ def updateDevice(name, json):
 
         return (c, d, t)
 
+def updateDeviceState(name, value):
+    with mutex:
+        try:
+            if not name in DEVICES:
+                return
+            device = DEVICES[name]
+            if 'last_state' not in device['args'] or device['args']['last_state'] != value:
+                logger.info('Saving state {} for device {}'.format(value, name))
+                device['args'].update({'last_state': value})
+                saveDevice(name)
+        except:
+            pass
+
 def addDevice(name, device, description, args, origin):
     with mutex:
         if name in DEVICES:
             logger.error("Device <%s> already exists" % name)
             return -1
         logger.debug('addDevice: ' + str(name) + ' ' + str(device))
+        if missingOneWireDevice({'class': device, 'args': args}):
+            return -1
     #    if '/' in device:
     #        deviceClass = device.split('/')[0]
     #    else:

myDevices/devices/onewire.py

@@ -105,3 +105,5 @@ def detectOneWireDevices():
         debug('Error detecting 1-wire devices: {}'.format(err))
     return devices
 
+def deviceExists(slave):
+    return os.path.exists("/sys/bus/w1/devices/%s" % slave)

myDevices/sensors/sensors.py

@@ -302,10 +302,10 @@ def SensorsInfo(self):
                                 'DigitalActuator': {'function': 'read', 'data_args': {'type': 'digital_actuator', 'unit': 'd'}},
                                 'AnalogSensor': {'function': 'readFloat', 'data_args': {'type': 'analog_sensor'}},
                                 'AnalogActuator': {'function': 'readFloat', 'data_args': {'type': 'analog_actuator'}}}
-                extension_types = {'ADC': {'function': 'analogReadAllFloat'},
-                                    'DAC': {'function': 'analogReadAllFloat'},
-                                    'PWM': {'function': 'pwmWildcard'},
-                                    'GPIOPort': {'function': 'wildcard'}}
+                # extension_types = {'ADC': {'function': 'analogReadAllFloat'},
+                #                     'DAC': {'function': 'analogReadAllFloat'},
+                #                     'PWM': {'function': 'pwmWildcard'},
+                #                     'GPIOPort': {'function': 'wildcard'}}
                 for device_type in device['type']:
                     try:
                         display_name = device['description']
@@ -319,19 +319,22 @@ def SensorsInfo(self):
                                 channel = '{}:{}'.format(device['name'], device_type.lower())
                             else:
                                 channel = device['name']
-                            cayennemqtt.DataChannel.add(sensors_info, cayennemqtt.DEV_SENSOR, channel, value=self.CallDeviceFunction(func), name=display_name, **sensor_type['data_args'])
+                            value = self.CallDeviceFunction(func)
+                            cayennemqtt.DataChannel.add(sensors_info, cayennemqtt.DEV_SENSOR, channel, value=value, name=display_name, **sensor_type['data_args'])
+                            if 'DigitalActuator' == device_type and value in (0, 1):
+                                manager.updateDeviceState(device['name'], value)
                         except:
                             exception('Failed to get sensor data: {} {}'.format(device_type, device['name']))
-                    else:
-                        try:
-                            extension_type = extension_types[device_type]
-                            func = getattr(sensor, extension_type['function'])
-                            values = self.CallDeviceFunction(func)
-                            for pin, value in values.items():
-                                cayennemqtt.DataChannel.add(sensors_info, cayennemqtt.DEV_SENSOR, device['name'] + ':' + str(pin), cayennemqtt.VALUE, value, name=display_name)
-                        except:
-                            exception('Failed to get extension data: {} {}'.format(device_type, device['name']))
-        logJson('Sensors info: {}'.format(sensors_info))
+                    # else:
+                    #     try:
+                    #         extension_type = extension_types[device_type]
+                    #         func = getattr(sensor, extension_type['function'])
+                    #         values = self.CallDeviceFunction(func)
+                    #         for pin, value in values.items():
+                    #             cayennemqtt.DataChannel.add(sensors_info, cayennemqtt.DEV_SENSOR, device['name'] + ':' + str(pin), cayennemqtt.VALUE, value, name=display_name)
+                    #     except:
+                    #         exception('Failed to get extension data: {} {}'.format(device_type, device['name']))
+        info('Sensors info: {}'.format(sensors_info))
         return sensors_info
 
     def AddSensor(self, name, description, device, args):
@@ -523,13 +526,16 @@ def SensorCommand(self, command, sensorId, channel, value):
                     info('Sensor not found')
                     return result
                 if command in commands:
-                    info('Sensor found: {}'.format(instance.DEVICES[sensorId]))
+                    device = instance.DEVICES[sensorId]
+                    info('Sensor found: {}'.format(device))
                     func = getattr(sensor, commands[command]['function'])
                     value = commands[command]['value_type'](value)
                     if channel:
                         result = self.CallDeviceFunction(func, int(channel), value)
                     else:
                         result = self.CallDeviceFunction(func, value)
+                    if 'DigitalActuator' in device['type']:
+                        manager.updateDeviceState(sensorId, value)
                     return result
                 warn('Command not implemented: {}'.format(command))
                 return result