Merge pull request #16 from myDevicesIoT/fix/reduce-payload-data

Fix/reduce payload data

Author: jburhenn

myDevices/devices/manager.py

@@ -8,14 +8,20 @@
 from myDevices.utils.config import Config
 from myDevices.devices import serial, digital, analog, sensor, shield
 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, shield]
 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)
 
@@ -68,7 +77,7 @@ def removeDevice(name):
         if name in DEVICES:
             if name in DYNAMIC_DEVICES:
                 if hasattr(DEVICES[name]["device"], 'close'):
-                        DEVICES[name]["device"].close()
+                    DEVICES[name]["device"].close()
                 del DEVICES[name]
                 del DYNAMIC_DEVICES[name]
                 json_devices = getJSON(DYNAMIC_DEVICES)
@@ -135,6 +144,8 @@ def addDevice(name, device, description, args, origin):
             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

@@ -164,10 +164,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']
@@ -184,16 +184,16 @@ def SensorsInfo(self):
                             cayennemqtt.DataChannel.add(sensors_info, cayennemqtt.DEV_SENSOR, channel, value=self.CallDeviceFunction(func), name=display_name, **sensor_type['data_args'])
                         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):