Merge pull request #25 from grimmpp/feature-branch

Feature branch
grimmpp · Apr 11, 2024 · 5bba1cd · 5bba1cd
2 parents f68798b + ef704ab
commit 5bba1cd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/changes.md b/changes.md
@@ -1,5 +1,7 @@
 # Change Log
 
+## v0.1.20 Bug-fix for detection of FSR14_2x
+
 ## v0.1.19 Added EEP A5-30-01 and A5-30-03
 * Added EEPs for digital input
 

diff --git a/eo_man/data/data_helper.py b/eo_man/data/data_helper.py
@@ -36,7 +36,7 @@
     {'hw-type': 'FMZ14', CONF_EEP: 'M5-38-08', 'sender_eep': 'A5-38-08', CONF_TYPE: Platform.LIGHT, 'PCT14-function-group': 1, 'description': 'Eltako relay', 'address_count': 1},
     {'hw-type': 'FSR14', CONF_EEP: 'M5-38-08', 'sender_eep': 'A5-38-08', CONF_TYPE: Platform.LIGHT, 'PCT14-function-group': 2, 'PCT14-key-function': 51, 'description': 'Eltako relay', 'address_count': 1},
     {'hw-type': 'FSR14_1x', CONF_EEP: 'M5-38-08', 'sender_eep': 'A5-38-08', CONF_TYPE: Platform.LIGHT, 'PCT14-function-group': 2, 'PCT14-key-function': 51, 'description': 'Eltako relay', 'address_count': 1},
-    {'hw-type': 'FSR14_x2', CONF_EEP: 'M5-38-08', 'sender_eep': 'A5-38-08', CONF_TYPE: Platform.LIGHT, 'PCT14-function-group': 2, 'PCT14-key-function': 51, 'description': 'Eltako relay', 'address_count': 2},
+    {'hw-type': 'FSR14_2x', CONF_EEP: 'M5-38-08', 'sender_eep': 'A5-38-08', CONF_TYPE: Platform.LIGHT, 'PCT14-function-group': 2, 'PCT14-key-function': 51, 'description': 'Eltako relay', 'address_count': 2},
     {'hw-type': 'FSR14_4x', CONF_EEP: 'M5-38-08', 'sender_eep': 'A5-38-08', CONF_TYPE: Platform.LIGHT, 'PCT14-function-group': 2, 'PCT14-key-function': 51, 'description': 'Eltako relay', 'address_count': 4},
     {'hw-type': 'F4SR14_LED', CONF_EEP: 'M5-38-08', 'sender_eep': 'A5-38-08', CONF_TYPE: Platform.LIGHT, 'PCT14-function-group': 2, 'PCT14-key-function': 51, 'description': 'Eltako relay', 'address_count': 4},
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 aiocoap==0.4.7
-eltako14bus==0.0.51
+eltako14bus==0.0.52
 numpy==1.26.3
 pillow==10.2.0
 pyserial==3.5

diff --git a/setup.py b/setup.py
@@ -26,7 +26,7 @@
 
 setup(
     name='eo_man',
-    version='0.1.19',
+    version='0.1.20',
     package_dir={'eo_man':"eo_man"},
     # packages=find_packages("./eo-man"),
     #package_data={'': ['*.png']},