Skip to content

Commit 5e89f3a

Browse files
committed
Merge commit '0c547fa52d0f2f18e02585cfeac9faf1ff7adb2e'
2 parents 768d88c + 0c547fa commit 5e89f3a

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file.
33

44
## Unreleased
55

6+
## [1.1.9] - 2023-03-20
7+
### Fixed
8+
- Remove escaping (0xAA and 0xA) master data bytes and master CRC on function ``EBusCommandUtils.buildPartMasterTelegram``
9+
10+
## [1.1.8] - 2021-12-29
11+
### Changed
12+
- Update project dependencies
13+
614
## [1.1.7] - 2021-06-27
715
### Changed
816
- Update project dependencies

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<description>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.</description>
88
<groupId>de.cs-dev.ebus</groupId>
99
<artifactId>ebus-core</artifactId>
10-
<version>1.1.8</version>
10+
<version>1.1.9</version>
1111
<url>https://github.com/csowada/ebus</url>
1212
<packaging>bundle</packaging>
1313

src/main/java/de/csdev/ebus/command/EBusCommandUtils.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,19 @@ public static byte unescapeSymbol(byte reversedByte) {
204204

205205
// add the escaped bytes
206206
for (byte b : masterData) {
207-
buf.put(escapeSymbol(b));
207+
// disable escaping the special characters as vaillant and wolf
208+
// generates AA and A9 bytes!
209+
// buf.put(escapeSymbol(b));
210+
buf.put(b);
208211
}
209212

210213
// calculate crc
211214
byte crc8 = EBusUtils.crc8(buf.array(), buf.position());
212215

213-
buf.put(escapeSymbol(crc8));
216+
// disable escaping the special characters as vaillant and wolf
217+
// generates AA and A9 bytes!
218+
// buf.put(escapeSymbol(b));
219+
buf.put(crc8);
214220

215221
// set limit and reset position
216222
buf.limit(buf.position());

0 commit comments

Comments
 (0)