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

simo/fleet/api.py

@@ -1,3 +1,4 @@
+import json
 from django.db.models import Count
 from django.utils.translation import gettext_lazy as _
 from rest_framework import viewsets
@@ -66,12 +67,14 @@ class ColonelsViewSet(InstanceMixin, viewsets.ModelViewSet):
     @action(detail=True, methods=['post'])
     def move_to(self, request, pk, *args, **kwargs):
         colonel = self.get_object()
+        data = json.loads(request.body)
+
         target = Colonel.objects.annotate(
             components_count=Count('components')
         ).filter(
-            pk=request.POST.get('target'), instance=self.instance,
+            pk=data.get('target'), instance=self.instance,
             components_count=0, type=colonel.type
-        )
+        ).first()
         if not target:
             raise APIValidationError(_('Invalid target.'), code=400)
         colonel.move_to(target)

simo/fleet/controllers.py

@@ -164,6 +164,11 @@ class BME680Sensor(DHTSensor):
     config_form = BME680SensorConfigForm
     name = "BME68X Climate Sensor (I2C)"
 
+    def _get_occupied_pins(self):
+        return [
+            self.component.config['i2c_interface'] + 100,
+        ]
+
 
 
 class MCP9808TempSensor(FleeDeviceMixin, BaseNumericSensor):
@@ -180,6 +185,11 @@ class MCP9808TempSensor(FleeDeviceMixin, BaseNumericSensor):
             return 'F'
         return 'C'
 
+    def _get_occupied_pins(self):
+        return [
+            self.component.config['i2c_interface'] + 100,
+        ]
+
     def _prepare_for_set(self, value):
         if self.component.zone.instance.units_of_measure == 'imperial':
             return round((value[0][1] * 9 / 5) + 32, 1)
@@ -198,6 +208,11 @@ class ENS160AirQualitySensor(FleeDeviceMixin, BaseMultiSensor):
         ["AQI (UBA)", 0, ""]
     ]
 
+    def _get_occupied_pins(self):
+        return [
+            self.component.config['i2c_interface'] + 100,
+        ]
+
     def get_co2(self):
         try:
             for entry in self.component.value:
@@ -855,13 +870,13 @@ class AirQualitySensor(FleeDeviceMixin, BaseMultiSensor):
 
     def _receive_from_device(self, value, *args, **kwargs):
         aqi = 5
-        if value < 812:
+        if value < 2000:
             aqi = 4
-        if value < 325:
+        if value < 800:
             aqi = 3
-        if value < 162:
+        if value < 400:
             aqi = 2
-        if value < 65:
+        if value < 200:
             aqi = 1
         value = [
             ["TVOC", value, "ppb"],
@@ -968,10 +983,14 @@ class RoomZonePresenceSensor(FleeDeviceMixin, BaseBinarySensor):
     config_form = BaseComponentForm
     name = "Room zone presence"
     discovery_msg = _(
-        "Move vigorously in particular zone of the room, "
-        "where presence needs to be detected. "
-        "Your movements are being recorded. "
-        "Hit Done, once you are done."
+        "Your body is a a live space marker now! Your movements are being recorded.<br>"
+        "Whenever you hear a beep, new space blob is being included.<br>"
+        "Move vigorously in the zone where you want presence to be detected until "
+        "you hear no more beeps.<br> "
+        "Green color of a sensor indicates, "
+        "that the space you are currently in is "
+        "already included.<br>"
+        "Tip: Dance! :)"
     )
 
     @classmethod
@@ -991,10 +1010,10 @@ class RoomZonePresenceSensor(FleeDeviceMixin, BaseBinarySensor):
                 command='discover', type=self.uid.split('.')[-1],
             ).publish()
         else:
+            from .custom_dali_operations import Frame
             dali_device = CustomDaliDevice.objects.filter(
                 id=form_cleaned_data['device'][5:]
             ).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] = 0 # action to perform: start room zone discovery
@@ -1008,6 +1027,11 @@ class RoomZonePresenceSensor(FleeDeviceMixin, BaseBinarySensor):
         form = cls.add_form(
             controller_uid=cls.uid, data=started_with
         )
+        from simo.core.middleware import introduce_instance
+        introduce_instance(form.data['zone'].instance)
+        form = cls.add_form(
+            controller_uid=cls.uid, data=started_with
+        )
         form.is_valid()
         if form.cleaned_data['device'].startswith('wifi'):
             form.instance.alive = False
@@ -1020,15 +1044,17 @@ class RoomZonePresenceSensor(FleeDeviceMixin, BaseBinarySensor):
                     id=new_component.config['colonel']
                 ), command='finalize',
                 data={
+                    'permanent_id': new_component.id,
                     'comp_config': {
-                        'type': str(cls).split('.')[-1],
+                        'type': cls.uid.split('.')[-1],
                         'family': new_component.controller.family,
-                        'config': json.loads(json.dumps(new_component.config))
+                        'config': json.loads(json.dumps(new_component.config)),
                     }
                 }
             ).publish()
         else:
             from simo.core.models import Component
+            from .custom_dali_operations import Frame
             dali_device = CustomDaliDevice.objects.filter(
                 id=form.cleaned_data['device'][5:]
             ).first()
@@ -1049,12 +1075,70 @@ class RoomZonePresenceSensor(FleeDeviceMixin, BaseBinarySensor):
             )
             form.instance.config['slot'] = free_slots.pop()
             new_component = form.save()
-            from .custom_dali_operations import Frame
             frame = Frame(40, bytes(bytearray(5)))
             frame[8:11] = 15  # command to custom dali device
             frame[12:15] = 1  # action to perform: stop room zone discovery
             frame[16:18] = new_component.config['slot']
             dali_device.transmit(frame)
 
-        print("NEW COMPONENT: ", new_component)
-        return new_component
+        return new_component
+
+    def repaint(self):
+        """Repaint included 3D space"""
+        if self.component.config['device'].startswith('wifi'):
+            GatewayObjectCommand(
+                self.component.gateway, Colonel(
+                    id=self.component.config['colonel']
+                ), command='call', method='repaint', id=self.component.id
+            ).publish()
+        else:
+            dali_device = CustomDaliDevice.objects.filter(
+                id=self.component.config['device'][5:]
+            ).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] = 3  # action to perform: repaint
+            frame[16:18] = self.component.config['slot']
+            dali_device.transmit(frame)
+
+    def finish_repaint(self):
+        """Finish repainting of 3D space"""
+        if self.component.config['device'].startswith('wifi'):
+            GatewayObjectCommand(
+                self.component.gateway, Colonel(
+                    id=self.component.config['colonel']
+                ), command='call', method='finish_repaint',
+                id=self.component.id
+            ).publish()
+        else:
+            dali_device = CustomDaliDevice.objects.filter(
+                id=self.component.config['device'][5:]
+            ).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] = 4  # action to perform: finish repaint
+            frame[16:18] = self.component.config['slot']
+            dali_device.transmit(frame)
+
+    def cancel_repaint(self):
+        """Finish repainting of 3D space"""
+        if self.component.config['device'].startswith('wifi'):
+            GatewayObjectCommand(
+                self.component.gateway, Colonel(
+                    id=self.component.config['colonel']
+                ), command='call', method='cancel_repaint',
+                id=self.component.id
+            ).publish()
+        else:
+            dali_device = CustomDaliDevice.objects.filter(
+                id=self.component.config['device'][5:]
+            ).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] = 5  # action to perform: cancel repaint
+            frame[16:18] = self.component.config['slot']
+            dali_device.transmit(frame)
+

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(
@@ -1831,8 +1793,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,

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),
+    ]