Merge pull request #26 from bcmi-labs/development

Development

Author: eigen-value

LICENSE

@@ -1,3 +1,14 @@
+/*
+    This file is part of the Arduino_RPClite library.
+
+    Copyright (c) 2025 Arduino SA
+
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    
+*/
+
 #ifndef DUMMY_TRANSPORT_H
 #define DUMMY_TRANSPORT_H
 #include "transport.h"

examples/decoder_tests/DummyTransport.h

@@ -0,0 +1,42 @@
+/*
+    This file is part of the Arduino_RPClite library.
+
+    Copyright (c) 2025 Arduino SA
+
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    
+*/
+
+#pragma once
+#ifndef RPCLITE_DECODER_TESTER_H
+#define RPCLITE_DECODER_TESTER_H
+
+class DecoderTester {
+  
+  RpcDecoder<>& decoder;
+
+public:
+
+  DecoderTester(RpcDecoder<>& _d): decoder(_d){}
+
+  void crop_bytes(size_t size, size_t offset){
+    decoder.consume(size, offset);
+  }
+
+  void print_raw_buf(){
+
+    Serial.print("Decoder raw buffer content: ");
+
+    for (size_t i = 0; i < decoder._bytes_stored; i++) {
+
+        Serial.print(decoder._raw_buffer[i], HEX);
+        Serial.print(" ");
+    }
+    Serial.println("");
+  }
+
+};
+
+#endif // RPCLITE_DECODER_TESTER_H

examples/decoder_tests/decoder_tester.h

@@ -1,5 +1,17 @@
+/*
+    This file is part of the Arduino_RPClite library.
+
+    Copyright (c) 2025 Arduino SA
+
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    
+*/
+
 #include <Arduino_RPClite.h>
 #include "DummyTransport.h"
+#include "decoder_tester.h"
 
 // Shorthand
 MsgPack::Packer packer;
@@ -36,6 +48,35 @@ void runDecoderTest(const char* label) {
   Serial.println("-- Done --\n");
 }
 
+void runDecoderConsumeTest(const char* label, size_t second_packet_sz) {
+  Serial.println(label);
+
+  print_buf();
+  DummyTransport dummy_transport(packer.data(), packer.size());
+  RpcDecoder<> decoder(dummy_transport);
+
+  DecoderTester dt(decoder);
+
+  while (!decoder.packet_incoming()) {
+    Serial.println("Packet not ready");
+    decoder.decode();
+    delay(50);
+  }
+
+  size_t pack_size = decoder.get_packet_size();
+  Serial.print("1st Packet size: ");
+  Serial.println(pack_size);
+
+  Serial.print("Consuming 2nd packet of given size: ");
+  Serial.println(second_packet_sz);
+
+  dt.crop_bytes(second_packet_sz, pack_size);
+
+  dt.print_raw_buf();
+
+  Serial.println("-- Done --\n");
+}
+
 void testNestedArrayRequest() {
   packer.clear();
   MsgPack::arr_size_t outer_arr(3);
@@ -120,6 +161,9 @@ void testMultipleRpcPackets() {
   packer.serialize(req_sz, 0, 2, "echo", par_sz, "Hello", true);
 
   runDecoderTest("== Test: Multiple RPCs in Buffer ==");
+
+  runDecoderConsumeTest("== Test: Mid-buffer consume ==", 5);
+
 }
 
 // Binary parameter (e.g., binary blob)
@@ -170,6 +214,8 @@ void testCombinedComplexBuffer() {
 
 void setup() {
   Serial.begin(115200);
+  while(!Serial);
+  
   delay(1000);
   Serial.println("=== RPC Decoder Nested Tests ===");
 

examples/decoder_tests/decoder_tests.ino

@@ -1,3 +1,14 @@
+/*
+    This file is part of the Arduino_RPClite library.
+
+    Copyright (c) 2025 Arduino SA
+
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    
+*/
+
 #include <Arduino_RPClite.h>
 
 int add(int x, int y) {

examples/dispatcher_example/dispatcher_example.ino

@@ -1,3 +1,14 @@
+/*
+    This file is part of the Arduino_RPClite library.
+
+    Copyright (c) 2025 Arduino SA
+
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    
+*/
+
 #include <Arduino_RPClite.h>
 
 SerialTransport transport(Serial1);

examples/rpc_lite_client/rpc_lite_client.ino

@@ -1,3 +1,14 @@
+/*
+    This file is part of the Arduino_RPClite library.
+
+    Copyright (c) 2025 Arduino SA
+
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    
+*/
+
 #include <Arduino_RPClite.h>
 
 SerialTransport transport(Serial1);

examples/rpc_lite_server/rpc_lite_server.ino

@@ -1,3 +1,14 @@
+/*
+    This file is part of the Arduino_RPClite library.
+
+    Copyright (c) 2025 Arduino SA
+
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    
+*/
+
 #include <Arduino_RPClite.h>
 
 int add(int x, int y) {
@@ -55,9 +66,9 @@ void loop() {
     out_packer.clear();
 
     blink_before();
-    int out = wrapped_add(5, 3);
+    int out = (*wrapped_add)(5, 3);
 
-    bool unpack_ok = wrapped_add(unpacker, out_packer);
+    bool unpack_ok = (*wrapped_add)(unpacker, out_packer);
 
     Serial.print("simple call: ");
     Serial.println(out);
@@ -82,7 +93,7 @@ void loop() {
     unpacker.feed(packer.data(), packer.size());
     out_packer.clear();
 
-    bool should_be_false = wrapped_divide(unpacker, out_packer);
+    bool should_be_false = (*wrapped_divide)(unpacker, out_packer);
 
     if (!should_be_false){
         Serial.println("RPC error call divide by zero ");
@@ -103,7 +114,7 @@ void loop() {
     unpacker.clear();
     unpacker.feed(packer.data(), packer.size());
     out_packer.clear();
-    wrapped_hello(unpacker, out_packer);
+    (*wrapped_hello)(unpacker, out_packer);
 
     for (size_t i=0; i<out_packer.size(); i++){
         Serial.print(out_packer.data()[i], HEX);

examples/wrapper_example/wrapper_example.ino

@@ -1,3 +1,11 @@
+# This file is part of the Arduino_RPClite library.
+#
+# Copyright (c) 2025 Arduino SA
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 from serial_client import SerialClient
 
 PORT = '/dev/ttySTM0'

extras/examples/serial_client_example.py

@@ -1,3 +1,11 @@
+# This file is part of the Arduino_RPClite library.
+#
+# Copyright (c) 2025 Arduino SA
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import random
 from serial_server import SerialServer