demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-25 14:55:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[dsmr] Fix delivery demand labels (#16739)

Browse Source 
* Fix delivery demand labels
* Add upgrade instructions

Signed-off-by: Leo Siepel <leosiepel@gmail.com>
Signed-off-by: Ciprian Pascu <contact@ciprianpascu.ro>
This commit is contained in:
lsiepel 2024-05-19 10:36:33 +02:00 committed by Ciprian Pascu
parent 3597069499
commit 8c3e107868
5 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/i18n/dsmr.properties
View File

@ -23,6 +23,7 @@ thing-type.dsmr.electricity_ace4000.label = Electricity Meter (ACE4000)
thing-type.dsmr.electricity_ace4000.description = This is an electricity meter that complies to the ACE4000 GTMM Mk3 specification.
thing-type.dsmr.electricity_emucs_v1_0.label = Electricity Meter (e-MUCS V1.0)
thing-type.dsmr.electricity_emucs_v1_0.description = This is an electricity meter that complies to the e-MUCS V1.0 specification.
thing-type.dsmr.electricity_emucs_v1_0.channel.emeter_maximum_demand_current_month.label = Power Demand Current Month
thing-type.dsmr.electricity_smarty_v1_0.label = Electricity Meter (Smarty V1.0)
thing-type.dsmr.electricity_smarty_v1_0.description = This is an electricity meter that complies to the Luxembourg's Smarty V1.0 specification.
thing-type.dsmr.electricity_smarty_v1_0_austria.label = Electricity Meter Austria
@ -133,8 +134,8 @@ channel-type.dsmr.activeImportPowerType.label = Aggregate Active Import Power
channel-type.dsmr.activeImportPowerType.description = The aggregate active import power.
channel-type.dsmr.activeThresholdSmax.label = Active Threshold
channel-type.dsmr.activeThresholdSmax.description = Active threshold (SMAX).
channel-type.dsmr.actualDeliveryBelgiumType.label = Actual Power Delivery
channel-type.dsmr.actualDeliveryBelgiumType.description = The current power delivery.
channel-type.dsmr.actualDeliveryBelgiumType.label = Actual Power Demand
channel-type.dsmr.actualDeliveryBelgiumType.description = The current power delivery demand.
channel-type.dsmr.actualDeliveryType.label = Actual Power Delivery
channel-type.dsmr.actualDeliveryType.description = The current power delivery.
channel-type.dsmr.actualFuseThresholdAType.label = Actual Fuse Threshold

4
bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/channeltypes_electricity.xml
View File

@ -155,8 +155,8 @@
</channel-type>
<channel-type id="actualDeliveryBelgiumType">
<item-type>Number:Power</item-type>
<label>Actual Power Delivery</label>
<description>The current power delivery.</description>
<label>Actual Power Demand</label>
<description>The current power delivery demand.</description>
<state pattern="%.3f %unit%" readOnly="true"/>
</channel-type>
<channel-type id="actualProductionType" advanced="true">

1
bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_device_emucs_v1_0.xml
View File

@ -17,6 +17,7 @@
<channel id="p1_emucs_version_output" typeId="p1VersionType"/>
<channel id="p1_timestamp" typeId="p1TimestampType"/>
</channels>
<config-description-ref uri="thing-type:dsmr:meterdescriptor"/>
</thing-type>
</thing:thing-descriptions>

7
bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_emucs_v1_0.xml
View File

@ -23,7 +23,7 @@
<channel id="emeter_actual_production" typeId="actualProductionType"/>
<channel id="emeter_actual_demand" typeId="actualDeliveryBelgiumType"/>
<channel id="emeter_maximum_demand_current_month" typeId="actualDeliveryBelgiumType">
<label>Power Delivery Current Month</label>
<label>Power Demand Current Month</label>
</channel>
<channel id="emeter_switch_position" typeId="switchPositionType"/>
<channel id="emeter_fuse_threshold_a" typeId="actualFuseThresholdAType"/>
@ -41,6 +41,11 @@
<channel id="emeter_instant_voltage_l2" typeId="instantVoltageL2Type"/>
<channel id="emeter_instant_voltage_l3" typeId="instantVoltageL3Type"/>
</channels>
<properties>
<property name="thingTypeVersion">1</property>
</properties>
<config-description-ref uri="thing-type:dsmr:meterdescriptor"/>
</thing-type>
</thing:thing-descriptions>

17
bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/update/instructions.xml Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<update:update-descriptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:update="https://openhab.org/schemas/update-description/v1.0.0"
xsi:schemaLocation="https://openhab.org/schemas/update-description/v1.0.0 https://openhab.org/schemas/update-description-1.0.0.xsd">
<thing-type uid="dsmr:device_emucs_v1_0">
<instruction-set targetVersion="1">
<add-channel id="emeter_actual_demand">
<type>dsmr:actualDeliveryBelgiumType</type>
</add-channel>
<add-channel id="emeter_maximum_demand_current_month">
<type>dsmr:actualDeliveryBelgiumType</type>
<label>Power Demand Current Month</label>
</add-channel>
</instruction-set>
</thing-type>
</update:update-descriptions>