simo 2.10.7__py3-none-any.whl → 2.10.11__py3-none-any.whl

simo/fleet/forms.py

@@ -460,65 +460,86 @@ class ColonelDHTSensorConfigForm(ColonelComponentForm):
         return super().save(commit=commit)
 
 
-class BME680SensorConfigForm(ColonelComponentForm):
-    interface = Select2ModelChoiceField(
-        queryset=Interface.objects.filter(type='i2c'),
-        url='autocomplete-interfaces',
+class I2CDevice(ColonelComponentForm):
+    interface_port = Select2ModelChoiceField(
+        label="Interface",
+        queryset=ColonelPin.objects.filter(interface__isnull=False),
+        url='autocomplete-colonel-pins',
         forward=[
             forward.Self(),
             forward.Field('colonel'),
-            forward.Const(
-                {'type': 'i2c'}, 'filters'
-            )
-        ]
-    )
-    i2c_address = forms.TypedChoiceField(
-        coerce=int, initial=118,
-        choices=((118, "0x76"), (119, "0x77")),
-    )
-    read_frequency_s = forms.IntegerField(
-        initial=60, min_value=1, max_value=60*60*24,
-        help_text='read and report climate value every s. '
-                              'Can not be less than 1s.'
-
+            forward.Const({'interface__isnull': False}, 'filters'),
+        ],
     )
 
     def clean(self):
-        if not self.cleaned_data.get('colonel'):
-            return self.cleaned_data
-        if self.cleaned_data['interface'].colonel != self.cleaned_data['colonel']:
+        cleaned_data = super().clean()
+        colonel = cleaned_data.get('colonel')
+        port_choice = cleaned_data.get('interface_port')
+        if not colonel or not port_choice:
+            return cleaned_data
+
+        # Create or fetch the I²C interface
+        interface, created = Interface.objects.get_or_create(
+            colonel=colonel,
+            no=port_choice.interface,
+            defaults={'type': 'i2c'},
+        )
+
+        # If it already existed as something else, ensure it's free
+        if interface.type != 'i2c':
+            occupied = interface.addresses.filter(occupied_by__isnull=False).first()
+            if occupied:
+                self.add_error(
+                    'interface_port',
+                    f"Port already occupied by {occupied.occupied_by}"
+                )
+                return cleaned_data
+            interface.type = 'i2c'
+            interface.save()
+
+        # Check for address collisions on that interface
+        other = Component.objects.filter(
+            config__colonel=colonel.id,
+            config__interface=interface.id,
+            config__i2c_address=cleaned_data['i2c_address'],
+        ).exclude(id=self.instance.id).first()
+        if other:
             self.add_error(
-                'interface',
-                f"This interface is on {self.cleaned_data['interface'].colonel}, "
-                f"however we need an interface from {self.cleaned_data['colonel']}."
+                'i2c_address',
+                f"Address already occupied by {other}"
             )
-        other_comp = Component.objects.filter(
-            config__colonel=self.cleaned_data['colonel'].id,
-            config__interface=self.cleaned_data['interface'].id,
-            config__i2c_address=self.cleaned_data['i2c_address']
-        ).exclude(id=self.instance.id).first()
-        if other_comp:
-            self.add_error('i2c_address', f'Already occupied by {other_comp}!')
-        return self.cleaned_data
+
+        # stash for save()
+        cleaned_data['i2c_interface'] = interface.id
+        return cleaned_data
 
     def save(self, commit=True):
-        if 'interface' in self.cleaned_data:
-            self.instance.config['i2c_interface'] = self.cleaned_data['interface'].no
+        self.instance.config['i2c_interface'] = self.cleaned_data['i2c_interface']
         return super().save(commit=commit)
 
 
-class MCP9808SensorConfigForm(ColonelComponentForm):
-    interface = Select2ModelChoiceField(
-        queryset=Interface.objects.filter(type='i2c'),
-        url='autocomplete-interfaces',
-        forward=[
-            forward.Self(),
-            forward.Field('colonel'),
-            forward.Const(
-                {'type': 'i2c'}, 'filters'
-            )
-        ]
+class BME680SensorConfigForm(I2CDevice):
+    i2c_address = forms.TypedChoiceField(
+        coerce=int,
+        initial=119,  # match “0x77 – default”
+        choices=(
+            (119, "0x77 – default"),
+            (118, "0x76 – soldered"),
+        ),
     )
+    read_frequency_s = forms.IntegerField(
+        initial=60,
+        min_value=1,
+        max_value=60 * 60 * 24,
+        help_text=(
+            "Read and report climate value every second. "
+            "Cannot be less than 1 second."
+        ),
+    )
+
+
+class MCP9808SensorConfigForm(I2CDevice):
     i2c_address = forms.TypedChoiceField(
         coerce=int, initial=24,
         choices=(
@@ -535,43 +556,8 @@ class MCP9808SensorConfigForm(ColonelComponentForm):
 
     )
 
-    def clean(self):
-        if not self.cleaned_data.get('colonel'):
-            return self.cleaned_data
-        if self.cleaned_data['interface'].colonel != self.cleaned_data['colonel']:
-            self.add_error(
-                'interface',
-                f"This interface is on {self.cleaned_data['interface'].colonel}, "
-                f"however we need an interface from {self.cleaned_data['colonel']}."
-            )
-
-        other_comp = Component.objects.filter(
-            config__colonel=self.cleaned_data['colonel'].id,
-            config__interface=self.cleaned_data['interface'].id,
-            config__i2c_address=self.cleaned_data['i2c_address']
-        ).exclude(id=self.instance.id).first()
-        if other_comp:
-            self.add_error('i2c_address', f'Already occupied by {other_comp}!')
-        return self.cleaned_data
-
-    def save(self, commit=True):
-        if 'interface' in self.cleaned_data:
-            self.instance.config['i2c_interface'] = self.cleaned_data['interface'].no
-        return super().save(commit=commit)
-
 
-class ENS160SensorConfigForm(ColonelComponentForm):
-    interface = Select2ModelChoiceField(
-        queryset=Interface.objects.filter(type='i2c'),
-        url='autocomplete-interfaces',
-        forward=[
-            forward.Self(),
-            forward.Field('colonel'),
-            forward.Const(
-                {'type': 'i2c'}, 'filters'
-            )
-        ]
-    )
+class ENS160SensorConfigForm(I2CDevice):
     i2c_address = forms.TypedChoiceField(
         coerce=int, initial=83,
         choices=((82, "0x52"), (83, "0x53")),
@@ -583,30 +569,6 @@ class ENS160SensorConfigForm(ColonelComponentForm):
 
     )
 
-    def clean(self):
-        if not self.cleaned_data.get('colonel'):
-            return self.cleaned_data
-        if self.cleaned_data['interface'].colonel != self.cleaned_data['colonel']:
-            self.add_error(
-                'interface',
-                f"This interface is on {self.cleaned_data['interface'].colonel}, "
-                f"however we need an interface from {self.cleaned_data['colonel']}."
-            )
-        other_comp = Component.objects.filter(
-            config__colonel=self.cleaned_data['colonel'].id,
-            config__interface=self.cleaned_data['interface'].id,
-            config__i2c_address=self.cleaned_data['i2c_address']
-        ).exclude(id=self.instance.id).first()
-        if other_comp:
-            self.add_error('i2c_address', f'Already occupied by {other_comp}!')
-        return self.cleaned_data
-
-    def save(self, commit=True):
-        if 'interface' in self.cleaned_data:
-            self.instance.config['i2c_interface'] = \
-                self.cleaned_data['interface'].no
-        return super().save(commit=commit)
-
 
 class ColonelTouchSensorConfigForm(ColonelComponentForm):
     pin = Select2ModelChoiceField(
@@ -727,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),
@@ -796,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),
@@ -879,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):
@@ -1831,8 +1802,6 @@ class CustomDaliDeviceForm(BaseComponentForm):
         for colonel in Colonel.objects.filter(
             type='room-sensor', instance=instance
         ):
-            if not colonel.is_connected:
-                continue
             choices.append((f"wifi-{colonel.id}", colonel.name))
         for device in CustomDaliDevice.objects.filter(
             instance=instance,
@@ -1854,6 +1823,7 @@ class CustomDaliDeviceForm(BaseComponentForm):
 
 class RoomSensorDeviceConfigForm(CustomDaliDeviceForm):
 
+
     def save(self, commit=True):
         from simo.core.models import Icon
         colonel = None

simo/fleet/gateways.py

@@ -11,6 +11,7 @@ from simo.core.utils.serialization import deserialize_form_data
 
 
 
+
 class FleetGatewayHandler(BaseObjectCommandsGatewayHandler):
     name = "SIMO.io Fleet"
     config_form = BaseGatewayForm
@@ -101,15 +102,19 @@ class FleetGatewayHandler(BaseObjectCommandsGatewayHandler):
                 gw.finish_discovery()
                 continue
 
-            colonel = Colonel.objects.get(
-                id=gw.discovery['init_data']['colonel']['val'][0]['pk']
-            )
             if gw.discovery['controller_uid'] == 'simo.fleet.controllers.TTLock':
+                colonel = Colonel.objects.get(
+                    id=gw.discovery['init_data']['colonel']['val'][0]['pk']
+                )
                 GatewayObjectCommand(
                     gw, colonel, command='discover',
                     type=gw.discovery['controller_uid']
                 ).publish()
-            elif gw.discovery['controller_uid'] == 'simo.fleet.controllers.DALIDevice':
+            elif gw.discovery['controller_uid'] == \
+            'simo.fleet.controllers.DALIDevice':
+                colonel = Colonel.objects.get(
+                    id=gw.discovery['init_data']['colonel']['val'][0]['pk']
+                )
                 form_cleaned_data = deserialize_form_data(gw.discovery['init_data'])
                 GatewayObjectCommand(
                     gw, colonel,
@@ -117,6 +122,31 @@ class FleetGatewayHandler(BaseObjectCommandsGatewayHandler):
                     type=gw.discovery['controller_uid'],
                     i=form_cleaned_data['interface'].no
                 ).publish()
+            elif gw.discovery['controller_uid'] == \
+            'simo.fleet.controllers.RoomZonePresenceSensor':
+                form_cleaned_data = deserialize_form_data(
+                    gw.discovery['init_data']
+                )
+                if form_cleaned_data['device'].startswith('wifi'):
+                    colonel = Colonel.objects.filter(
+                        id=form_cleaned_data['device'][5:]
+                    ).first()
+                    GatewayObjectCommand(
+                        gw, colonel,
+                        command='discover', type=self.uid.split('.')[-1],
+                    ).publish()
+                else:
+                    from .models import CustomDaliDevice
+                    from .custom_dali_operations import Frame
+                    dali_device = CustomDaliDevice.objects.filter(
+                        id=form_cleaned_data['device'][5:]
+                    ).first()
+                    frame = Frame(40, bytes(bytearray(5)))
+                    frame[8:11] = 15  # command to custom dali device
+                    frame[12:15] = 0  # action to perform: start room zone discovery
+                    dali_device.transmit(frame)
+
+
 
     def watch_buttons(self, component):
         for i, ctrl in enumerate(component.config.get('controls', [])):

simo/fleet/migrations/0052_colonelpin_interface.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.10 on 2025-05-07 07:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0051_customdalidevice_components'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='colonelpin',
+            name='interface',
+            field=models.PositiveIntegerField(blank=True, null=True),
+        ),
+    ]

simo/fleet/migrations/0053_auto_20250507_0713.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.10 on 2025-05-07 07:13
+
+from django.db import migrations
+
+
+def forwards_func(apps, schema_editor):
+    ColonelPin = apps.get_model("fleet", "ColonelPin")
+    ColonelPin.objects.filter(no=101).update(interface=1)
+    ColonelPin.objects.filter(no=102).update(interface=2)
+
+
+def reverse_func(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0052_colonelpin_interface'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func, reverse_func, elidable=True),
+    ]

simo/fleet/migrations/0054_auto_20250507_1256.py

@@ -0,0 +1,36 @@
+# Generated by Django 4.2.10 on 2025-05-07 12:56
+
+from django.db import migrations
+
+def forwards_func(apps, schema_editor):
+    Component = apps.get_model("core", "Component")
+    ColonelPin = apps.get_model('fleet', "ColonelPin")
+
+    for comp in Component.objects.filter(controller_uid__in=(
+        'simo.fleet.controllers.BME680Sensor',
+        'simo.fleet.controllers.MCP9808TempSensor',
+        'simo.fleet.controllers.ENS160AirQualitySensor'
+    )):
+        cp = ColonelPin.objects.filter(
+            colonel__id=comp.config['colonel'],
+            interface=comp.config['i2c_interface']
+        ).first()
+        if cp:
+            comp.config['interface_port'] = cp.id
+            comp.save()
+
+
+
+def reverse_func(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0053_auto_20250507_0713'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func, reverse_func, elidable=True),
+    ]