From b3498f3b1eda35f7e4de584c658f9d00061ea3d0 Mon Sep 17 00:00:00 2001 From: csowada Date: Wed, 29 Dec 2021 17:56:18 +0100 Subject: [PATCH 1/4] Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8496696..d7f70dc 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ eBUS core library - This library handles the communication with heating engineering via the BUS specification. This protocol is used by many heating manufacturers in Europe. de.cs-dev.ebus ebus-core - 1.1.8 + 1.1.9-SNAPSHOT https://github.com/csowada/ebus bundle From ab3f59f553be006bc1611eb61e315c9e5372f183 Mon Sep 17 00:00:00 2001 From: csowada Date: Thu, 30 Dec 2021 10:14:00 +0100 Subject: [PATCH 2/4] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cee5d80..db463fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. ## Unreleased +## [1.1.8] - 2021-12-29 +### Changed +- Update project dependencies + ## [1.1.7] - 2021-06-27 ### Changed - Update project dependencies From 0221fc7eed7237dd8c44343429c53197bebc7439 Mon Sep 17 00:00:00 2001 From: csowada Date: Mon, 20 Mar 2023 20:14:36 +0100 Subject: [PATCH 3/4] Remove escaping (AA and A9) master data and CRC --- CHANGELOG.md | 4 ++++ .../java/de/csdev/ebus/command/EBusCommandUtils.java | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db463fb..5f7a475 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. ## Unreleased +## [1.1.9] - 2023-03-20 +### Fixed +- Remove escaping (0xAA and 0xA) master data bytes and master CRC on function ``EBusCommandUtils.buildPartMasterTelegram`` + ## [1.1.8] - 2021-12-29 ### Changed - Update project dependencies diff --git a/src/main/java/de/csdev/ebus/command/EBusCommandUtils.java b/src/main/java/de/csdev/ebus/command/EBusCommandUtils.java index b7a7e88..aef0307 100644 --- a/src/main/java/de/csdev/ebus/command/EBusCommandUtils.java +++ b/src/main/java/de/csdev/ebus/command/EBusCommandUtils.java @@ -204,13 +204,19 @@ public static byte unescapeSymbol(byte reversedByte) { // add the escaped bytes for (byte b : masterData) { - buf.put(escapeSymbol(b)); + // disable escaping the special characters as vaillant and wolf + // generates AA and A9 bytes! + // buf.put(escapeSymbol(b)); + buf.put(b); } // calculate crc byte crc8 = EBusUtils.crc8(buf.array(), buf.position()); - buf.put(escapeSymbol(crc8)); + // disable escaping the special characters as vaillant and wolf + // generates AA and A9 bytes! + // buf.put(escapeSymbol(b)); + buf.put(crc8); // set limit and reset position buf.limit(buf.position()); From 0c547fa52d0f2f18e02585cfeac9faf1ff7adb2e Mon Sep 17 00:00:00 2001 From: csowada Date: Mon, 20 Mar 2023 20:15:01 +0100 Subject: [PATCH 4/4] Update versions for release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d7f70dc..512e987 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ eBUS core library - This library handles the communication with heating engineering via the BUS specification. This protocol is used by many heating manufacturers in Europe. de.cs-dev.ebus ebus-core - 1.1.9-SNAPSHOT + 1.1.9 https://github.com/csowada/ebus bundle