Skip to content

Commit 60978ab

Browse files
chilobochilobo
committed
This is my commit message
Signed-off-by: Christian Koch <[email protected]>
1 parent fa08107 commit 60978ab

38 files changed

+273
-263
lines changed

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

+2-42
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,8 @@ The other things use another parameter Subindex to add one or more things of thi
7272

7373
Channels within the things are grouped into channel groups.
7474

75-
### Lambda General: General Ambient Group
75+
### General Ambient Group
7676

77-
This group contains ambient temperatures for the heat pump system.
78-
79-
<<<<<<< HEAD
80-
| Channel ID | Item Type | Read only | Unit | Description |
81-
| -------------------------------- | ------------------ | --------- | -------- | ------------------------------------------------------------------------ |
82-
| ambient-error-number | Number | true | [Nr] | Ambient Error Number (0 = No error) |
83-
| ambient-operating-state | Number | true | [Nr] | Ambient Operating State (0 = OFF, 1 = AUTOMATIC, 2 = MANUAL, 3 = ERROR) |
84-
| actual-ambient-temperature | Number:Temperature | false | [0.1 °C] | Actual Ambient Temperature (min = -50.0°C); max = 80.0° |
85-
| average-ambient-temperature | Number:Temperature | true | [0.1 °C] | Arithmetic average temperature of the last 60 minutes |
86-
| calculated-ambient-temperature | Number:Temperature | true | [0.1 °C] | Temperature for calculations in heat distribution modules |
87-
88-
### General E-Manager Group
89-
=======
9077
| Channel ID | Item Type | Read only | Description |
9178
| -------------------------------- | ------------------ | --------- | ------------------------------------------------------------------------ |
9279
| ambient-error-number | Number | true | Ambient Error Number (0 = No error) |
@@ -96,7 +83,6 @@ This group contains ambient temperatures for the heat pump system.
9683
| calculated-ambient-temperature | Number:Temperature | true | Temperature for calculations in heat distribution modules |
9784

9885
### Lambda General: General E-Manager Group
99-
>>>>>>> a94b30930a27ebb6250a76473a41de81a7945cd6
10086

10187
This group contains parameters signaling the PV excess to the heat pump.
10288

@@ -108,11 +94,7 @@ This group contains parameters signaling the PV excess to the heat pump.
10894
| actual-power-consumption | Number:Power | true | Power consumption of heatpump (only valid when Betriebsart: Automatik, 0 W otherwise) |
10995
| power-consumption-setpoint | Number:Power | false | Power consumption setpoint for heat pump 1 |
11096

111-
<<<<<<< HEAD
11297
### Heat Pump 1 Group
113-
=======
114-
### Labda Heat Pump: Heatpump Group
115-
>>>>>>> a94b30930a27ebb6250a76473a41de81a7945cd6
11698

11799
This group contains general operational information about the heat pump itself.
118100

@@ -136,11 +118,7 @@ This group contains general operational information about the heat pump itself.
136118
| heatpump-vdaq | Number:Energy | true | Accumulated thermal energy output of compressor unit |
137119
| heatpump-set-error-quit | Number | false | Set Error Quit (1 = Quit all active heat pump errors |
138120

139-
<<<<<<< HEAD
140-
### Boiler 1 Group
141-
=======
142121
### Lambda Boiler: Boiler Group
143-
>>>>>>> a94b30930a27ebb6250a76473a41de81a7945cd6
144122

145123
This group contains information about the boiler for the water for domestic use / tap water / washwater.
146124

@@ -164,24 +142,7 @@ This group contains information about the buffer for the heating circuit.
164142
| buffer-actual-low-temperature | Number:Temperature | true | Actual temperature buffer low sensor |
165143
| buffer-maximum-buffer-temperature | Number:Temperature | false | Setting for maximum buffer temperature (min = 25.0°C; max = 65.0°C) |
166144

167-
<<<<<<< HEAD
168-
### Heating Circuit 1 Group
169-
170-
This group contains general operational information about the heating circuit 1.
171-
172-
| Channel ID | Item Type | Read only | Unit | Description |
173-
| ---------------------------------------------- | -------------------| --------- | ------------ | --------------------------------------------------------------------------------|
174-
| heatingcircuit1-error-number | Number | true | [Nr] | Error Number (0 = No error) |
175-
| heatingcircuit1-operating-state | Number | true | [Nr] | Operating State: See Modbus description manual, link above| |
176-
| heatingcircuit1-flow-line-temperature | Number:Temperature | true | [Nr] | Actual temperature flow line sensor |
177-
| heatingcircuit1-return-line-temperature | Number:Temperature | true | [Nr] | Actual temperature return line sensor |
178-
| heatingcircuit1-room-device-temperature | Number:Temperature | true | [0.01°C] | Actual temperature room device sensor (min = -29.9°C; max = 99.9°C) |
179-
| heatingcircuit1-setpoint-flow-line-temperature | Number:Temperature | true | [0.01°C] | Setpoint temperature flow line (min = 15.0°C; max = 65.0°C) |
180-
| heatingcircuit1-operating-mode | Number | true | [Nr] | Operating Mode: See Modbus description manual, link above |
181-
| heatingcircuit1-offset-flow-line-temperature | Number:Temperature | true | [0.01°C] | Setting for flow line temperature setpoint offset(min = -10.0K; max = 10.0K) |
182-
| heatingcircuit1-room-heating-temperature | Number:Temperature | rue | [0.01°C] | Setting for heating mode room setpoint temperature(min = 15.0°C; max = 40.0 °C) |
183-
| heatingcircuit1-room-cooling-temperature | Number:Temperature | true | [0.01 l/min] | Setting for cooling mode room setpoint temperature(min = 15.0°C; max = 40.0 °C) |
184-
=======
145+
185146
### Lambda Heating: Heating Circuit Group
186147

187148
This group contains general operational information about the heating circuit.
@@ -198,7 +159,6 @@ This group contains general operational information about the heating circuit.
198159
| heatingcircuit-offset-flow-line-temperature | Number:Temperature | false | Setting for flow line temperature setpoint offset(min = -10.0K; max = 10.0K) |
199160
| heatingcircuit-room-heating-temperature | Number:Temperature | false | Setting for heating mode room setpoint temperature(min = 15.0°C; max = 40.0 °C) |
200161
| heatingcircuit-room-cooling-temperature | Number:Temperature | false | Setting for cooling mode room setpoint temperature(min = 15.0°C; max = 40.0 °C) |
201-
>>>>>>> a94b30930a27ebb6250a76473a41de81a7945cd6
202162

203163
## Full Example
204164

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.openhab.addons.bundles</groupId>
88
<artifactId>org.openhab.addons.reactor.bundles</artifactId>
9-
<version>5.0.0-SNAPSHOT</version>
9+
<version>4.3.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>org.openhab.binding.modbus.lambda</artifactId>

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright (c) 2010-2024 Contributors to the openHAB project
33
*
44
* See the NOTICE file(s) distributed with this work for additional
@@ -14,7 +14,7 @@
1414

1515
import org.eclipse.jdt.annotation.NonNullByDefault;
1616

17-
/**
17+
/*
1818
* The {@link BoilerConfiguration} class contains fields mapping
1919
* thing configuration parameters.
2020
*
@@ -24,20 +24,20 @@
2424
@NonNullByDefault
2525
public class BoilerConfiguration {
2626

27-
/**
27+
/*
2828
* Refresh interval in seconds
2929
*/
3030
private int refresh = 30;
3131

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

35-
/**
35+
/*
3636
* Subindex to calculate the base adress of the modbus registers
3737
*/
3838
private int subindex = 0;
3939

40-
/**
40+
/*
4141
* Gets refresh period in milliseconds
4242
*/
4343
public long getRefreshMillis() {

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright (c) 2010-2024 Contributors to the openHAB project
33
*
44
* See the NOTICE file(s) distributed with this work for additional
@@ -14,7 +14,7 @@
1414

1515
import org.eclipse.jdt.annotation.NonNullByDefault;
1616

17-
/**
17+
/*
1818
* The {@link BufferConfiguration} class contains fields mapping
1919
* thing configuration parameters.
2020
*
@@ -23,20 +23,20 @@
2323
*/
2424
@NonNullByDefault
2525
public class BufferConfiguration {
26-
/**
26+
/*
2727
* Refresh interval in seconds
2828
*/
2929
private int refresh = 30;
3030

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

34-
/**
34+
/*
3535
* Subindex to calculate the base adress of the modbus registers
3636
*/
3737
private int subindex = 0;
3838

39-
/**
39+
/*
4040
* Gets refresh period in milliseconds
4141
*/
4242
public long getRefreshMillis() {

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright (c) 2010-2024 Contributors to the openHAB project
33
*
44
* See the NOTICE file(s) distributed with this work for additional
@@ -14,7 +14,7 @@
1414

1515
import org.eclipse.jdt.annotation.NonNullByDefault;
1616

17-
/**
17+
/*
1818
* The {@link GeneralConfiguration} class contains fields mapping
1919
* thing configuration parameters.
2020
*
@@ -23,14 +23,14 @@
2323
*/
2424
@NonNullByDefault
2525
public class GeneralConfiguration {
26-
/**
26+
/*
2727
* Refresh interval in seconds
2828
*/
2929
private int refresh = 30;
3030

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

33-
/**
33+
/*
3434
* Gets refresh period in milliseconds
3535
*/
3636
public long getRefreshMillis() {

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright (c) 2010-2024 Contributors to the openHAB project
33
*
44
* See the NOTICE file(s) distributed with this work for additional
@@ -14,7 +14,7 @@
1414

1515
import org.eclipse.jdt.annotation.NonNullByDefault;
1616

17-
/**
17+
/*
1818
* The {@link HeatingCircuitConfiguration} class contains fields mapping
1919
* thing configuration parameters.
2020
*
@@ -23,20 +23,20 @@
2323
*/
2424
@NonNullByDefault
2525
public class HeatingCircuitConfiguration {
26-
/**
26+
/*
2727
* Refresh interval in seconds
2828
*/
2929
private int refresh = 30;
3030

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

34-
/**
34+
/*
3535
* Subindex to calculate the base adress of the modbus registers
3636
*/
3737
private int subindex = 0;
3838

39-
/**
39+
/*
4040
* Gets refresh period in milliseconds
4141
*/
4242
public long getRefreshMillis() {

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright (c) 2010-2024 Contributors to the openHAB project
33
*
44
* See the NOTICE file(s) distributed with this work for additional
@@ -14,7 +14,7 @@
1414

1515
import org.eclipse.jdt.annotation.NonNullByDefault;
1616

17-
/**
17+
/*
1818
* The {@link HeatpumpConfiguration} class contains fields mapping
1919
* thing configuration parameters.
2020
*
@@ -24,7 +24,7 @@
2424
@NonNullByDefault
2525
public class HeatpumpConfiguration {
2626

27-
/**
27+
/*
2828
* Refresh interval in seconds
2929
*/
3030
private int refresh = 30;
@@ -33,12 +33,12 @@ public class HeatpumpConfiguration {
3333

3434
// backwards compatibility and tests
3535

36-
/**
36+
/*
3737
* Subindex to calculate the base adress of the modbus registers
3838
*/
3939
private int subindex = 0;
4040

41-
/**
41+
/*
4242
* Gets refresh period in milliseconds
4343
*/
4444
public long getRefreshMillis() {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright (c) 2010-2024 Contributors to the openHAB project
33
*
44
* See the NOTICE file(s) distributed with this work for additional
@@ -16,7 +16,7 @@
1616
import org.openhab.binding.modbus.ModbusBindingConstants;
1717
import org.openhab.core.thing.ThingTypeUID;
1818

19-
/**
19+
/*
2020
* The {@link LambdaBindingConstants} class defines common
2121
* constants, which are used across the whole binding.
2222
*

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright (c) 2010-2024 Contributors to the openHAB project
33
*
44
* See the NOTICE file(s) distributed with this work for additional
@@ -14,7 +14,7 @@
1414

1515
import org.eclipse.jdt.annotation.NonNullByDefault;
1616

17-
/**
17+
/*
1818
* The {@link LambdaConfiguration} class contains fields mapping
1919
* thing configuration parameters.
2020
*
@@ -23,14 +23,14 @@
2323
*/
2424
@NonNullByDefault
2525
public class LambdaConfiguration {
26-
/**
26+
/*
2727
* Refresh interval in seconds
2828
*/
2929
private int refresh = 30;
3030

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

33-
/**
33+
/*
3434
* Gets refresh period in milliseconds
3535
*/
3636
public long getRefreshMillis() {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright (c) 2010-2024 Contributors to the openHAB project
33
*
44
* See the NOTICE file(s) distributed with this work for additional
@@ -36,7 +36,7 @@
3636
import org.slf4j.Logger;
3737
import org.slf4j.LoggerFactory;
3838

39-
/**
39+
/*
4040
* The {@link LambdaHandlerFactory} is responsible for creating things and thing
4141
* handlers.
4242
*

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright (c) 2010-2024 Contributors to the openHAB project
33
*
44
* See the NOTICE file(s) distributed with this work for additional
@@ -12,7 +12,7 @@
1212
*/
1313
package org.openhab.binding.modbus.lambda.internal.dto;
1414

15-
/**
15+
/*
1616
* Dto class for the Ambient Block
1717
*
1818
* @author Paul Frank - Initial contribution

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright (c) 2010-2024 Contributors to the openHAB project
33
*
44
* See the NOTICE file(s) distributed with this work for additional
@@ -12,7 +12,7 @@
1212
*/
1313
package org.openhab.binding.modbus.lambda.internal.dto;
1414

15-
/**
15+
/*
1616
* Dto class for the Boiler Block
1717
*
1818
* @author Paul Frank - Initial contribution

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright (c) 2010-2024 Contributors to the openHAB project
33
*
44
* See the NOTICE file(s) distributed with this work for additional
@@ -12,7 +12,7 @@
1212
*/
1313
package org.openhab.binding.modbus.lambda.internal.dto;
1414

15-
/**
15+
/*
1616
* Dto class for the BoilerReg50 Block
1717
*
1818
* @author Paul Frank - Initial contribution

0 commit comments

Comments
 (0)