simo 2.5.33__py3-none-any.whl → 2.5.34__py3-none-any.whl

simo/core/forms.py

@@ -403,7 +403,8 @@ class NumericSensorForm(BaseComponentForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields['value_units'].initial = self.controller.default_value_units
+        if 'value_units' in self.fields:
+            self.fields['value_units'].initial = self.controller.default_value_units
 
 
 

simo/fleet/forms.py

@@ -1267,23 +1267,38 @@ class BlindsConfigForm(ColonelComponentForm):
 
 
 class GateConfigForm(ColonelComponentForm):
-    control_pin = Select2ModelChoiceField(
-        label="Control Relay Port",
+    open_pin = Select2ModelChoiceField(
+        label="Open Relay Port",
         queryset=ColonelPin.objects.filter(output=True),
         url='autocomplete-colonel-pins',
         forward=[
             forward.Self(),
             forward.Field('colonel'),
             forward.Const({'output': True}, 'filters')
-        ]
+        ], help_text="If your gate is controlled by single input, "
+                     "using this port is enough."
     )
     open_action = forms.ChoiceField(
-        choices=(('HIGH', "HIGH"), ('LOW', "LOW")), initial='HIGH'
+        choices=(('HIGH', "HIGH"), ('LOW', "LOW")),
+    )
+    close_pin = Select2ModelChoiceField(
+        label="Close Relay Port",
+        queryset=ColonelPin.objects.filter(output=True),
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True}, 'filters')
+        ], required=False
+    )
+    close_action = forms.ChoiceField(
+        choices=(('HIGH', "HIGH"), ('LOW', "LOW")),
     )
     control_method = forms.ChoiceField(
         choices=(('pulse', "Pulse"), ('hold', "Hold")), initial="pulse",
-        help_text="What your gate motor expects to receive as control command?"
+        help_text="What your gate motors expect to receive as control command?"
     )
+
     sensor_pin = Select2ModelChoiceField(
         label='Gate open/closed sensor port',
         queryset=ColonelPin.objects.filter(input=True),
@@ -1292,7 +1307,7 @@ class GateConfigForm(ColonelComponentForm):
             forward.Self(),
             forward.Field('colonel'),
             forward.Const({'input': True}, 'filters')
-        ]
+        ], required=False,
     )
     closed_value = forms.ChoiceField(
         label='Gate closed value',
@@ -1300,6 +1315,8 @@ class GateConfigForm(ColonelComponentForm):
         help_text="What is the input sensor value, "
                   "when your gate is in closed position?"
     )
+
+
     open_duration = forms.FloatField(
         initial=30, min_value=1, max_value=600,
         help_text="How much time in seconds does it take for your gate "
@@ -1315,15 +1332,24 @@ class GateConfigForm(ColonelComponentForm):
     def clean(self):
         super().clean()
 
-        if self.cleaned_data.get('control_pin') \
-        and self.cleaned_data.get('sensor_pin') \
-        and self.cleaned_data['control_pin'] == self.cleaned_data['sensor_pin']:
-            self.add_error(
-                'sensor_pin', "Can't be the same as control port!"
-            )
+        check_pins = ('open_pin', 'close_pin', 'sensor_pin')
+        for pin in check_pins:
+            if not self.cleaned_data.get(pin):
+                continue
+            for p in check_pins:
+                if pin == pin:
+                    continue
+                if not self.cleaned_data.get(p):
+                    continue
+                if self.cleaned_data[pin] == self.cleaned_data[p]:
+                    self.add_error(
+                        pin, f"Can't be the same {p}!"
+                    )
 
-        if self.cleaned_data.get('control_pin'):
-            self._clean_pin('control_pin')
+        if self.cleaned_data.get('open_pin'):
+            self._clean_pin('open_pin')
+        if self.cleaned_data.get('close_pin'):
+            self._clean_pin('close_pin')
         if self.cleaned_data.get('sensor_pin'):
             self._clean_pin('sensor_pin')
 
@@ -1353,10 +1379,13 @@ class GateConfigForm(ColonelComponentForm):
         return self.cleaned_data
 
     def save(self, commit=True):
-        if 'control_pin' in self.cleaned_data:
-            self.instance.config['control_pin_no'] = \
-                self.cleaned_data['control_pin'].no
-        if 'sensor_pin' in self.cleaned_data:
+        if self.cleaned_data.get('open_pin'):
+            self.instance.config['open_pin_no'] = \
+                self.cleaned_data['open_pin'].no
+        if self.cleaned_data.get('close_pin'):
+            self.instance.config['close_pin_no'] = \
+                self.cleaned_data['close_pin'].no
+        if self.cleaned_data.get('sensor_pin'):
             self.instance.config['sensor_pin_no'] = \
                 self.cleaned_data['sensor_pin'].no
         obj = super().save(commit=commit)

simo/fleet/migrations/0042_auto_20241120_1028.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.2.10 on 2024-11-20 10:28
+
+from django.db import migrations
+
+
+def forwards_func(apps, schema_editor):
+    Component = apps.get_model("core", "Component")
+
+    for gate in Component.objects.filter(
+        controller_uid='simo.fleet.controllers.Gate'
+    ):
+        gate.config['open_pin_no'] = gate.config.get('control_pin_no')
+        gate.config['open_pin'] = gate.config.get('control_pin')
+        gate.save()
+
+
+def reverse_func(apps, schema_editor):
+    pass
+
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0041_alter_colonel_instance_and_more'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func, reverse_func, elidable=True),
+    ]

simo/users/api.py

@@ -196,17 +196,21 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
         if request.META.get('HTTP_HOST', '').endswith('.simo.io'):
             relay = request.META.get('HTTP_HOST')
 
-        speed_kmh = request.data.get('speed', 0) * 3.6
+        try:
+            speed_kmh = request.data.get('speed', 0) * 3.6
+        except:
+            speed_kmh = 0
 
         if relay:
             location = request.data.get('location')
+            if 'null' in location:
+                location = None
         else:
             location = self.instance.location
-            location_smoothed = location
 
         user_device.last_seen = timezone.now()
 
-        if request.data.get('app_open', False):
+        if request.data.get('app_open', False) == True:
             user_device.is_primary = True
             UserDevice.objects.filter(
                 users=request.user
@@ -214,7 +218,7 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
         user_device.save()
 
         phone_on_charge = False
-        if request.data.get('is_charging'):
+        if request.data.get('is_charging') == True:
             phone_on_charge = True
 
 

{simo-2.5.33.dist-info → simo-2.5.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.5.33
+Version: 2.5.34
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io

{simo-2.5.33.dist-info → simo-2.5.34.dist-info}/RECORD

@@ -47,7 +47,7 @@ simo/core/dynamic_settings.py,sha256=bUs58XEZOCIEhg1TigR3LmYggli13KMryBZ9pC7ugAQ
 simo/core/events.py,sha256=1_KIk5pJqdLPRQlCQ9xSyALst2Cn0b2lAEAJ3QjwIjE,4801
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
 simo/core/form_fields.py,sha256=wowWocYgxkKBr0WYzpKn4UvH4ScnImus56Tg2G8OPBc,2274
-simo/core/forms.py,sha256=O40apPH7a4qX4WdCc10A1aoAaGWOpKqmjB8d-OhEKCo,21523
+simo/core/forms.py,sha256=cLsiyTIAlVni_ir0VplPs6hCdx8SHDkdNW4I9C-lhyw,21568
 simo/core/gateways.py,sha256=m0eS3XjVe34Dge6xtoCq16kFWCKJcdQrT0JW0REqoq8,3715
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=n-b3I4uXzfHKTeB1VMjSaMsDUxp8FegFJwnbV1IsWQ4,3019
@@ -10228,7 +10228,7 @@ simo/fleet/auto_urls.py,sha256=UX66eR2ykMqFgfIllW-RTdjup5-FieCWl_BVm3CcXKg,702
 simo/fleet/base_types.py,sha256=wL9RVkHr0gA7HI1wZq0pruGEIgvQqpfnCL4cC3ywsvw,102
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
 simo/fleet/controllers.py,sha256=fjri1GtCnflkkDpNqhTwy6i9CK6RDEB0Q_BtADzcG8E,29156
-simo/fleet/forms.py,sha256=bFW9OYxZsnYXEvGUZMZQ1Lef5kf3mW9eH6HYxmJK22A,63048
+simo/fleet/forms.py,sha256=Z2iTfV_3Ui2QS2mQX7vPtLqiHvHprwkVSeyJ45c0aeU,64047
 simo/fleet/gateways.py,sha256=lKEJW0MgaOEiNnijH50DNSVChvaUT3TA3UurcI57P8k,5677
 simo/fleet/managers.py,sha256=ZNeHFSkF5kzsl9E1DCBevOW6kXJlD6kw0LU4B-JMOG8,828
 simo/fleet/models.py,sha256=zPplx_v64nfKBmb-nCb74aCVtEeY3m3SjEy-VhbnydU,17511
@@ -10245,7 +10245,7 @@ simo/fleet/__pycache__/auto_urls.cpython-38.pyc,sha256=Tc6a6BCXHjijP8U2jE2ghlJwn
 simo/fleet/__pycache__/base_types.cpython-38.pyc,sha256=deyPwjpT6xZiFxBGFnj5b7R-lbdOTh2krgpJhrcGVhc,274
 simo/fleet/__pycache__/ble.cpython-38.pyc,sha256=Nrof9w7cm4OlpFWHeVnmvvanh2_oF9oQ3TknJiV93-0,1267
 simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=jtFHr_uyjCCeuidL-o-hGaf21u0fnxK_O6hTRdY6lpc,24906
-simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=P7ajkIjrJTAWqPP2ma7L24jyAXpacHShWDdHva88a6o,42628
+simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=asyDqRo5kRIaFhWqDRXqBPxKGl43O6O00dXOemUN6p0,43057
 simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=0RKVn0ndreVKhsrukqeLPSdMnRrsQ_W7yeVeBkRLfIk,5058
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=Vmm23zoQnS3-uS5_WJt2n3wtjhLiEhLWaYxXJCU6Gts,1339
 simo/fleet/__pycache__/models.cpython-38.pyc,sha256=WUahZgETWlem5rVXlJ_vINFRM7OZWp5xpWXGMoeBXsM,14131
@@ -10296,6 +10296,7 @@ simo/fleet/migrations/0038_alter_colonel_type.py,sha256=3NCAJc5M5BilQynd3lIvub3V
 simo/fleet/migrations/0039_auto_20241016_1047.py,sha256=c75iDlPH9NPQohkNBt58NPl31tNmctk5rww8wWQJmxA,801
 simo/fleet/migrations/0040_alter_colonel_pwm_frequency.py,sha256=AiiYeLXEmBAFj1O3WdJB0xQy1KqfiErYR8yPpL8W7e4,498
 simo/fleet/migrations/0041_alter_colonel_instance_and_more.py,sha256=r3PzZERt4kM0ul_TFl-i7qS7n0ht0G8jS83nucMxZfQ,1181
+simo/fleet/migrations/0042_auto_20241120_1028.py,sha256=nXyOXyTqhYfR2IDpIX0E3oIhKI7ShI7TGZ0Uf1CzR1U,715
 simo/fleet/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/fleet/migrations/__pycache__/0001_initial.cpython-38.pyc,sha256=9kc1UyMEYkRNVnZ7iwZbiW1t3qWXROvWrI2G1BdzIaA,1250
 simo/fleet/migrations/__pycache__/0002_auto_20220422_0743.cpython-38.pyc,sha256=8oxhGb7rL8QYKlBLU3pOYcd8aHeQWDB9I8awkK04mXg,841
@@ -10338,6 +10339,7 @@ simo/fleet/migrations/__pycache__/0038_alter_colonel_type.cpython-38.pyc,sha256=
 simo/fleet/migrations/__pycache__/0039_auto_20241016_1047.cpython-38.pyc,sha256=6QU9LBUexU9GFSwPoBgLznO6xZU0N-HbWITah-W1xWo,1088
 simo/fleet/migrations/__pycache__/0040_alter_colonel_pwm_frequency.cpython-38.pyc,sha256=o_trHQUyQfYzWO_iWmZpvzc-uVJlBjK-GfyKhPOVSjc,736
 simo/fleet/migrations/__pycache__/0041_alter_colonel_instance_and_more.cpython-38.pyc,sha256=76yu9gz3pcAq5IYbNeZIoOSgdi0HVqTvc3EdXLGriQI,1178
+simo/fleet/migrations/__pycache__/0042_auto_20241120_1028.cpython-38.pyc,sha256=yK2HRc7MYMc4i9ev7FaguBdnXUnUmpFn8E8JOP_yluA,1030
 simo/fleet/migrations/__pycache__/__init__.cpython-38.pyc,sha256=5k1KW0jeSDzw6RnVPRq4CaO13Lg7M0F-pxA_gqqZ6Mg,170
 simo/fleet/templates/fleet/controllers_info/Button.md,sha256=GIuxqG617174NEtpPeCGVocxO4YMe7-CacgVSu_L5-E,739
 simo/fleet/templates/fleet/controllers_info/ENS160AirQualitySensor.md,sha256=3LSTY9YPFuVPIbVsYCAifcotrXJcOXl2k774_vo6nAE,770
@@ -10447,7 +10449,7 @@ simo/notifications/migrations/__pycache__/0003_alter_notification_instance.cpyth
 simo/notifications/migrations/__pycache__/__init__.cpython-38.pyc,sha256=YMBRHVon2nWDtIUbghckjnC12sIg_ykPWhV5aM0tto4,178
 simo/users/__init__.py,sha256=6a7uBpCWB_DR7p54rbHusc0xvi1qfT1ZCCQGb6TiBh8,52
 simo/users/admin.py,sha256=nmFNHWckp73YZN5MV6ez6ommlj4MSI1Sr8BnQdSKW5g,7187
-simo/users/api.py,sha256=hU70VoYQtTH5xZ2b6swH8_b8G6bdsl8yztk-FHxbZlA,12342
+simo/users/api.py,sha256=O3PYSk8BSX2hsi22cHSgqKQXViL9b3-xgBU2oJDfQGA,12443
 simo/users/apps.py,sha256=cq0A8-U1HALEwev0TicgFhr4CAu7Icz8rwq0HfOaL4E,207
 simo/users/auth_backends.py,sha256=KIw2AdjCUKfm_7Lql6aC4qdE6JznP0ECIMA5MVMLeiM,4251
 simo/users/auto_urls.py,sha256=lcJvteBsbHQMJieZpDz-63tDYejLApqsW3CUnDakd7k,272
@@ -10464,7 +10466,7 @@ simo/users/utils.py,sha256=-Lu7C_sz8JJauLaIwgEa6umArqzNL7JJTY-ZcuF4irA,2004
 simo/users/views.py,sha256=dOQVvmlHG7ihWKJLFUBcqKOA0UDctlMKR0pTc36JZqg,3487
 simo/users/__pycache__/__init__.cpython-38.pyc,sha256=VFoDJE_SKKaPqqYaaBYd1Ndb1hjakkTo_u0EG_XJ1GM,211
 simo/users/__pycache__/admin.cpython-38.pyc,sha256=Jcwn0jqueQkmgXPb327-3iUtrSycGzM537JB_-sryOM,8213
-simo/users/__pycache__/api.cpython-38.pyc,sha256=N6s2wXZiOKXCVekI7U3HbMymoOMsZGlKNHdfjJgLn_8,9947
+simo/users/__pycache__/api.cpython-38.pyc,sha256=bwjxYhY4MBPbKLj-wJkTFZxHSqUE0fIC4Pw4lrHw9g4,9980
 simo/users/__pycache__/apps.cpython-38.pyc,sha256=dgbWL8CxzzISJQTmq_4IztPJ2UzykNVdqA2Ae1PmeGk,605
 simo/users/__pycache__/auth_backends.cpython-38.pyc,sha256=jYS2hlbTZh_ZtPeWcN50pc0IpyfCSO7_MvIbuVwEp8M,3144
 simo/users/__pycache__/auto_urls.cpython-38.pyc,sha256=K-3sz2h-cEitoflSmZk1t0eUg5mQMMGLNZFREVwG7_o,430
@@ -10575,9 +10577,9 @@ simo/users/templates/invitations/expired_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCe
 simo/users/templates/invitations/expired_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo-2.5.33.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.5.33.dist-info/METADATA,sha256=IorucYL9ZZ7DjoUiKgucRTDPyUlHNQZNu5VY4THxPQw,1953
-simo-2.5.33.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-simo-2.5.33.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.5.33.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.5.33.dist-info/RECORD,,
+simo-2.5.34.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.5.34.dist-info/METADATA,sha256=It5zSxA-pwB_V8rKlMy-sHyM3fLZgFds8V4Seg4XChc,1953
+simo-2.5.34.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+simo-2.5.34.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.5.34.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.5.34.dist-info/RECORD,,