Compare commits

...

3 Commits

Author SHA1 Message Date
Thomas Burri
64051371f4 Updated item configuration
Added the unit metadata to pressure item configurations as 'bar' is used
as unit with heating pumps.

Signed-off-by: Thomas Burri <th@thonojato.ch>
2025-01-08 17:30:39 +01:00
Thomas Burri
7282b597e7 Fixed typo in class names
Class names fixed are 'SystemInformationBlockParser' and
'SystemInformationBlockAllWpmParser'.

Signed-off-by: Thomas Burri <th@thonojato.ch>
2025-01-08 17:26:14 +01:00
Thomas Burri
1242c1ae3e Updated pattern to two decimal places as pressure shall be visualized in
bar (via unit metadata).
Signed-off-by: Thomas Burri <th@thonojato.ch>
2025-01-08 17:19:26 +01:00
9 changed files with 24 additions and 20 deletions

View File

@ -475,7 +475,7 @@ Number:Temperature stiebel_eltron_heat_pump_wpm_return_temperature
Number:Temperature stiebel_eltron_heat_pump_wpm_fixed_temperature_set_point "Fixed Temperature Set Point" <temperature> { channel="modubs:stiebeleltron-heatpump-wpmsystem:stiebelEltronWPMsytem:systemInformationWpm3#fixed-temperature-setpoint" }
Number:Temperature stiebel_eltron_heat_pump_wpm_buffer_temperature "Buffer Temperature" <temperature> { channel="modubs:stiebeleltron-heatpump-wpmsystem:stiebelEltronWPMsytem:systemInformationWpm3#buffer-temperature" }
Number:Temperature stiebel_eltron_heat_pump_wpm_buffer_temperature_set_point "Buffer Temperature Set Point" <temperature> { channel="modubs:stiebeleltron-heatpump-wpmsystem:stiebelEltronWPMsytem:systemInformationWpm3#buffer-temperature-setpoint" }
Number:Pressure stiebel_eltron_heat_pump_wpm_heating_pressure "Heating Pressure" <pressure> { channel="modubs:stiebeleltron-heatpump-wpmsystem:stiebelEltronWPMsytem:systemInformationWpm3#heating-pressure" }
Number:Pressure stiebel_eltron_heat_pump_wpm_heating_pressure "Heating Pressure" <pressure> { unit="bar", channel="modubs:stiebeleltron-heatpump-wpmsystem:stiebelEltronWPMsytem:systemInformationWpm3#heating-pressure" }
Number:VolumetricFlowRate stiebel_eltron_heat_pump_wpm_flow_rate "Flow Rate" <flow> { channel="modubs:stiebeleltron-heatpump-wpmsystem:stiebelEltronWPMsytem:systemInformationWpm3#flow-rate" }
Number:Temperature stiebel_eltron_heat_pump_wpm_hot_water_temperature "Hot Water Temperature" <temperature> { channel="modubs:stiebeleltron-heatpump-wpmsystem:stiebelEltronWPMsytem:systemInformationWpm3#hotwater-temperature" }
Number:Temperature stiebel_eltron_heat_pump_wpm_hot_water_temperature_set_point "Hot Water Temperature Set Point" <temperature> { channel="modubs:stiebeleltron-heatpump-wpmsystem:stiebelEltronWPMsytem:systemInformationWpm3#hotwater-temperature-setpoint" }
@ -490,7 +490,7 @@ Number:Temperature stiebel_eltron_heat_pump_wpm_lower_application_limit_h
Number:Temperature stiebel_eltron_heat_pump_wpm_lower_application_limit_hot_water "Lower Application Limit Hot Water" <temperature> { channel="modubs:stiebeleltron-heatpump-wpmsystem:stiebelEltronWPMsytem:systemInformationWpm3#lower-application-limit-hotwater" }
Number:Temperature stiebel_eltron_heat_pump_wpm_source_temperature "Source Temperature" <temperature> { channel="modubs:stiebeleltron-heatpump-wpmsystem:stiebelEltronWPMsytem:systemInformationWpm3#source-temperature" }
Number:Temperature stiebel_eltron_heat_pump_wpm_minimal_source_temperature "Minimal Source Temperature" <temperature> { channel="modubs:stiebeleltron-heatpump-wpmsystem:stiebelEltronWPMsytem:systemInformationWpm3#min-source-temperature" }
Number:Pressure stiebel_eltron_heat_pump_wpm_source_pressure "Source Pressure" <pressure> { channel="modubs:stiebeleltron-heatpump-wpmsystem:stiebelEltronWPMsytem:systemInformationWpm3#source-pressure" }
Number:Pressure stiebel_eltron_heat_pump_wpm_source_pressure "Source Pressure" <pressure> { unit="bar", channel="modubs:stiebeleltron-heatpump-wpmsystem:stiebelEltronWPMsytem:systemInformationWpm3#source-pressure" }
Number:Energy stiebel_eltron_heat_pump_wpm_heat_quantity_today "Heat Quantity Today [%.0f kWh]" <energy> { channel="modubs:stiebeleltron-heatpump-wpmsystem:stiebelEltronWPMsytem:energyInformationWpm3#production-heat-today" }
Number:Energy stiebel_eltron_heat_pump_wpm_heat_quantity_total "Heat Quantity Total [%.3f MWh]" <energy> { channel="modubs:stiebeleltron-heatpump-wpmsystem:stiebelEltronWPMsytem:energyInformationWpm3#production-heat-total" }
@ -580,7 +580,7 @@ Number:Temperature stiebel_eltron_heat_pump_wpm3_return_temperature
Number:Temperature stiebel_eltron_heat_pump_wpm3_fixed_temperature_set_point "Fixed Temperature Set Point" <temperature> { channel="modbus:stiebeleltron-heatpump-wpm3:stiebelEltronWPM3:systemInformationWpm3#fixed-temperature-setpoint" }
Number:Temperature stiebel_eltron_heat_pump_wpm3_buffer_temperature "Buffer Temperature" <temperature> { channel="modbus:stiebeleltron-heatpump-wpm3:stiebelEltronWPM3:systemInformationWpm3#buffer-temperature" }
Number:Temperature stiebel_eltron_heat_pump_wpm3_buffer_temperature_set_point "Buffer Temperature Set Point" <temperature> { channel="modbus:stiebeleltron-heatpump-wpm3:stiebelEltronWPM3:systemInformationWpm3#buffer-temperature-setpoint" }
Number:Pressure stiebel_eltron_heat_pump_wpm3_heating_pressure "Heating Pressure" <pressure> { channel="modbus:stiebeleltron-heatpump-wpm3:stiebelEltronWPM3:systemInformationWpm3#heating-pressure" }
Number:Pressure stiebel_eltron_heat_pump_wpm3_heating_pressure "Heating Pressure" <pressure> { unit="bar", channel="modbus:stiebeleltron-heatpump-wpm3:stiebelEltronWPM3:systemInformationWpm3#heating-pressure" }
Number:VolumetricFlowRate stiebel_eltron_heat_pump_wpm3_flow_rate "Flow Rate" <flow> { channel="modbus:stiebeleltron-heatpump-wpm3:stiebelEltronWPM3:systemInformationWpm3#flow-rate" }
Number:Temperature stiebel_eltron_heat_pump_wpm3_hot_water_temperature "Hot Water Temperature" <temperature> { channel="modbus:stiebeleltron-heatpump-wpm3:stiebelEltronWPM3:systemInformationWpm3#hotwater-temperature" }
Number:Temperature stiebel_eltron_heat_pump_wpm3_hot_water_temperature_set_point "Hot Water Temperature Set Point" <temperature> { channel="modbus:stiebeleltron-heatpump-wpm3:stiebelEltronWPM3:systemInformationWpm3#hotwater-temperature-setpoint" }
@ -598,7 +598,7 @@ Number:Temperature stiebel_eltron_heat_pump_wpm3_lower_application_limit_
Number:Temperature stiebel_eltron_heat_pump_wpm3_lower_application_limit_hot_water "Lower Application Limit Hot Water" <temperature> { channel="modbus:stiebeleltron-heatpump-wpm3:stiebelEltronWPM3:systemInformationWpm3#lower-application-limit-hotwater" }
Number:Temperature stiebel_eltron_heat_pump_wpm3_source_temperature "Source Temperature" <temperature> { channel="modbus:stiebeleltron-heatpump-wpm3:stiebelEltronWPM3:systemInformationWpm3#source-temperature" }
Number:Temperature stiebel_eltron_heat_pump_wpm3_minimal_source_temperature "Minimal Source Temperature" <temperature> { channel="modbus:stiebeleltron-heatpump-wpm3:stiebelEltronWPM3:systemInformationWpm3#min-source-temperature" }
Number:Pressure stiebel_eltron_heat_pump_wpm3_source_pressure "Source Pressure" <pressure> { channel="modbus:stiebeleltron-heatpump-wpm3:stiebelEltronWPM3:systemInformationWpm3#source-pressure" }
Number:Pressure stiebel_eltron_heat_pump_wpm3_source_pressure "Source Pressure" <pressure> { unit="bar", channel="modbus:stiebeleltron-heatpump-wpm3:stiebelEltronWPM3:systemInformationWpm3#source-pressure" }
Number:Energy stiebel_eltron_heat_pump_wpm3_heat_quantity_today "Heat Quantity Today [%.0f kWh]" <energy> { channel="modbus:stiebeleltron-heatpump-wpm3:stiebelEltronWPM3:energyInformationWpm3#production-heat-today" }
Number:Energy stiebel_eltron_heat_pump_wpm3_heat_quantity_total "Heat Quantity Total [%.3f MWh]" <energy> { channel="modbus:stiebeleltron-heatpump-wpm3:stiebelEltronWPM3:energyInformationWpm3#production-heat-total" }
@ -673,7 +673,7 @@ Number:Temperature stiebel_eltron_heat_pump_wpm3i_return_temperature
Number:Temperature stiebel_eltron_heat_pump_wpm3i_fixed_temperature_set_point "Fixed Temperature Set Point" <temperature> { channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#fixed-temperature-setpoint" }
Number:Temperature stiebel_eltron_heat_pump_wpm3i_buffer_temperature "Buffer Temperature" <temperature> { channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#buffer-temperature" }
Number:Temperature stiebel_eltron_heat_pump_wpm3i_buffer_temperature_set_point "Buffer Temperature Set Point" <temperature> { channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#buffer-temperature-setpoint" }
Number:Pressure stiebel_eltron_heat_pump_wpm3i_heating_pressure "Heating Pressure" <pressure> { channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#heating-pressure" }
Number:Pressure stiebel_eltron_heat_pump_wpm3i_heating_pressure "Heating Pressure" <pressure> { unit="bar", channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#heating-pressure" }
Number:VolumetricFlowRate stiebel_eltron_heat_pump_wpm3i_flow_rate "Flow Rate" <flow> { channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#flow-rate" }
Number:Temperature stiebel_eltron_heat_pump_wpm3i_hot_water_temperature "Hot Water Temperature" <temperature> { channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#hotwater-temperature" }
Number:Temperature stiebel_eltron_heat_pump_wpm3i_hot_water_temperature_set_point "Hot Water Temperature Set Point" <temperature> { channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#hotwater-temperature-setpoint" }
@ -685,10 +685,10 @@ Number:Temperature stiebel_eltron_heat_pump_wpm3i_lower_application_limit
Number:Temperature stiebel_eltron_heat_pump_wpm3i_lower_application_limit_hot_water "Lower Application Limit Hot Water" <temperature> { channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#lower-application-limit-hotwater" }
Number:Temperature stiebel_eltron_heat_pump_wpm3i_source_temperature "Source Temperature" <temperature> { channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#source-temperature" }
Number:Temperature stiebel_eltron_heat_pump_wpm3i_minimal_source_temperature "Minimal Source Temperature" <temperature> { channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#min-source-temperature" }
Number:Pressure stiebel_eltron_heat_pump_wpm3i_source_pressure "Source Pressure" <pressure> { channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#source-pressure" }
Number:Pressure stiebel_eltron_heat_pump_wpm3i_source_pressure "Source Pressure" <pressure> { unit="bar", channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#source-pressure" }
Number:Temperature stiebel_eltron_heat_pump_wpm3i_hot_gas_temperature "Hot Gas Temperature" <temperature> { channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#hotgas-temperature" }
Number:Pressure stiebel_eltron_heat_pump_wpm3i_high_pressure "High Pressure" <pressure> { channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#high-pressure" }
Number:Pressure stiebel_eltron_heat_pump_wpm3i_low_pressure "Low Pressure" <pressure> { channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#low-pressure" }
Number:Pressure stiebel_eltron_heat_pump_wpm3i_high_pressure "High Pressure" <pressure> { unit="bar", channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#high-pressure" }
Number:Pressure stiebel_eltron_heat_pump_wpm3i_low_pressure "Low Pressure" <pressure> { unit="bar", channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:systemInformationWpm3i#low-pressure" }
Number:Energy stiebel_eltron_heat_pump_wpm3i_heat_quantity_today "Heat Quantity Today [%.0f kWh]" <energy> { channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:energyRuntimeInformationWpm3i#production-heat-today" }
Number:Energy stiebel_eltron_heat_pump_wpm3i_heat_quantity_total "Heat Quantity Total [%.3f MWh]" <energy> { channel="modbus:stiebeleltron-heatpump-wpm3i:stiebelEltronWPM3i:energyRuntimeInformationWpm3i#production-heat-total" }

View File

@ -44,9 +44,12 @@ public class SystemInformationBlockAllWpm extends SystemInformationBlock {
public short temperatureAreaCooling;
public short temperatureAreaCoolingSetPoint;
// The following three values are only available for WPM3
public short temperatureCollectorSolar;
public short temperatureCylinderSolar;
public int runtimeSolar;
// The following three values are only available for WPMsystem and WPM3
public short temperatureExtHeatSource;
public short temperatureExtHeatSourceSetPoint;
public int runtimeExtHeatSource;
@ -57,6 +60,7 @@ public class SystemInformationBlockAllWpm extends SystemInformationBlock {
public short temperatureSourceMin;
public short pressureSource;
// The following three values are only available for WPM3i
public short temperatureHotgas;
public short pressureHigh;
public short pressureLow;

View File

@ -30,7 +30,7 @@ import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemInformationBl
import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemParameterBlock;
import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemStateBlock;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.EnergyBlockParser;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemInfromationBlockParser;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemInformationBlockParser;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemParameterBlockParser;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemStateBlockParser;
import org.openhab.core.io.transport.modbus.AsyncModbusFailure;
@ -134,7 +134,7 @@ public class StiebelEltronHandler extends BaseThingHandler {
/**
* Parser used to convert incoming raw messages into system blocks
*/
private final SystemInfromationBlockParser systemInformationBlockParser = new SystemInfromationBlockParser();
private final SystemInformationBlockParser systemInformationBlockParser = new SystemInformationBlockParser();
/**
* Parser used to convert incoming raw messages into system state blocks
*/

View File

@ -30,7 +30,7 @@ import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemInformationBl
import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemParameterBlockAllWpm;
import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemStateBlockAllWpm;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.EnergyBlockParser;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemInfromationBlockAllWpmParser;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemInformationBlockAllWpmParser;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemParameterBlockAllWpmParser;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemStateBlockParserAllWpm;
import org.openhab.core.io.transport.modbus.AsyncModbusFailure;
@ -137,7 +137,7 @@ public class StiebelEltronHandlerWpm extends BaseThingHandler {
/**
* Parser used to convert incoming raw messages into system blocks
*/
private final SystemInfromationBlockAllWpmParser systemInformationBlockParser = new SystemInfromationBlockAllWpmParser();
private final SystemInformationBlockAllWpmParser systemInformationBlockParser = new SystemInformationBlockAllWpmParser();
/**
* Parser used to convert incoming raw messages into system parameter blocks
*/

View File

@ -30,7 +30,7 @@ import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemInformationBl
import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemParameterBlockAllWpm;
import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemStateBlockAllWpm;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.EnergyBlockParser;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemInfromationBlockAllWpmParser;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemInformationBlockAllWpmParser;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemParameterBlockAllWpmParser;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemStateBlockParserAllWpm;
import org.openhab.core.io.transport.modbus.AsyncModbusFailure;
@ -137,7 +137,7 @@ public class StiebelEltronHandlerWpm3 extends BaseThingHandler {
/**
* Parser used to convert incoming raw messages into system blocks
*/
private final SystemInfromationBlockAllWpmParser systemInformationBlockParser = new SystemInfromationBlockAllWpmParser();
private final SystemInformationBlockAllWpmParser systemInformationBlockParser = new SystemInformationBlockAllWpmParser();
/**
* Parser used to convert incoming raw messages into system parameter blocks
*/

View File

@ -32,7 +32,7 @@ import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemParameterBloc
import org.openhab.binding.modbus.stiebeleltron.internal.dto.SystemStateBlockAllWpm;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.EnergyBlockParser;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.RuntimeBlockParser;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemInfromationBlockAllWpmParser;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemInformationBlockAllWpmParser;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemParameterBlockAllWpmParser;
import org.openhab.binding.modbus.stiebeleltron.internal.parser.SystemStateBlockParserAllWpm;
import org.openhab.core.io.transport.modbus.AsyncModbusFailure;
@ -139,7 +139,7 @@ public class StiebelEltronHandlerWpm3i extends BaseThingHandler {
/**
* Parser used to convert incoming raw messages into system blocks
*/
private final SystemInfromationBlockAllWpmParser systemInformationBlockParser = new SystemInfromationBlockAllWpmParser();
private final SystemInformationBlockAllWpmParser systemInformationBlockParser = new SystemInformationBlockAllWpmParser();
/**
* Parser used to convert incoming raw messages into system parameter blocks
*/

View File

@ -23,7 +23,7 @@ import org.openhab.core.io.transport.modbus.ModbusRegisterArray;
*
*/
@NonNullByDefault
public class SystemInfromationBlockAllWpmParser extends AbstractBaseParser {
public class SystemInformationBlockAllWpmParser extends AbstractBaseParser {
public SystemInformationBlockAllWpm parse(ModbusRegisterArray raw) {
SystemInformationBlockAllWpm block = new SystemInformationBlockAllWpm();

View File

@ -24,7 +24,7 @@ import org.openhab.core.io.transport.modbus.ModbusRegisterArray;
*
*/
@NonNullByDefault
public class SystemInfromationBlockParser extends AbstractBaseParser {
public class SystemInformationBlockParser extends AbstractBaseParser {
public SystemInformationBlock parse(ModbusRegisterArray raw) {
SystemInformationBlock block = new SystemInformationBlock();

View File

@ -270,13 +270,13 @@
<item-type>Number:Pressure</item-type>
<label>High Pressure</label>
<category>pressure</category>
<state readOnly="true" pattern="%.1f %unit%"/>
<state readOnly="true" pattern="%.2f %unit%"/>
</channel-type>
<channel-type id="low-pressure-type">
<item-type>Number:Pressure</item-type>
<label>Low Pressure</label>
<category>pressure</category>
<state readOnly="true" pattern="%.1f %unit%"/>
<state readOnly="true" pattern="%.2f %unit%"/>
</channel-type>