[teleinfo] Add power dimension to apparent power channels (#10512)

* Add Power dimension to PAPP channels

Signed-off-by: Olivier Marceau <hollysaiqs@marceau.ovh>
* Add PAPP dimension in documentation

Signed-off-by: Olivier Marceau <hollysaiqs@marceau.ovh>

diff --git a/bundles/org.openhab.binding.teleinfo/README.md b/bundles/org.openhab.binding.teleinfo/README.md
index 65387c4049755221b5d536ba5cb34c3861a4a801..845b643159ef8430bef240add175efbdb76f2f74 100644 (file)
--- a/bundles/org.openhab.binding.teleinfo/README.md
+++ b/bundles/org.openhab.binding.teleinfo/README.md
@@ -67,7 +67,7 @@ Channel availability depends on the electricity connection (single or three phas
 | iinst3   | `Number:ElectricCurrent`  | Instantaneous electric current on phase 3                | Three  | All   |
 | ppot     | `String`                  | Electrical potential presence                            | Three  | All   |
 | pmax     | `Number:Energy`           | Maximum consumed electric power on all phases            | Three  | All   |
-| papp     | `Number`                  | Instantaneous apparent power (Unit: `VA`)                | Three, single (ICC evolution only) | All   |
+| papp     | `Number:Power`            | Instantaneous apparent power                             | Three, single (ICC evolution only) | All   |
 | hhphc    | `String`                  | Pricing schedule group                                   | All    | HCHP  |
 | hchc     | `Number:Energy`           | Total consumed energy at low rate pricing                | All    | HCHP  |
 | hchp     | `Number:Energy`           | Total consumed energy at high rate pricing               | All    | HCHP  |
@@ -98,7 +98,7 @@ Bridge teleinfo:serialcontroller:teleinfoUSB [ serialport="/dev/ttyUSB0" ]{
 This `items` file links some supported channels to items: 
 
 ```
-Number TLInfoEDF_PAPP "PAPP" <energy> {channel="teleinfo:cbemm_evolution_icc_hc_electricitymeter:teleinfoUSB:myElectricityMeter:papp"}
+Number:Power TLInfoEDF_PAPP "PAPP" <energy> {channel="teleinfo:cbemm_evolution_icc_hc_electricitymeter:teleinfoUSB:myElectricityMeter:papp"}
 Number:ElectricCurrent TLInfoEDF_ISOUSC "ISOUSC" <energy> {channel="teleinfo:cbemm_evolution_icc_hc_electricitymeter:teleinfoUSB:myElectricityMeter:isousc"}
 String TLInfoEDF_PTEC "PTEC" <energy> {channel="teleinfo:cbemm_evolution_icc_hc_electricitymeter:teleinfoUSB:myElectricityMeter:ptec"}
 Number:ElectricCurrent TLInfoEDF_IMAX "IMAX" <energy> {channel="teleinfo:cbemm_evolution_icc_hc_electricitymeter:teleinfoUSB:myElectricityMeter:imax"}

diff --git a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-cbemm-evo-icc-channel-types.xml b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-cbemm-evo-icc-channel-types.xml
index a1383ef353e3f49741359c6c238b65c520062056..f7a9cdda5b957e5116d536a14ae48891a5903904 100644 (file)
--- a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-cbemm-evo-icc-channel-types.xml
+++ b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-cbemm-evo-icc-channel-types.xml
@@ -5,11 +5,11 @@
        xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
 
        <channel-type id="pappType">
-               <item-type>Number</item-type>
+               <item-type>Number:Power</item-type>
                <label>PAPP</label>
                <description>Instantaneous apparent power</description>
                <category>Energy</category>
-               <state pattern="%d VA" readOnly="true"/>
+               <state pattern="%d %unit%" readOnly="true"/>
        </channel-type>
 
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-cbetm-channel-types.xml b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-cbetm-channel-types.xml
index 03fbd590e5c66662f45f14e3cf57cbbd000933d4..75990557f3ae41857767179363f7f4dd9e1c35d3 100644 (file)
--- a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-cbetm-channel-types.xml
+++ b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-cbetm-channel-types.xml
@@ -74,11 +74,11 @@
        </channel-type>
 
        <channel-type id="pappType">
-               <item-type>Number</item-type>
+               <item-type>Number:Power</item-type>
                <label>PAPP</label>
                <description>Instantaneous apparent power</description>
                <category>Energy</category>
-               <state pattern="%d VA" readOnly="true"/>
+               <state pattern="%d %unit%" readOnly="true"/>
        </channel-type>
 
        <channel-type id="ppotType">