Skip to content

Commit af4cbea

Browse files
chilobochilobo
committed
I am rebasing to Version 0.2 of Lambda Heat Pump Bundle
Based on the Stiebel Eltron Modubs Bundle by Paul Frank Signed-off-by: Christian Koch <[email protected]>
1 parent 59bbdca commit af4cbea

27 files changed

+1222
-296
lines changed

‎bundles/org.openhab.binding.modbus.lambda/README.md

+128-153
Large diffs are not rendered by default.

‎bundles/org.openhab.binding.modbus.lambda/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
44

55
<modelVersion>4.0.0</modelVersion>
6-
76
<parent>
87
<groupId>org.openhab.addons.bundles</groupId>
98
<artifactId>org.openhab.addons.reactor.bundles</artifactId>

‎bundles/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/LambdaBindingConstants.java

+38-3
Original file line numberDiff line numberDiff line change
@@ -35,35 +35,70 @@ public class LambdaBindingConstants {
3535
public static final String GROUP_GENERAL_AMBIENT = "generalAmbient";
3636
public static final String GROUP_GENERAL_EMANAGER = "generalEManager";
3737
public static final String GROUP_HEATPUMP1 = "Heatpump1";
38+
public static final String GROUP_HEATPUMP1SET = "Heatpump1Set";
3839
public static final String GROUP_BOILER1 = "Boiler1";
3940
public static final String GROUP_BOILER1MT = "Boiler1Mt";
4041
public static final String GROUP_BUFFER1 = "Buffer1";
4142
public static final String GROUP_BUFFER1MT = "Buffer1Mt";
43+
public static final String GROUP_HEATINGCIRCUIT1 = "HeatingCircuit1";
44+
public static final String GROUP_HEATINGCIRCUIT1SETTING = "HeatingCircuit1Setting";
4245

4346
// List of all Channel ids in device information group
4447
// General Ambient
4548
public static final String CHANNEL_AMBIENT_ERROR_NUMBER = "ambient-error-number";
46-
public static final String CHANNEL_AMBIENT_OPERATOR_STATE = "ambient-operator-state";
49+
public static final String CHANNEL_AMBIENT_OPERATING_STATE = "ambient-operating-state";
4750
public static final String CHANNEL_ACTUAL_AMBIENT_TEMPERATURE = "actual-ambient-temperature";
4851
public static final String CHANNEL_AVERAGE_AMBIENT_TEMPERATURE = "average-ambient-temperature";
4952
public static final String CHANNEL_CALCULATED_AMBIENT_TEMPERATURE = "calculated-ambient-temperature";
5053

5154
// General E-manager
5255
public static final String CHANNEL_EMANAGER_ERROR_NUMBER = "emanager-error-number";
53-
public static final String CHANNEL_EMANAGER_OPERATOR_STATE = "emanager-operator-state";
56+
public static final String CHANNEL_EMANAGER_OPERATING_STATE = "emanager-operating-state";
5457
public static final String CHANNEL_ACTUAL_POWER = "actual-power";
5558
public static final String CHANNEL_ACTUAL_POWER_CONSUMPTION = "actual-power-consumption";
59+
public static final String CHANNEL_POWER_CONSUMPTION_SETPOINT = "power-consumption-setpoint";
5660

5761
// Heatpump 1
58-
public static final String CHANNEL_HEATPUMP1_TFLOW = "heatpump1-t-flow";
62+
public static final String CHANNEL_HEATPUMP1_ERROR_STATE = "heatpump1-error-state";
63+
public static final String CHANNEL_HEATPUMP1_ERROR_NUMBER = "heatpump1-error-number";
64+
public static final String CHANNEL_HEATPUMP1_STATE = "heatpump1-state";
65+
public static final String CHANNEL_HEATPUMP1_OPERATING_STATE = "heatpump1-operating-state";
66+
public static final String CHANNEL_HEATPUMP1_T_FLOW = "heatpump1-t-flow";
67+
public static final String CHANNEL_HEATPUMP1_T_RETURN = "heatpump1-t-return";
68+
public static final String CHANNEL_HEATPUMP1_VOL_SINK = "heatpump1-vol-sink";
69+
public static final String CHANNEL_HEATPUMP1_T_EQIN = "heatpump1-t-eqin";
70+
public static final String CHANNEL_HEATPUMP1_T_EQOUT = "heatpump1-t-eqout";
71+
public static final String CHANNEL_HEATPUMP1_VOL_SOURCE = "heatpump1-vol-source";
72+
public static final String CHANNEL_HEATPUMP1_COMPRESSOR_RATING = "heatpump1-compressor-rating";
73+
public static final String CHANNEL_HEATPUMP1_QP_HEATING = "heatpump1-qp-heating";
74+
public static final String CHANNEL_HEATPUMP1_FI_POWER_CONSUMPTION = "heatpump1-fi-power-consumption";
75+
public static final String CHANNEL_HEATPUMP1_COP = "heatpump1-cop";
76+
public static final String CHANNEL_HEATPUMP1_SET_ERROR_QUIT = "heatpump1-set-error-quit";
5977

6078
// Boiler 1
79+
public static final String CHANNEL_BOILER1_ERROR_NUMBER = "boiler1-error-number";
80+
public static final String CHANNEL_BOILER1_OPERATING_STATE = "boiler1-operating-state";
6181
public static final String CHANNEL_BOILER1_ACTUAL_HIGH_TEMPERATURE = "boiler1-actual-high-temperature";
6282
public static final String CHANNEL_BOILER1_ACTUAL_LOW_TEMPERATURE = "boiler1-actual-low-temperature";
6383
public static final String CHANNEL_BOILER1_MAXIMUM_BOILER_TEMPERATURE = "boiler1-maximum-boiler-temperature";
6484

6585
// Buffer 1
86+
public static final String CHANNEL_BUFFER1_ERROR_NUMBER = "buffer1-error-number";
87+
public static final String CHANNEL_BUFFER1_OPERATING_STATE = "buffer1-operating-state";
6688
public static final String CHANNEL_BUFFER1_ACTUAL_HIGH_TEMPERATURE = "buffer1-actual-high-temperature";
6789
public static final String CHANNEL_BUFFER1_ACTUAL_LOW_TEMPERATURE = "buffer1-actual-low-temperature";
6890
public static final String CHANNEL_BUFFER1_MAXIMUM_BOILER_TEMPERATURE = "buffer1-maximum-boiler-temperature";
91+
92+
// Heating Circuit 1
93+
public static final String CHANNEL_HEATINGCIRCUIT1_ERROR_NUMBER = "heatingcircuit1-error-number";
94+
public static final String CHANNEL_HEATINGCIRCUIT1_OPERATING_STATE = "heatingcircuit1-operating-state";
95+
public static final String CHANNEL_HEATINGCIRCUIT1_FLOW_LINE_TEMPERATURE = "heatingcircuit1-flow-line-temperature";
96+
public static final String CHANNEL_HEATINGCIRCUIT1_RETURN_LINE_TEMPERATURE = "heatingcircuit1-return-line-temperature";
97+
public static final String CHANNEL_HEATINGCIRCUIT1_ROOM_DEVICE_TEMPERATURE = "heatingcircuit1-room-device-temperature";
98+
public static final String CHANNEL_HEATINGCIRCUIT1_SETPOINT_FLOW_LINE_TEMPERATURE = "heatingcircuit1-setpoint-flow-line-temperature";
99+
public static final String CHANNEL_HEATINGCIRCUIT1_OPERATING_MODE = "heatingcircuit1-operating-mode";
100+
// Heating Cirucuit 1 Set
101+
public static final String CHANNEL_HEATINGCIRCUIT1_OFFSET_FLOW_LINE_TEMPERATURE = "heatingcircuit1-offset-flow-line-temperature";
102+
public static final String CHANNEL_HEATINGCIRCUIT1_ROOM_HEATING_TEMPERATURE = "heatingcircuit1-room-heating-temperature";
103+
public static final String CHANNEL_HEATINGCIRCUIT1_ROOM_COOLING_TEMPERATURE = "heatingcircuit1-room-cooling-temperature";
69104
}

‎bundles/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/LambdaConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class LambdaConfiguration {
2626
/**
2727
* Refresh interval in seconds
2828
*/
29-
private long refresh;
29+
private long refresh = 30;
3030

3131
private int maxTries = 3;// backwards compatibility and tests
3232

‎bundles/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/dto/AmbientBlock.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
public class AmbientBlock {
2323
public int ambientErrorNumber;
24-
public int ambientOperatorState;
24+
public int ambientOperatingState;
2525
public int actualAmbientTemperature;
2626
public int averageAmbientTemperature;
2727
public int calculatedAmbientTemperature;

‎bundles/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/dto/Boiler1Block.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
*
2121
*/
2222
public class Boiler1Block {
23-
23+
public int boiler1ErrorNumber;
24+
public int boiler1OperatingState;
2425
public int boiler1ActualHighTemperature;
2526
public int boiler1ActualLowTemperature;
2627
}

‎bundles/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/dto/Buffer1Block.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
*
2121
*/
2222
public class Buffer1Block {
23-
23+
public int buffer1ErrorNumber;
24+
public int buffer1OperatingState;
2425
public int buffer1ActualHighTemperature;
2526
public int buffer1ActualLowTemperature;
2627
}

‎bundles/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/dto/EManagerBlock.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
*/
2222
public class EManagerBlock {
2323
public int emanagerErrorNumber;
24-
public int emanagerOperatorState;
24+
public int emanagerOperatingState;
2525
public int actualPower;
2626
public int actualPowerConsumption;
27+
public int powerConsumptionSetpoint;
2728
}

‎bundles/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/dto/HeatingCircuit1Block.java

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package org.openhab.binding.modbus.lambda.internal.dto;
2+
/**
3+
* Copyright (c) 2010-2024 Contributors to the openHAB project
4+
*
5+
* See the NOTICE file(s) distributed with this work for additional
6+
* information.
7+
*
8+
* This program and the accompanying materials are made available under the
9+
* terms of the Eclipse Public License 2.0 which is available at
10+
* http://www.eclipse.org/legal/epl-2.0
11+
*
12+
* SPDX-License-Identifier: EPL-2.0
13+
*/
14+
15+
/**
16+
* Dto class for the HeatingCircuit1 Block
17+
*
18+
* @author Paul Frank - Initial contribution
19+
* @author Christian Koch - modified for lambda heat pump based on stiebeleltron binding for modbus
20+
*
21+
*/
22+
public class HeatingCircuit1Block {
23+
24+
public int heatingcircuit1ErrorNumber;
25+
public int heatingcircuit1OperatingState;
26+
public int heatingcircuit1FlowLineTemperature;
27+
public int heatingcircuit1ReturnLineTemperature;
28+
public int heatingcircuit1RoomDeviceTemperature;
29+
public int heatingcircuit1SetpointFlowLineTemperature;
30+
public int heatingcircuit1OperatingMode;
31+
}

‎bundles/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/dto/HeatingCircuit1SettingBlock.java

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package org.openhab.binding.modbus.lambda.internal.dto;
2+
3+
/**
4+
* Copyright (c) 2010-2024 Contributors to the openHAB project
5+
*
6+
* See the NOTICE file(s) distributed with this work for additional
7+
* information.
8+
*
9+
* This program and the accompanying materials are made available under the
10+
* terms of the Eclipse Public License 2.0 which is available at
11+
* http://www.eclipse.org/legal/epl-2.0
12+
*
13+
* SPDX-License-Identifier: EPL-2.0
14+
*/
15+
16+
/**
17+
* Dto class for the HeatingCircuit1Setting Block
18+
*
19+
* @author Paul Frank - Initial contribution
20+
* @author Christian Koch - modified for lambda heat pump based on stiebeleltron binding for modbus
21+
*
22+
*/
23+
24+
public class HeatingCircuit1SettingBlock {
25+
public int heatingcircuit1OffsetFlowLineTemperature;
26+
public int heatingcircuit1RoomHeatingTemperature;
27+
public int heatingcircuit1RoomCoolingTemperature;
28+
}

‎bundles/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/dto/Heatpump1Block.java

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package org.openhab.binding.modbus.lambda.internal.dto;
2+
/**
3+
* Copyright (c) 2010-2024 Contributors to the openHAB project
4+
*
5+
* See the NOTICE file(s) distributed with this work for additional
6+
* information.
7+
*
8+
* This program and the accompanying materials are made available under the
9+
* terms of the Eclipse Public License 2.0 which is available at
10+
* http://www.eclipse.org/legal/epl-2.0
11+
*
12+
* SPDX-License-Identifier: EPL-2.0
13+
*/
14+
15+
/**
16+
* Dto class for the Heatpump1 Block
17+
*
18+
* @author Paul Frank - Initial contribution
19+
* @author Christian Koch - modified for lambda heat pump based on stiebeleltron binding for modbus
20+
*
21+
*/
22+
public class Heatpump1Block {
23+
public int heatpump1ErrorState;
24+
public int heatpump1ErrorNumber;
25+
public int heatpump1State;
26+
public int heatpump1OperatingState;
27+
public int heatpump1TFlow;
28+
public int heatpump1TReturn;
29+
public int heatpump1VolSink;
30+
public int heatpump1TEQin;
31+
public int heatpump1TEQout;
32+
public int heatpump1VolSource;
33+
public int heatpump1CompressorRating;
34+
public int heatpump1QpHeating;
35+
public int heatpump1FIPowerConsumption;
36+
public int heatpump1COP;
37+
}

‎bundles/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/dto/Heatpump1SetBlock.java

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package org.openhab.binding.modbus.lambda.internal.dto;
2+
/**
3+
* Copyright (c) 2010-2024 Contributors to the openHAB project
4+
*
5+
* See the NOTICE file(s) distributed with this work for additional
6+
* information.
7+
*
8+
* This program and the accompanying materials are made available under the
9+
* terms of the Eclipse Public License 2.0 which is available at
10+
* http://www.eclipse.org/legal/epl-2.0
11+
*
12+
* SPDX-License-Identifier: EPL-2.0
13+
*/
14+
15+
/**
16+
* Dto class for the Heatpump1 Block
17+
*
18+
* @author Paul Frank - Initial contribution
19+
* @author Christian Koch - modified for lambda heat pump based on stiebeleltron binding for modbus
20+
*
21+
*/
22+
public class Heatpump1SetBlock {
23+
24+
public int heatpump1seterrorquit;
25+
}

0 commit comments

Comments
 (0)