From 1a01e2b761c9e9325706173cbf26629f99560304 Mon Sep 17 00:00:00 2001 From: Philipp Grimm Date: Tue, 13 Aug 2024 09:20:15 +0200 Subject: [PATCH] v0.1.30 Extended device list --- changes.md | 4 ++++ eo_man/data/data_helper.py | 24 ++++++++++++++++++++++++ eo_man/data/ha_config_generator.py | 2 +- setup.py | 2 +- 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/changes.md b/changes.md index 938af52..2b62906 100644 --- a/changes.md +++ b/changes.md @@ -1,5 +1,9 @@ # Change Log +## v0.1.30 Extended device list +* Extended device list with EEP mapping +* Fixed sender id duplication check. + ## v0.1.29 Added FGD14 and FD2G14 Support * Added FGD14 and FD2G14 Support * Fixed missing dependency for FSR14M-2x support. diff --git a/eo_man/data/data_helper.py b/eo_man/data/data_helper.py index 1d52be8..c6e8910 100644 --- a/eo_man/data/data_helper.py +++ b/eo_man/data/data_helper.py @@ -25,10 +25,34 @@ {'hw-type': 'FTS14EM', CONF_EEP: 'D5-00-01', CONF_TYPE: Platform.BINARY_SENSOR, 'description': 'Contact sensor', 'address_count': 1}, {'hw-type': 'FTS14EM', CONF_EEP: 'A5-08-01', CONF_TYPE: Platform.BINARY_SENSOR, 'description': 'Occupancy sensor', 'address_count': 1}, + {'hw-type': 'FFTE', CONF_EEP: 'F6-10-00', CONF_TYPE: Platform.BINARY_SENSOR, 'description': 'window and door contacts', 'address_count': 1}, + {'hw-type': 'FTKE', CONF_EEP: 'F6-10-00', CONF_TYPE: Platform.BINARY_SENSOR, 'description': 'window and door contacts', 'address_count': 1}, + {'hw-type': 'FTK', CONF_EEP: 'F6-10-00', CONF_TYPE: Platform.BINARY_SENSOR, 'description': 'window and door contacts', 'address_count': 1}, + {'hw-type': 'FSDG14', CONF_EEP: 'A5-12-01', CONF_TYPE: Platform.SENSOR, 'description': 'Automated meter reading - electricity', 'address_count': 1}, {'hw-type': 'F3Z14D', CONF_EEP: 'A5-12-01', CONF_TYPE: Platform.SENSOR, 'description': 'Automated meter reading - electricity', 'address_count': 3}, {'hw-type': 'F3Z14D', CONF_EEP: 'A5-12-02', CONF_TYPE: Platform.SENSOR, 'description': 'Automated meter reading - gas', 'address_count': 3}, {'hw-type': 'F3Z14D', CONF_EEP: 'A5-12-03', CONF_TYPE: Platform.SENSOR, 'description': 'Automated meter reading - water', 'address_count': 3}, + + {'hw-type': 'FWG14', CONF_EEP: 'A5-13-01', CONF_TYPE: Platform.SENSOR, 'description': 'Weather Station', 'address_count': 1}, + {'hw-type': 'FWG14MS', CONF_EEP: 'A5-13-01', CONF_TYPE: Platform.SENSOR, 'description': 'Weather Station', 'address_count': 1}, + {'hw-type': 'MS', CONF_EEP: 'A5-13-01', CONF_TYPE: Platform.SENSOR, 'description': 'Weather Station', 'address_count': 1}, + {'hw-type': 'WMS', CONF_EEP: 'A5-13-01', CONF_TYPE: Platform.SENSOR, 'description': 'Weather Station', 'address_count': 1}, + {'hw-type': 'FWS61', CONF_EEP: 'A5-13-01', CONF_TYPE: Platform.SENSOR, 'description': 'Weather Station', 'address_count': 1}, + + {'hw-type': 'FLGTF', CONF_EEP: 'A5-04-02', CONF_TYPE: Platform.SENSOR, 'description': 'Temperature and Humidity Sensor', 'address_count': 1}, + {'hw-type': 'FLT58', CONF_EEP: 'A5-04-02', CONF_TYPE: Platform.SENSOR, 'description': 'Temperature and Humidity Sensor', 'address_count': 1}, + {'hw-type': 'FFT60', CONF_EEP: 'A5-04-02', CONF_TYPE: Platform.SENSOR, 'description': 'Temperature and Humidity Sensor', 'address_count': 1}, + + {'hw-type': 'FABH65S', CONF_EEP: 'A5-08-01', CONF_TYPE: Platform.SENSOR, 'description': 'Light-, Temperature-, Occupancy Sensor', 'address_count': 1}, + {'hw-type': 'FBH65', CONF_EEP: 'A5-08-01', CONF_TYPE: Platform.SENSOR, 'description': 'Light-, Temperature-, Occupancy Sensor', 'address_count': 1}, + {'hw-type': 'FBH65S', CONF_EEP: 'A5-08-01', CONF_TYPE: Platform.SENSOR, 'description': 'Light-, Temperature-, Occupancy Sensor', 'address_count': 1}, + {'hw-type': 'FBH65TF', CONF_EEP: 'A5-08-01', CONF_TYPE: Platform.SENSOR, 'description': 'Light-, Temperature-, Occupancy Sensor', 'address_count': 1}, + + {'hw-type': 'FLGTF', CONF_EEP: 'A5-09-0C', CONF_TYPE: Platform.SENSOR, 'description': 'Air Quality / VOC⁠ (Volatile Organic Compounds)', 'address_count': 1}, + + {'hw-type': 'FUTH', CONF_EEP: 'A5-10-06', CONF_TYPE: Platform.SENSOR, 'description': 'Temperature Sensor and Controller', 'address_count': 1}, + {'hw-type': 'FUTH-feature', CONF_EEP: 'A5-10-12', CONF_TYPE: Platform.SENSOR, 'description': 'Temperature Sensor and Controller and Humidity Sensor', 'address_count': 1}, {'hw-type': 'FUD14', CONF_EEP: 'A5-38-08', 'sender_eep': 'A5-38-08', CONF_TYPE: Platform.LIGHT, 'PCT14-function-group': 3, 'PCT14-key-function': 32, 'description': 'Central command - gateway', 'address_count': 1}, {'hw-type': 'FUD14_800W', CONF_EEP: 'A5-38-08', 'sender_eep': 'A5-38-08', CONF_TYPE: Platform.LIGHT, 'PCT14-function-group': 3, 'PCT14-key-function': 32, 'description': 'Central command - gateway', 'address_count': 1}, diff --git a/eo_man/data/ha_config_generator.py b/eo_man/data/ha_config_generator.py index 622f124..e2585a9 100644 --- a/eo_man/data/ha_config_generator.py +++ b/eo_man/data/ha_config_generator.py @@ -41,7 +41,7 @@ def get_gateway_by(self, gw_d:Device) -> GatewayDeviceType: return None def perform_tests(self): - device_list = [d for d in self.data_manager.devices.values() if d.use_in_ha] + device_list = [d for d in self.data_manager.devices.values() if not d.is_gateway() and d.use_in_ha] self.test_unique_sender_ids(device_list) diff --git a/setup.py b/setup.py index 2e83234..9882059 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ setup( name='eo_man', - version='0.1.29', + version='0.1.30', package_dir={'eo_man':"eo_man"}, # packages=find_packages("./eo-man"), #package_data={'': ['*.png']},