simo 2.0.6__py3-none-any.whl → 2.0.7__py3-none-any.whl

simo/core/admin.py

@@ -322,7 +322,7 @@ class ComponentAdmin(admin.ModelAdmin):
             if request.session.get('add_comp_type'):
                 try:
                     controller_cls = CONTROLLERS_BY_GATEWAY.get(
-                        gateway, {}
+                        gateway.type, {}
                     )[request.session['add_comp_type']]
                 except:
                     request.session.pop('add_comp_type')
@@ -355,6 +355,7 @@ class ComponentAdmin(admin.ModelAdmin):
                     pop_fields_from_form(ctx['form'])
                     if ctx['form'].is_valid():
                         if ctx['form'].controller.is_discoverable:
+                            print("INIT DISCOVERY!!!")
                             ctx['form'].controller.init_discovery(
                                 ctx['form'].cleaned_data
                             )
@@ -393,6 +394,7 @@ class ComponentAdmin(admin.ModelAdmin):
                     if ctx['form'].is_valid():
                         request.session['add_comp_type'] = \
                             ctx['form'].cleaned_data['controller_type']
+                        print("Session controller type: ", request.session['add_comp_type'])
                         return redirect(request.path)
 
                 else:
@@ -429,7 +431,7 @@ class ComponentAdmin(admin.ModelAdmin):
         if obj:
             try:
                 self.form = CONTROLLERS_BY_GATEWAY.get(
-                    obj.gateway, {}
+                    obj.gateway.type, {}
                 )[obj.controller_uid].config_form
             except KeyError:
                 pass

simo/core/api.py

@@ -62,7 +62,7 @@ class IconViewSet(viewsets.ReadOnlyModelViewSet):
         if 'q' in self.request.GET:
             queryset = search_queryset(
                 queryset, self.request.GET['q'], ['slug', 'keywords']
-            )[:10]
+            )[:25]
         return queryset
 
     def get_view_name(self):
@@ -592,7 +592,8 @@ class ControllerTypes(InstanceMixin, viewsets.GenericViewSet):
             data[cls.gateway_class.name].append({
                 'uid': uid,
                 'name': cls.name,
-                'is_discoverable': cls.is_discoverable
+                'is_discoverable': cls.is_discoverable,
+                'manual_add': cls.manual_add
             })
 
         return RESTResponse(data)
@@ -603,7 +604,6 @@ class RunningDiscoveries(InstanceMixin, viewsets.GenericViewSet):
     basename = 'discoveries'
     queryset = []
 
-
     def get_permissions(self):
         permissions = super().get_permissions()
         permissions.append(IsInstanceSuperuser())
@@ -612,6 +612,8 @@ class RunningDiscoveries(InstanceMixin, viewsets.GenericViewSet):
     def get_data(self, gateways):
         data = []
         for gateway in gateways:
+            gateway.discovery['last_check'] = time.time()
+            gateway.save(update_fields=['discovery'])
             data.append({
                 'gateway': gateway.id,
                 'start': gateway.discovery['start'],

simo/core/controllers.py

@@ -34,6 +34,7 @@ class ControllerBase(ABC):
     default_config = {}
     default_meta = {}
     discovery_msg = None
+    manual_add = True # Can be added manually
 
     @property
     @abstractmethod

simo/core/forms.py

@@ -264,7 +264,7 @@ class CompTypeSelectForm(forms.Form):
             self.fields['controller_type'].choices = [
                 (cls.uid, cls.name) for cls in CONTROLLERS_BY_GATEWAY.get(
                     gateway.handler.uid, {}
-                ).values()
+                ).values() if cls.manual_add
             ]
 
 

simo/core/migrations/0030_alter_instance_timezone.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.9 on 2024-04-15 11:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0029_auto_20240229_1331'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='instance',
+            name='timezone',
+            field=models.CharField(choices=[('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmara', 'Africa/Asmara'), ('Africa/Asmera', 'Africa/Asmera'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Timbuktu', 'Africa/Timbuktu'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/Buenos_Aires', 'America/Argentina/Buenos_Aires'), ('America/Argentina/Catamarca', 'America/Argentina/Catamarca'), ('America/Argentina/ComodRivadavia', 'America/Argentina/ComodRivadavia'), ('America/Argentina/Cordoba', 'America/Argentina/Cordoba'), ('America/Argentina/Jujuy', 'America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Mendoza', 'America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Atikokan', 'America/Atikokan'), ('America/Atka', 'America/Atka'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Buenos_Aires', 'America/Buenos_Aires'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Catamarca', 'America/Catamarca'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Coral_Harbour', 'America/Coral_Harbour'), ('America/Cordoba', 'America/Cordoba'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Ensenada', 'America/Ensenada'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fort_Wayne', 'America/Fort_Wayne'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Godthab', 'America/Godthab'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Indianapolis', 'America/Indiana/Indianapolis'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Indianapolis', 'America/Indianapolis'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Jujuy', 'America/Jujuy'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Louisville', 'America/Kentucky/Louisville'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/Knox_IN', 'America/Knox_IN'), ('America/Kralendijk', 'America/Kralendijk'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Louisville', 'America/Louisville'), ('America/Lower_Princes', 'America/Lower_Princes'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Marigot', 'America/Marigot'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Mendoza', 'America/Mendoza'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montreal', 'America/Montreal'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nipigon', 'America/Nipigon'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Nuuk', 'America/Nuuk'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Pangnirtung', 'America/Pangnirtung'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Acre', 'America/Porto_Acre'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rainy_River', 'America/Rainy_River'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Rosario', 'America/Rosario'), ('America/Santa_Isabel', 'America/Santa_Isabel'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Shiprock', 'America/Shiprock'), ('America/Sitka', 'America/Sitka'), ('America/St_Barthelemy', 'America/St_Barthelemy'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Thunder_Bay', 'America/Thunder_Bay'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Virgin', 'America/Virgin'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('America/Yellowknife', 'America/Yellowknife'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/South_Pole', 'Antarctica/South_Pole'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Arctic/Longyearbyen', 'Arctic/Longyearbyen'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Ashkhabad', 'Asia/Ashkhabad'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Calcutta', 'Asia/Calcutta'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Choibalsan', 'Asia/Choibalsan'), ('Asia/Chongqing', 'Asia/Chongqing'), ('Asia/Chungking', 'Asia/Chungking'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Dacca', 'Asia/Dacca'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Harbin', 'Asia/Harbin'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Ho_Chi_Minh', 'Asia/Ho_Chi_Minh'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Istanbul', 'Asia/Istanbul'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Kashgar', 'Asia/Kashgar'), ('Asia/Kathmandu', 'Asia/Kathmandu'), ('Asia/Katmandu', 'Asia/Katmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Kolkata', 'Asia/Kolkata'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macao', 'Asia/Macao'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Rangoon', 'Asia/Rangoon'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Saigon', 'Asia/Saigon'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Tel_Aviv', 'Asia/Tel_Aviv'), ('Asia/Thimbu', 'Asia/Thimbu'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ujung_Pandang', 'Asia/Ujung_Pandang'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Ulan_Bator', 'Asia/Ulan_Bator'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yangon', 'Asia/Yangon'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faeroe', 'Atlantic/Faeroe'), ('Atlantic/Faroe', 'Atlantic/Faroe'), ('Atlantic/Jan_Mayen', 'Atlantic/Jan_Mayen'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/ACT', 'Australia/ACT'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Canberra', 'Australia/Canberra'), ('Australia/Currie', 'Australia/Currie'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/LHI', 'Australia/LHI'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/NSW', 'Australia/NSW'), ('Australia/North', 'Australia/North'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Queensland', 'Australia/Queensland'), ('Australia/South', 'Australia/South'), ('Australia/Sydney', 'Australia/Sydney'), ('Australia/Tasmania', 'Australia/Tasmania'), ('Australia/Victoria', 'Australia/Victoria'), ('Australia/West', 'Australia/West'), ('Australia/Yancowinna', 'Australia/Yancowinna'), ('Brazil/Acre', 'Brazil/Acre'), ('Brazil/DeNoronha', 'Brazil/DeNoronha'), ('Brazil/East', 'Brazil/East'), ('Brazil/West', 'Brazil/West'), ('CET', 'CET'), ('CST6CDT', 'CST6CDT'), ('Canada/Atlantic', 'Canada/Atlantic'), ('Canada/Central', 'Canada/Central'), ('Canada/Eastern', 'Canada/Eastern'), ('Canada/Mountain', 'Canada/Mountain'), ('Canada/Newfoundland', 'Canada/Newfoundland'), ('Canada/Pacific', 'Canada/Pacific'), ('Canada/Saskatchewan', 'Canada/Saskatchewan'), ('Canada/Yukon', 'Canada/Yukon'), ('Chile/Continental', 'Chile/Continental'), ('Chile/EasterIsland', 'Chile/EasterIsland'), ('Cuba', 'Cuba'), ('EET', 'EET'), ('EST', 'EST'), ('EST5EDT', 'EST5EDT'), ('Egypt', 'Egypt'), ('Eire', 'Eire'), ('Etc/GMT', 'Etc/GMT'), ('Etc/GMT+0', 'Etc/GMT+0'), ('Etc/GMT+1', 'Etc/GMT+1'), ('Etc/GMT+10', 'Etc/GMT+10'), ('Etc/GMT+11', 'Etc/GMT+11'), ('Etc/GMT+12', 'Etc/GMT+12'), ('Etc/GMT+2', 'Etc/GMT+2'), ('Etc/GMT+3', 'Etc/GMT+3'), ('Etc/GMT+4', 'Etc/GMT+4'), ('Etc/GMT+5', 'Etc/GMT+5'), ('Etc/GMT+6', 'Etc/GMT+6'), ('Etc/GMT+7', 'Etc/GMT+7'), ('Etc/GMT+8', 'Etc/GMT+8'), ('Etc/GMT+9', 'Etc/GMT+9'), ('Etc/GMT-0', 'Etc/GMT-0'), ('Etc/GMT-1', 'Etc/GMT-1'), ('Etc/GMT-10', 'Etc/GMT-10'), ('Etc/GMT-11', 'Etc/GMT-11'), ('Etc/GMT-12', 'Etc/GMT-12'), ('Etc/GMT-13', 'Etc/GMT-13'), ('Etc/GMT-14', 'Etc/GMT-14'), ('Etc/GMT-2', 'Etc/GMT-2'), ('Etc/GMT-3', 'Etc/GMT-3'), ('Etc/GMT-4', 'Etc/GMT-4'), ('Etc/GMT-5', 'Etc/GMT-5'), ('Etc/GMT-6', 'Etc/GMT-6'), ('Etc/GMT-7', 'Etc/GMT-7'), ('Etc/GMT-8', 'Etc/GMT-8'), ('Etc/GMT-9', 'Etc/GMT-9'), ('Etc/GMT0', 'Etc/GMT0'), ('Etc/Greenwich', 'Etc/Greenwich'), ('Etc/UCT', 'Etc/UCT'), ('Etc/UTC', 'Etc/UTC'), ('Etc/Universal', 'Etc/Universal'), ('Etc/Zulu', 'Etc/Zulu'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belfast', 'Europe/Belfast'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Bratislava', 'Europe/Bratislava'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Busingen', 'Europe/Busingen'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Guernsey', 'Europe/Guernsey'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Isle_of_Man', 'Europe/Isle_of_Man'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Jersey', 'Europe/Jersey'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kiev', 'Europe/Kiev'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/Ljubljana', 'Europe/Ljubljana'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Mariehamn', 'Europe/Mariehamn'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Nicosia', 'Europe/Nicosia'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Podgorica', 'Europe/Podgorica'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/San_Marino', 'Europe/San_Marino'), ('Europe/Sarajevo', 'Europe/Sarajevo'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Skopje', 'Europe/Skopje'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Tiraspol', 'Europe/Tiraspol'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Uzhgorod', 'Europe/Uzhgorod'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vatican', 'Europe/Vatican'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zagreb', 'Europe/Zagreb'), ('Europe/Zaporozhye', 'Europe/Zaporozhye'), ('Europe/Zurich', 'Europe/Zurich'), ('GB', 'GB'), ('GB-Eire', 'GB-Eire'), ('GMT', 'GMT'), ('GMT+0', 'GMT+0'), ('GMT-0', 'GMT-0'), ('GMT0', 'GMT0'), ('Greenwich', 'Greenwich'), ('HST', 'HST'), ('Hongkong', 'Hongkong'), ('Iceland', 'Iceland'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Iran', 'Iran'), ('Israel', 'Israel'), ('Jamaica', 'Jamaica'), ('Japan', 'Japan'), ('Kwajalein', 'Kwajalein'), ('Libya', 'Libya'), ('MET', 'MET'), ('MST', 'MST'), ('MST7MDT', 'MST7MDT'), ('Mexico/BajaNorte', 'Mexico/BajaNorte'), ('Mexico/BajaSur', 'Mexico/BajaSur'), ('Mexico/General', 'Mexico/General'), ('NZ', 'NZ'), ('NZ-CHAT', 'NZ-CHAT'), ('Navajo', 'Navajo'), ('PRC', 'PRC'), ('PST8PDT', 'PST8PDT'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Chuuk', 'Pacific/Chuuk'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Enderbury', 'Pacific/Enderbury'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Johnston', 'Pacific/Johnston'), ('Pacific/Kanton', 'Pacific/Kanton'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Pohnpei', 'Pacific/Pohnpei'), ('Pacific/Ponape', 'Pacific/Ponape'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Samoa', 'Pacific/Samoa'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Truk', 'Pacific/Truk'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis'), ('Pacific/Yap', 'Pacific/Yap'), ('Poland', 'Poland'), ('Portugal', 'Portugal'), ('ROC', 'ROC'), ('ROK', 'ROK'), ('Singapore', 'Singapore'), ('Turkey', 'Turkey'), ('UCT', 'UCT'), ('US/Alaska', 'US/Alaska'), ('US/Aleutian', 'US/Aleutian'), ('US/Arizona', 'US/Arizona'), ('US/Central', 'US/Central'), ('US/East-Indiana', 'US/East-Indiana'), ('US/Eastern', 'US/Eastern'), ('US/Hawaii', 'US/Hawaii'), ('US/Indiana-Starke', 'US/Indiana-Starke'), ('US/Michigan', 'US/Michigan'), ('US/Mountain', 'US/Mountain'), ('US/Pacific', 'US/Pacific'), ('US/Samoa', 'US/Samoa'), ('UTC', 'UTC'), ('Universal', 'Universal'), ('W-SU', 'W-SU'), ('WET', 'WET'), ('Zulu', 'Zulu')], db_index=True, max_length=50),
+        ),
+    ]

simo/core/models.py

@@ -278,6 +278,7 @@ class Gateway(DirtyFieldsMixin, models.Model, SimoAdminMixin):
                 started_with=self.discovery['init_data'], data=data
             )
             if result:
+                self.refresh_from_db()
                 if not isinstance(result, dict) and isinstance(result, Iterable):
                     for res in result:
                         if isinstance(res, models.Model):

simo/core/serializers.py

@@ -293,7 +293,7 @@ class ComponentSerializer(FormSerializer):
                 if controller:
                     self.Meta.form = controller.add_form
             else:
-                controller = controllers_map.get(
+                controller = CONTROLLER_TYPES_MAP.get(
                     self.instance.controller_uid
                 )
                 if controller:

simo/core/utils/serialization.py

@@ -21,14 +21,14 @@ def serialize_form_data(data):
                 serialized_data[field_name] = {
                     'model': 'many',
                     'val': json.loads(model_serializers.serialize(
-                        'json', val
+                        'json', val, fields=['pk']
                     ))
                 }
             else:
                 serialized_data[field_name] = {
                     'model': 'single',
                     'val': json.loads(model_serializers.serialize(
-                        'json', [val]
+                        'json', [val], fields=['pk']
                     ))
                 }
         else:
@@ -46,11 +46,13 @@ def deserialize_form_data(data):
             if val['model'] == 'single':
                 for item in deserializer_generator:
                     deserialized_data[field_name] = item.object
+                    deserialized_data[field_name].refresh_from_db()
                     break
             else:
                 deserialized_data[field_name] = []
                 for item in deserializer_generator:
                     deserialized_data[field_name].append(item.object)
+                    deserialized_data[field_name][-1].refresh_from_db()
         else:
             deserialized_data[field_name] = val
     return deserialized_data

simo/fleet/admin.py

@@ -5,14 +5,14 @@ from django.template.loader import render_to_string
 from django.templatetags.static import static
 from simo.core.models import Component
 from simo.core.utils.admin import FormAction
-from .models import Colonel, I2CInterface, ColonelPin
-from .forms import ColonelAdminForm, MoveColonelForm, I2CInterfaceAdminForm
+from .models import Colonel, Interface, ColonelPin
+from .forms import ColonelAdminForm, MoveColonelForm, InterfaceAdminForm
 
 
-class I2CInterfaceInline(admin.TabularInline):
-    model = I2CInterface
+class InterfaceInline(admin.TabularInline):
+    model = Interface
     extra = 0
-    form = I2CInterfaceAdminForm
+    form = InterfaceAdminForm
 
 
 class ColonelPinsInline(admin.TabularInline):
@@ -71,7 +71,7 @@ class ColonelAdmin(admin.ModelAdmin):
         'rebuild_occupied_pins'
     )
 
-    inlines = I2CInterfaceInline, ColonelPinsInline
+    inlines = InterfaceInline, ColonelPinsInline
 
     def get_queryset(self, request):
         qs = super().get_queryset(request)

simo/fleet/auto_urls.py

@@ -1,9 +1,8 @@
 from django.urls import path, re_path
-from django.views.generic import TemplateView
 from .views import (
     colonels_ping,
     PinsSelectAutocomplete,
-    I2CInterfaceSelectAutocomplete
+    InterfaceSelectAutocomplete
 )
 
 urlpatterns = [
@@ -15,7 +14,8 @@ urlpatterns = [
         PinsSelectAutocomplete.as_view(), name='autocomplete-colonel-pins'
     ),
     path(
-        'autocomplete-colonel-i2c_interfaces',
-        I2CInterfaceSelectAutocomplete.as_view(), name='autocomplete-colonel-i2c_interfaces'
+        'autocomplete-colonel-interfaces',
+        InterfaceSelectAutocomplete.as_view(),
+        name='autocomplete-interfaces'
     )
 ]

simo/fleet/controllers.py

@@ -24,7 +24,7 @@ from .forms import (
     ColonelDHTSensorConfigForm, DS18B20SensorConfigForm,
     BME680SensorConfigForm, MPC9808SensorConfigForm,
     DualMotorValveForm, BlindsConfigForm, BurglarSmokeDetectorConfigForm,
-    TTLockConfigForm
+    TTLockConfigForm, DALIDeviceConfigForm
 )
 
 
@@ -294,6 +294,7 @@ class TTLock(FleeDeviceMixin, Lock):
     @classmethod
     def init_discovery(self, form_cleaned_data):
         from simo.core.models import Gateway
+        print("INIT discovery form cleaned data: ", form_cleaned_data)
         print("Serialized form: ", serialize_form_data(form_cleaned_data))
         gateway = Gateway.objects.filter(type=self.gateway_class.uid).first()
         gateway.start_discovery(
@@ -307,7 +308,7 @@ class TTLock(FleeDeviceMixin, Lock):
 
     @classmethod
     def _process_discovery(cls, started_with, data):
-        if data['discover-ttlock'] == 'fail':
+        if data['discovery-result'] == 'fail':
             if data['result'] == 0:
                 return {'error': 'Internal Colonel error. See Colonel logs.'}
             if data['result'] == 1:
@@ -348,6 +349,7 @@ class TTLock(FleeDeviceMixin, Lock):
                 },
             }
             new_component.save()
+            new_component.gateway.finish_discovery()
             GatewayObjectCommand(
                 new_component.gateway, Colonel(
                     id=new_component.config['colonel']
@@ -417,4 +419,75 @@ class TTLock(FleeDeviceMixin, Lock):
         ).publish()
 
 
+class DALIDevice(FleeDeviceMixin):
+    gateway_class = FleetGatewayHandler
+    config_form = DALIDeviceConfigForm
+    discovery_msg = _("Please hook up your new DALI device to your DALI bus.")
+
+    @classmethod
+    def init_discovery(self, form_cleaned_data):
+        from simo.core.models import Gateway
+        gateway = Gateway.objects.filter(type=self.gateway_class.uid).first()
+        gateway.start_discovery(
+            self.uid, serialize_form_data(form_cleaned_data),
+            timeout=60
+        )
+        GatewayObjectCommand(
+            gateway, form_cleaned_data['colonel'],
+            command=f'discover-dali',
+            interface=form_cleaned_data['interface'].no
+        ).publish()
+
+    @classmethod
+    def _process_discovery(cls, started_with, data):
+        started_with = deserialize_form_data(started_with)
+        form = TTLockConfigForm(controller_uid=cls.uid, data=started_with)
+
+        if form.is_valid():
+            new_component = form.save()
+            new_component.config.update(data.get('result', {}).get('config'))
+            new_component.meta['finalization_data'] = {
+                'temp_id': data['result']['id'],
+                'permanent_id': new_component.id,
+                'config': {
+                    'type': cls.uid.split('.')[-1],
+                    'config': new_component.config,
+                    'val': False,
+                },
+            }
+            new_component.save()
+            new_component.gateway.finish_discovery()
+            GatewayObjectCommand(
+                new_component.gateway, Colonel(
+                    id=new_component.config['colonel']
+                ), command='finalize',
+                data=new_component.meta['finalization_data'],
+            ).publish()
+            return [new_component]
+
+        # Literally impossible, but just in case...
+        return {'error': 'INVALID INITIAL DISCOVERY FORM!'}
+
+
+class DALIGear(DALIDevice):
+
+    def _send_to_device(self, value):
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            set_val=value,
+            component_id=self.component.id,
+        ).publish()
+
+
+class DALILamp(DALIGear, BaseSwitch):
+    manual_add = False
+    name = 'DALI Lamp'
+    discovery_msg = _("Please hook up your new DALI device to your DALI bus.")
+
+
+class DALIDimmableLamp(DALIGear, BaseDimmer):
+    manual_add = False
+    name = 'DALI Dimmable Lamp'
+    discovery_msg = _("Please hook up your new DALI lamp to your DALI bus.")
 

simo/fleet/forms.py

@@ -12,7 +12,8 @@ from simo.core.widgets import LogOutputWidget
 from simo.core.utils.easing import EASING_CHOICES
 from simo.core.utils.validators import validate_slaves
 from simo.core.utils.admin import AdminFormActionForm
-from .models import Colonel, ColonelPin, I2CInterface, i2c_interface_no_choices
+from .models import Colonel, ColonelPin, Interface
+from .utils import INTERFACES_PINS_MAP
 
 
 class ColonelPinChoiceField(forms.ModelChoiceField):
@@ -23,6 +24,11 @@ class ColonelPinChoiceField(forms.ModelChoiceField):
     filter_by = 'colonel'
 
 
+class ColonelInterfacesChoiceField(forms.ModelChoiceField):
+    filter_by = 'colonel'
+
+
+
 class ColonelAdminForm(forms.ModelForm):
     log = forms.CharField(
         widget=forms.HiddenInput, required=False
@@ -52,34 +58,29 @@ class MoveColonelForm(AdminFormActionForm):
     )
 
 
-class I2CInterfaceAdminForm(forms.ModelForm):
-    scl_pin = ColonelPinChoiceField(
-        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')
-            ]
-        )
-    )
-    sda_pin = ColonelPinChoiceField(
-        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')
-            ]
-        )
-    )
+class InterfaceAdminForm(forms.ModelForm):
 
     class Meta:
-        model = I2CInterface
+        model = Interface
         fields = '__all__'
 
+
+    def clean(self):
+        if self.instance.pk:
+            return self.cleaned_data
+
+        for pin_no in INTERFACES_PINS_MAP[self.cleaned_data['no']]:
+            cpin = ColonelPin.objects.get(
+                colonel=self.instance.colonel, no=pin_no
+            )
+            if cpin.occupied_by:
+                raise forms.ValidationError(
+                    f"Interface can not be created, because "
+                    f"GPIO{cpin} is already occupied by {cpin.occupied_by}."
+                )
+
+
+
     def clean_scl_pin(self):
         if self.cleaned_data['scl_pin'].occupied_by \
         and self.cleaned_data['scl_pin'].occupied_by  != self.instance:
@@ -416,13 +417,16 @@ class ColonelDHTSensorConfigForm(ColonelComponentForm):
 
 
 class BME680SensorConfigForm(ColonelComponentForm):
-    i2c_interface = forms.TypedChoiceField(
-        coerce=int, choices=i2c_interface_no_choices,
+    interface = ColonelInterfacesChoiceField(
+        queryset=Interface.objects.filter(type='i2c'),
         widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-i2c_interfaces',
+            url='autocomplete-interfaces',
             forward=[
                 forward.Self(),
                 forward.Field('colonel'),
+                forward.Const(
+                    {'type': 'i2c'}, 'filters'
+                )
             ]
         )
     )
@@ -437,15 +441,22 @@ class BME680SensorConfigForm(ColonelComponentForm):
 
     )
 
+    def save(self, commit=True):
+        self.instance.config['i2c_interface'] = self.cleaned_data['interface'].no
+        return super().save(commit=commit)
+
 
 class MPC9808SensorConfigForm(ColonelComponentForm):
-    i2c_interface = forms.TypedChoiceField(
-        coerce=int, choices=i2c_interface_no_choices,
+    interface = ColonelInterfacesChoiceField(
+        queryset=Interface.objects.filter(type='i2c'),
         widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-i2c_interfaces',
+            url='autocomplete-interfaces',
             forward=[
                 forward.Self(),
                 forward.Field('colonel'),
+                forward.Const(
+                    {'type': 'i2c'}, 'filters'
+                )
             ]
         )
     )
@@ -460,6 +471,10 @@ class MPC9808SensorConfigForm(ColonelComponentForm):
 
     )
 
+    def save(self, commit=True):
+        self.instance.config['i2c_interface'] = self.cleaned_data['interface'].no
+        return super().save(commit=commit)
+
 
 class ColonelTouchSensorConfigForm(ColonelComponentForm):
     pin = ColonelPinChoiceField(
@@ -987,7 +1002,6 @@ class BurglarSmokeDetectorConfigForm(ColonelComponentForm):
 
 
 class TTLockConfigForm(ColonelComponentForm):
-    pass
 
     def clean(self):
         if not self.instance or not self.instance.pk:
@@ -1002,7 +1016,6 @@ class TTLockConfigForm(ColonelComponentForm):
                 )
         return self.cleaned_data
 
-
     def save(self, commit=True):
         obj = super(ColonelComponentForm, self).save(commit)
         if commit:
@@ -1010,3 +1023,25 @@ class TTLockConfigForm(ColonelComponentForm):
             self.cleaned_data['colonel'].save()
         return obj
 
+
+
+class DALIDeviceConfigForm(ColonelComponentForm):
+    interface = ColonelInterfacesChoiceField(
+        queryset=Interface.objects.filter(type='dali'),
+        widget=autocomplete.ListSelect2(
+            url='autocomplete-interfaces',
+            forward=[
+                forward.Self(),
+                forward.Field('colonel'),
+                forward.Const(
+                    {'type': 'dali'}, 'filters'
+                )
+            ]
+        )
+    )
+
+    def save(self, commit=True):
+        self.instance.config['dali_interface'] = self.cleaned_data['interface'].no
+        return super().save(commit=commit)
+
+

simo/fleet/gateways.py

@@ -1,4 +1,5 @@
 import datetime
+import time
 from django.utils import timezone
 from simo.core.gateways import BaseObjectCommandsGatewayHandler
 from simo.core.forms import BaseGatewayForm
@@ -14,7 +15,7 @@ class FleetGatewayHandler(BaseObjectCommandsGatewayHandler):
     periodic_tasks = (
         ('look_for_updates', 600),
         ('watch_colonels_connection', 30),
-        ('push_discoveries', 3),
+        ('push_discoveries', 10),
     )
 
     def _on_mqtt_message(self, client, userdata, msg):
@@ -37,9 +38,12 @@ class FleetGatewayHandler(BaseObjectCommandsGatewayHandler):
     def push_discoveries(self):
         from .models import Colonel
         for gw in Gateway.objects.filter(
-            type=self.uid,
-            discovery__has_key='start',
+            type=self.uid, discovery__has_key='start',
         ).exclude(discovery__has_key='finished'):
+            if time.time() - gw.discovery.get('last_check') > 10:
+                gw.finish_discovery()
+                continue
+
             colonel = Colonel.objects.get(
                 id=gw.discovery['init_data']['colonel']['val'][0]['pk']
             )

simo/fleet/managers.py

@@ -22,11 +22,13 @@ class ColonelPinsManager(models.Manager):
         return qs
 
 
-class I2CInterfacesManager(models.Manager):
+class InterfacesManager(models.Manager):
 
     def get_queryset(self):
         qs = super().get_queryset()
         instance = get_current_instance()
         if instance:
             qs = qs.filter(colonel__instance=instance)
-        return qs
+        return qs
+
+

simo/fleet/migrations/0032_auto_20240415_0736.py

@@ -0,0 +1,33 @@
+# Generated by Django 3.2.9 on 2024-04-15 07:36
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0031_alter_colonel_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='colonel',
+            name='logs_stream',
+            field=models.BooleanField(default=False, help_text='ATENTION! Causes serious overhead and significantly degrades the lifespan of a chip due to a lot of writes to the memory. It also causes Colonel websocket to run out of memory and reset if a lot of data is being transmitted. Leave this off, unleess you know what you are doing!'),
+        ),
+        migrations.CreateModel(
+            name='Interface',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('no', models.PositiveIntegerField(choices=[(1, '1'), (2, '2')])),
+                ('type', models.CharField(choices=[('i2c', 'I2C'), ('dali', 'DALI')], max_length=20)),
+                ('pin_a', models.ForeignKey(editable=False, limit_choices_to={'native': True, 'output': True}, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='interface_a', to='fleet.colonelpin')),
+                ('pin_b', models.ForeignKey(editable=False, limit_choices_to={'native': True, 'output': True}, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='interface_b', to='fleet.colonelpin')),
+                ('colonel', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='interfaces', to='fleet.colonel')),
+            ],
+            options={
+                'unique_together': {('colonel', 'no')},
+            },
+        ),
+    ]

simo/fleet/migrations/0033_auto_20240415_0736.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.2.9 on 2024-04-15 07:36
+
+from django.db import migrations
+
+def create_objects(apps, schema_editor):
+    I2CInterface = apps.get_model("fleet", "I2CInterface")
+    Interface = apps.get_model("fleet", "Interface")
+    for i2c_i in I2CInterface.objects.filter(no__gt=0):
+        Interface.objects.create(
+            colonel=i2c_i.colonel, type='i2c',
+            pin_a=i2c_i.scl_pin, pin_b=i2c_i.sda_pin
+        )
+
+
+def delete_objects(apps, schema_editor):
+    Interface = apps.get_model("fleet", "Interface")
+    Interface.delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0032_auto_20240415_0736'),
+    ]
+
+    operations = [
+        migrations.RunPython(create_objects, delete_objects),
+    ]

simo/fleet/models.py

@@ -1,5 +1,6 @@
 import requests
 import time
+from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.db import models
 from django.db.models.signals import post_save, pre_delete, post_delete
@@ -11,8 +12,8 @@ from simo.core.models import Instance, Gateway, Component
 from simo.core.utils.helpers import get_random_string
 from simo.core.events import GatewayObjectCommand
 from .gateways import FleetGatewayHandler
-from .managers import ColonelsManager, ColonelPinsManager, I2CInterfacesManager
-from .utils import GPIO_PINS
+from .managers import ColonelsManager, ColonelPinsManager, InterfacesManager
+from .utils import GPIO_PINS, INTERFACES_PINS_MAP
 
 
 
@@ -181,10 +182,12 @@ class Colonel(DirtyFieldsMixin, models.Model):
                 pin.save()
 
         for interface in self.i2c_interfaces.all():
-            interface.sda_pin.occupied_by = interface
-            interface.sda_pin.save()
-            interface.scl_pin.occupied_by = interface
-            interface.scl_pin.save()
+            if interface.sda_pin:
+                interface.sda_pin.occupied_by = interface
+                interface.sda_pin.save()
+            if interface.scl_pin:
+                interface.scl_pin.occupied_by = interface
+                interface.scl_pin.save()
 
 
     def move_to(self, other_colonel):
@@ -256,12 +259,6 @@ def after_colonel_save(sender, instance, created, *args, **kwargs):
                 capacitive=data.get('capacitive'), adc=data.get('adc'),
                 native=data.get('native'), note=data.get('note')
             )
-        if instance.type in ('ample-wall', 'game-changer'):
-            I2CInterface.objects.create(
-                colonel=instance, name='Main', no=0,
-                scl_pin=ColonelPin.objects.get(colonel=instance, no=4),
-                sda_pin=ColonelPin.objects.get(colonel=instance, no=15),
-            )
 
 
 @receiver(pre_delete, sender=Component)
@@ -310,7 +307,7 @@ class I2CInterface(models.Model):
         default=100000, help_text="100000 - is a good middle point!"
     )
 
-    objects = I2CInterfacesManager()
+    objects = InterfacesManager()
 
     class Meta:
         unique_together = 'colonel', 'no'
@@ -319,7 +316,7 @@ class I2CInterface(models.Model):
         return self.name
 
 
-@receiver(post_save, sender=I2CInterface)
+@receiver(post_delete, sender=I2CInterface)
 def post_i2c_interface_delete(sender, instance, *args, **kwargs):
     with transaction.atomic():
         ct = ContentType.objects.get_for_model(instance)
@@ -334,3 +331,74 @@ def post_i2c_interface_delete(sender, instance, *args, **kwargs):
         instance.scl_pin.save()
         instance.sda_pin.occupied_by = instance
         instance.sda_pin.save()
+
+
+class Interface(models.Model):
+    colonel = models.ForeignKey(
+        Colonel, on_delete=models.CASCADE, related_name='interfaces'
+    )
+    no = models.PositiveIntegerField(choices=((1, "1"), (2, "2")))
+    type = models.CharField(
+        max_length=20, choices=(('i2c', "I2C"), ('dali', "DALI"))
+    )
+    pin_a = models.ForeignKey(
+        ColonelPin, on_delete=models.CASCADE, limit_choices_to={
+            'native': True, 'output': True,
+        }, verbose_name="Pin A (scl)", null=True, related_name='interface_a',
+        editable=False
+    )
+    pin_b = models.ForeignKey(
+        ColonelPin, on_delete=models.CASCADE, limit_choices_to={
+            'native': True, 'output': True,
+        }, verbose_name="Pin B (sda)", null=True, related_name='interface_b',
+        editable=False
+    )
+
+    objects = InterfacesManager()
+
+    class Meta:
+        unique_together = 'colonel', 'no'
+
+    def __str__(self):
+        return f"{self.no} - {self.get_type_display()}"
+
+    def save(self, *args, **kwargs):
+        if not self.pk:
+            for pin_no in INTERFACES_PINS_MAP[self.no]:
+                cpin = ColonelPin.objects.get(colonel=self.colonel, no=pin_no)
+                if cpin.occupied_by:
+                    raise ValidationError(
+                        f"Interface can not be created, because "
+                        f"GPIO{cpin} is already occupied by {cpin.occupied_by}."
+                    )
+        return super().save(*args, **kwargs)
+
+
+@receiver(post_save, sender=Interface)
+def post_interface_save(sender, instance, created, *args, **kwargs):
+    if created:
+        instance.pin_a = ColonelPin.objects.get(
+            colonel=instance.colonel, no=INTERFACES_PINS_MAP[instance.no][0]
+        )
+        instance.pin_a.occupied_by = instance
+        instance.pin_a.save()
+        instance.pin_b = ColonelPin.objects.get(
+            colonel=instance.colonel, no=INTERFACES_PINS_MAP[instance.no][1]
+        )
+        instance.pin_b.occupied_by = instance
+        instance.pin_b.save()
+
+
+@receiver(post_delete, sender=Interface)
+def post_interface_delete(sender, instance, *args, **kwargs):
+    with transaction.atomic():
+        ct = ContentType.objects.get_for_model(instance)
+        for pin in ColonelPin.objects.filter(
+            occupied_by_content_type=ct,
+            occupied_by_id=instance.id
+        ):
+            pin.occupied_by_content_type = None
+            pin.occupied_by_content_id = None
+            pin.save()
+
+

simo/fleet/socket_consumers.py

@@ -218,15 +218,14 @@ class FleetConsumer(AsyncWebsocketConsumer):
             }
         }
         config_data['settings'].update(instance_options)
-        i2c_interfaces = await sync_to_async(list, thread_sensitive=True)(
-            self.colonel.i2c_interfaces.all().select_related(
-                'scl_pin', 'sda_pin'
+        interfaces = await sync_to_async(list, thread_sensitive=True)(
+            self.colonel.interfaces.all().select_related(
+                'pin_a', 'pin_b'
             )
         )
-        for i2c_interface in i2c_interfaces:
-            config_data['interfaces']['i2c-%d' % i2c_interface.no] = {
-                'scl': i2c_interface.scl_pin.no, 'sda': i2c_interface.sda_pin.no,
-                'freq': i2c_interface.freq
+        for interface in interfaces:
+            config_data['interfaces'][f'{interface.type}-{interface.no}'] = {
+                'pin_a': interface.pin_a.no, 'pin_b': interface.pin_b.no,
             }
         components = await sync_to_async(
             list, thread_sensitive=True
@@ -319,6 +318,11 @@ class FleetConsumer(AsyncWebsocketConsumer):
                     asyncio.run(self.send_data({
                         'command': 'discover-ttlock'
                     }))
+                elif payload.get('command') == 'discover-dali':
+                    print("SEND discover-dali command!")
+                    asyncio.run(self.send_data({
+                        'command': 'discover-dali', 'i': payload['interface']
+                    }))
                 elif payload.get('command') == 'finalize':
                     asyncio.run(self.send_data({
                         'command': 'finalize',
@@ -420,18 +424,21 @@ class FleetConsumer(AsyncWebsocketConsumer):
                     except Exception as e:
                         print(traceback.format_exc(), file=sys.stderr)
 
-                elif 'discover-ttlock' in data:
+                elif 'discovery-result' in data:
                     def process_discovery_result():
-                        self.gateway.refresh_from_db()
-                        if self.gateway.discovery.get('finished'):
-                            return Component.objects.filter(
+                        # check if component is already created
+                        if data['discovery-result'] == 'success':
+                            comp = Component.objects.filter(
                                 meta__finalization_data__temp_id=data['result']['id']
                             ).first()
+                            if comp:
+                                return comp
+
+                        self.gateway.refresh_from_db()
                         try:
                             self.gateway.process_discovery(data)
                         except Exception as e:
                             print(traceback.format_exc(), file=sys.stderr)
-                        self.gateway.finish_discovery()
 
                     finished_comp = await sync_to_async(
                         process_discovery_result, thread_sensitive=True

simo/fleet/utils.py

@@ -58,7 +58,7 @@ for no, data in BASE_ESP32_GPIO_PINS.items():
 
 # ample-wall
 for no, data in BASE_ESP32_GPIO_PINS.items():
-    if no in (4, 12, 13, 14, 15, 23, 32, 33, 34, 36, 39):
+    if no in (12, 13, 14, 23, 32, 33, 34, 36, 39):
         GPIO_PINS['ample-wall'][no] = GPIO_PIN_DEFAULTS.copy()
         GPIO_PINS['ample-wall'][no].update(data)
 
@@ -114,3 +114,8 @@ for no, data in BASE_ESP32_GPIO_PINS.items():
         GPIO_PINS['4-relays'][no]['note'] = 'Relay4'
     else:
         GPIO_PINS['4-relays'][no].update(data)
+
+
+INTERFACES_PINS_MAP = {
+    1: [13, 23], 2: [32, 33]
+}

simo/fleet/views.py

@@ -1,9 +1,8 @@
-from django.contrib.contenttypes.models import ContentType
 from django.http import HttpResponse, Http404
 from django.db.models import Q
 from dal import autocomplete
 from simo.core.utils.helpers import search_queryset
-from .models import Colonel, ColonelPin, I2CInterface
+from .models import Colonel, ColonelPin, Interface
 
 
 def colonels_ping(request):
@@ -43,20 +42,22 @@ class PinsSelectAutocomplete(autocomplete.Select2QuerySetView):
         return qs
 
 
-class I2CInterfaceSelectAutocomplete(autocomplete.Select2ListView):
+class InterfaceSelectAutocomplete(autocomplete.Select2ListView):
 
     def get_list(self):
         if not self.request.user.is_staff:
-            return []
+            return Interface.objects.none()
 
         try:
             colonel = Colonel.objects.get(
                 pk=self.forwarded.get("colonel")
             )
         except:
-            return []
+            return Interface.objects.none()
 
-        return [
-            (i.no, i.get_no_display()) for i in
-            I2CInterface.objects.filter(colonel=colonel)
-        ]
+        qs = Interface.objects.filter(colonel=colonel)
+
+        if self.forwarded.get('filters'):
+            qs = qs.filter(**self.forwarded.get('filters'))
+
+        return qs

{simo-2.0.6.dist-info → simo-2.0.7.dist-info}/METADATA

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

{simo-2.0.6.dist-info → simo-2.0.7.dist-info}/RECORD

@@ -25,8 +25,8 @@ simo/_hub_template/hub/settings.py,sha256=4QhvhbtLRxHvAntwqG_qeAAtpDUqKvN4jzw9u3
 simo/_hub_template/hub/supervisor.conf,sha256=IY3fdK0fDD2eAothB0n54xhjQj8LYoXIR96-Adda5Z8,1353
 simo/_hub_template/hub/urls.py,sha256=Ydm-1BkYAzWeEF-MKSDIFf-7aE4qNLPm48-SA51XgJQ,25
 simo/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo/core/admin.py,sha256=p4wbVpU4H42hwj5edWP-0a2aWElEnrOH0t9WA9SFUZQ,17464
-simo/core/api.py,sha256=93q_58VAj-HKzvixGb0Z0T7obDHbdRC4T_YExEtcvM0,23646
+simo/core/admin.py,sha256=MoYz7B5YaTkF2JeacaqsR177N2IagKXc-rG0FTXjJ1w,17622
+simo/core/api.py,sha256=OVvv3a7KYJGbuUgSOfWzPg8hoCCRhdDejQ2kVs0H2p8,23803
 simo/core/api_auth.py,sha256=_3hG4e1eLKrcRnSAOB_xTL6cwtOJ2_7JS7GZU_iqTgA,1251
 simo/core/api_meta.py,sha256=li4KLFl6xTYOoD8pgS8PYcjqTZlzhXI0reAkt06PZFA,3404
 simo/core/app_widgets.py,sha256=EEQOto3fGR0syDqpJE38tQrx8DoTTyg26nF5kYzHY38,2018
@@ -34,19 +34,19 @@ 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=paeZU6Ky2LgRTwj9nFqrgfeJ4kxWPcl95WDTf6P7jOo,27200
+simo/core/controllers.py,sha256=2D7YCLktx7a-4tn80DenQP2CdY0dc2bWg6IRU69YTZ8,27246
 simo/core/dynamic_settings.py,sha256=U2WNL96JzVXdZh0EqMPWrxqO6BaRR2Eo5KTDqz7MC4o,1943
 simo/core/events.py,sha256=LvtonJGNyCb6HLozs4EG0WZItnDwNdtnGQ4vTcnKvUs,4438
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
-simo/core/forms.py,sha256=FkuP1NKWCfMpYGHs0unYiW_bjEuq951IokLRWu4pz9o,21466
+simo/core/forms.py,sha256=OQTPuacid9AoEvZ86G9p6ILuviqJCtSDuwk2WlLj43E,21484
 simo/core/gateways.py,sha256=s_c2W0v2_te89i6LS4Nj7F2wn9UwjZXPT7pfy6SToVo,3714
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=WoQ4OX3akIvoroSYji-nLVqXBSJzCiC1u_IiWkKbKmA,2413
 simo/core/middleware.py,sha256=64PYjnyRnYf4sgMvPfR0oQqf9UEtxUwnhJe3RV6z_HI,2040
-simo/core/models.py,sha256=b8ADs_jb09wt_hqZBux1TW4uHP0UyBnlN1YbTglJpB8,18997
+simo/core/models.py,sha256=VNoHjHUFQRvKH4ejv4kGv5E6a4bSOhuM8sfAlRYaj-g,19036
 simo/core/permissions.py,sha256=UmFjGPDWtAUbaWxJsWORb2q6BREHqndv9mkSIpnmdLk,1379
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
-simo/core/serializers.py,sha256=JXCgdzJR8cfydtAaXDAHa_H-MilO5r0li_2ZyfdVcnk,15754
+simo/core/serializers.py,sha256=miEh2Sd47KmB0viyNlwrEG_1kxYiTUrvQQvisEoLYuA,15759
 simo/core/signal_receivers.py,sha256=EZ8NSYZxUgSaLS16YZdK7T__l8dl0joMRllOxx5PUt4,2809
 simo/core/socket_consumers.py,sha256=n7VE2Fvqt4iEAYLTRbTPOcI-7tszMAADu7gimBxB-Fg,9635
 simo/core/storage.py,sha256=YlxmdRs-zhShWtFKgpJ0qp2NDBuIkJGYC1OJzqkbttQ,572
@@ -56,8 +56,8 @@ simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=hlAKpAbCbqI3a-uL5tDp532T2oLFiF0MBzKUJ_SNzo0,5833
 simo/core/widgets.py,sha256=J9e06C6I22F6xKic3VMgG7WeX07glAcl-4bF2Mg180A,2827
 simo/core/__pycache__/__init__.cpython-38.pyc,sha256=y0IW37wBUIGa3Eh_ZG28pRqHKoLiPyTgUX2OnbkEPlc,158
-simo/core/__pycache__/admin.cpython-38.pyc,sha256=NhGeufnlBnidyTV7bzSPOS3yrLMX-18dW0UJANJm1EA,13347
-simo/core/__pycache__/api.cpython-38.pyc,sha256=Yklz1SziU8ZLDG6zG7gmSuN_RDaf6bW2lFGCORCpAVc,18775
+simo/core/__pycache__/admin.cpython-38.pyc,sha256=GP3lRW8djW3w_k5jgzs_fuW7j8wnmeysZcDtm5RFnD0,13442
+simo/core/__pycache__/api.cpython-38.pyc,sha256=W-CdACWTu_ebqH52riswadzT7z2mNRZJU8HngqbYXzw,18874
 simo/core/__pycache__/api_auth.cpython-38.pyc,sha256=5UTBr3rDMERAfc0OuOVDwGeQkt6Q7GLBtZJAMBse1sg,1712
 simo/core/__pycache__/api_meta.cpython-38.pyc,sha256=bdk1PG7FuRfFwcvQtF103H0kQrx6Vt0JRiepktWEPh8,2730
 simo/core/__pycache__/app_widgets.cpython-38.pyc,sha256=9Es2wZNduzUJv-jZ_HX0-L3vqwpXWBbseEwoC5K6b-w,3465
@@ -65,19 +65,19 @@ 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=Ukc5U63YJbyUcn0cwNMS8nteRSvEJmCszZUfHClKBtg,735
 simo/core/__pycache__/context.cpython-38.pyc,sha256=MSZPDhqMhCpUuBJl3HCIBHZA3BntYeP8RAnQcdqAH9k,1278
-simo/core/__pycache__/controllers.cpython-38.pyc,sha256=j7ND-Gd9YOcnz9Z92Wrvc55rR6fZN2-_w0BbnNsNjr8,24092
+simo/core/__pycache__/controllers.cpython-38.pyc,sha256=-NjuX7iGheE_ZMqkZ6g4ZnnVjdUnFCTlH0awAJxZt2Y,24110
 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
-simo/core/__pycache__/forms.cpython-38.pyc,sha256=iwwT-M_G6jh2X4W8Z14tNKo7ESBMVCJequkCorMLWN4,17823
+simo/core/__pycache__/forms.cpython-38.pyc,sha256=KH1SBm1NaDv99yHONenWWJcd4XSIqQ5tqaF8LSoeDws,17843
 simo/core/__pycache__/gateways.cpython-38.pyc,sha256=XBiwMfBkjoQ2re6jvADJOwK0_0Aav-crzie9qtfqT9U,4599
 simo/core/__pycache__/loggers.cpython-38.pyc,sha256=Z-cdQnC6XlIonPV4Sl4E52tP4NMEdPAiHK0cFaIL7I8,1623
 simo/core/__pycache__/managers.cpython-38.pyc,sha256=5vstOMfm997CZBBkaSiaS7EojhLTWZlbeA_EQ8u-yfg,2554
 simo/core/__pycache__/middleware.cpython-38.pyc,sha256=bGOFJNEhJeLbpsZp8LYn1VA3paLF5HULHQ6IFKa7Juc,2022
-simo/core/__pycache__/models.cpython-38.pyc,sha256=Vj5YpJqEd0xI-lv2kJc_wEUF1gPkTSAM9NNrP3xfL3w,16685
+simo/core/__pycache__/models.cpython-38.pyc,sha256=Hl9MXjnnmDTp826aEc5KLqPFl4ZzrT7HTVxVSz2-Vik,16695
 simo/core/__pycache__/permissions.cpython-38.pyc,sha256=uygjPbfRQiEzyo5-McCxsuMDJLbDYO_TLu55U7bJbR0,1809
 simo/core/__pycache__/routing.cpython-38.pyc,sha256=3T3FPJ8Cn99xZCGvMyg2xjl7al-Shm9CelbSpkJtNP8,599
-simo/core/__pycache__/serializers.cpython-38.pyc,sha256=_4Dn280tzqXYLhoOE33WVwjz5ara9i-00VndiEaJsQk,15724
+simo/core/__pycache__/serializers.cpython-38.pyc,sha256=tJf8jV9pPJXnJjUPXCc103wQxC5ZrZaC9SlIR41JomQ,15707
 simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=sgjH_wv-1U99auH5uHb3or0qettPeHAlsz8P7B03ajY,2430
 simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=NJUr7nRyHFvmAumxxWpsod5wzVVZM99rCEuJs1utHA4,8432
 simo/core/__pycache__/storage.cpython-38.pyc,sha256=BTkYH8QQyjqI0WOtJC8fHNtgu0YA1vjqZclXjC2vCVI,1116
@@ -170,6 +170,7 @@ simo/core/migrations/0026_category_instance.py,sha256=Slrev0VvCkqEQhKly2ZcM7QUam
 simo/core/migrations/0027_remove_component_tags.py,sha256=V0o_lgKiVU3HfG5V8MTO-j4UVPakGV5lxV0Jo6qAPpQ,325
 simo/core/migrations/0028_rename_subcomponents_component_slaves.py,sha256=ioQcfO2_IIfPc_BZzETmSodsYstzygR9U0ULnhET6ac,373
 simo/core/migrations/0029_auto_20240229_1331.py,sha256=BYXPNwjXApAx7mxE5li3QssfksWTsSjDf_VPQ8iGV8c,1140
+simo/core/migrations/0030_alter_instance_timezone.py,sha256=XZuYr2eD9MvE21Jxfdat8RC3sbc7PaGUfNPaqqxBNzE,23248
 simo/core/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/core/migrations/__pycache__/0001_initial.cpython-38.pyc,sha256=w6GiBXVxWj30Bg4Sn_pFVeA041d-pCrkaq8mR3KuF70,5381
 simo/core/migrations/__pycache__/0002_load_icons.cpython-38.pyc,sha256=Nb9RrPjVYo_RpZ5PmzoaEIWGCeVt4kicpmGiKlBrpIw,2123
@@ -200,6 +201,7 @@ simo/core/migrations/__pycache__/0026_category_instance.cpython-38.pyc,sha256=0C
 simo/core/migrations/__pycache__/0027_remove_component_tags.cpython-38.pyc,sha256=Jadlk2tN_3UfPj-xpZssFs5dftZaPl8reWpPWYQu2nY,538
 simo/core/migrations/__pycache__/0028_rename_subcomponents_component_slaves.cpython-38.pyc,sha256=PSiMp1yDzZ36Ei36U2tcIlvyzGgB5RuvGImrJ__7Q5s,593
 simo/core/migrations/__pycache__/0029_auto_20240229_1331.cpython-38.pyc,sha256=nO6lBU-1SxMQv67jQs7cGgNnot722UVL9pj3UE14I1k,1086
+simo/core/migrations/__pycache__/0030_alter_instance_timezone.cpython-38.pyc,sha256=paRgdijg5o8QzluT4GjSEQIMk6UAF7XmSwjqknXPE_4,16333
 simo/core/migrations/__pycache__/__init__.cpython-38.pyc,sha256=VZmDQ57BTcebuM0KMhjiTOabgWZCBxQmSJzWZos9SO8,169
 simo/core/static/ansi_styles.css,sha256=4ieJGrjZPKyPSago9FdB_gflHoGE1vxCHi8qVn5tY-Y,37352
 simo/core/static/admin/Img/plus.svg,sha256=2NpSFPWqGIjpAQGFI7LDQHPKagEhYkJiJX95ufCoZaI,741
@@ -10140,7 +10142,7 @@ simo/core/utils/logs.py,sha256=Zn9JQxqCH9Odx2J1BWT84nFCfkJ4Z4p5X8psdll7hNc,2366
 simo/core/utils/mixins.py,sha256=X6kUPKAi_F-uw7tgm8LEaYalBXpvDA-yrLNFCGr2rks,259
 simo/core/utils/model_helpers.py,sha256=3IzJeOvBoYdUJVXCJkY20npOZXPjNPAiEFvuT0OPhwA,884
 simo/core/utils/relay.py,sha256=i1xy_nPTgY5Xn0l2W4lNI3xeVUpDQTUUfV3M8h2DeBg,457
-simo/core/utils/serialization.py,sha256=JuVMl5Oc2ZrZNW4cTJUiQt-xFESP2fuO_-pun2xQi-M,1887
+simo/core/utils/serialization.py,sha256=v0HLQ98r3zOlsf6dv6S4WxOEt6BzmFz2eTXa_iuKjSM,2057
 simo/core/utils/type_constants.py,sha256=xR2HXZOw9GZhC47iO1Py5B8mpaQMPbzvqX5nHWakhsY,4116
 simo/core/utils/validators.py,sha256=FRO6_K5HAO1OaC-LosApZjh-W3EA-IJZ53HnwEJgqiI,1297
 simo/core/utils/__pycache__/__init__.cpython-38.pyc,sha256=NJHPMizDKYRDEyMdQIh-ZRwT-BntwrvYfF450N2RYdI,164
@@ -10156,39 +10158,39 @@ simo/core/utils/__pycache__/logs.cpython-38.pyc,sha256=BVVeQoOhfRHm3SHnCoE1d5G84
 simo/core/utils/__pycache__/mixins.cpython-38.pyc,sha256=8Js2T7jVQ7hugRUIRu3rdxW86dJW4KeUUWqKqSkIGb0,615
 simo/core/utils/__pycache__/model_helpers.cpython-38.pyc,sha256=QzO0rh1NuQePHDCSLmUCRrAZEnV4o8jh9CF_jp7IoUo,1351
 simo/core/utils/__pycache__/relay.cpython-38.pyc,sha256=gs4iN9TWBo_JIW07emIggIcv6gHKuOY_4jfmAFhuL3k,697
-simo/core/utils/__pycache__/serialization.cpython-38.pyc,sha256=Mq5NrDvrKiiwjZFUrl5dJ6cgJikRNGHu8BjwJf0qlhQ,1254
+simo/core/utils/__pycache__/serialization.cpython-38.pyc,sha256=9nTbzozDi8Avl6krHvAo67CLdiTrYW0ij3hQtucHty0,1338
 simo/core/utils/__pycache__/type_constants.cpython-38.pyc,sha256=bEMvzkBxzc6MKq6gn9A6wszXzMjLTbX-V-IK4NMht8E,3363
 simo/core/utils/__pycache__/validators.cpython-38.pyc,sha256=gjeBOjL_keMoRDjdn8v-3F3wcjPIT3Xx5KpTalo0e-Y,1247
 simo/fleet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo/fleet/admin.py,sha256=Vxp3yTNRVoDif_hwwBW3weeMNakQ3iZo-GC0VvdScfQ,5699
+simo/fleet/admin.py,sha256=aQulOPtrIQUKj8WvA4GfINfqVA52fcU72yK2hVlcmJ0,5681
 simo/fleet/api.py,sha256=Hxn84xI-Q77HxjINgRbjSJQOv9jii4OL20LxK0VSrS8,2499
-simo/fleet/auto_urls.py,sha256=gAXTWUvsWkQHRdZGM_W_5iJBEsM4lY063kIx3f5LUqs,578
+simo/fleet/auto_urls.py,sha256=X04oKJWA48wFW5iXg3PPROY2KDdHn_a99orQSE28QC4,518
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
-simo/fleet/controllers.py,sha256=N8Qzdp2RPFrpZ_l9O4u8VjHWoY_WTWGg76s3V3oJqEs,13999
-simo/fleet/forms.py,sha256=HpvcdFyMl9dLNx1sEOkAkXOkYht6ku2HwWWga-PJzZQ,35067
-simo/fleet/gateways.py,sha256=xFsmF_SXYXK_kMJOCHkiInPJ_0VcPWz-kJDoMup2lT8,1576
-simo/fleet/managers.py,sha256=kpfvvfdH4LDxddIBDpdAb5gsVk8Gb0-L9biFcj9OFPs,807
-simo/fleet/models.py,sha256=O0lsXRmTgPyOhpcwWeJ-2GHTNe2uFhiJy4FTW9Ljz-c,11830
+simo/fleet/controllers.py,sha256=VxutXZSZaZHmXGYpqjsC_6DgJsF1ZDZeJwu3px79wSE,16683
+simo/fleet/forms.py,sha256=pR_KER9u9VtNb5NpSWwI7LrnBBtn9jbEXzUvyFRzoj0,35986
+simo/fleet/gateways.py,sha256=m-jF8S_kJCI-yLI0UmWm46xZrsHcvSfw2gozZWRoFfE,1707
+simo/fleet/managers.py,sha256=XOpDOA9L-f_550TNSyXnJbun2EmtGz1TenVTMlUSb8E,807
+simo/fleet/models.py,sha256=7ZZ1z_cId7z9bEzLHvEEDtpFwUMgIUDesr5hhveDcWg,14136
 simo/fleet/routing.py,sha256=cofGsVWXMfPDwsJ6HM88xxtRxHwERhJ48Xyxc8mxg5o,149
 simo/fleet/serializers.py,sha256=zEpXAXxjk4Rf1JhlNnLTrs20qJggqjvIySbeHVo4Tt4,1505
-simo/fleet/socket_consumers.py,sha256=xNeR1IuaBTiHO2GEXwB1_4CJ29uMlqBycIUdxGT96E8,19578
-simo/fleet/utils.py,sha256=D0EGFbDmW8zyhyxf5ozGtRpo4Sy5Ov6ZixukBK_e2Do,3462
-simo/fleet/views.py,sha256=PbdZpsM_7-oyKzuDX1A5WULNABA1_B7ISF70UJX97FE,1662
+simo/fleet/socket_consumers.py,sha256=ii5L1di8iXzn-l91zVFQ_g9YQm_a-_Z-Dn5OnKbJ9FI,19876
+simo/fleet/utils.py,sha256=2gcjbwQawsGw2edr_wm9q6XacGpYqO-gd4BF1t0Hg6U,3511
+simo/fleet/views.py,sha256=WMMG8rEJA6RTOf3U-2sYbiSH2Q3rBC-6kYg9KpYHtlI,1686
 simo/fleet/__pycache__/__init__.cpython-38.pyc,sha256=pIZE7EL6-cuJ3pQtaSwjKLrKLsTYelp1k9sRhXKLh6s,159
-simo/fleet/__pycache__/admin.cpython-38.pyc,sha256=sVZl_jESRoUjJRMDSlpzFkwW0uUNeBdlu95jPehilqc,5807
+simo/fleet/__pycache__/admin.cpython-38.pyc,sha256=Tw3g9JKzJ3ICjWnHQedU8qV7RSZeJL81jSYpvTLK5bM,5798
 simo/fleet/__pycache__/api.cpython-38.pyc,sha256=rL9fb7cCQatyFvXyKmlNOKmxVo8vHYeYhfSiAgchyAs,3110
-simo/fleet/__pycache__/auto_urls.cpython-38.pyc,sha256=P-ja8CU47dnovCrZu2vv1ut0iEQTgyoefZMS0T39BBM,604
+simo/fleet/__pycache__/auto_urls.cpython-38.pyc,sha256=SqyTuaz_kEBvx-bL46SclsZEEP5RFh6U6TGKyXDdiOE,565
 simo/fleet/__pycache__/ble.cpython-38.pyc,sha256=Nrof9w7cm4OlpFWHeVnmvvanh2_oF9oQ3TknJiV93-0,1267
-simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=dVdHAhAjCiS9QRkcWryFHh7MtrfEDtlCGly7qyiQnos,12944
-simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=_oArxGwzm-ct4McPfWm4ymlr-Q2Qa9iXjHhcRB-1yPc,24416
-simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=DT07jzeceh0QpT2eQd4dhX9gB87SmTNE9mBdQhRVRHg,2056
-simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=JMyjf8wVsVGqox645or0qaO6B4Ek-K1oa1eV1FQCTvA,1316
-simo/fleet/__pycache__/models.cpython-38.pyc,sha256=5Dac_TOovkwFpdE_qwyqLVtbG6PHMDxaCXDbqzJWCs8,10463
+simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=sOxMEUCc347vDlsC2Pp9h5jxyhax2dFBAVEgP_aTN3s,14848
+simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=7AjtKMSUAuaxLIRx1lvEfRaAlujKRyIMK7gnJjru-fI,25650
+simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=Qpfw3NYxCS9tS63FaZz8fdL9fq5X1k5QcQlaJl-szb4,2152
+simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=8uz-xpUiqbGDgXIZ_XRZtFb-Tju6NGxflGg-Ee4Yo6k,1310
+simo/fleet/__pycache__/models.cpython-38.pyc,sha256=1nBzbxLzIOYxss3wx0-lyGP-JCHnGdbADH_NDQ4If50,12273
 simo/fleet/__pycache__/routing.cpython-38.pyc,sha256=aPrCmxFKVyB8R8ZbJDwdPdFfvT7CvobovvZeq_mqRgY,314
 simo/fleet/__pycache__/serializers.cpython-38.pyc,sha256=yuY2H7jcboQGZdjb5WIsgNHXFhI9IPMUrEu9NgSiXNo,2452
-simo/fleet/__pycache__/socket_consumers.cpython-38.pyc,sha256=kavoF9hB6ohz5k1KyqxAuiq4EYIWCTdNG0MyapDYzX0,14325
-simo/fleet/__pycache__/utils.cpython-38.pyc,sha256=NprFr6NRDZSv7I2Vj1WiL6FbuW6a0KWhzHjbKESMlHc,1888
-simo/fleet/__pycache__/views.cpython-38.pyc,sha256=IiPtx3PRmmUpq4MM-Lr90O4QYczugGzHlsk3e1qiOvI,2054
+simo/fleet/__pycache__/socket_consumers.cpython-38.pyc,sha256=5bmMyD3gRyfR2Hbh0KwZwMPYzZR8NPWuMhN8PHWOqLg,14408
+simo/fleet/__pycache__/utils.cpython-38.pyc,sha256=dTuvW9MnhUycwdCc6eHYfHsMlvZw-CmEWXWYu18X8Uw,1955
+simo/fleet/__pycache__/views.cpython-38.pyc,sha256=HLHXI3JgCDUWP7oY944nBqpVVu0D6-qOuiSMraNUdq8,1825
 simo/fleet/migrations/0001_initial.py,sha256=lce8nkD8Sz6pYr-XJSpDm4CMDuB6TA__WtnHpIp-eA4,1326
 simo/fleet/migrations/0002_auto_20220422_0743.py,sha256=sFOfAjnQOzcJjE8lHrrHgTaGilJNYswMdXphgVzUZqY,825
 simo/fleet/migrations/0003_auto_20220422_0752.py,sha256=VcH7DyMAniEwT76hDVofS8FTNpM3nxz_J9AC2zKHDSA,543
@@ -10220,6 +10222,8 @@ simo/fleet/migrations/0028_remove_i2cinterface_scl_pin_no_and_more.py,sha256=Ceo
 simo/fleet/migrations/0029_alter_i2cinterface_scl_pin_and_more.py,sha256=aquymc1ZcUVgdrqZxl3viN6kiCHtw4HjgL6n4d0cSpQ,886
 simo/fleet/migrations/0030_colonelpin_label_alter_colonel_type.py,sha256=5T5bmQxPZrG0UseCLd7ssV-AeFF3O4T_DFxLu3whSqg,706
 simo/fleet/migrations/0031_alter_colonel_type.py,sha256=Kv_Gld-X0NZ7d2P9WBXfIlhq4iPH1_NnzDrPyy9_Pos,522
+simo/fleet/migrations/0032_auto_20240415_0736.py,sha256=yBT48pIfDBm7J1Y3LrvNtmihRbwEXjmBGBB1ghc2z5Y,1800
+simo/fleet/migrations/0033_auto_20240415_0736.py,sha256=_7p3-Qdc7aaP4mDwny_ig5E4XoEm8t2PoZ3-UeQ4jio,758
 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
@@ -10252,6 +10256,8 @@ simo/fleet/migrations/__pycache__/0028_remove_i2cinterface_scl_pin_no_and_more.c
 simo/fleet/migrations/__pycache__/0029_alter_i2cinterface_scl_pin_and_more.cpython-38.pyc,sha256=S0V5f3Q366v6NlSBW78IqjC8evoFoOTnoYmsFhsOBO4,902
 simo/fleet/migrations/__pycache__/0030_colonelpin_label_alter_colonel_type.cpython-38.pyc,sha256=sfglSDxXLKJ0qE8Dl3MYjv5hbszpDtb9CDxatoEzPSw,853
 simo/fleet/migrations/__pycache__/0031_alter_colonel_type.cpython-38.pyc,sha256=zXX254ZgEE4uSV8xnLdH9DM3qy-ICmbrT05i0Q287bU,733
+simo/fleet/migrations/__pycache__/0032_auto_20240415_0736.cpython-38.pyc,sha256=QD3JNIDQhzseXKLRYysYY3Q9_vDaurIhlWBcri83FMw,1655
+simo/fleet/migrations/__pycache__/0033_auto_20240415_0736.cpython-38.pyc,sha256=XBy2jZZ4kDRn06KC9YcHRnoaol8heCMAvHZ3BAELr2c,1031
 simo/fleet/migrations/__pycache__/__init__.cpython-38.pyc,sha256=5k1KW0jeSDzw6RnVPRq4CaO13Lg7M0F-pxA_gqqZ6Mg,170
 simo/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/generic/app_widgets.py,sha256=E_pnpA1hxMIhenRCrHoQ5cik06jm2BAHCkl_eo-OudU,1264
@@ -10431,8 +10437,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.6.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.6.dist-info/METADATA,sha256=PyDP96gxumILX0PRUHKNWqLdOFuHkNoI1ulsao4ZMRs,1699
-simo-2.0.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.6.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.6.dist-info/RECORD,,
+simo-2.0.7.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.0.7.dist-info/METADATA,sha256=D3DwzzxRfVOdr1NCw4Me2MvxkgLnZ-jPQdbnREr0oV0,1699
+simo-2.0.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.0.7.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.0.7.dist-info/RECORD,,