simo 2.1.14__py3-none-any.whl → 2.2.2__py3-none-any.whl

simo/core/controllers.py

@@ -78,7 +78,7 @@ class ControllerBase(ABC):
     @property
     def info_template_path(self) -> str:
         return f"{self.__class__.__module__.split('.')[-2]}/" \
-               f"controllers_info/{self.__class__.__name__.lower()}.md"
+               f"controllers_info/{self.__class__.__name__}.md"
 
     @abstractmethod
     def _validate_val(self, value, occasion=None):

simo/fleet/controllers.py

@@ -25,7 +25,7 @@ from .forms import (
     ColonelSwitchConfigForm, ColonelPWMOutputConfigForm,
     ColonelNumericSensorConfigForm, ColonelRGBLightConfigForm,
     ColonelDHTSensorConfigForm, DS18B20SensorConfigForm,
-    BME680SensorConfigForm, MPC9808SensorConfigForm,
+    BME680SensorConfigForm, MPC9808SensorConfigForm, ENS160SensorConfigForm,
     DualMotorValveForm, BlindsConfigForm, BurglarSmokeDetectorConfigForm,
     TTLockConfigForm, DALIDeviceConfigForm, DaliLampForm, DaliGearGroupForm,
     DaliSwitchConfigForm,
@@ -210,6 +210,41 @@ class MPC9808TempSensor(FleeDeviceMixin, BaseNumericSensor):
     name = "MPC9808 Temperature Sensor (I2C)"
 
 
+class ENS160AirQualitySensor(FleeDeviceMixin, BaseMultiSensor):
+    gateway_class = FleetGatewayHandler
+    config_form = ENS160SensorConfigForm
+    name = "ENS160 Air Quality Sensor (I2C)"
+
+    default_value = [
+        ["CO2", 0, "ppm"],
+        ["TVOC", 0, "ppb"],
+        ["AQI (UBA)", 0, ""]
+    ]
+
+    def get_co2(self):
+        try:
+            for entry in self.component.value:
+                if entry[0] == 'CO2':
+                    return entry[1]
+        except:
+            return
+
+    def get_tvoc(self):
+        try:
+            for entry in self.component.value:
+                if entry[0] == 'TVOC':
+                    return entry[1]
+        except:
+            return
+
+    def get_aqi(self):
+        try:
+            for entry in self.component.value:
+                if entry[0] == 'AQI (UBA)':
+                    return entry[1]
+        except:
+            return
+
 
 class BasicOutputMixin:
     gateway_class = FleetGatewayHandler

simo/fleet/forms.py

@@ -462,9 +462,9 @@ class BME680SensorConfigForm(ColonelComponentForm):
             ]
         )
     )
-    i2c_address = forms.IntegerField(
-        min_value=0, max_value=127, initial=118,
-        help_text="Integer: 0 - 127. Dafault: 118"
+    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,
@@ -482,6 +482,13 @@ class BME680SensorConfigForm(ColonelComponentForm):
                 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):
@@ -504,9 +511,14 @@ class MPC9808SensorConfigForm(ColonelComponentForm):
             ]
         )
     )
-    i2c_address = forms.IntegerField(
-        min_value=0, max_value=127, initial=24,
-        help_text="Integer: 0 - 127. Default: 24",
+    i2c_address = forms.TypedChoiceField(
+        coerce=int, initial=24,
+        choices=(
+            (24, "Default"),
+            (25, "AD0"), (25, "AD1"), (28, "AD2"),
+            (27, "AD0 + AD1"), (29, "AD0 + AD2"), (30, "AD1 + AD2"),
+            (31, "AD0 + AD1 + AD2")
+        ),
     )
     read_frequency_s = forms.IntegerField(
         initial=60, min_value=1, max_value=60 * 60 * 24,
@@ -524,6 +536,14 @@ class MPC9808SensorConfigForm(ColonelComponentForm):
                 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):
@@ -532,6 +552,56 @@ class MPC9808SensorConfigForm(ColonelComponentForm):
         return super().save(commit=commit)
 
 
+class ENS160SensorConfigForm(ColonelComponentForm):
+    interface = ColonelInterfacesChoiceField(
+        queryset=Interface.objects.filter(type='i2c'),
+        widget=autocomplete.ListSelect2(
+            url='autocomplete-interfaces',
+            forward=[
+                forward.Self(),
+                forward.Field('colonel'),
+                forward.Const(
+                    {'type': 'i2c'}, 'filters'
+                )
+            ]
+        )
+    )
+    i2c_address = forms.TypedChoiceField(
+        coerce=int, initial=83,
+        choices=((82, "0x52"), (83, "0x53")),
+    )
+    read_frequency_s = forms.IntegerField(
+        initial=10, min_value=1, max_value=60 * 60 * 24,
+        help_text='read and report air quality values every s. '
+                  'Can not be less than 1s.'
+
+    )
+
+    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 = ColonelPinChoiceField(
         label="Port",

simo/fleet/templates/fleet/controllers_info/ENS160AirQualitySensor.md

@@ -0,0 +1,15 @@
+### Initial Start-Up
+
+Initial Start-Up is the time the ENS160 needs to exhibit reasonable air quality readings after
+its first ever power-on.
+The ENS160 sensor raw resistance signals and sensitivities will change upon first power-on.
+The change in resistance is greatest in the first 48 hours of operation. Therefore, the ENS160
+employs a start-up algorithm, allowing eCO2-, TVOC- and AQI-output signals to be used from
+first power-on after 1 hour of operation.
+
+### Warm-Up
+
+Further to “Initial Start-Up” the conditioning or “Warm-Up” period is the time required to
+achieve adequate sensor stability before measuring VOCs after idle periods or power-off.
+Typically, the ENS160 requires 1 minute of warm-up before reasonable air quality readings
+can be expected.

simo/generic/controllers.py

@@ -1048,8 +1048,8 @@ class Watering(ControllerBase):
     def _perform_schedule(self):
         self.component.refresh_from_db()
         next_run = self._get_next_run()
-        if self.component.config['next_run'] != next_run:
-            self.component.config['next_run'] = next_run
+        if self.component.meta['next_run'] != next_run:
+            self.component.meta['next_run'] = next_run
             self.component.save()
 
         if self.component.value['status'] == 'running_program':
@@ -1065,8 +1065,8 @@ class Watering(ControllerBase):
                 str(localtime.weekday() + 1)
             ]
         if not times_to_start:
-            if self.component.config.get('next_run'):
-                self.component.config['next_run'] = None
+            if self.component.meta.get('next_run'):
+                self.component.meta['next_run'] = None
                 self.component.save()
             return
 

{simo-2.1.14.dist-info → simo-2.2.2.dist-info}/METADATA

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

{simo-2.1.14.dist-info → simo-2.2.2.dist-info}/RECORD

@@ -23,7 +23,7 @@ simo/core/auto_urls.py,sha256=nNXEgLAAAQAhRWQDA9AbDtw-zcPKmu_pufJaSa8g818,1102
 simo/core/autocomplete_views.py,sha256=JT5LA2_Wtr60XYSAIqaXFKFYPjrmkEf6yunXD9y2zco,4022
 simo/core/base_types.py,sha256=qVh6MrXZEfN7bFOyFftC7u0yyz0PkvpsjllLBc6SCp4,616
 simo/core/context.py,sha256=98PXAMie43faRVBFkOG22uNpvGRNprcGhzjBFkrxaRY,1367
-simo/core/controllers.py,sha256=2XqqnpZy1nYwowflIKI4lcNMbotERf_YkbY0ztExfbY,29529
+simo/core/controllers.py,sha256=y6nB_iv1KxsyNutGRYZIBAHua2BHuV7OMRBD9nJXFbg,29521
 simo/core/dynamic_settings.py,sha256=U9pY7p_hoeD1LxobIvxZqQ7Zn_4MhYMqZvsr4O0PAYs,1871
 simo/core/events.py,sha256=LvtonJGNyCb6HLozs4EG0WZItnDwNdtnGQ4vTcnKvUs,4438
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
@@ -10191,8 +10191,8 @@ simo/fleet/api.py,sha256=Hxn84xI-Q77HxjINgRbjSJQOv9jii4OL20LxK0VSrS8,2499
 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=ounEUw51X6EYA8xDcGNIik1bDbw4JR3DOGr1FKo4hHs,28829
-simo/fleet/forms.py,sha256=CbrLN_gMCTo8u6fg0ovztkhdYEjHZmSr_3gzsDRMP84,54425
+simo/fleet/controllers.py,sha256=mASn88pUAFnkmd0UreXh2M0amZpjbv3xMghfTC8OB94,29744
+simo/fleet/forms.py,sha256=gp95NiQl6Lik-FzY6pSXNAa85VN-HeSOe5vr8Lc2pVc,57219
 simo/fleet/gateways.py,sha256=lKEJW0MgaOEiNnijH50DNSVChvaUT3TA3UurcI57P8k,5677
 simo/fleet/managers.py,sha256=XOpDOA9L-f_550TNSyXnJbun2EmtGz1TenVTMlUSb8E,807
 simo/fleet/models.py,sha256=t_oi6EYSkg8Y5p3trJPv4MqW6AyUcylge9Bfw83mWCg,16462
@@ -10208,8 +10208,8 @@ simo/fleet/__pycache__/api.cpython-38.pyc,sha256=rL9fb7cCQatyFvXyKmlNOKmxVo8vHYe
 simo/fleet/__pycache__/auto_urls.cpython-38.pyc,sha256=Tc6a6BCXHjijP8U2jE2ghlJwnSNrGm59-hW5t-80wF0,689
 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=61dvQDl2nIuB4iaCzdBMwQnly_m0OvI7zteRS6sIm5U,23831
-simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=7B6NZnY6yS8qrmv5zlTa07iUYmdv4nW7PTpOVfRn3OY,37436
+simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=CagiILAhdfOsckuO6nh5ukKjAqke4O1m4LSHbAQru5I,24830
+simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=bdJgWyMfvGtnQiord-SawX8it5OVqJdY21hH5qkPjOQ,38820
 simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=0RKVn0ndreVKhsrukqeLPSdMnRrsQ_W7yeVeBkRLfIk,5058
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=8uz-xpUiqbGDgXIZ_XRZtFb-Tju6NGxflGg-Ee4Yo6k,1310
 simo/fleet/__pycache__/models.cpython-38.pyc,sha256=GZ01BjdvTn6_XJBfV8VrSldJ67X06ne-xW4CsQ6N6Wc,13756
@@ -10295,11 +10295,12 @@ simo/fleet/migrations/__pycache__/0035_auto_20240514_0855.cpython-38.pyc,sha256=
 simo/fleet/migrations/__pycache__/0036_auto_20240605_0702.cpython-38.pyc,sha256=SDGibhEg0SYDF6fCte8l8NLChvHKn1qhLIrNZ_WoZQk,1654
 simo/fleet/migrations/__pycache__/0037_alter_colonelpin_options_alter_colonelpin_no_and_more.cpython-38.pyc,sha256=ZappGrTStz3EIHlQ94y5ieXI-SkM9J1ashPey13ncFA,955
 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/Button.md,sha256=GIuxqG617174NEtpPeCGVocxO4YMe7-CacgVSu_L5-E,739
+simo/fleet/templates/fleet/controllers_info/ENS160AirQualitySensor.md,sha256=3LSTY9YPFuVPIbVsYCAifcotrXJcOXl2k774_vo6nAE,770
 simo/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/generic/app_widgets.py,sha256=E_pnpA1hxMIhenRCrHoQ5cik06jm2BAHCkl_eo-OudU,1264
 simo/generic/base_types.py,sha256=djymox_boXTHX1BTTCLXrCH7ED-uAsV_idhaDOc3OLI,409
-simo/generic/controllers.py,sha256=gojeCP_vSyLTaP4h56LqqLDykny5lEG-nLclieyVrRg,58292
+simo/generic/controllers.py,sha256=lnojSqDQ-1FArF2wH_c11y0qd906Wog-qrSG1DoqeXc,58284
 simo/generic/forms.py,sha256=IAfDtmEk1-CP0JBoetOD_ahLm64nK41GOUXjmbUzNtY,29550
 simo/generic/gateways.py,sha256=cc_q_g2HsI2_rWmr8yZ3spnMPwsgoYS5ApWRimc11wU,18831
 simo/generic/models.py,sha256=flpK2jsBFghrvRHzl6IKT-t3WZ-hNOj4ZP2vmBzx0K8,7657
@@ -10504,9 +10505,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.1.14.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.1.14.dist-info/METADATA,sha256=ciR_wlaOnCRk7dYaoHrnRJHcDnBiH7rv14fZdxxT3A8,1848
-simo-2.1.14.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-simo-2.1.14.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
-simo-2.1.14.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.1.14.dist-info/RECORD,,
+simo-2.2.2.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.2.2.dist-info/METADATA,sha256=Ru0FCahOkylESH_ERFdMhvY_J5YwYXMmIBsjAZvsdKY,1847
+simo-2.2.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+simo-2.2.2.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
+simo-2.2.2.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.2.2.dist-info/RECORD,,