simo 2.0.42__py3-none-any.whl → 2.1.2__py3-none-any.whl

simo/fleet/controllers.py

@@ -1,8 +1,10 @@
 import json
 from django.utils.translation import gettext_lazy as _
+from django.db.transaction import atomic
 from simo.core.events import GatewayObjectCommand
 from simo.core.controllers import (
     BinarySensor as BaseBinarySensor,
+    Button as BaseButton,
     NumericSensor as BaseNumericSensor,
     Switch as BaseSwitch, Dimmer as BaseDimmer,
     MultiSensor as BaseMultiSensor, RGBWLight as BaseRGBWLight
@@ -15,18 +17,20 @@ from simo.core.utils.serialization import (
     serialize_form_data, deserialize_form_data
 )
 from simo.generic.controllers import Blinds as GenericBlinds
-from .models import Colonel
+from .models import Colonel, ColonelPin
 from .gateways import FleetGatewayHandler
 from .forms import (
     ColonelPinChoiceField,
-    ColonelBinarySensorConfigForm, ColonelTouchSensorConfigForm,
+    ColonelBinarySensorConfigForm, ColonelButtonConfigForm,
     ColonelSwitchConfigForm, ColonelPWMOutputConfigForm,
     ColonelNumericSensorConfigForm, ColonelRGBLightConfigForm,
     ColonelDHTSensorConfigForm, DS18B20SensorConfigForm,
     BME680SensorConfigForm, MPC9808SensorConfigForm,
     DualMotorValveForm, BlindsConfigForm, BurglarSmokeDetectorConfigForm,
     TTLockConfigForm, DALIDeviceConfigForm, DaliLampForm, DaliGearGroupForm,
-    DaliOccupancySensorConfigForm, DALILightSensorConfigForm
+    DaliSwitchConfigForm,
+    DaliOccupancySensorConfigForm, DALILightSensorConfigForm,
+    DALIButtonConfigForm
 )
 
 
@@ -67,19 +71,39 @@ class FleeDeviceMixin:
                 config[key] = val
         return config
 
+    def _fix_pin_relations(self):
+        pass
+
 
 class BasicSensorMixin:
     gateway_class = FleetGatewayHandler
 
+    def _get_occupied_pins(self):
+        return [
+            self.component.config['pin_no'],
+        ]
+
+    @atomic
+    def _fix_pin_relations(self):
+        colonel = Colonel.objects.filter(
+            id=self.component.config.get('colonel', 0)
+        ).first()
+        if not colonel:
+            return
+        cp = ColonelPin.objects.filter(
+            colonel=colonel, no=self.component.config['pin_no']
+        ).first()
+        if self.component.config.get('pin') != cp.id:
+            self.component.config['pin'] = cp.id
+            self.component.save()
 
 
 class BinarySensor(FleeDeviceMixin, BasicSensorMixin, BaseBinarySensor):
     config_form = ColonelBinarySensorConfigForm
 
-    def _get_occupied_pins(self):
-        return [
-            self.component.config['pin_no'],
-        ]
+
+class Button(FleeDeviceMixin, BasicSensorMixin, BaseButton):
+    config_form = ColonelButtonConfigForm
 
 
 class BurglarSmokeDetector(BinarySensor):
@@ -92,6 +116,26 @@ class BurglarSmokeDetector(BinarySensor):
             self.component.config['sensor_pin_no']
         ]
 
+    @atomic
+    def _fix_pin_relations(self):
+        colonel = Colonel.objects.filter(
+            id=self.component.config.get('colonel', 0)
+        ).first()
+        if not colonel:
+            return
+        cp = ColonelPin.objects.filter(
+            colonel=colonel, no=self.component.config['power_pin_no']
+        ).first()
+        if self.component.config.get('power_pin') != cp.id:
+            self.component.config['power_pin'] = cp.id
+            self.component.save()
+        cp = ColonelPin.objects.filter(
+            colonel=colonel, no=self.component.config['sensor_pin_no']
+        ).first()
+        if self.component.config.get('sensor_pin') != cp.id:
+            self.component.config['sensor_pin'] = cp.id
+            self.component.save()
+
 
 # class AnalogSensor(FleeDeviceMixin, BasicSensorMixin, BaseNumericSensor):
 #     config_form = ColonelNumericSensorConfigForm
@@ -107,11 +151,6 @@ class DS18B20Sensor(FleeDeviceMixin, BasicSensorMixin, BaseNumericSensor):
     config_form = DS18B20SensorConfigForm
     name = "DS18B20 Temperature sensor"
 
-    def _get_occupied_pins(self):
-        return [
-            self.component.config['pin_no'],
-        ]
-
 
 class BaseClimateSensor(FleeDeviceMixin, BasicSensorMixin, BaseMultiSensor):
     app_widget = NumericSensorWidget
@@ -119,7 +158,7 @@ class BaseClimateSensor(FleeDeviceMixin, BasicSensorMixin, BaseMultiSensor):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.sys_temp_units = 'C'
-        if dynamic_settings['core__units_of_measure'] == 'imperial':
+        if self.component.zone.instance.units_of_measure == 'imperial':
             self.sys_temp_units = 'F'
 
     @property
@@ -158,18 +197,15 @@ class DHTSensor(BaseClimateSensor):
     config_form = ColonelDHTSensorConfigForm
     name = "DHT climate sensor"
 
-    def _get_occupied_pins(self):
-        return [
-            self.component.config['pin_no'],
-        ]
-
 
-class BME680Sensor(BaseClimateSensor):
+class BME680Sensor(FleeDeviceMixin, BaseMultiSensor):
+    gateway_class = FleetGatewayHandler
     config_form = BME680SensorConfigForm
     name = "BME680 Climate Sensor (I2C)"
 
 
-class MPC9808TempSensor(FleeDeviceMixin, BasicSensorMixin, BaseNumericSensor):
+class MPC9808TempSensor(FleeDeviceMixin, BaseNumericSensor):
+    gateway_class = FleetGatewayHandler
     config_form = MPC9808SensorConfigForm
     name = "MPC9808 Temperature Sensor (I2C)"
 
@@ -180,10 +216,47 @@ class BasicOutputMixin:
 
     def _get_occupied_pins(self):
         pins = [self.component.config['output_pin_no']]
-        for control_unit in self.component.config.get('controls', []):
-            pins.append(control_unit['pin_no'])
+        for ctrl in self.component.config.get('controls', []):
+            if 'pin_no' in ctrl:
+                pins.append(ctrl['pin_no'])
         return pins
 
+    @atomic
+    def _fix_pin_relations(self):
+        colonel = Colonel.objects.filter(
+            id=self.component.config.get('colonel', 0)
+        ).first()
+        if not colonel:
+            return
+        cp = ColonelPin.objects.filter(
+            colonel=colonel, no=self.component.config['output_pin_no']
+        ).first()
+        if self.component.config.get('output_pin') != cp.id:
+            self.component.config['output_pin'] = cp.id
+
+        for ctrl in self.component.config.get('controls', []):
+            if 'pin_no' not in ctrl:
+                continue
+            if not ctrl.get('input').startswith('pin-'):
+                continue
+            cp = ColonelPin.objects.filter(
+                colonel=colonel, no=ctrl['pin_no']
+            ).first()
+            if not cp:
+                continue
+            ctrl['input'] = f'pin-{cp.id}'
+
+        self.component.save()
+
+
+    def _ctrl(self, ctrl_no, ctrl_event, method):
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            id=self.component.id, command='call', method='ctrl',
+            args=[ctrl_no, ctrl_event, method]
+        ).publish()
+
 
 class Switch(FleeDeviceMixin, BasicOutputMixin, BaseSwitch):
     config_form = ColonelSwitchConfigForm
@@ -211,8 +284,37 @@ class Switch(FleeDeviceMixin, BasicOutputMixin, BaseSwitch):
         ).publish()
 
 
+class FadeMixin:
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.component.last_fade_direction = 0
+
+    def fade_up(self):
+        self.component.last_fade_direction = 1
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            id=self.component.id, command='call', method='fade_up'
+        ).publish()
+
+    def fade_down(self):
+        self.component.last_fade_direction = -1
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            id=self.component.id, command='call', method='fade_down'
+        ).publish()
+
+    def fade_stop(self):
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            id=self.component.id, command='call', method='fade_stop'
+        ).publish()
+
 
-class PWMOutput(FleeDeviceMixin, BasicOutputMixin, BaseDimmer):
+class PWMOutput(FadeMixin, FleeDeviceMixin, BasicOutputMixin, BaseDimmer):
     name = "Dimmer"
     config_form = ColonelPWMOutputConfigForm
 
@@ -262,6 +364,7 @@ class PWMOutput(FleeDeviceMixin, BasicOutputMixin, BaseDimmer):
         return value
 
 
+
 class RGBLight(FleeDeviceMixin, BasicOutputMixin, BaseRGBWLight):
     config_form = ColonelRGBLightConfigForm
 
@@ -278,6 +381,26 @@ class DualMotorValve(FleeDeviceMixin, BasicOutputMixin, BaseSwitch):
             self.component.config['close_pin_no']
         ]
 
+    @atomic
+    def _fix_pin_relations(self):
+        colonel = Colonel.objects.filter(
+            id=self.component.config.get('colonel', 0)
+        ).first()
+        if not colonel:
+            return
+        cp = ColonelPin.objects.filter(
+            colonel=colonel, no=self.component.config['open_pin_no']
+        ).first()
+        if self.component.config.get('open_pin') != cp.id:
+            self.component.config['open_pin'] = cp.id
+        cp = ColonelPin.objects.filter(
+            colonel=colonel, no=self.component.config['close_pin_no']
+        ).first()
+        if self.component.config.get('close_pin') != cp.id:
+            self.component.config['close_pin'] = cp.id
+
+        self.component.save()
+
 
 class Blinds(FleeDeviceMixin, BasicOutputMixin, GenericBlinds):
     gateway_class = FleetGatewayHandler
@@ -288,10 +411,41 @@ class Blinds(FleeDeviceMixin, BasicOutputMixin, GenericBlinds):
             self.component.config['open_pin_no'],
             self.component.config['close_pin_no']
         ]
-        for p in self.component.config.get('controls', []):
-            pins.append(p['pin'])
+        for ctrl in self.component.config.get('controls', []):
+            if 'pin_no' in ctrl:
+                pins.append(ctrl['pin_no'])
         return pins
 
+    @atomic
+    def _fix_pin_relations(self):
+        colonel = Colonel.objects.filter(
+            id=self.component.config.get('colonel', 0)
+        ).first()
+        if not colonel:
+            return
+        cp = ColonelPin.objects.filter(
+            colonel=colonel, no=self.component.config['open_pin_no']
+        ).first()
+        if self.component.config.get('open_pin') != cp.id:
+            self.component.config['open_pin'] = cp.id
+        cp = ColonelPin.objects.filter(
+            colonel=colonel, no=self.component.config['close_pin_no']
+        ).first()
+        if self.component.config.get('close_pin') != cp.id:
+            self.component.config['close_pin'] = cp.id
+        for ctrl in self.component.config.get('controls', []):
+            if 'pin_no' not in ctrl:
+                continue
+            if not ctrl.get('input').startswith('pin-'):
+                continue
+            cp = ColonelPin.objects.filter(
+                colonel=colonel, no=ctrl['pin_no']
+            ).first()
+            if not cp:
+                continue
+            ctrl['input'] = f'pin-{cp.id}'
+        self.component.save()
+
 
 class TTLock(FleeDeviceMixin, Lock):
     gateway_class = FleetGatewayHandler
@@ -315,6 +469,7 @@ class TTLock(FleeDeviceMixin, Lock):
         ).publish()
 
     @classmethod
+    @atomic
     def _process_discovery(cls, started_with, data):
         if data['discovery-result'] == 'fail':
             if data['result'] == 0:
@@ -510,6 +665,7 @@ class DALIDevice(FleeDeviceMixin, ControllerBase):
         ).publish()
 
     @classmethod
+    @atomic
     def _process_discovery(cls, started_with, data):
         if data['discovery-result'] == 'fail':
             if data['result'] == 1:
@@ -545,6 +701,8 @@ class DALIDevice(FleeDeviceMixin, ControllerBase):
 
         started_with = deserialize_form_data(started_with)
         started_with['name'] += f" {data['result']['config']['da']}"
+        if data['result'].get('di') is not None:
+            started_with['name'] += f" - {data['result']['di']}"
         started_with['controller_uid'] = controller_uid
         started_with['base_type'] = controller_cls.base_type
         form = controller_cls.config_form(
@@ -566,10 +724,6 @@ class DALIDevice(FleeDeviceMixin, ControllerBase):
                     'config': json.loads(json.dumps(new_component.config))
                 }
             }
-            # Perform default config update on initial component setup
-            new_component.meta[
-                'finalization_data'
-            ]['comp_config']['config']['boot_update'] = True
             new_component.save()
             GatewayObjectCommand(
                 new_component.gateway, Colonel(
@@ -595,14 +749,14 @@ class DALIDevice(FleeDeviceMixin, ControllerBase):
         ).publish()
 
 
-class DALILamp(BaseDimmer, DALIDevice):
+class DALILamp(FadeMixin, BaseDimmer, DALIDevice):
     family = 'dali'
     manual_add = False
     name = 'DALI Lamp'
     config_form = DaliLampForm
 
 
-class DALIGearGroup(FleeDeviceMixin, BaseDimmer):
+class DALIGearGroup(FadeMixin, FleeDeviceMixin, BaseDimmer):
     gateway_class = FleetGatewayHandler
     family = 'dali'
     manual_add = True
@@ -632,9 +786,11 @@ class DALIGearGroup(FleeDeviceMixin, BaseDimmer):
 
 
 class DALIRelay(BaseSwitch, DALIDevice):
+    '''Not tested with a real device yet'''
     family = 'dali'
     manual_add = False
     name = 'DALI Relay'
+    config_form = DaliSwitchConfigForm
 
 
 class DALIOccupancySensor(BaseBinarySensor, DALIDevice):
@@ -650,3 +806,10 @@ class DALILightSensor(BaseNumericSensor, DALIDevice):
     name = 'DALI Light Sensor'
     default_value_units = 'lux'
     config_form = DALILightSensorConfigForm
+
+
+class DALIButton(BaseButton, DALIDevice):
+    family = 'dali'
+    manual_add = False
+    name = 'DALI Button'
+    config_form = DALIButtonConfigForm