Skip to content

Commit

Permalink
New version using seperate things for parts of the Lambda Heat Pump S…
Browse files Browse the repository at this point in the history 
…ystem, enables more than one heat pump, boiler, buffer, heating cirucuit.

Signed-off-by: Christian Koch <[email protected]>
Beschreibung in:
file:///D:/Prog/Git/mingw64/share/doc/git-doc/git-commit.html
Signed-off-by: Christian Koch <[email protected]>
  • Loading branch information
@chilobo
chilobo committed Nov 20, 2024
1 parent 4322970 commit a7dca7c
Show file tree
Hide file tree
Showing 61 changed files with 30 additions and 5,915 deletions.
7 changes: 7 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,10 @@ pom.xml.versionsBackup
.vim
shell.nix
tags
bundles/org.openhab.binding.modbus.stiebeleltron_mist/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/dto/HeatingCircuitReg50Block.java
bundles/org.openhab.binding.modbus.stiebeleltron_mist/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/handler/HeatingCircuitHandler.java
bundles/org.openhab.binding.modbus.stiebeleltron_mist/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/parser/BoilerReg50BlockParser.java
bundles/org.openhab.binding.modbus.stiebeleltron_mist/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/parser/BufferReg50BlockParser.java
bundles/org.openhab.binding.modbus.stiebeleltron_mist/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/parser/HeatingCircuitBlockParser.java
bundles/org.openhab.binding.modbus.stiebeleltron_mist/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/parser/HeatingCircuitReg50BlockParser.java
bundles/org.openhab.binding.modbus.stiebeleltron_mist/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/parser/HeatpumpReg50BlockParser.java
20 changes: 10 additions & 10 deletions ...mbda/src/main/java/org/openhab/binding/modbus/lambda/internal/LambdaBindingConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ public class LambdaBindingConstants {
public static final ThingTypeUID THING_TYPE_LAMBDAHEATING = new ThingTypeUID(BINDING_ID, LAMBDAHEATING);

// Channel group ids
public static final String GROUP_GENERAL_AMBIENT = "Ambient";
public static final String GROUP_GENERAL_EMANAGER = "EManager";
public static final String GROUP_HEATPUMP = "Heatpump";
public static final String GROUP_HEATPUMP_REG50 = "Heatpump-reg50";
public static final String GROUP_BOILER = "Boiler";
public static final String GROUP_BOILER_REG50 = "Boiler-reg50";
public static final String GROUP_BUFFER = "Buffer";
public static final String GROUP_BUFFER_REG50 = "Buffer-reg50";
public static final String GROUP_HEATINGCIRCUIT = "Heatingcircuit";
public static final String GROUP_HEATINGCIRCUIT_REG50 = "Heatingcircuit-reg50";
public static final String GROUP_GENERAL_AMBIENT = "ambient-group";
public static final String GROUP_GENERAL_EMANAGER = "emanager-group";
public static final String GROUP_HEATPUMP = "heatpump-group";
public static final String GROUP_HEATPUMP_REG50 = "heatpump-reg50-group";
public static final String GROUP_BOILER = "boiler-group";
public static final String GROUP_BOILER_REG50 = "boiler-reg50-group";
public static final String GROUP_BUFFER = "buffer-group";
public static final String GROUP_BUFFER_REG50 = "buffer-reg50-group";
public static final String GROUP_HEATINGCIRCUIT = "heating-group";
public static final String GROUP_HEATINGCIRCUIT_REG50 = "heating-reg50-group";

// List of all Channel ids in device information group
// General Ambient
Expand Down
12 changes: 6 additions & 6 deletions bundles/org.openhab.binding.modbus.lambda/src/main/resources/OH-INF/i18n/lambda.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ thing-type.config.lambda-heatingcircuit.modbusconfig.refresh.description = Refre

# channel group types

channel-group-type.modbus.ambient.label = General Ambient Group
channel-group-type.modbus.emanager.label = General E-Manager Group
channel-group-type.modbus.heatpump.label = Heatpump Group
channel-group-type.modbus.boiler.label = Boiler Group
channel-group-type.modbus.buffer.label = Buffer Group
channel-group-type.modbus.heatingcircuit.label = Heating Circuit Group
channel-group-type.modbus.ambient-type.label = General Ambient Group
channel-group-type.modbus.emanager-type.label = General E-Manager Group
channel-group-type.modbus.heatpump-type.label = Heatpump Group
channel-group-type.modbus.boiler-type.label = Boiler Group
channel-group-type.modbus.buffer-type.label = Buffer Group
channel-group-type.modbus.heatingcircuit-type.label = Heating Circuit Group

# channel types

Expand Down
2 changes: 1 addition & 1 deletion ...nhab.binding.modbus.lambda/src/main/resources/OH-INF/thing/boiler-channel-group-types.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">

<channel-group-type id="boiler">
<channel-group-type id="boiler-type">
<label>Boiler</label>
<channels>
<channel id="boiler-error-number" typeId="boiler-error-number-type"/>
Expand Down
92 changes: 0 additions & 92 deletions ...nhab.binding.modbus.lambda/src/main/resources/OH-INF/thing/general-channel-types copy.xml
View file

This file was deleted.

4 changes: 2 additions & 2 deletions ...org.openhab.binding.modbus.lambda/src/main/resources/OH-INF/thing/general-thing-types.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

<channel-groups>

<channel-group id="ambient" typeId="ambient"/>
<channel-group id="emanager" typeId="emanager"/>
<channel-group id="ambient-group" typeId="ambient-type"/>
<channel-group id="emanager-group" typeId="emanager-type"/>

</channel-groups>

Expand Down
2 changes: 1 addition & 1 deletion ...hab.binding.modbus.lambda/src/main/resources/OH-INF/thing/heating-channel-group-types.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">

<channel-group-type id="heatingcircuit">
<channel-group-type id="heatingcircuit-type">
<label>Heating Circuit</label>
<channels>
<channel id="heatingcircuit-error-number" typeId="heatingcircuit-error-number-type"/>
Expand Down
2 changes: 1 addition & 1 deletion ...org.openhab.binding.modbus.lambda/src/main/resources/OH-INF/thing/heating-thing-types.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<channel-groups>

<channel-group id="heatingcircuit" typeId="heatingcircuit"/>
<channel-group id="heatingcircuit-group" typeId="heatingcircuit-type"/>

</channel-groups>

Expand Down
2 changes: 1 addition & 1 deletion ...ab.binding.modbus.lambda/src/main/resources/OH-INF/thing/heatpump-channel-group-types.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">

<channel-group-type id="heatpump">
<channel-group-type id="heatpump-type">
<label>Heat Pump</label>
<channels>
<channel id="heatpump-error-state" typeId="heatpump-error-state-type"/>
Expand Down
2 changes: 1 addition & 1 deletion ...g.openhab.binding.modbus.lambda/src/main/resources/OH-INF/thing/heatpump-thing-types..xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<channel-groups>

<channel-group id="heatpump" typeId="heatpump"/>
<channel-group id="heatpump-group" typeId="heatpump-type"/>

</channel-groups>

Expand Down
13 changes: 0 additions & 13 deletions bundles/org.openhab.binding.modbus.lambdageneral/NOTICE
View file

This file was deleted.

Loading

0 comments on commit a7dca7c

Please sign in to comment.