simo 2.10.9__py3-none-any.whl → 2.11.1__py3-none-any.whl

simo/fleet/controllers.py

@@ -10,20 +10,21 @@ from simo.core.controllers import (
     Switch as BaseSwitch, Dimmer as BaseDimmer,
     MultiSensor as BaseMultiSensor, RGBWLight as BaseRGBWLight,
     Blinds as BaseBlinds, Gate as BaseGate,
+    Lock, ControllerBase, SingleSwitchWidget
 )
 from simo.core.app_widgets import NumericSensorWidget, AirQualityWidget
-from simo.core.controllers import Lock, ControllerBase, SingleSwitchWidget
 from simo.core.utils.helpers import heat_index
 from simo.core.utils.serialization import (
     serialize_form_data, deserialize_form_data
 )
 from simo.core.forms import BaseComponentForm
+from simo.generic.controllers import StateSelect
 from .models import Colonel, CustomDaliDevice
 from .gateways import FleetGatewayHandler
 from .forms import (
     ColonelPinChoiceField,
     ColonelBinarySensorConfigForm, ColonelButtonConfigForm,
-    ColonelSwitchConfigForm, ColonelPWMOutputConfigForm, DCDriverConfigForm,
+    ColonelSwitchConfigForm, ColonelPWMOutputConfigForm, DC10VConfigForm,
     ColonelNumericSensorConfigForm, ColonelRGBLightConfigForm,
     ColonelDHTSensorConfigForm, DS18B20SensorConfigForm,
     BME680SensorConfigForm, MCP9808SensorConfigForm, ENS160SensorConfigForm,
@@ -37,7 +38,7 @@ from .forms import (
 )
 
 
-class FleeDeviceMixin:
+class FleetDeviceMixin:
 
     def update_options(self, options):
         GatewayObjectCommand(
@@ -91,11 +92,11 @@ class BasicSensorMixin:
             self.component.config['pin_no'],
         ]
 
-class BinarySensor(FleeDeviceMixin, BasicSensorMixin, BaseBinarySensor):
+class BinarySensor(FleetDeviceMixin, BasicSensorMixin, BaseBinarySensor):
     config_form = ColonelBinarySensorConfigForm
 
 
-class Button(FleeDeviceMixin, BasicSensorMixin, BaseButton):
+class Button(FleetDeviceMixin, BasicSensorMixin, BaseButton):
     config_form = ColonelButtonConfigForm
 
 
@@ -110,12 +111,12 @@ class BurglarSmokeDetector(BinarySensor):
         ]
 
 
-class DS18B20Sensor(FleeDeviceMixin, BasicSensorMixin, BaseNumericSensor):
+class DS18B20Sensor(FleetDeviceMixin, BasicSensorMixin, BaseNumericSensor):
     config_form = DS18B20SensorConfigForm
     name = "DS18B20 Temperature sensor"
 
 
-class DHTSensor(FleeDeviceMixin, BasicSensorMixin, BaseMultiSensor):
+class DHTSensor(FleetDeviceMixin, BasicSensorMixin, BaseMultiSensor):
     config_form = ColonelDHTSensorConfigForm
     name = "DHT climate sensor"
     app_widget = NumericSensorWidget
@@ -171,7 +172,7 @@ class BME680Sensor(DHTSensor):
 
 
 
-class MCP9808TempSensor(FleeDeviceMixin, BaseNumericSensor):
+class MCP9808TempSensor(FleetDeviceMixin, BaseNumericSensor):
     gateway_class = FleetGatewayHandler
     config_form = MCP9808SensorConfigForm
     name = "MCP9808 Temperature Sensor (I2C)"
@@ -196,7 +197,7 @@ class MCP9808TempSensor(FleeDeviceMixin, BaseNumericSensor):
         return value
 
 
-class ENS160AirQualitySensor(FleeDeviceMixin, BaseMultiSensor):
+class ENS160AirQualitySensor(FleetDeviceMixin, BaseMultiSensor):
     gateway_class = FleetGatewayHandler
     config_form = ENS160SensorConfigForm
     name = "ENS160 Air Quality Sensor (I2C)"
@@ -257,7 +258,7 @@ class BasicOutputMixin:
         ).publish()
 
 
-class Switch(FleeDeviceMixin, BasicOutputMixin, BaseSwitch):
+class Switch(FleetDeviceMixin, BasicOutputMixin, BaseSwitch):
     config_form = ColonelSwitchConfigForm
 
     def signal(self, pulses):
@@ -313,8 +314,8 @@ class FadeMixin:
         ).publish()
 
 
-class PWMOutput(FadeMixin, FleeDeviceMixin, BasicOutputMixin, BaseDimmer):
-    name = "Dimmer"
+class PWMOutput(FadeMixin, FleetDeviceMixin, BasicOutputMixin, BaseDimmer):
+    name = "AC/DC Dimmer | PWM Driver"
     config_form = ColonelPWMOutputConfigForm
 
     def _prepare_for_send(self, value):
@@ -344,7 +345,7 @@ class PWMOutput(FadeMixin, FleeDeviceMixin, BasicOutputMixin, BaseDimmer):
 
     def _prepare_for_set(self, pwm_value):
         conf = self.component.config
-        duty_max = 1023 - (conf.get('device_min', 0) * 0.01 * 1023)
+        duty_max = 1023 - conf.get('device_min', 0) * 0.01 * 1023
         duty_min = 1023 - conf.get('device_max', 100) * 0.01 * 1023
 
         if pwm_value > duty_max:
@@ -352,7 +353,7 @@ class PWMOutput(FadeMixin, FleeDeviceMixin, BasicOutputMixin, BaseDimmer):
         elif pwm_value < duty_min:
             value = conf.get('min', 0)
         else:
-            pwm_amplitude =duty_max - duty_min
+            pwm_amplitude = duty_max - duty_min
             relative_value = (pwm_value - duty_min) / pwm_amplitude
             val_amplitude = conf.get('max', 100) - conf.get('min', 0)
             value = conf.get('min', 0) + val_amplitude * relative_value
@@ -362,57 +363,71 @@ class PWMOutput(FadeMixin, FleeDeviceMixin, BasicOutputMixin, BaseDimmer):
         return round(value, 3)
 
 
-class DCDriver(FadeMixin, FleeDeviceMixin, BasicOutputMixin, BaseDimmer):
-    name = "0 - 24V DC Driver"
-    config_form = DCDriverConfigForm
-    default_value_units = 'V'
+class DC10VDriver(FadeMixin, FleetDeviceMixin, BasicOutputMixin, BaseDimmer):
+    name = "0 - 10V Driver"
+    config_form = DC10VConfigForm
+    default_value_units = '%'
 
     def _prepare_for_send(self, value):
         conf = self.component.config
-        if value >= conf.get('max', 24):
-            value = conf.get('max', 24)
+        if value >= conf.get('max', 100):
+            value = conf.get('max', 100)
         elif value < conf.get('min', 0):
             value = conf.get('min', 0)
 
-        if value >= conf.get('max', 24):
-            pwm_value = 1023
-        elif value <= conf.get('min', 100):
-            pwm_value = 0
+        if value >= conf.get('max', 100):
+            if conf.get('inverse') == True:
+                pwm_value = 0
+            else:
+                pwm_value = 1023
+        elif value <= conf.get('min', 0):
+            if conf.get('inverse') == True:
+                pwm_value = 1023
+            else:
+                pwm_value = 0
         else:
-            val_amplitude = conf.get('max', 24) - conf.get('min', 0)
+            val_amplitude = conf.get('max', 100) - conf.get('min', 0)
             val_relative = value / val_amplitude
 
-            duty_max = conf.get('device_max', 24) / 24 * 1023
-            duty_min = conf.get('device_min', 0) / 24 * 1023
-
-            pwm_amplitude = duty_max - duty_min
-            pwm_value = duty_min + pwm_amplitude * val_relative
+            if conf.get('inverse') == True:
+                duty_max = 1023 - conf.get('device_min', 0) / 10 * 1023
+                duty_min = 1023 - conf.get('device_max', 10) / 10 * 1023
+                pwm_amplitude = duty_max - duty_min
+                pwm_value = duty_min + pwm_amplitude * val_relative
+                pwm_value = duty_max - pwm_value + duty_min
+            else:
+                duty_max = conf.get('device_max', 10) / 10 * 1023
+                duty_min = conf.get('device_min', 0) / 10 * 1023
+                pwm_amplitude = duty_max - duty_min
+                pwm_value = duty_min + pwm_amplitude * val_relative
 
         return pwm_value
 
     def _prepare_for_set(self, pwm_value):
         conf = self.component.config
-        duty_max = conf.get('device_max', 24) / 24 * 1023
-        duty_min = conf.get('device_min', 0) / 24 * 1023
+        if conf.get('inverse') == True:
+            pwm_value = 1023 - pwm_value
+        duty_max = conf.get('device_max', 10) / 10 * 1023
+        duty_min = conf.get('device_min', 0) / 10 * 1023
 
         if pwm_value > duty_max:
-            value = conf.get('max', 24)
+            value = conf.get('max', 100)
         elif pwm_value < duty_min:
             value = conf.get('min', 0)
         else:
             pwm_amplitude = duty_max - duty_min
             relative_value = (pwm_value - duty_min) / pwm_amplitude
-            val_amplitude = conf.get('max', 24) - conf.get('min', 0)
+            val_amplitude = conf.get('max', 100) - conf.get('min', 0)
             value = conf.get('min', 0) + val_amplitude * relative_value
 
         return round(value, 3)
 
 
-class RGBLight(FleeDeviceMixin, BasicOutputMixin, BaseRGBWLight):
+class RGBLight(FleetDeviceMixin, BasicOutputMixin, BaseRGBWLight):
     config_form = ColonelRGBLightConfigForm
 
 
-class DualMotorValve(FleeDeviceMixin, BasicOutputMixin, BaseDimmer):
+class DualMotorValve(FleetDeviceMixin, BasicOutputMixin, BaseDimmer):
     gateway_class = FleetGatewayHandler
     config_form = DualMotorValveForm
     name = "Dual Motor Valve"
@@ -444,7 +459,7 @@ class DualMotorValve(FleeDeviceMixin, BasicOutputMixin, BaseDimmer):
         return conf.get('min', 0) + (value / 100) * val_amplitude
 
 
-class Blinds(FleeDeviceMixin, BasicOutputMixin, BaseBlinds):
+class Blinds(FleetDeviceMixin, BasicOutputMixin, BaseBlinds):
     gateway_class = FleetGatewayHandler
     config_form = BlindsConfigForm
 
@@ -459,7 +474,7 @@ class Blinds(FleeDeviceMixin, BasicOutputMixin, BaseBlinds):
         return pins
 
 
-class Gate(FleeDeviceMixin, BasicOutputMixin, BaseGate):
+class Gate(FleetDeviceMixin, BasicOutputMixin, BaseGate):
     gateway_class = FleetGatewayHandler
     config_form = GateConfigForm
 
@@ -475,7 +490,7 @@ class Gate(FleeDeviceMixin, BasicOutputMixin, BaseGate):
 
 
 
-class TTLock(FleeDeviceMixin, Lock):
+class TTLock(FleetDeviceMixin, Lock):
     gateway_class = FleetGatewayHandler
     config_form = TTLockConfigForm
     name = 'TTLock'
@@ -666,7 +681,7 @@ class TTLock(FleeDeviceMixin, Lock):
 
 
 
-class DALIDevice(FleeDeviceMixin, ControllerBase):
+class DALIDevice(FleetDeviceMixin, ControllerBase):
     gateway_class = FleetGatewayHandler
     config_form = DALIDeviceConfigForm
     name = "DALI Device"
@@ -785,7 +800,7 @@ class DALILamp(FadeMixin, BaseDimmer, DALIDevice):
     config_form = DaliLampForm
 
 
-class DALIGearGroup(FadeMixin, FleeDeviceMixin, BaseDimmer):
+class DALIGearGroup(FadeMixin, FleetDeviceMixin, BaseDimmer):
     gateway_class = FleetGatewayHandler
     family = 'dali'
     manual_add = True
@@ -844,7 +859,7 @@ class DALIButton(BaseButton, DALIDevice):
     config_form = DALIButtonConfigForm
 
 
-class RoomSensor(FleeDeviceMixin, ControllerBase):
+class RoomSensor(FleetDeviceMixin, ControllerBase):
     gateway_class = FleetGatewayHandler
     config_form = RoomSensorDeviceConfigForm
     name = "Room Sensor"
@@ -854,9 +869,49 @@ class RoomSensor(FleeDeviceMixin, ControllerBase):
 
     def _validate_val(self, value, occasion=None):
         return value
+    
+    
+class RoomSiren(FleetDeviceMixin, StateSelect):
+    gateway_class = FleetGatewayHandler
+    config_form = BaseComponentForm
+    default_config = {'states': [
+        {'icon': 'bell', 'slug': 'silent', 'name': "Silent"},
+        {'icon': 'bell-exclamation', 'slug': 'warning', 'name': "Warning"},
+        {'icon': 'bell-on', 'slug': 'alarm', 'name': "Alarm"},
+        {'icon': 'circle-check', 'slug': 'success', 'name': "Success"},
+        {'icon': 'circle-xmark', 'slug': 'error', 'name': "Error"},
+        {'icon': 'siren-on', 'slug': 'panic', 'name': "Panic"},
+    ]}
+    VALUES_MAP = {
+        'silent': 0, 'warning': 1, 'alarm': 2,
+        'success': 3, 'error': 4, 'panic': 5
+    }
+
+    def turn_on(self):
+        self.send('panic')
+
+    def turn_off(self):
+        self.send('silent')
+
+    def _send_to_device(self, value):
+        if self.component.config.get('colonel'):
+            GatewayObjectCommand(
+                self.component.gateway, self.component, set_val=value
+            ).publish()
+        else:
+            dali_device = CustomDaliDevice.objects.filter(
+                id=self.component.config['dali_device']
+            ).first()
+            from .custom_dali_operations import Frame
+            frame = Frame(40, bytes(bytearray(5)))
+            frame[8:11] = 15  # command to custom dali device
+            frame[12:15] = 6  # action to perform: set value
+            frame[16:20] = 0 # device on which to perform value set
+            frame[21:24] = self.VALUES_MAP[value]
+            dali_device.transmit(frame)
 
 
-class AirQualitySensor(FleeDeviceMixin, BaseMultiSensor):
+class AirQualitySensor(FleetDeviceMixin, BaseMultiSensor):
     gateway_class = FleetGatewayHandler
     config_form = BaseComponentForm
     name = "Air Quality Sensor"
@@ -901,7 +956,7 @@ class AirQualitySensor(FleeDeviceMixin, BaseMultiSensor):
             return
 
 
-class TempHumSensor(FleeDeviceMixin, BasicSensorMixin, BaseMultiSensor):
+class TempHumSensor(FleetDeviceMixin, BasicSensorMixin, BaseMultiSensor):
     gateway_class = FleetGatewayHandler
     config_form = BaseComponentForm
     name = "Temperature & Humidity sensor"
@@ -956,7 +1011,7 @@ class TempHumSensor(FleeDeviceMixin, BasicSensorMixin, BaseMultiSensor):
         return super()._receive_from_device(new_val, *args, **kwargs)
 
 
-class AmbientLightSensor(FleeDeviceMixin, BaseNumericSensor):
+class AmbientLightSensor(FleetDeviceMixin, BaseNumericSensor):
     gateway_class = FleetGatewayHandler
     name = "Ambient lighting sensor"
     manual_add = False
@@ -971,13 +1026,13 @@ class AmbientLightSensor(FleeDeviceMixin, BaseNumericSensor):
     }
 
 
-class RoomPresenceSensor(FleeDeviceMixin, BaseBinarySensor):
+class RoomPresenceSensor(FleetDeviceMixin, BaseBinarySensor):
     gateway_class = FleetGatewayHandler
     name = "Human presence sensor"
     manual_add = False
 
 
-class RoomZonePresenceSensor(FleeDeviceMixin, BaseBinarySensor):
+class RoomZonePresenceSensor(FleetDeviceMixin, BaseBinarySensor):
     gateway_class = FleetGatewayHandler
     add_form = RoomZonePresenceConfigForm
     config_form = BaseComponentForm

simo/fleet/custom_dali_operations.py

@@ -2,7 +2,7 @@ from django.utils import timezone
 from simo.core.models import Component
 from .models import Interface, CustomDaliDevice
 from .controllers import (
-    TempHumSensor, AirQualitySensor, AmbientLightSensor,
+    RoomSiren, TempHumSensor, AirQualitySensor, AmbientLightSensor,
     RoomPresenceSensor, RoomZonePresenceSensor
 )
 
@@ -234,6 +234,7 @@ def process_frame(colonel_id, interface_no, data):
             comp.controller._receive_from_device(voc)
 
     elif frame[8:11] == 1:
+        # presence sensors
         comp = Component.objects.filter(
             controller_uid=AmbientLightSensor.uid, config__dali_device=device.id
         ).first()
@@ -272,4 +273,15 @@ def process_frame(colonel_id, interface_no, data):
                 # was never successfully created
                 if zone_sensors[slot].alive:
                     zone_sensors[slot].alive = False
-                    zone_sensors[slot].save()
+                    zone_sensors[slot].save()
+
+    elif frame[8:11] == 2:
+        # siren and others
+        comp = Component.objects.filter(
+            controller_uid=RoomSiren.uid, config__dali_device=device.id
+        ).first()
+        if comp:
+            VALUES_MAP = {
+                int_v: str_v for str_v, int_v in RoomSiren.VALUES_MAP.items()
+            }
+            comp.controller._receive_from_device(VALUES_MAP[frame[12:16]])

simo/fleet/forms.py

@@ -689,7 +689,75 @@ class ColonelSwitchConfigForm(ColonelComponentForm):
         return obj
 
 
-class ColonelPWMOutputConfigForm(ColonelComponentForm):
+class PWMOutputBaseConfig(ColonelComponentForm):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if 'value_units' in self.fields:
+            self.fields['value_units'].initial = self.controller.default_value_units
+        self.basic_fields.extend(
+            ['value_units', 'turn_on_time', 'turn_off_time', 'skew']
+        )
+        if self.instance.pk and 'slaves' in self.fields:
+            self.fields['slaves'].initial = self.instance.slaves.all()
+
+    def clean_slaves(self):
+        if not self.cleaned_data['slaves'] or not self.instance:
+            return self.cleaned_data['slaves']
+        return validate_slaves(self.cleaned_data['slaves'], self.instance)
+
+    def clean(self):
+        super().clean()
+        if 'output_pin' in self.cleaned_data:
+            self._clean_pin('output_pin')
+        if 'controls' in self.cleaned_data:
+            self._clean_controls()
+
+        if self.cleaned_data.get('output_pin') and self.cleaned_data.get('controls'):
+            for ctrl in self.cleaned_data['controls']:
+                if not ctrl['input'].startswith('pin'):
+                    continue
+                if int(ctrl['input'][4:]) == self.cleaned_data['output_pin'].id:
+                    self.add_error(
+                        "output_pin",
+                        "Can't be used as control pin at the same time!"
+                    )
+        return self.cleaned_data
+
+
+    def save(self, commit=True):
+        if 'output_pin' in self.cleaned_data:
+            self.instance.config['output_pin_no'] = self.cleaned_data['output_pin'].no
+
+        update_colonel = False
+        if not self.instance.pk:
+            update_colonel = True
+        elif 'output_pin' in self.changed_data:
+            update_colonel = True
+        elif 'slaves' in self.changed_data:
+            update_colonel = True
+        if not update_colonel:
+            old = Component.objects.get(id=self.instance.id)
+            if old.config.get('controls') != self.cleaned_data.get('controls'):
+                update_colonel = True
+
+        obj = super().save(commit=commit)
+        if commit and 'slaves' in self.cleaned_data:
+            obj.slaves.set(self.cleaned_data['slaves'])
+        if not update_colonel:
+            GatewayObjectCommand(
+                obj.gateway, self.cleaned_data['colonel'], id=obj.id,
+                command='call', method='update_config', args=[
+                    obj.controller._get_colonel_config()
+                ]
+            ).publish()
+        if commit and self.cleaned_data.get('controls'):
+            GatewayObjectCommand(
+                self.instance.gateway, obj, command='watch_buttons'
+            ).publish()
+        return obj
+
+class ColonelPWMOutputConfigForm(PWMOutputBaseConfig):
     output_pin = Select2ModelChoiceField(
         label="Port",
         queryset=ColonelPin.objects.filter(output=True),
@@ -758,74 +826,8 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
         )
     )
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if 'value_units' in self.fields:
-            self.fields['value_units'].initial = self.controller.default_value_units
-        self.basic_fields.extend(
-            ['value_units', 'turn_on_time', 'turn_off_time', 'skew']
-        )
-        if self.instance.pk and 'slaves' in self.fields:
-            self.fields['slaves'].initial = self.instance.slaves.all()
-
-    def clean_slaves(self):
-        if not self.cleaned_data['slaves'] or not self.instance:
-            return self.cleaned_data['slaves']
-        return validate_slaves(self.cleaned_data['slaves'], self.instance)
-
-    def clean(self):
-        super().clean()
-        if 'output_pin' in self.cleaned_data:
-            self._clean_pin('output_pin')
-        if 'controls' in self.cleaned_data:
-            self._clean_controls()
-
-        if self.cleaned_data.get('output_pin') and self.cleaned_data.get('controls'):
-            for ctrl in self.cleaned_data['controls']:
-                if not ctrl['input'].startswith('pin'):
-                    continue
-                if int(ctrl['input'][4:]) == self.cleaned_data['output_pin'].id:
-                    self.add_error(
-                        "output_pin",
-                        "Can't be used as control pin at the same time!"
-                    )
-        return self.cleaned_data
-
-
-    def save(self, commit=True):
-        if 'output_pin' in self.cleaned_data:
-            self.instance.config['output_pin_no'] = self.cleaned_data['output_pin'].no
-
-        update_colonel = False
-        if not self.instance.pk:
-            update_colonel = True
-        elif 'output_pin' in self.changed_data:
-            update_colonel = True
-        elif 'slaves' in self.changed_data:
-            update_colonel = True
-        if not update_colonel:
-            old = Component.objects.get(id=self.instance.id)
-            if old.config.get('controls') != self.cleaned_data.get('controls'):
-                update_colonel = True
 
-        obj = super().save(commit=commit)
-        if commit and 'slaves' in self.cleaned_data:
-            obj.slaves.set(self.cleaned_data['slaves'])
-        if not update_colonel:
-            GatewayObjectCommand(
-                obj.gateway, self.cleaned_data['colonel'], id=obj.id,
-                command='call', method='update_config', args=[
-                    obj.controller._get_colonel_config()
-                ]
-            ).publish()
-        if commit and self.cleaned_data.get('controls'):
-            GatewayObjectCommand(
-                self.instance.gateway, obj, command='watch_buttons'
-            ).publish()
-        return obj
-
-
-class DCDriverConfigForm(ColonelComponentForm):
+class DC10VConfigForm(PWMOutputBaseConfig):
     output_pin = Select2ModelChoiceField(
         label="Port",
         queryset=ColonelPin.objects.filter(output=True),
@@ -841,53 +843,60 @@ class DCDriverConfigForm(ColonelComponentForm):
         help_text="Minimum component value displayed to the user."
     )
     max = forms.FloatField(
-        required=True, initial=24,
+        required=True, initial=100,
         help_text="Maximum component value displayed to the user."
     )
-    value_units = forms.CharField(required=False)
+    value_units = forms.CharField(required=False, initial='%')
 
     device_min = forms.FloatField(
         label="Device minimum Voltage.",
         help_text="This will be the lowest possible voltage value of a device.\n"
                    "Don't forget to adjust your component min value accordingly "
                    "if you change this.",
-        initial=0, min_value=0, max_value=24,
+        initial=0, min_value=0, max_value=10,
     )
-    device_max = forms.IntegerField(
+    device_max = forms.FloatField(
         label="Device maximum Voltage.",
-        help_text="Can be set lower than it's natural maximum of 24V. \n"
+        help_text="Can be set lower than it's natural maximum of 10V. \n"
                   "Don't forget to adjust your component max value accordingly "
                   "if you change this.",
-        initial=24, min_value=0, max_value=24,
+        initial=10, min_value=0, max_value=10,
     )
+    inverse = forms.BooleanField(required=False, initial=False)
 
-    def clean(self):
-        super().clean()
-        if 'output_pin' in self.cleaned_data:
-            self._clean_pin('output_pin')
-        return self.cleaned_data
-
-
-    def save(self, commit=True):
-        if 'output_pin' in self.cleaned_data:
-            self.instance.config['output_pin_no'] = self.cleaned_data['output_pin'].no
-
-        update_colonel = False
-        if not self.instance.pk:
-            update_colonel = True
-        elif 'output_pin' in self.changed_data:
-            update_colonel = True
-
-        obj = super().save(commit=commit)
+    turn_on_time = forms.IntegerField(
+        min_value=0, max_value=60000, initial=0,
+        help_text="Turn on speed in ms. 1500 is a great quick default for controlling lights. "
+                  "10000 - great slow default."
+    )
+    turn_off_time = forms.IntegerField(
+        min_value=0, max_value=60000, initial=0,
+        help_text="Turn off speed in ms. 3000 is a great quick default when controlling lights. "
+                  "20000 - great slow default"
+    )
+    skew = forms.ChoiceField(
+        initial='linear', choices=EASING_CHOICES,
+        help_text="easeOutSine - offers most naturally looking effect for lights."
+    )
+    on_value = forms.FloatField(
+        required=False,
+        help_text="Static ON value used to turn on the device with physical controls. <br>"
+                  "Leaving this field empty turns the device on to the last used value."
+    )
 
-        if not update_colonel:
-            GatewayObjectCommand(
-                obj.gateway, self.cleaned_data['colonel'], id=obj.id,
-                command='call', method='update_config', args=[
-                    obj.controller._get_colonel_config()
-                ]
-            ).publish()
-        return obj
+    slaves = Select2ModelMultipleChoiceField(
+        queryset=Component.objects.filter(
+            base_type__in=('dimmer',),
+        ),
+        url='autocomplete-component',
+        forward=(forward.Const(['dimmer', ], 'base_type'),),
+        required=False
+    )
+    controls = FormsetField(
+        formset_factory(
+            ControlForm, can_delete=True, can_order=True, extra=0, max_num=10
+        )
+    )
 
 
 class ColonelRGBLightConfigForm(ColonelComponentForm):
@@ -1814,6 +1823,7 @@ class CustomDaliDeviceForm(BaseComponentForm):
 
 class RoomSensorDeviceConfigForm(CustomDaliDeviceForm):
 
+
     def save(self, commit=True):
         from simo.core.models import Icon
         colonel = None
@@ -1827,13 +1837,14 @@ class RoomSensorDeviceConfigForm(CustomDaliDeviceForm):
             colonel = device
 
         from .controllers import (
-            AirQualitySensor, TempHumSensor, AmbientLightSensor,
+            RoomSiren, AirQualitySensor, TempHumSensor, AmbientLightSensor,
             RoomPresenceSensor
         )
 
         org_name = self.cleaned_data['name']
         org_icon = self.cleaned_data['icon']
         for CtrlClass, icon, suffix in (
+            (RoomSiren, 'siren', 'siren'),
             (AirQualitySensor, 'leaf', 'air quality'),
             (TempHumSensor, 'temperature-half', 'temperature'),
             (AmbientLightSensor, 'brightness-low', 'brightness'),