fix(cbus): fixed length calculations

apache · Jul 27, 2022 · 30aa269 · 30aa269
1 parent 55807bb
commit 30aa269
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/plc4go/protocols/cbus/readwrite/model/ReplyEncodedReply.go b/plc4go/protocols/cbus/readwrite/model/ReplyEncodedReply.go
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestCommand.go b/plc4go/protocols/cbus/readwrite/model/RequestCommand.go
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestDirectCommandAccess.go b/plc4go/protocols/cbus/readwrite/model/RequestDirectCommandAccess.go
diff --git a/plc4go/protocols/cbus/readwrite/model/RequestObsolete.go b/plc4go/protocols/cbus/readwrite/model/RequestObsolete.go
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
@@ -88,20 +88,20 @@
                               calData
                         'STATIC_CALL("readCALData", readBuffer)'
                         'STATIC_CALL("writeCALData", writeBuffer, calData)'
-                        '(_value.lengthInBytes*2)*8'                        ]
+                        '(calData.lengthInBytes*2)*8'                       ]
         ]
         ['REQUEST_COMMAND' *Command
             [const    byte  initiator 0x5C                                  ] // 0x5C == "/"
             [manual   CBusCommand
                               cbusCommand
                         'STATIC_CALL("readCBusCommand", readBuffer, cBusOptions, cBusOptions.srchk)'
                         'STATIC_CALL("writeCBusCommand", writeBuffer, cbusCommand)'
-                        '(_value.lengthInBytes*2)*8'                        ]
+                        '(cbusCommand.lengthInBytes*2)*8'                   ]
             [manual   Checksum
                               chksum
                         'STATIC_CALL("readAndValidateChecksum", readBuffer, cbusCommand, cBusOptions.srchk)'
                         'STATIC_CALL("calculateChecksum", writeBuffer, cbusCommand, cBusOptions.srchk)'
-                        '8'                                                 ]
+                        'cBusOptions.srchk?16:0'                            ]
             [optional Alpha         alpha                                   ]
         ]
         ['NULL' *Null
@@ -115,7 +115,7 @@
                               calData
                         'STATIC_CALL("readCALData", readBuffer)'
                         'STATIC_CALL("writeCALData", writeBuffer, calData)'
-                        '(_value.lengthInBytes*2)*8'                        ]
+                        '(calData.lengthInBytes*2)*8'                       ]
             [optional Alpha   alpha                                         ]
         ]
     ]
@@ -1401,12 +1401,12 @@
                               encodedReply
                                     'STATIC_CALL("readEncodedReply", readBuffer, cBusOptions, requestContext, cBusOptions.srchk)'
                                     'STATIC_CALL("writeEncodedReply", writeBuffer, encodedReply)'
-                                    '(_value.lengthInBytes*2)*8'                                     ]
+                                    '(encodedReply.lengthInBytes*2)*8'                                   ]
             [manual   Checksum
                               chksum
                         'STATIC_CALL("readAndValidateChecksum", readBuffer, encodedReply, cBusOptions.srchk)'
                         'STATIC_CALL("calculateChecksum", writeBuffer, encodedReply, cBusOptions.srchk)'
-                        '8'                   ]
+                        'cBusOptions.srchk?16:0'        ]
         ]
     ]
 ]