From 0221fc7eed7237dd8c44343429c53197bebc7439 Mon Sep 17 00:00:00 2001 From: csowada Date: Mon, 20 Mar 2023 20:14:36 +0100 Subject: [PATCH] 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());