You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2022/08/05 17:26:59 UTC

[plc4x] branch develop updated: fix(cbus): repaired some byte numberings

This is an automated email from the ASF dual-hosted git repository.

sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/develop by this push:
     new 274449d66 fix(cbus): repaired some byte numberings
274449d66 is described below

commit 274449d66b64036e73aabe17da2026f7841e16fa
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Aug 5 19:26:53 2022 +0200

    fix(cbus): repaired some byte numberings
---
 plc4go/protocols/cbus/readwrite/model/CALCommandTypeContainer.go | 8 ++++----
 protocols/c-bus/src/main/resources/protocols/cbus/c-bus.mspec    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plc4go/protocols/cbus/readwrite/model/CALCommandTypeContainer.go b/plc4go/protocols/cbus/readwrite/model/CALCommandTypeContainer.go
index 71af24cef..21a492ac3 100644
--- a/plc4go/protocols/cbus/readwrite/model/CALCommandTypeContainer.go
+++ b/plc4go/protocols/cbus/readwrite/model/CALCommandTypeContainer.go
@@ -289,19 +289,19 @@ func (e CALCommandTypeContainer) NumBytes() uint8 {
 		}
 	case 0x1A:
 		{ /* '0x1A' */
-			return 0
+			return 2
 		}
 	case 0x21:
 		{ /* '0x21' */
-			return 0
+			return 1
 		}
 	case 0x2A:
 		{ /* '0x2A' */
-			return 0
+			return 2
 		}
 	case 0x32:
 		{ /* '0x32' */
-			return 0
+			return 2
 		}
 	case 0x80:
 		{ /* '0x80' */
diff --git a/protocols/c-bus/src/main/resources/protocols/cbus/c-bus.mspec b/protocols/c-bus/src/main/resources/protocols/cbus/c-bus.mspec
index d5454dd16..8acd7efbd 100644
--- a/protocols/c-bus/src/main/resources/protocols/cbus/c-bus.mspec
+++ b/protocols/c-bus/src/main/resources/protocols/cbus/c-bus.mspec
@@ -1183,10 +1183,10 @@
 // The invalid packets are receiving a value of 13 / 0x0D -> Short form command: length = 5 (no idea what the bit number 4 means, which is set)
 [enum uint 8 CALCommandTypeContainer(CALCommandType commandType, uint 5 numBytes)
     ['0x08' CALCommandReset                  ['RESET',            '0']]
-    ['0x1A' CALCommandRecall                 ['RECALL',           '0']]
-    ['0x21' CALCommandIdentify               ['IDENTIFY',         '0']]
-    ['0x2A' CALCommandGetStatus              ['GET_STATUS',       '0']]
-    ['0x32' CALCommandAcknowledge            ['ACKNOWLEDGE',      '0']]
+    ['0x1A' CALCommandRecall                 ['RECALL',           '2']]
+    ['0x21' CALCommandIdentify               ['IDENTIFY',         '1']]
+    ['0x2A' CALCommandGetStatus              ['GET_STATUS',       '2']]
+    ['0x32' CALCommandAcknowledge            ['ACKNOWLEDGE',      '2']]
     ['0x80' CALCommandReply_0Bytes           ['REPLY',            '0']]
     ['0x81' CALCommandReply_1Bytes           ['REPLY',            '1']]
     ['0x82' CALCommandReply_2Bytes           ['REPLY',            '2']]