simo 2.10.7__py3-none-any.whl → 2.10.11__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

@@ -23,7 +23,7 @@ from .gateways import FleetGatewayHandler
 from .forms import (
     ColonelPinChoiceField,
     ColonelBinarySensorConfigForm, ColonelButtonConfigForm,
-    ColonelSwitchConfigForm, ColonelPWMOutputConfigForm, DCDriverConfigForm,
+    ColonelSwitchConfigForm, ColonelPWMOutputConfigForm, DC10VConfigForm,
     ColonelNumericSensorConfigForm, ColonelRGBLightConfigForm,
     ColonelDHTSensorConfigForm, DS18B20SensorConfigForm,
     BME680SensorConfigForm, MCP9808SensorConfigForm, ENS160SensorConfigForm,
@@ -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:
@@ -299,7 +314,7 @@ class FadeMixin:
 
 
 class PWMOutput(FadeMixin, FleeDeviceMixin, BasicOutputMixin, BaseDimmer):
-    name = "Dimmer"
+    name = "AC/DC Dimmer | PWM Driver"
     config_form = ColonelPWMOutputConfigForm
 
     def _prepare_for_send(self, value):
@@ -329,7 +344,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:
@@ -337,7 +352,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
@@ -347,47 +362,61 @@ 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, FleeDeviceMixin, 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)
@@ -855,13 +884,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 +997,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 +1024,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 +1041,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 +1058,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 +1089,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)
+