simo 2.4.1__py3-none-any.whl → 2.5.1__py3-none-any.whl

simo/fleet/forms.py

@@ -195,17 +195,15 @@ class ControlForm(forms.Form):
 
 
 class ColonelBinarySensorConfigForm(ColonelComponentForm):
-    pin = ColonelPinChoiceField(
+    pin = Select2ModelChoiceField(
         label='Port',
         queryset=ColonelPin.objects.filter(input=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'input': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'input': True}, 'filters')
+        ]
     )
     inverse = forms.TypedChoiceField(
         choices=((1, "Yes"), (0, "No")), coerce=int, initial=1,
@@ -283,17 +281,15 @@ class ColonelBinarySensorConfigForm(ColonelComponentForm):
 
 
 class ColonelButtonConfigForm(ColonelComponentForm):
-    pin = ColonelPinChoiceField(
+    pin = Select2ModelChoiceField(
         label="Port",
         queryset=ColonelPin.objects.filter(input=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'input': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'input': True}, 'filters')
+        ]
     )
     action_method = forms.ChoiceField(
         label="Action method", initial='down',
@@ -322,19 +318,17 @@ class ColonelButtonConfigForm(ColonelComponentForm):
 
 
 class ColonelNumericSensorConfigForm(ColonelComponentForm, NumericSensorForm):
-    pin = ColonelPinChoiceField(
+    pin = Select2ModelChoiceField(
         label="Port",
         queryset=ColonelPin.objects.filter(adc=True, input=True, native=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const(
-                    {'adc': True, 'native': True, 'input': True}, 'filters'
-                )
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const(
+                {'adc': True, 'native': True, 'input': True}, 'filters'
+            )
+        ]
     )
     attenuation = forms.TypedChoiceField(
         initial=0, coerce=int, choices=(
@@ -375,19 +369,17 @@ class ColonelNumericSensorConfigForm(ColonelComponentForm, NumericSensorForm):
 
 
 class DS18B20SensorConfigForm(ColonelComponentForm, NumericSensorForm):
-    pin = ColonelPinChoiceField(
+    pin = Select2ModelChoiceField(
         label="Port",
         queryset=ColonelPin.objects.filter(input=True, native=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const(
-                    {'native': True, 'input': True}, 'filters'
-                )
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const(
+                {'native': True, 'input': True}, 'filters'
+            )
+        ]
     )
     read_frequency_s = forms.IntegerField(
         initial=60, min_value=1, max_value=60*60*24,
@@ -415,19 +407,17 @@ class DS18B20SensorConfigForm(ColonelComponentForm, NumericSensorForm):
 
 
 class ColonelDHTSensorConfigForm(ColonelComponentForm):
-    pin = ColonelPinChoiceField(
+    pin = Select2ModelChoiceField(
         label="Port",
         queryset=ColonelPin.objects.filter(input=True, native=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const(
-                    {'native': True, 'input': True}, 'filters'
-                )
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const(
+                {'native': True, 'input': True}, 'filters'
+            )
+        ]
     )
     sensor_type = forms.TypedChoiceField(
         initial=11, coerce=int, choices=(
@@ -462,18 +452,16 @@ class ColonelDHTSensorConfigForm(ColonelComponentForm):
 
 
 class BME680SensorConfigForm(ColonelComponentForm):
-    interface = ColonelInterfacesChoiceField(
+    interface = Select2ModelChoiceField(
         queryset=Interface.objects.filter(type='i2c'),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-interfaces',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const(
-                    {'type': 'i2c'}, 'filters'
-                )
-            ]
-        )
+        url='autocomplete-interfaces',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const(
+                {'type': 'i2c'}, 'filters'
+            )
+        ]
     )
     i2c_address = forms.TypedChoiceField(
         coerce=int, initial=118,
@@ -511,18 +499,16 @@ class BME680SensorConfigForm(ColonelComponentForm):
 
 
 class MPC9808SensorConfigForm(ColonelComponentForm):
-    interface = ColonelInterfacesChoiceField(
+    interface = Select2ModelChoiceField(
         queryset=Interface.objects.filter(type='i2c'),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-interfaces',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const(
-                    {'type': 'i2c'}, 'filters'
-                )
-            ]
-        )
+        url='autocomplete-interfaces',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const(
+                {'type': 'i2c'}, 'filters'
+            )
+        ]
     )
     i2c_address = forms.TypedChoiceField(
         coerce=int, initial=24,
@@ -566,18 +552,16 @@ class MPC9808SensorConfigForm(ColonelComponentForm):
 
 
 class ENS160SensorConfigForm(ColonelComponentForm):
-    interface = ColonelInterfacesChoiceField(
+    interface = Select2ModelChoiceField(
         queryset=Interface.objects.filter(type='i2c'),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-interfaces',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const(
-                    {'type': 'i2c'}, 'filters'
-                )
-            ]
-        )
+        url='autocomplete-interfaces',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const(
+                {'type': 'i2c'}, 'filters'
+            )
+        ]
     )
     i2c_address = forms.TypedChoiceField(
         coerce=int, initial=83,
@@ -616,17 +600,15 @@ class ENS160SensorConfigForm(ColonelComponentForm):
 
 
 class ColonelTouchSensorConfigForm(ColonelComponentForm):
-    pin = ColonelPinChoiceField(
+    pin = Select2ModelChoiceField(
         label="Port",
         queryset=ColonelPin.objects.filter(input=True, capacitive=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'input': True, 'capacitive': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'input': True, 'capacitive': True}, 'filters')
+        ]
     )
     threshold = forms.IntegerField(
         min_value=0, max_value=999999999, required=False, initial=1000,
@@ -740,17 +722,15 @@ class ColonelSwitchConfigForm(ColonelComponentForm):
 
 
 class ColonelPWMOutputConfigForm(ColonelComponentForm):
-    output_pin = ColonelPinChoiceField(
+    output_pin = Select2ModelChoiceField(
         label="Port",
         queryset=ColonelPin.objects.filter(output=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True}, 'filters')
+        ]
     )
     min = forms.FloatField(
         required=True, initial=0,
@@ -761,14 +741,21 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
         help_text="Maximum component value"
     )
     value_units = forms.CharField(required=False)
-    duty_min = forms.IntegerField(
-        min_value=0, max_value=1023, required=True, initial=0,
-        help_text="Minumum PWM signal output duty (0 - 1023)"
+
+    device_min = forms.IntegerField(
+        label="Device minimum (%).",
+        help_text="Device will turn off once it reaches this internal value. "
+                  "Usually it is a good idea to "                  
+                  "set this somewhere in between of 5 - 15 %. ",
+        initial=10, min_value=0, max_value=100,
     )
-    duty_max = forms.IntegerField(
-        min_value=0, max_value=1023, required=True, initial=900,
-        help_text="Maximum PWM signal output duty (0 - 1023)"
+    device_max = forms.IntegerField(
+        label="Device maximum (%).",
+        help_text="Can be used to prevent reaching maximum values. "
+                  "Default is 100%",
+        initial=100, min_value=0, max_value=100,
     )
+
     turn_on_time = forms.IntegerField(
         min_value=0, max_value=60000, initial=1000,
         help_text="Turn on speed in ms. 1500 is a great quick default. "
@@ -783,9 +770,6 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
         initial='easeOutSine', choices=EASING_CHOICES,
         help_text="easeOutSine - offers most naturally looking effect."
     )
-    inverse = forms.BooleanField(
-        label=_("Inverse dimmer signal"), required=False, initial=True
-    )
     on_value = forms.FloatField(
         required=True, initial=100,
         help_text="ON value when used with toggle switch"
@@ -874,18 +858,81 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
         return obj
 
 
+class DCDriverConfigForm(ColonelComponentForm):
+    output_pin = Select2ModelChoiceField(
+        label="Port",
+        queryset=ColonelPin.objects.filter(output=True),
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True}, 'filters')
+        ]
+    )
+    min = forms.FloatField(
+        required=True, initial=0,
+        help_text="Minimum component value displayed to the user."
+    )
+    max = forms.FloatField(
+        required=True, initial=24,
+        help_text="Maximum component value displayed to the user."
+    )
+    value_units = forms.CharField(required=False)
+
+    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,
+    )
+    device_max = forms.IntegerField(
+        label="Device maximum Voltage.",
+        help_text="Can be set lower than it's natural maximum of 24V. \n"
+                  "Don't forget to adjust your component max value accordingly "
+                  "if you change this.",
+        initial=24, min_value=0, max_value=24,
+    )
+
+    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)
+
+        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
+
+
 class ColonelRGBLightConfigForm(ColonelComponentForm):
-    output_pin = ColonelPinChoiceField(
+    output_pin = Select2ModelChoiceField(
         label="Port",
         queryset=ColonelPin.objects.filter(output=True, native=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True, 'native': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True, 'native': True}, 'filters')
+        ]
     )
     num_leds = forms.IntegerField(
         label=_("Number of leds"), min_value=1, max_value=2000
@@ -998,17 +1045,15 @@ class ColonelRGBLightConfigForm(ColonelComponentForm):
 
 
 class DualMotorValveForm(ColonelComponentForm):
-    open_pin = ColonelPinChoiceField(
+    open_pin = Select2ModelChoiceField(
         label="Open Relay Port",
         queryset=ColonelPin.objects.filter(output=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True}, 'filters')
+        ]
     )
     open_action = forms.ChoiceField(
         choices=(('HIGH', "HIGH"), ('LOW', "LOW")),
@@ -1017,17 +1062,15 @@ class DualMotorValveForm(ColonelComponentForm):
         required=True, min_value=0.01, max_value=1000000000,
         initial=2, help_text="Time in seconds to open."
     )
-    close_pin = ColonelPinChoiceField(
+    close_pin = Select2ModelChoiceField(
         label="Close Relay Port",
         queryset=ColonelPin.objects.filter(output=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True}, 'filters')
+        ]
     )
     close_action = forms.ChoiceField(
         choices=(('HIGH', "HIGH"), ('LOW', "LOW")),
@@ -1036,6 +1079,12 @@ class DualMotorValveForm(ColonelComponentForm):
         required=True, min_value=0.01, max_value=1000000000,
         initial=10, help_text="Time in seconds to close."
     )
+    min = forms.FloatField(
+        label="Minimum displayed value", required=True, initial=0
+    )
+    max = forms.FloatField(
+        label="Maximum displayed value", required=True, initial=100
+    )
 
 
     def clean(self):
@@ -1064,32 +1113,28 @@ class DualMotorValveForm(ColonelComponentForm):
 
 
 class BlindsConfigForm(ColonelComponentForm):
-    open_pin = ColonelPinChoiceField(
+    open_pin = Select2ModelChoiceField(
         label="Open Relay Port",
         queryset=ColonelPin.objects.filter(output=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True}, 'filters')
+        ]
     )
     open_action = forms.ChoiceField(
         choices=(('HIGH', "HIGH"), ('LOW', "LOW")),
     )
-    close_pin = ColonelPinChoiceField(
+    close_pin = Select2ModelChoiceField(
         label="Close Relay Port",
         queryset=ColonelPin.objects.filter(output=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True}, 'filters')
+        ]
     )
     close_action = forms.ChoiceField(
         choices=(('HIGH', "HIGH"), ('LOW', "LOW")),
@@ -1212,29 +1257,25 @@ class BlindsConfigForm(ColonelComponentForm):
 
 
 class BurglarSmokeDetectorConfigForm(ColonelComponentForm):
-    power_pin = ColonelPinChoiceField(
+    power_pin = Select2ModelChoiceField(
         label="Power port",
         queryset=ColonelPin.objects.filter(output=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True}, 'filters')
+        ]
     )
-    sensor_pin = ColonelPinChoiceField(
+    sensor_pin = Select2ModelChoiceField(
         label="Sensor port",
         queryset=ColonelPin.objects.filter(input=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'input': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'input': True}, 'filters')
+        ]
     )
     sensor_inverse = forms.TypedChoiceField(
         choices=((0, "No"), (1, "Yes")), coerce=int, initial=0,
@@ -1306,18 +1347,16 @@ class TTLockConfigForm(ColonelComponentForm):
 
 
 class DALIDeviceConfigForm(ColonelComponentForm):
-    interface = ColonelInterfacesChoiceField(
+    interface = Select2ModelChoiceField(
         queryset=Interface.objects.filter(type='dali'),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-interfaces',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const(
-                    {'type': 'dali'}, 'filters'
-                )
-            ]
-        )
+        url='autocomplete-interfaces',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const(
+                {'type': 'dali'}, 'filters'
+            )
+        ]
     )
 
     def clean_interface(self):

simo/fleet/migrations/0038_alter_colonel_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.10 on 2024-10-09 09:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0037_alter_colonelpin_options_alter_colonelpin_no_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='colonel',
+            name='type',
+            field=models.CharField(choices=[('4-relays', '4 Relay'), ('ample-wall', 'Ample Wall'), ('game-changer', 'Game Changer'), ('game-changer-mini', 'Game Changer Mini')], default='ample-wall', max_length=20),
+        ),
+    ]

simo/fleet/migrations/0039_auto_20241016_1047.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.10 on 2024-10-16 10:47
+from django.db import migrations
+
+
+def forwards_func(apps, schema_editor):
+    Component = apps.get_model("core", "Component")
+
+    for comp in Component.objects.filter(controller_uid='simo.fleet.controllers.PWMOutput'):
+        duty_min = comp.config.get('duty_min', 0)
+        duty_max = comp.config.get('duty_max', 1023)
+        comp.config['device_min'] = int((1023 - duty_max) / 1023 * 100)
+        comp.config['device_max'] = int(100 - (duty_min / 1023 * 100))
+        comp.save()
+
+
+def reverse_func(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0038_alter_colonel_type'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func, reverse_func, elidable=True),
+    ]

simo/fleet/migrations/0040_alter_colonel_pwm_frequency.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.10 on 2024-10-18 08:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0039_auto_20241016_1047'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='colonel',
+            name='pwm_frequency',
+            field=models.IntegerField(choices=[(0, '3kHz'), (1, '22kHz')], default=0, help_text='Affects Ample Wall dimmer PWM output (dimmer) frequency'),
+        ),
+    ]