Merge commit '0c547fa52d0f2f18e02585cfeac9faf1ff7adb2e'

CHANGELOG.md

@@ -3,6 +3,14 @@ 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
+
 ## [1.1.7] - 2021-06-27
 ### Changed
 - Update project dependencies

pom.xml

@@ -7,7 +7,7 @@
 	<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>
 	<groupId>de.cs-dev.ebus</groupId>
 	<artifactId>ebus-core</artifactId>
-	<version>1.1.8</version>
+	<version>1.1.9</version>
 	<url>https://github.com/csowada/ebus</url>
 	<packaging>bundle</packaging>
 

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());