feat(cbus): added support for deprecated binary state status request

apache · Jul 13, 2022 · b56ad32 · b56ad32
1 parent 505eb67
commit b56ad32
Show file tree

Hide file tree

Showing 5 changed files with 264 additions and 5 deletions.
diff --git a/plc4go/protocols/cbus/readwrite/model/StatusRequest.go b/plc4go/protocols/cbus/readwrite/model/StatusRequest.go
diff --git a/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryStateDeprecated.go b/plc4go/protocols/cbus/readwrite/model/StatusRequestBinaryStateDeprecated.go
diff --git a/.../drivers/c-bus/src/main/java/org/apache/plc4x/java/cbus/readwrite/utils/StaticHelper.java b/.../drivers/c-bus/src/main/java/org/apache/plc4x/java/cbus/readwrite/utils/StaticHelper.java
@@ -133,7 +133,4 @@ public static boolean knowsSALCommandTypeContainer(ReadBuffer readBuffer) {
         }
     }
 
-    public static boolean moreThanOneByteLeft(ReadBuffer readBuffer) {
-        return readBuffer.hasMore(16);
-    }
 }
diff --git a/plc4j/drivers/c-bus/src/test/java/org/apache/plc4x/java/cbus/RandomPackagesTest.java b/plc4j/drivers/c-bus/src/test/java/org/apache/plc4x/java/cbus/RandomPackagesTest.java
@@ -773,5 +773,19 @@ void strangeNotYetParsableCommandResponse() throws Exception {
             byte[] bytes1 = writeBuffer.getBytes();
             assertThat(bytes1).isEqualTo(bytes);
         }
+
+        @Test
+        void statusRequestBinaryState() throws Exception {
+            byte[] bytes = "\\05FF00FAFF00v\r".getBytes(StandardCharsets.UTF_8);
+            ReadBufferByteBased readBufferByteBased = new ReadBufferByteBased(bytes);
+            cBusOptions = new CBusOptions(false, false, false, false, false, false, false, false, true);
+            CBusMessage msg = CBusMessage.staticParse(readBufferByteBased, false, requestContext, cBusOptions, bytes.length);
+            assertThat(msg).isNotNull();
+            System.out.println(msg);
+            CBusMessageToServer messageToServer = (CBusMessageToServer) msg;
+            RequestCommand requestCommand = (RequestCommand) messageToServer.getRequest();
+            CBusCommand cbusCommand = requestCommand.getCbusCommand();
+            System.out.println(cbusCommand);
+        }
     }
 }
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
@@ -1228,12 +1228,17 @@
 [type StatusRequest
     [peek    byte     statusType           ]
     [typeSwitch statusType
-        ['0x7A' StatusRequestBinaryState
+        ['0x7A' *BinaryState
             [reserved   byte      '0x7A'                                              ]
             [simple     byte      application                                         ]
             [reserved   byte      '0x00'                                              ]
         ]
-        ['0x73' StatusRequestLevel
+        ['0xFA' *BinaryStateDeprecated
+            [reserved   byte      '0xFA'                                              ]
+            [simple     byte      application                                         ]
+            [reserved   byte      '0x00'                                              ]
+        ]
+        ['0x73' *Level
             [reserved   byte      '0x73'                                              ]
             [reserved   byte      '0x07'                                              ]
             [simple     byte      application                                         ]