From e89a5e6996a9ff9317531cdf9778ed99df02afdb Mon Sep 17 00:00:00 2001 From: olivierkeke Date: Mon, 7 Feb 2022 16:02:48 +0100 Subject: [PATCH] [teleinfo] Refactor channel config files for Linky standard mode (#12204) * Refactor channel config files * Remove duplicate PAPP channel type Signed-off-by: Olivier Marceau --- .../common-cbemm-evo-icc-channel-types.xml | 15 -- .../thing/common-lsm-prod-channel-group.xml | 133 ---------- .../common-lsm-three-phase-channel-group.xml | 179 -------------- ...-group.xml => lsm-channel-group-types.xml} | 231 +++++++++++++++--- .../OH-INF/thing/lsm-channel-types.xml | 56 +++++ 5 files changed, 247 insertions(+), 367 deletions(-) delete mode 100644 bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-cbemm-evo-icc-channel-types.xml delete mode 100644 bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-lsm-prod-channel-group.xml delete mode 100644 bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-lsm-three-phase-channel-group.xml rename bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/{common-lsm-channel-group.xml => lsm-channel-group-types.xml} (60%) create mode 100644 bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/lsm-channel-types.xml 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 deleted file mode 100644 index f7a9cdda5..000000000 --- a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-cbemm-evo-icc-channel-types.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Number:Power - - Instantaneous apparent power - Energy - - - - diff --git a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-lsm-prod-channel-group.xml b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-lsm-prod-channel-group.xml deleted file mode 100644 index 63399587e..000000000 --- a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-lsm-prod-channel-group.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - Producer channels for Linky telemeter in standard teleinformation mode - Energy - - - - Total active energy injected - - - - - Total reactive energy Q1 - - - - - Total reactive energy Q2 - - - - - Total reactive energy Q3 - - - - - Total reactive energy Q4 - - - - - Instantaneous injected apparent power - - - - - Maximum injected apparent power of the day - - - - - Maximum injected apparent power of the previous day - - - - - Injected active charge point N - - - - - Injected active charge point N-1 - - - - - Timestamp of SMAXIN value - - - - - Timestamp of SMAXIN-1 value - - - - - Timestamp of CCAIN value - - - - - Timestamp of CCAIN-1 value - - - - - - String - - Energy - - - - - Number:Energy - - Energy - - - - - Number:ElectricCurrent - - Energy - - - - - Number:ElectricPotential - - Energy - - - - - Number:Power - - Energy - - - - - Switch - - Energy - - - - - DateTime - - Energy - - - - diff --git a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-lsm-three-phase-channel-group.xml b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-lsm-three-phase-channel-group.xml deleted file mode 100644 index 408602297..000000000 --- a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-lsm-three-phase-channel-group.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - Three-phased channels for Linky telemeter in standard teleinformation mode - Energy - - - - - RMS Current on phase 2 - - - - - RMS Current on phase 3 - - - - - RMS Voltage on phase 2 - - - - - RMS Voltage on phase 3 - - - - - Instantaneous withdrawn apparent power on phase 1 - - - - - Instantaneous withdrawn apparent power on phase 2 - - - - - Instantaneous withdrawn apparent power on phase 3 - - - - - Maximum withdrawn apparent power of the day on phase 1 - - - - - Maximum withdrawn apparent power of the day on phase 2 - - - - - Maximum withdrawn apparent power of the day on phase 3 - - - - - Maximum withdrawn apparent power of the previous day on phase 1 - - - - - Maximum withdrawn apparent power of the previous day on phase 2 - - - - - Maximum withdrawn apparent power of the previous day on phase 3 - - - - - Mean Voltage on phase 2 - - - - - Mean Voltage on phase 3 - - - - - Timestamp of SMAXSN1 value - - - - - Timestamp of SMAXSN2 value - - - - - Timestamp of SMAXSN3 value - - - - - Timestamp of SMAXSN1-1 value - - - - - Timestamp of SMAXSN2-1 value - - - - - Timestamp of SMAXSN3-1 value - - - - - Timestamp of UMOY2 value - - - - - Timestamp of UMOY3 value - - - - - - String - - Energy - - - - - Number:Energy - - Energy - - - - - Number:ElectricCurrent - - Energy - - - - - Number:ElectricPotential - - Energy - - - - - Number:Power - - Energy - - - - - Switch - - Energy - - - - - DateTime - - Energy - - - - diff --git a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-lsm-channel-group.xml b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/lsm-channel-group-types.xml similarity index 60% rename from bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-lsm-channel-group.xml rename to bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/lsm-channel-group-types.xml index 8a17dd784..f7895e975 100644 --- a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-lsm-channel-group.xml +++ b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/lsm-channel-group-types.xml @@ -310,53 +310,204 @@ - - String - + + + Producer channels for Linky telemeter in standard teleinformation mode Energy - - + + + + Total active energy injected + - - Number:Energy - - Energy - - + + + Total reactive energy Q1 + - - Number:ElectricCurrent - - Energy - - + + + Total reactive energy Q2 + - - Number:ElectricPotential - - Energy - - + + + Total reactive energy Q3 + - - Number:Power - - Energy - - + + + Total reactive energy Q4 + - - Switch - - Energy - - + + + Instantaneous injected apparent power + - - DateTime - + + + Maximum injected apparent power of the day + + + + + Maximum injected apparent power of the previous day + + + + + Injected active charge point N + + + + + Injected active charge point N-1 + + + + + Timestamp of SMAXIN value + + + + + Timestamp of SMAXIN-1 value + + + + + Timestamp of CCAIN value + + + + + Timestamp of CCAIN-1 value + + + + + + + Three-phased channels for Linky telemeter in standard teleinformation mode Energy - - + + + + + RMS Current on phase 2 + + + + + RMS Current on phase 3 + + + + + RMS Voltage on phase 2 + + + + + RMS Voltage on phase 3 + + + + + Instantaneous withdrawn apparent power on phase 1 + + + + + Instantaneous withdrawn apparent power on phase 2 + + + + + Instantaneous withdrawn apparent power on phase 3 + + + + + Maximum withdrawn apparent power of the day on phase 1 + + + + + Maximum withdrawn apparent power of the day on phase 2 + + + + + Maximum withdrawn apparent power of the day on phase 3 + + + + + Maximum withdrawn apparent power of the previous day on phase 1 + + + + + Maximum withdrawn apparent power of the previous day on phase 2 + + + + + Maximum withdrawn apparent power of the previous day on phase 3 + + + + + Mean Voltage on phase 2 + + + + + Mean Voltage on phase 3 + + + + + Timestamp of SMAXSN1 value + + + + + Timestamp of SMAXSN2 value + + + + + Timestamp of SMAXSN3 value + + + + + Timestamp of SMAXSN1-1 value + + + + + Timestamp of SMAXSN2-1 value + + + + + Timestamp of SMAXSN3-1 value + + + + + Timestamp of UMOY2 value + + + + + Timestamp of UMOY3 value + + + diff --git a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/lsm-channel-types.xml b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/lsm-channel-types.xml new file mode 100644 index 000000000..4ff842db4 --- /dev/null +++ b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/lsm-channel-types.xml @@ -0,0 +1,56 @@ + + + + + String + + Energy + + + + + Number:Energy + + Energy + + + + + Number:ElectricCurrent + + Energy + + + + + Number:ElectricPotential + + Energy + + + + + Number:Power + + Energy + + + + + Switch + + Energy + + + + + DateTime + + Energy + + + +