You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ld...@apache.org on 2020/10/22 11:55:22 UTC

[plc4x] 13/22: Fix socketcan mspec.

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

ldywicki pushed a commit to branch feature/socketcan
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit c6ff0e1a4f4d35834c3d719a5384153d96ebc65a
Author: Ɓukasz Dywicki <lu...@code-house.org>
AuthorDate: Thu Sep 3 13:40:38 2020 +0200

    Fix socketcan mspec.
---
 protocols/can/src/main/resources/protocols/can/socketcan.mspec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/protocols/can/src/main/resources/protocols/can/socketcan.mspec b/protocols/can/src/main/resources/protocols/can/socketcan.mspec
index 201c0d6..9440365 100644
--- a/protocols/can/src/main/resources/protocols/can/socketcan.mspec
+++ b/protocols/can/src/main/resources/protocols/can/socketcan.mspec
@@ -18,15 +18,13 @@
  */
 
 [type 'BrokenSocketCANFrame'
-    [discriminator bit 'extended']
     [simple bit 'remote']
     [simple bit 'error']
-    [simple bit 'extended']
+    [discriminator bit 'extended']
     [typeSwitch 'extended'
         ['true' ExtendedSocketCANFrame
             [simple uint 29 'identifier']
         ]
-
         ['false' StandardSocketCANFrame
             [const  uint 18 'spacing' '0x0']
             [simple uint 11 'identifier']
@@ -58,7 +56,7 @@
     [reserved uint 8 '0x0'] // padding 1
     [reserved uint 8 '0x0'] // padding 2
     [array int 8 'data' COUNT 'size']
-    [padding  uint 8 '0x00' '8 - (COUNT(data))']
+    [padding uint 8 'alignment' '0x00' '8 - (COUNT(data))']
 ]
 
 [type 'SocketCAN20AFrame'