simo 2.0.13__py3-none-any.whl → 2.0.15__py3-none-any.whl

simo/core/controllers.py

@@ -697,16 +697,6 @@ class Switch(MultiSwitchBase, TimerMixin, OnOffPokerMixin):
             self.turn_off()
         threading.Thread(target=toggle_back).start()
 
-    def _prepare_for_send(self, value):
-        if self.component.config.get('inverse'):
-            return not value
-        return value
-
-    def _prepare_for_set(self, value):
-        if self.component.config.get('inverse'):
-            return not value
-        return value
-
 
 class DoubleSwitch(MultiSwitchBase):
     name = _("Double Switch")

simo/fleet/forms.py

@@ -196,18 +196,10 @@ class ColonelBinarySensorConfigForm(ColonelComponentForm):
             ]
         )
     )
-    pull = forms.ChoiceField(
-        choices=(
-            ('HIGH', "HIGH"), ('LOW', "LOW"), ("FLOATING", "leave floating"),
-        ),
-        help_text="If you are not sure what is this all about, "
-                  "you are most definitely want to pull this HIGH or LOW "
-                  "but not leave it floating!"
-    )
     inverse = forms.TypedChoiceField(
-        choices=((1, "Yes"), (0, "No")), coerce=int,
-        help_text="Hint: Set pull HIGH and inverse to Yes, to get ON signal when "
-                  "you deliver GND to the pin and OFF when you cut it out."
+        choices=((1, "Yes"), (0, "No")), coerce=int, initial=1,
+        help_text="Hint: Set inverse to Yes, to get ON signal when "
+                  "you deliver GND to the input and OFF when you cut it out."
     )
     debounce = forms.IntegerField(
         min_value=0, max_value=1000 * 60 * 60, required=False, initial=0,
@@ -215,7 +207,6 @@ class ColonelBinarySensorConfigForm(ColonelComponentForm):
                   "between ON/OFF states when engaged. <br>"
                   "Set debounce value in milliseconds, to remediate this. "
                   "100ms offers a good starting point!"
-
     )
 
     def clean(self):
@@ -508,17 +499,12 @@ class ColonelSwitchConfigForm(ColonelComponentForm):
             ]
         )
     )
-    engaged_action = forms.ChoiceField(
-        choices=(('HIGH', "HIGH"), ('LOW', "LOW")),
-    )
     auto_off = forms.FloatField(
         required=False, min_value=0.01, max_value=1000000000,
         help_text="If provided, switch will be turned off after "
                   "given amount of seconds after every turn on event."
     )
-    inverse = forms.BooleanField(
-        label=_("Inverse switch value"), required=False
-    )
+    inverse = forms.BooleanField(required=False)
     slaves = forms.ModelMultipleChoiceField(
         required=False,
         queryset=Component.objects.filter(
@@ -681,14 +667,30 @@ class ColonelRGBLightConfigForm(ColonelComponentForm):
     num_leds = forms.IntegerField(
         label=_("Number of leds"), min_value=1, max_value=2000
     )
-    timing = forms.TypedChoiceField(
-        initial=1, coerce=int, choices=((1, "800kHz (most common)"), (0, "400kHz"),)
+    strip_type = forms.ChoiceField(
+        label="LED strip type",
+        choices=(
+            ("WS2811", "WS2811"),
+            ('WS2812', "WS2812"),
+            ('WS2812B', "WS2812B"),
+            ('WS2813', "WS2813"),
+            ('WS2815', "WS2815"),
+            ('SK6812', "SK6812"),
+            ('generic', "Generic"),
+        )
     )
-    order = forms.ChoiceField(
-        initial='RGB', choices=(
+    has_white = forms.BooleanField(initial=False, required=False)
+    color_order = forms.ChoiceField(
+        required=False, choices=(
+            (None, 'Default'),
             ("RGB", "RGB"), ("RBG", "RBG"), ("GRB", "GRB"),
             ("RGBW", "RGBW"), ("RBGW", "RBGW"), ("GRBW", "GRBW"),
-        )
+        ),
+    )
+    custom_timing = forms.CharField(
+        required=False,
+        help_text="Custom addressable led strip timing (T0H, T0L, T1H, T1L). <br>"
+                  "For example SK6812 is: (300, 900, 600, 600)"
     )
     controls = FormsetField(
         formset_factory(
@@ -698,12 +700,26 @@ class ColonelRGBLightConfigForm(ColonelComponentForm):
 
     def save(self, commit=True):
         self.instance.config['output_pin_no'] = self.cleaned_data['output_pin'].no
-        if len(self.cleaned_data['order']) > 3:
-            self.instance.config['has_white'] = True
-        else:
-            self.instance.config['has_white'] = False
         return super().save(commit)
 
+    def clean_custom_timing(self):
+        custom_timing = self.cleaned_data.get('custom_timing')
+        if not custom_timing:
+            return custom_timing
+        custom_timing = custom_timing.strip().\
+            strip('(').strip('[').rstrip(')').rstrip(']').split(',')
+        if len(custom_timing.split(',')) != 4:
+            raise forms.ValidationError("Tuple of 4 integers please.")
+        for t in custom_timing.split(','):
+            try:
+                t = int(t)
+            except:
+                raise forms.ValidationError(f"Integers only please.")
+            if t <= 0:
+                raise forms.ValidationError(f"Intervals must be greater than 0.")
+            if t > 100000:
+                raise forms.ValidationError(f"{t} seems way to much!")
+        return f"({custom_timing})"
 
     def clean(self):
         super().clean()
@@ -712,6 +728,20 @@ class ColonelRGBLightConfigForm(ColonelComponentForm):
         if not self.cleaned_data.get('output_pin'):
             return self.cleaned_data
 
+        if self.cleaned_data.get('color_order'):
+            if self.cleaned_data['has_white']:
+                if len(self.cleaned_data['color_order']) != 4:
+                    self.add_error(
+                        "color_order",
+                        _("4 colors expected for stripes with dedicated White led.")
+                    )
+            else:
+                if len(self.cleaned_data['color_order']) != 3:
+                    self.add_error(
+                        "color_order",
+                        _("3 colors expected for stripes without dedicated White led.")
+                    )
+
         self._clean_pin('output_pin')
 
         if not self.cleaned_data.get('controls'):

{simo-2.0.13.dist-info → simo-2.0.15.dist-info}/METADATA

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

{simo-2.0.13.dist-info → simo-2.0.15.dist-info}/RECORD

@@ -34,7 +34,7 @@ simo/core/auto_urls.py,sha256=0gu-IL7PHobrmKW6ksffiOkAYu-aIorykWdxRNtwGYo,1194
 simo/core/autocomplete_views.py,sha256=JT5LA2_Wtr60XYSAIqaXFKFYPjrmkEf6yunXD9y2zco,4022
 simo/core/base_types.py,sha256=yqbIZqBksrAkEuHRbt6iExwPDDy0K5II2NzRCkmOvMU,589
 simo/core/context.py,sha256=98PXAMie43faRVBFkOG22uNpvGRNprcGhzjBFkrxaRY,1367
-simo/core/controllers.py,sha256=2D7YCLktx7a-4tn80DenQP2CdY0dc2bWg6IRU69YTZ8,27246
+simo/core/controllers.py,sha256=2NH1xZFA4_YWNjJWjHqEvCB6SerebiQ5eHZix_xYvx8,26967
 simo/core/dynamic_settings.py,sha256=U2WNL96JzVXdZh0EqMPWrxqO6BaRR2Eo5KTDqz7MC4o,1943
 simo/core/events.py,sha256=LvtonJGNyCb6HLozs4EG0WZItnDwNdtnGQ4vTcnKvUs,4438
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
@@ -65,7 +65,7 @@ simo/core/__pycache__/auto_urls.cpython-38.pyc,sha256=SVl4fF0-yiq7e9gt08jIM6_rL4
 simo/core/__pycache__/autocomplete_views.cpython-38.pyc,sha256=hJ6JILI1LqrAtpQMvxnLvljGdW1v1gpvBsD79vFkZ58,3972
 simo/core/__pycache__/base_types.cpython-38.pyc,sha256=CasZJN42cK_ymoQgn5E4s8oOkuZJ18fVHCgN4GPuT7c,735
 simo/core/__pycache__/context.cpython-38.pyc,sha256=MSZPDhqMhCpUuBJl3HCIBHZA3BntYeP8RAnQcdqAH9k,1278
-simo/core/__pycache__/controllers.cpython-38.pyc,sha256=-NjuX7iGheE_ZMqkZ6g4ZnnVjdUnFCTlH0awAJxZt2Y,24110
+simo/core/__pycache__/controllers.cpython-38.pyc,sha256=WmItOZU7CPqyYhxxB1F9I7QAhCqwUn0DSbLii_pqXwI,23818
 simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=ELu06Hub4DOidja71ybvD3ZM4HdXiyZjNJrZfnXZXNA,2476
 simo/core/__pycache__/events.cpython-38.pyc,sha256=A1Axx-qftd1r7st7wkO3DkvTdt9-RkcJe5KJhpzJVk8,5109
 simo/core/__pycache__/filters.cpython-38.pyc,sha256=VIMADCBiYhziIyRmxAyUDJluZvuZmiC4bNYWTRsGSao,721
@@ -10169,7 +10169,7 @@ simo/fleet/auto_urls.py,sha256=X04oKJWA48wFW5iXg3PPROY2KDdHn_a99orQSE28QC4,518
 simo/fleet/base_types.py,sha256=wL9RVkHr0gA7HI1wZq0pruGEIgvQqpfnCL4cC3ywsvw,102
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
 simo/fleet/controllers.py,sha256=rTxRFf-LKWAZxzixrsLZHHm51BmMx9a1PLdgf6inlNM,20533
-simo/fleet/forms.py,sha256=rLymJ2ovNgmwdKYJtxTfjuIm5Q4p3GLkIb7-Yo2DmS4,36375
+simo/fleet/forms.py,sha256=Ree_e3V0rBkVk1bVPr4aV8bsdo0pfCS8i5UV2OBtMJQ,37684
 simo/fleet/gateways.py,sha256=KV5i5fxXIrlK-k6zyEkk83x11GJt-ELQ0npb4Ac83cM,3693
 simo/fleet/managers.py,sha256=XOpDOA9L-f_550TNSyXnJbun2EmtGz1TenVTMlUSb8E,807
 simo/fleet/models.py,sha256=J-rnn7Ew-7s3646NNRVY947Sbz21mUD_nBHtuHAKXds,14160
@@ -10185,7 +10185,7 @@ simo/fleet/__pycache__/auto_urls.cpython-38.pyc,sha256=SqyTuaz_kEBvx-bL46SclsZEE
 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=l9bz18Qp33C12TJOKPSn9vIXnlBKnBusODNk7Fg64qA,18103
-simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=-Sbb1kBxb246hV8A2ESlR4LVEISJNedVFiOK1IzRt6c,25954
+simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=IvK-njOrKBAlvzSGsvPrKnsHwB1gcRrmWL8Nlkg_fF0,27050
 simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=YAcgTOqJbtjGI03lvEcU6keFfrwAHkObVmErYzfRvjk,3569
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=8uz-xpUiqbGDgXIZ_XRZtFb-Tju6NGxflGg-Ee4Yo6k,1310
 simo/fleet/__pycache__/models.cpython-38.pyc,sha256=S9pPqRjIxASXahoIOkkjQX7cBwjkdu4d2nXMju0-Cf8,12283
@@ -10444,8 +10444,8 @@ 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.0.13.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.13.dist-info/METADATA,sha256=rwjjG5hKGMgEGunNKlhYByM46Kepk1OFgrYTcoQ5bcg,1700
-simo-2.0.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.13.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.13.dist-info/RECORD,,
+simo-2.0.15.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.0.15.dist-info/METADATA,sha256=UqCCt7aUFVM4KSRZgpdaBDqE7HmzyUYAa8BKE01kwz8,1700
+simo-2.0.15.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.0.15.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.0.15.dist-info/RECORD,,