[teleinfo] Refactor channel config files for Linky standard mode (#12204)

* Refactor channel config files
* Remove duplicate PAPP channel type

Signed-off-by: Olivier Marceau <hollysaiqs@marceau.ovh>
This commit is contained in:
olivierkeke 2022-02-07 16:02:48 +01:00 committed by GitHub
parent 144cb11243
commit e89a5e6996
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 247 additions and 367 deletions

View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<thing:thing-descriptions bindingId="teleinfo"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
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:Power</item-type>
<label>PAPP</label>
<description>Instantaneous apparent power</description>
<category>Energy</category>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
</thing:thing-descriptions>

View File

@ -1,133 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<thing:thing-descriptions bindingId="teleinfo"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
<channel-group-type id="producerLSMGroupType">
<label>Producer</label>
<description>Producer channels for Linky telemeter in standard teleinformation mode</description>
<category>Energy</category>
<channels>
<channel id="eait" typeId="energyType">
<label>EAIT</label>
<description>Total active energy injected</description>
</channel>
<channel id="erq1" typeId="energyType">
<label>ERQ1</label>
<description>Total reactive energy Q1</description>
</channel>
<channel id="erq2" typeId="energyType">
<label>ERQ2</label>
<description>Total reactive energy Q2</description>
</channel>
<channel id="erq3" typeId="energyType">
<label>ERQ3</label>
<description>Total reactive energy Q3</description>
</channel>
<channel id="erq4" typeId="energyType">
<label>ERQ4</label>
<description>Total reactive energy Q4</description>
</channel>
<channel id="sinsti" typeId="powerType">
<label>SINSTI</label>
<description>Instantaneous injected apparent power</description>
</channel>
<channel id="smaxin" typeId="powerType">
<label>SMAXIN</label>
<description>Maximum injected apparent power of the day</description>
</channel>
<channel id="smaxinMinus1" typeId="powerType">
<label>SMAXIN-1</label>
<description>Maximum injected apparent power of the previous day</description>
</channel>
<channel id="ccain" typeId="powerType">
<label>CCAIN</label>
<description>Injected active charge point N</description>
</channel>
<channel id="ccainMinus1" typeId="powerType">
<label>CCAIN-1</label>
<description>Injected active charge point N-1</description>
</channel>
<channel id="smaxinDate" typeId="dateTimeType">
<label>SMAXIN TIMESTAMP</label>
<description>Timestamp of SMAXIN value</description>
</channel>
<channel id="smaxinMinus1Date" typeId="dateTimeType">
<label>SMAXIN-1 TIMESTAMP</label>
<description>Timestamp of SMAXIN-1 value</description>
</channel>
<channel id="ccainDate" typeId="dateTimeType">
<label>CCAIN TIMESTAMP</label>
<description>Timestamp of CCAIN value</description>
</channel>
<channel id="ccainMinus1Date" typeId="dateTimeType">
<label>CCAIN-1 TIMESTAMP</label>
<description>Timestamp of CCAIN-1 value</description>
</channel>
</channels>
</channel-group-type>
<channel-type id="stringType">
<item-type>String</item-type>
<label>Teleinfo String Type</label>
<category>Energy</category>
<state pattern="%s" readOnly="true"/>
</channel-type>
<channel-type id="energyType">
<item-type>Number:Energy</item-type>
<label>Teleinfo Energy Type</label>
<category>Energy</category>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
<channel-type id="currentType">
<item-type>Number:ElectricCurrent</item-type>
<label>Teleinfo Current Type</label>
<category>Energy</category>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
<channel-type id="potentialType">
<item-type>Number:ElectricPotential</item-type>
<label>Teleinfo Potential Type</label>
<category>Energy</category>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
<channel-type id="powerType">
<item-type>Number:Power</item-type>
<label>Teleinfo Power Type</label>
<category>Energy</category>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
<channel-type id="switchType">
<item-type>Switch</item-type>
<label>Teleinfo Switch Type</label>
<category>Energy</category>
<state readOnly="true"/>
</channel-type>
<channel-type id="dateTimeType">
<item-type>DateTime</item-type>
<label>Teleinfo DateTime Type</label>
<category>Energy</category>
<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
</channel-type>
</thing:thing-descriptions>

View File

@ -1,179 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<thing:thing-descriptions bindingId="teleinfo"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
<channel-group-type id="threePhasedLSMGroupType">
<label>Three-phase</label>
<description>Three-phased channels for Linky telemeter in standard teleinformation mode</description>
<category>Energy</category>
<channels>
<channel id="irms2" typeId="currentType">
<label>IRMS2</label>
<description>RMS Current on phase 2</description>
</channel>
<channel id="irms3" typeId="currentType">
<label>IRMS3</label>
<description>RMS Current on phase 3</description>
</channel>
<channel id="urms2" typeId="potentialType">
<label>URMS2</label>
<description>RMS Voltage on phase 2</description>
</channel>
<channel id="urms3" typeId="potentialType">
<label>URMS3</label>
<description>RMS Voltage on phase 3</description>
</channel>
<channel id="sinsts1" typeId="powerType">
<label>SINSTS1</label>
<description>Instantaneous withdrawn apparent power on phase 1</description>
</channel>
<channel id="sinsts2" typeId="powerType">
<label>SINSTS2</label>
<description>Instantaneous withdrawn apparent power on phase 2</description>
</channel>
<channel id="sinsts3" typeId="powerType">
<label>SINSTS3</label>
<description>Instantaneous withdrawn apparent power on phase 3</description>
</channel>
<channel id="smaxsn1" typeId="powerType">
<label>SMAXSN1</label>
<description>Maximum withdrawn apparent power of the day on phase 1</description>
</channel>
<channel id="smaxsn2" typeId="powerType">
<label>SMAXSN2</label>
<description>Maximum withdrawn apparent power of the day on phase 2</description>
</channel>
<channel id="smaxsn3" typeId="powerType">
<label>SMAXSN3</label>
<description>Maximum withdrawn apparent power of the day on phase 3</description>
</channel>
<channel id="smaxsn1Minus1" typeId="powerType">
<label>SMAXSN1-1</label>
<description>Maximum withdrawn apparent power of the previous day on phase 1</description>
</channel>
<channel id="smaxsn2Minus1" typeId="powerType">
<label>SMAXSN2-1</label>
<description>Maximum withdrawn apparent power of the previous day on phase 2</description>
</channel>
<channel id="smaxsn3Minus1" typeId="powerType">
<label>SMAXSN3-1</label>
<description>Maximum withdrawn apparent power of the previous day on phase 3</description>
</channel>
<channel id="umoy2" typeId="potentialType">
<label>UMOY2</label>
<description>Mean Voltage on phase 2</description>
</channel>
<channel id="umoy3" typeId="potentialType">
<label>UMOY3</label>
<description>Mean Voltage on phase 3</description>
</channel>
<channel id="smaxsn1Date" typeId="dateTimeType">
<label>SMAXSN1 TIMESTAMP</label>
<description>Timestamp of SMAXSN1 value</description>
</channel>
<channel id="smaxsn2Date" typeId="dateTimeType">
<label>SMAXSN2 TIMESTAMP</label>
<description>Timestamp of SMAXSN2 value</description>
</channel>
<channel id="smaxsn3Date" typeId="dateTimeType">
<label>SMAXSN3 TIMESTAMP</label>
<description>Timestamp of SMAXSN3 value</description>
</channel>
<channel id="smaxsn1Minus1Date" typeId="dateTimeType">
<label>SMAXSN1-1 TIMESTAMP</label>
<description>Timestamp of SMAXSN1-1 value</description>
</channel>
<channel id="smaxsn2Minus1Date" typeId="dateTimeType">
<label>SMAXSN2-1 TIMESTAMP</label>
<description>Timestamp of SMAXSN2-1 value</description>
</channel>
<channel id="smaxsn3Minus1Date" typeId="dateTimeType">
<label>SMAXSN3-1 TIMESTAMP</label>
<description>Timestamp of SMAXSN3-1 value</description>
</channel>
<channel id="umoy2Date" typeId="dateTimeType">
<label>UMOY2 TIMESTAMP</label>
<description>Timestamp of UMOY2 value</description>
</channel>
<channel id="umoy3Date" typeId="dateTimeType">
<label>UMOY3 TIMESTAMP</label>
<description>Timestamp of UMOY3 value</description>
</channel>
</channels>
</channel-group-type>
<channel-type id="stringType">
<item-type>String</item-type>
<label>Teleinfo String Type</label>
<category>Energy</category>
<state pattern="%s" readOnly="true"/>
</channel-type>
<channel-type id="energyType">
<item-type>Number:Energy</item-type>
<label>Teleinfo Energy Type</label>
<category>Energy</category>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
<channel-type id="currentType">
<item-type>Number:ElectricCurrent</item-type>
<label>Teleinfo Current Type</label>
<category>Energy</category>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
<channel-type id="potentialType">
<item-type>Number:ElectricPotential</item-type>
<label>Teleinfo Potential Type</label>
<category>Energy</category>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
<channel-type id="powerType">
<item-type>Number:Power</item-type>
<label>Teleinfo Power Type</label>
<category>Energy</category>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
<channel-type id="switchType">
<item-type>Switch</item-type>
<label>Teleinfo Switch Type</label>
<category>Energy</category>
<state readOnly="true"/>
</channel-type>
<channel-type id="dateTimeType">
<item-type>DateTime</item-type>
<label>Teleinfo DateTime Type</label>
<category>Energy</category>
<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
</channel-type>
</thing:thing-descriptions>

View File

@ -310,53 +310,204 @@
</channel-group-type> </channel-group-type>
<channel-type id="stringType"> <channel-group-type id="producerLSMGroupType">
<item-type>String</item-type> <label>Producer</label>
<label>Teleinfo String Type</label> <description>Producer channels for Linky telemeter in standard teleinformation mode</description>
<category>Energy</category> <category>Energy</category>
<state pattern="%s" readOnly="true"/> <channels>
</channel-type> <channel id="eait" typeId="energyType">
<label>EAIT</label>
<description>Total active energy injected</description>
</channel>
<channel-type id="energyType"> <channel id="erq1" typeId="energyType">
<item-type>Number:Energy</item-type> <label>ERQ1</label>
<label>Teleinfo Energy Type</label> <description>Total reactive energy Q1</description>
<category>Energy</category> </channel>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
<channel-type id="currentType"> <channel id="erq2" typeId="energyType">
<item-type>Number:ElectricCurrent</item-type> <label>ERQ2</label>
<label>Teleinfo Current Type</label> <description>Total reactive energy Q2</description>
<category>Energy</category> </channel>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
<channel-type id="potentialType"> <channel id="erq3" typeId="energyType">
<item-type>Number:ElectricPotential</item-type> <label>ERQ3</label>
<label>Teleinfo Potential Type</label> <description>Total reactive energy Q3</description>
<category>Energy</category> </channel>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
<channel-type id="powerType"> <channel id="erq4" typeId="energyType">
<item-type>Number:Power</item-type> <label>ERQ4</label>
<label>Teleinfo Power Type</label> <description>Total reactive energy Q4</description>
<category>Energy</category> </channel>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
<channel-type id="switchType"> <channel id="sinsti" typeId="powerType">
<item-type>Switch</item-type> <label>SINSTI</label>
<label>Teleinfo Switch Type</label> <description>Instantaneous injected apparent power</description>
<category>Energy</category> </channel>
<state readOnly="true"/>
</channel-type>
<channel-type id="dateTimeType"> <channel id="smaxin" typeId="powerType">
<item-type>DateTime</item-type> <label>SMAXIN</label>
<label>Teleinfo DateTime Type</label> <description>Maximum injected apparent power of the day</description>
</channel>
<channel id="smaxinMinus1" typeId="powerType">
<label>SMAXIN-1</label>
<description>Maximum injected apparent power of the previous day</description>
</channel>
<channel id="ccain" typeId="powerType">
<label>CCAIN</label>
<description>Injected active charge point N</description>
</channel>
<channel id="ccainMinus1" typeId="powerType">
<label>CCAIN-1</label>
<description>Injected active charge point N-1</description>
</channel>
<channel id="smaxinDate" typeId="dateTimeType">
<label>SMAXIN TIMESTAMP</label>
<description>Timestamp of SMAXIN value</description>
</channel>
<channel id="smaxinMinus1Date" typeId="dateTimeType">
<label>SMAXIN-1 TIMESTAMP</label>
<description>Timestamp of SMAXIN-1 value</description>
</channel>
<channel id="ccainDate" typeId="dateTimeType">
<label>CCAIN TIMESTAMP</label>
<description>Timestamp of CCAIN value</description>
</channel>
<channel id="ccainMinus1Date" typeId="dateTimeType">
<label>CCAIN-1 TIMESTAMP</label>
<description>Timestamp of CCAIN-1 value</description>
</channel>
</channels>
</channel-group-type>
<channel-group-type id="threePhasedLSMGroupType">
<label>Three-phase</label>
<description>Three-phased channels for Linky telemeter in standard teleinformation mode</description>
<category>Energy</category> <category>Energy</category>
<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/> <channels>
</channel-type>
<channel id="irms2" typeId="currentType">
<label>IRMS2</label>
<description>RMS Current on phase 2</description>
</channel>
<channel id="irms3" typeId="currentType">
<label>IRMS3</label>
<description>RMS Current on phase 3</description>
</channel>
<channel id="urms2" typeId="potentialType">
<label>URMS2</label>
<description>RMS Voltage on phase 2</description>
</channel>
<channel id="urms3" typeId="potentialType">
<label>URMS3</label>
<description>RMS Voltage on phase 3</description>
</channel>
<channel id="sinsts1" typeId="powerType">
<label>SINSTS1</label>
<description>Instantaneous withdrawn apparent power on phase 1</description>
</channel>
<channel id="sinsts2" typeId="powerType">
<label>SINSTS2</label>
<description>Instantaneous withdrawn apparent power on phase 2</description>
</channel>
<channel id="sinsts3" typeId="powerType">
<label>SINSTS3</label>
<description>Instantaneous withdrawn apparent power on phase 3</description>
</channel>
<channel id="smaxsn1" typeId="powerType">
<label>SMAXSN1</label>
<description>Maximum withdrawn apparent power of the day on phase 1</description>
</channel>
<channel id="smaxsn2" typeId="powerType">
<label>SMAXSN2</label>
<description>Maximum withdrawn apparent power of the day on phase 2</description>
</channel>
<channel id="smaxsn3" typeId="powerType">
<label>SMAXSN3</label>
<description>Maximum withdrawn apparent power of the day on phase 3</description>
</channel>
<channel id="smaxsn1Minus1" typeId="powerType">
<label>SMAXSN1-1</label>
<description>Maximum withdrawn apparent power of the previous day on phase 1</description>
</channel>
<channel id="smaxsn2Minus1" typeId="powerType">
<label>SMAXSN2-1</label>
<description>Maximum withdrawn apparent power of the previous day on phase 2</description>
</channel>
<channel id="smaxsn3Minus1" typeId="powerType">
<label>SMAXSN3-1</label>
<description>Maximum withdrawn apparent power of the previous day on phase 3</description>
</channel>
<channel id="umoy2" typeId="potentialType">
<label>UMOY2</label>
<description>Mean Voltage on phase 2</description>
</channel>
<channel id="umoy3" typeId="potentialType">
<label>UMOY3</label>
<description>Mean Voltage on phase 3</description>
</channel>
<channel id="smaxsn1Date" typeId="dateTimeType">
<label>SMAXSN1 TIMESTAMP</label>
<description>Timestamp of SMAXSN1 value</description>
</channel>
<channel id="smaxsn2Date" typeId="dateTimeType">
<label>SMAXSN2 TIMESTAMP</label>
<description>Timestamp of SMAXSN2 value</description>
</channel>
<channel id="smaxsn3Date" typeId="dateTimeType">
<label>SMAXSN3 TIMESTAMP</label>
<description>Timestamp of SMAXSN3 value</description>
</channel>
<channel id="smaxsn1Minus1Date" typeId="dateTimeType">
<label>SMAXSN1-1 TIMESTAMP</label>
<description>Timestamp of SMAXSN1-1 value</description>
</channel>
<channel id="smaxsn2Minus1Date" typeId="dateTimeType">
<label>SMAXSN2-1 TIMESTAMP</label>
<description>Timestamp of SMAXSN2-1 value</description>
</channel>
<channel id="smaxsn3Minus1Date" typeId="dateTimeType">
<label>SMAXSN3-1 TIMESTAMP</label>
<description>Timestamp of SMAXSN3-1 value</description>
</channel>
<channel id="umoy2Date" typeId="dateTimeType">
<label>UMOY2 TIMESTAMP</label>
<description>Timestamp of UMOY2 value</description>
</channel>
<channel id="umoy3Date" typeId="dateTimeType">
<label>UMOY3 TIMESTAMP</label>
<description>Timestamp of UMOY3 value</description>
</channel>
</channels>
</channel-group-type>
</thing:thing-descriptions> </thing:thing-descriptions>

View File

@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<thing:thing-descriptions bindingId="teleinfo"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
<channel-type id="stringType">
<item-type>String</item-type>
<label>Teleinfo String Type</label>
<category>Energy</category>
<state pattern="%s" readOnly="true"/>
</channel-type>
<channel-type id="energyType">
<item-type>Number:Energy</item-type>
<label>Teleinfo Energy Type</label>
<category>Energy</category>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
<channel-type id="currentType">
<item-type>Number:ElectricCurrent</item-type>
<label>Teleinfo Current Type</label>
<category>Energy</category>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
<channel-type id="potentialType">
<item-type>Number:ElectricPotential</item-type>
<label>Teleinfo Potential Type</label>
<category>Energy</category>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
<channel-type id="powerType">
<item-type>Number:Power</item-type>
<label>Teleinfo Power Type</label>
<category>Energy</category>
<state pattern="%d %unit%" readOnly="true"/>
</channel-type>
<channel-type id="switchType">
<item-type>Switch</item-type>
<label>Teleinfo Switch Type</label>
<category>Energy</category>
<state readOnly="true"/>
</channel-type>
<channel-type id="dateTimeType">
<item-type>DateTime</item-type>
<label>Teleinfo DateTime Type</label>
<category>Energy</category>
<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
</channel-type>
</thing:thing-descriptions>