From: olivierkeke Date: Mon, 7 Feb 2022 15:02:48 +0000 (+0100) Subject: [teleinfo] Refactor channel config files for Linky standard mode (#12204) X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=e89a5e6996a9ff9317531cdf9778ed99df02afdb;p=openhab-addons.git [teleinfo] Refactor channel config files for Linky standard mode (#12204) * Refactor channel config files * Remove duplicate PAPP channel type Signed-off-by: Olivier Marceau --- 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 f7a9cdda5b..0000000000 --- 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-channel-group.xml b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-lsm-channel-group.xml deleted file mode 100644 index 8a17dd7845..0000000000 --- a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/common-lsm-channel-group.xml +++ /dev/null @@ -1,362 +0,0 @@ - - - - - - Common channels for Linky telemeter in standard teleinformation mode - Energy - - - - - Provider schedule name - - - - - Current pricing label - - - - - Total active energy withdrawn - - - - - Active energy withdrawn from provider on index 01 - - - - - Active energy withdrawn from provider on index 02 - - - - - Active energy withdrawn from provider on index 03 - - - - - Active energy withdrawn from provider on index 04 - - - - - Active energy withdrawn from provider on index 05 - - - - - Active energy withdrawn from provider on index 06 - - - - - Active energy withdrawn from provider on index 07 - - - - - Active energy withdrawn from provider on index 08 - - - - - Active energy withdrawn from provider on index 09 - - - - - Active energy withdrawn from provider on index 10 - - - - - Active energy withdrawn from distributor on index 01 - - - - - Active energy withdrawn from distributor on index 02 - - - - - Active energy withdrawn from distributor on index 03 - - - - - Active energy withdrawn from distributor on index 04 - - - - - RMS Current on phase 1 - - - - - RMS Voltage on phase 1 - - - - - Reference apparent power - - - - - Apparent power rupture capacity - - - - - Instantaneous withdrawn apparent power - - - - - Maximum withdrawn apparent power of the day - - - - - Maximum withdrawn apparent power of the previous day - - - - - Active charge point N - - - - - Active charge point N-1 - - - - - Mean Voltage on phase 1 - - - - - Status registry - - - - - Start of mobile peak period 1 - - - - - End of mobile peak period 1 - - - - - Start of mobile peak period 2 - - - - - End of mobile peak period 2 - - - - - Start of mobile peak period 3 - - - - - End of mobile peak period 3 - - - - - Short message - - - - - Very short message - - - - - PRM - - - - - - Index of current pricing - - - - - Number of current provider schedule - - - - - Number of next day provider schedule - - - - - Profile of next day provider schedule - - - - - Profile of next rush day - - - - - Date and Time - - - - - Timestamp of SMAXSN value - - - - - Timestamp of SMAXSN-1 value - - - - - Timestamp of CCASN value - - - - - Timestamp of CCASN-1 value - - - - - Timestamp of UMOY1 value - - - - - Date of DPM1 - - - - - Date of FPM1 - - - - - Date of DPM2 - - - - - Date of FPM2 - - - - - Date of DPM3 - - - - - Date of FPM3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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-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 63399587ed..0000000000 --- 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 4086022978..0000000000 --- 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/lsm-channel-group-types.xml b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/lsm-channel-group-types.xml new file mode 100644 index 0000000000..f7895e9754 --- /dev/null +++ b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/thing/lsm-channel-group-types.xml @@ -0,0 +1,513 @@ + + + + + + Common channels for Linky telemeter in standard teleinformation mode + Energy + + + + + Provider schedule name + + + + + Current pricing label + + + + + Total active energy withdrawn + + + + + Active energy withdrawn from provider on index 01 + + + + + Active energy withdrawn from provider on index 02 + + + + + Active energy withdrawn from provider on index 03 + + + + + Active energy withdrawn from provider on index 04 + + + + + Active energy withdrawn from provider on index 05 + + + + + Active energy withdrawn from provider on index 06 + + + + + Active energy withdrawn from provider on index 07 + + + + + Active energy withdrawn from provider on index 08 + + + + + Active energy withdrawn from provider on index 09 + + + + + Active energy withdrawn from provider on index 10 + + + + + Active energy withdrawn from distributor on index 01 + + + + + Active energy withdrawn from distributor on index 02 + + + + + Active energy withdrawn from distributor on index 03 + + + + + Active energy withdrawn from distributor on index 04 + + + + + RMS Current on phase 1 + + + + + RMS Voltage on phase 1 + + + + + Reference apparent power + + + + + Apparent power rupture capacity + + + + + Instantaneous withdrawn apparent power + + + + + Maximum withdrawn apparent power of the day + + + + + Maximum withdrawn apparent power of the previous day + + + + + Active charge point N + + + + + Active charge point N-1 + + + + + Mean Voltage on phase 1 + + + + + Status registry + + + + + Start of mobile peak period 1 + + + + + End of mobile peak period 1 + + + + + Start of mobile peak period 2 + + + + + End of mobile peak period 2 + + + + + Start of mobile peak period 3 + + + + + End of mobile peak period 3 + + + + + Short message + + + + + Very short message + + + + + PRM + + + + + + Index of current pricing + + + + + Number of current provider schedule + + + + + Number of next day provider schedule + + + + + Profile of next day provider schedule + + + + + Profile of next rush day + + + + + Date and Time + + + + + Timestamp of SMAXSN value + + + + + Timestamp of SMAXSN-1 value + + + + + Timestamp of CCASN value + + + + + Timestamp of CCASN-1 value + + + + + Timestamp of UMOY1 value + + + + + Date of DPM1 + + + + + Date of FPM1 + + + + + Date of DPM2 + + + + + Date of FPM2 + + + + + Date of DPM3 + + + + + Date of FPM3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + 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 0000000000..4ff842db48 --- /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 + + + +