[enocean] Spell when devices support power measurement, power failure detection ...

configurable dimming or pilot wire, do not have local control.

Co-authored-by: Cody Cutrer <cody@cutrer.us>

diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/i18n/enocean.properties b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/i18n/enocean.properties
index 8e165ddaf32866f6215e7837116946f08ea9f409..457d5b446ac09ab560c821eb0b0b0c0ea5953e80 100644 (file)
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/i18n/enocean.properties
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/i18n/enocean.properties
@@ -184,18 +184,18 @@ thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_00 = Swi
 thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_01 = Switching (EEP: D2_01_01)
 thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_02 = Switching, dimming and energy measurement (EEP: D2_01_02)
 thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_03 = Switching and dimming (EEP: D2_01_03)
-thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_04 = Switching, dimming and energy measurement (EEP: D2_01_04)
-thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_05 = Switching, dimming and energy measurement (EEP: D2_01_05)
-thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_06 = Switching and energy measurement (EEP: D2_01_06)
-thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_07 = Switching (EEP: D2_01_07)
-thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_08 = Switching, dimming and energy measurement (EEP: D2_01_08)
-thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_09 = Switching, dimming and energy measurement (EEP: D2_01_09)
+thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_04 = Switching, configurable dimming, power and energy measurement (EEP: D2_01_04)
+thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_05 = Switching, configurable dimming, power and energy measurement (EEP: D2_01_05)
+thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_06 = Switching and energy measurement without local control (EEP: D2_01_06)
+thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_07 = Switching without local control (EEP: D2_01_07)
+thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_08 = Switching, power and energy measurement (EEP: D2_01_08)
+thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_09 = Switching, configurable dimming, power and energy measurement (EEP: D2_01_09)
 thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_09_PERMUNDO = Permundo PSC
-thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_0A = Switching and energy measurement (EEP: D2_01_0A)
-thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_0B = Switching and energy measurement (EEP: D2_01_0B)
-thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_0C = Switching and energy measurement (EEP: D2_01_0C)
+thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_0A = Switching and power failure detection (EEP: D2_01_0A)
+thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_0B = Switching, power failure detection, power and energy measurement (EEP: D2_01_0B)
+thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_0C = Switching, pilot wire mode, power and energy measurement (EEP: D2_01_0C)
 thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_0D = Switching (EEP: D2_01_0D)
-thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_0E = Switching and energy measurement (EEP: D2_01_0E)
+thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_0E = Switching, power and energy measurement (EEP: D2_01_0E)
 thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_0F = Switching (EEP: D2_01_0F)
 thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_0F_NODON = NodON SIN-2-1-00 (EEP: D2_01_0F)
 thing-type.config.enocean.measurementSwitch.receivingEEPId.option.D2_01_11 = Switching (EEP: D2_01_11)
@@ -209,18 +209,18 @@ thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_00 = Switc
 thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_01 = Switching (EEP: D2_01_01)
 thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_02 = Switching, dimming and energy measurement (EEP: D2_01_02)
 thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_03 = Switching and dimming (EEP: D2_01_03)
-thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_04 = Switching, dimming and energy measurement (EEP: D2_01_04)
-thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_05 = Switching, dimming and energy measurement (EEP: D2_01_05)
-thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_06 = Switching and energy measurement (EEP: D2_01_06)
-thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_07 = Switching (EEP: D2_01_07)
-thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_08 = Switching, dimming and energy measurement (EEP: D2_01_08)
-thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_09 = Switching, dimming and energy measurement (EEP: D2_01_09)
+thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_04 = Switching, configurable dimming, power and energy measurement (EEP: D2_01_04)
+thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_05 = Switching, configurable dimming, power and energy measurement (EEP: D2_01_05)
+thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_06 = Switching and energy measurement without local control (EEP: D2_01_06)
+thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_07 = Switching without local control (EEP: D2_01_07)
+thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_08 = Switching, power and energy measurement (EEP: D2_01_08)
+thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_09 = Switching, configurable dimming, power and energy measurement (EEP: D2_01_09)
 thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_09_PERMUNDO = Permundo PSC
-thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_0A = Switching and energy measurement (EEP: D2_01_0A)
-thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_0B = Switching and energy measurement (EEP: D2_01_0B)
-thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_0C = Switching and energy measurement (EEP: D2_01_0C)
+thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_0A = Switching and power failure detection (EEP: D2_01_0A)
+thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_0B = Switching, power failure detection, power and energy measurement (EEP: D2_01_0B)
+thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_0C = Switching, pilot wire mode, power and energy measurement (EEP: D2_01_0C)
 thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_0D = Switching (EEP: D2_01_0D)
-thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_0E = Switching and energy measurement (EEP: D2_01_0E)
+thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_0E = Switching, power and energy measurement (EEP: D2_01_0E)
 thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_0F = Switching (EEP: D2_01_0F)
 thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_0F_NODON = NodON SIN-2-1-00 (EEP: D2_01_0F)
 thing-type.config.enocean.measurementSwitch.sendingEEPId.option.D2_01_11 = Switching (EEP: D2_01_11)

diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/MeasurementSwitch.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/MeasurementSwitch.xml
index abe36f166243e1d2444b52ebb80b96e9a207b30e..2e0657004640d6ab7441c8422d0d44818e434586 100644 (file)
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/MeasurementSwitch.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/MeasurementSwitch.xml
@@ -34,18 +34,18 @@
                                        <option value="D2_01_01">Switching (EEP: D2_01_01)</option>
                                        <option value="D2_01_02">Switching, dimming and energy measurement (EEP: D2_01_02)</option>
                                        <option value="D2_01_03">Switching and dimming (EEP: D2_01_03)</option>
-                                       <option value="D2_01_04">Switching, dimming and energy measurement (EEP: D2_01_04)</option>
-                                       <option value="D2_01_05">Switching, dimming and energy measurement (EEP: D2_01_05)</option>
-                                       <option value="D2_01_06">Switching and energy measurement (EEP: D2_01_06)</option>
-                                       <option value="D2_01_07">Switching (EEP: D2_01_07)</option>
-                                       <option value="D2_01_08">Switching, dimming and energy measurement (EEP: D2_01_08)</option>
-                                       <option value="D2_01_09">Switching, dimming and energy measurement (EEP: D2_01_09)</option>
+                                       <option value="D2_01_04">Switching, configurable dimming, power and energy measurement (EEP: D2_01_04)</option>
+                                       <option value="D2_01_05">Switching, configurable dimming, power and energy measurement (EEP: D2_01_05)</option>
+                                       <option value="D2_01_06">Switching and energy measurement without local control (EEP: D2_01_06)</option>
+                                       <option value="D2_01_07">Switching without local control (EEP: D2_01_07)</option>
+                                       <option value="D2_01_08">Switching, power and energy measurement (EEP: D2_01_08)</option>
+                                       <option value="D2_01_09">Switching, configurable dimming, power and energy measurement (EEP: D2_01_09)</option>
                                        <option value="D2_01_09_PERMUNDO">Permundo PSC</option>
-                                       <option value="D2_01_0A">Switching and energy measurement (EEP: D2_01_0A)</option>
-                                       <option value="D2_01_0B">Switching and energy measurement (EEP: D2_01_0B)</option>
-                                       <option value="D2_01_0C">Switching and energy measurement (EEP: D2_01_0C)</option>
+                                       <option value="D2_01_0A">Switching and power failure detection (EEP: D2_01_0A)</option>
+                                       <option value="D2_01_0B">Switching, power failure detection, power and energy measurement (EEP: D2_01_0B)</option>
+                                       <option value="D2_01_0C">Switching, pilot wire mode, power and energy measurement (EEP: D2_01_0C)</option>
                                        <option value="D2_01_0D">Switching (EEP: D2_01_0D)</option>
-                                       <option value="D2_01_0E">Switching and energy measurement (EEP: D2_01_0E)</option>
+                                       <option value="D2_01_0E">Switching, power and energy measurement (EEP: D2_01_0E)</option>
                                        <option value="D2_01_0F">Switching (EEP: D2_01_0F)</option>
                                        <option value="D2_01_0F_NODON">NodON SIN-2-1-00 (EEP: D2_01_0F)</option>
                                        <option value="D2_01_11">Switching (EEP: D2_01_11)</option>
@@ -65,18 +65,18 @@
                                        <option value="D2_01_01">Switching (EEP: D2_01_01)</option>
                                        <option value="D2_01_02">Switching, dimming and energy measurement (EEP: D2_01_02)</option>
                                        <option value="D2_01_03">Switching and dimming (EEP: D2_01_03)</option>
-                                       <option value="D2_01_04">Switching, dimming and energy measurement (EEP: D2_01_04)</option>
-                                       <option value="D2_01_05">Switching, dimming and energy measurement (EEP: D2_01_05)</option>
-                                       <option value="D2_01_06">Switching and energy measurement (EEP: D2_01_06)</option>
-                                       <option value="D2_01_07">Switching (EEP: D2_01_07)</option>
-                                       <option value="D2_01_08">Switching, dimming and energy measurement (EEP: D2_01_08)</option>
-                                       <option value="D2_01_09">Switching, dimming and energy measurement (EEP: D2_01_09)</option>
+                                       <option value="D2_01_04">Switching, configurable dimming, power and energy measurement (EEP: D2_01_04)</option>
+                                       <option value="D2_01_05">Switching, configurable dimming, power and energy measurement (EEP: D2_01_05)</option>
+                                       <option value="D2_01_06">Switching and energy measurement without local control (EEP: D2_01_06)</option>
+                                       <option value="D2_01_07">Switching without local control (EEP: D2_01_07)</option>
+                                       <option value="D2_01_08">Switching, power and energy measurement (EEP: D2_01_08)</option>
+                                       <option value="D2_01_09">Switching, configurable dimming, power and energy measurement (EEP: D2_01_09)</option>
                                        <option value="D2_01_09_PERMUNDO">Permundo PSC</option>
-                                       <option value="D2_01_0A">Switching and energy measurement (EEP: D2_01_0A)</option>
-                                       <option value="D2_01_0B">Switching and energy measurement (EEP: D2_01_0B)</option>
-                                       <option value="D2_01_0C">Switching and energy measurement (EEP: D2_01_0C)</option>
+                                       <option value="D2_01_0A">Switching and power failure detection (EEP: D2_01_0A)</option>
+                                       <option value="D2_01_0B">Switching, power failure detection, power and energy measurement (EEP: D2_01_0B)</option>
+                                       <option value="D2_01_0C">Switching, pilot wire mode, power and energy measurement (EEP: D2_01_0C)</option>
                                        <option value="D2_01_0D">Switching (EEP: D2_01_0D)</option>
-                                       <option value="D2_01_0E">Switching and energy measurement (EEP: D2_01_0E)</option>
+                                       <option value="D2_01_0E">Switching, power and energy measurement (EEP: D2_01_0E)</option>
                                        <option value="D2_01_0F">Switching (EEP: D2_01_0F)</option>
                                        <option value="D2_01_0F_NODON">NodON SIN-2-1-00 (EEP: D2_01_0F)</option>
                                        <option value="D2_01_11">Switching (EEP: D2_01_11)</option>