Merge remote-tracking branch 'origin/main' into wait_for_router_service

Author: eigen-value

examples/test_rpc_thread/test_rpc_thread.ino

@@ -7,6 +7,8 @@
 
 
 void rpc_thread_entry(void *p1, void *p2, void *p3) {
+    (void)p3; // unused argument
+
     RpcCall<MsgPack::str_t> *call  = reinterpret_cast<RpcCall<MsgPack::str_t>*>(p1);
     struct k_mutex *mtx = reinterpret_cast<struct k_mutex*>(p2);
 

extras/test/udp_echo/udp_echo.ino

@@ -14,7 +14,7 @@
  */
 
 #include <Arduino.h>
-#include "src/Arduino_RouterBridge.h"
+#include "Arduino_RouterBridge.h"
 
 // Configuration
 #define LOCAL_UDP_PORT 8888           // Local port to listen on
@@ -193,4 +193,4 @@ void printStatistics() {
     }
     Monitor.println("%)");
     Monitor.println("===========================================\n");
-}
+}

extras/test/udp_test/udp_test.ino

@@ -6,7 +6,7 @@
  */
 
 #include <Arduino.h>
-#include "src/Arduino_RouterBridge.h"
+#include "Arduino_RouterBridge.h"
 
 // Test configuration
 #define TEST_UDP_PORT 8888
@@ -372,4 +372,4 @@ void setup() {
 void loop() {
     // Test suite runs once in setup()
     delay(1000);
-}
+}

library.json

@@ -14,7 +14,7 @@
       "maintainer": true
     }
   ],
-  "version": "0.2.2",
+  "version": "0.3.0",
   "license": "MPL2.0",
   "frameworks": "arduino",
   "platforms": "*",

library.properties

@@ -1,5 +1,5 @@
 name=Arduino_RouterBridge
-version=0.2.2
+version=0.3.0
 author=Arduino
 maintainer=Arduino
 sentence=A RPC bridge for Arduino UNO Q boards

src/bridge.h

@@ -16,6 +16,8 @@
 
 #define RESET_METHOD "$/reset"
 #define BIND_METHOD "$/register"
+#define GET_VERSION_METHOD "$/version"
+
 //#define BRIDGE_ERROR "$/bridgeLog"
 
 #define UPDATE_THREAD_STACK_SIZE    500
@@ -231,6 +233,10 @@ class BridgeClass {
         return res;
     }
 
+    bool getRouterVersion(MsgPack::str_t& version) {
+        return call(GET_VERSION_METHOD).result(version);
+    }
+
     template<typename F>
     bool provide(const MsgPack::str_t& name, F&& func) {
         k_mutex_lock(&bridge_mutex, K_FOREVER);

src/monitor.h

@@ -31,13 +31,18 @@ class BridgeMonitor: public Stream {
     RingBufferN<BufferSize> temp_buffer;
     struct k_mutex monitor_mutex{};
     bool _connected = false;
+    bool _compatibility_mode = true;
 
 public:
     explicit BridgeMonitor(BridgeClass& bridge): bridge(&bridge) {}
 
     using Print::write;
 
     bool begin(unsigned long _legacy_baud=0, uint16_t _legacy_config=0) {
+	// unused parameters for compatibility with Stream
+	(void)_legacy_baud;
+	(void)_legacy_config;
+
         k_mutex_init(&monitor_mutex);
 
         if (is_connected()) return true;
@@ -55,6 +60,8 @@ class BridgeMonitor: public Stream {
 
         bool out = false;
         _connected = bridge->call(MON_CONNECTED_METHOD).result(out) && out;
+        MsgPack::str_t ver;
+        _compatibility_mode = !bridge->getRouterVersion(ver);
         k_mutex_unlock(&monitor_mutex);
         return out;
     }
@@ -71,19 +78,19 @@ class BridgeMonitor: public Stream {
     }
 
     int read() override {
-        uint8_t c;
+        uint8_t c = 0;
         read(&c, 1);
         return c;
     }
 
     int read(uint8_t* buffer, size_t size) {
         k_mutex_lock(&monitor_mutex, K_FOREVER);
-        int i = 0;
+        size_t i = 0;
         while (temp_buffer.available() && i < size) {
             buffer[i++] = temp_buffer.read_char();
         }
         k_mutex_unlock(&monitor_mutex);
-        return i;
+        return (int)i;
     }
 
     int available() override {
@@ -117,10 +124,15 @@ class BridgeMonitor: public Stream {
             send_buffer += static_cast<char>(buffer[i]);
         }
 
-        size_t written;
-        const bool ret = bridge->call(MON_WRITE_METHOD, send_buffer).result(written);
+        size_t written = 0;
+
+        if (_compatibility_mode) {
+            bridge->call(MON_WRITE_METHOD, send_buffer).result(written);
+        } else {
+            bridge->notify(MON_WRITE_METHOD, send_buffer);
+        }
 
-        return ret? written : 0;
+        return written;
     }
 
     bool reset() {
@@ -167,4 +179,4 @@ extern BridgeClass Bridge;
 
 inline BridgeMonitor<> Monitor(Bridge);
 
-#endif // BRIDGE_MONITOR_H
+#endif // BRIDGE_MONITOR_H

src/tcp_client.h

@@ -132,12 +132,12 @@ class BridgeTCPClient : public Client {
 
     int read(uint8_t *buf, size_t size) override {
         k_mutex_lock(&client_mutex, K_FOREVER);
-        int i = 0;
+        size_t i = 0;
         while (temp_buffer.available() && i < size) {
             buf[i++] = temp_buffer.read_char();
         }
         k_mutex_unlock(&client_mutex);
-        return i;
+        return (int)i;
     }
 
     int peek() override {
@@ -193,16 +193,26 @@ class BridgeTCPClient : public Client {
         }
 
         MsgPack::arr_t<uint8_t> message;
-        RpcCall async_rpc = bridge->call(TCP_READ_METHOD, connection_id, size, read_timeout);
-        const bool ret = async_rpc.result(message);
+        bool ret;
+        int err;
+
+        if (read_timeout > 0) {
+            RpcCall async_rpc_timeout = bridge->call(TCP_READ_METHOD, connection_id, size, read_timeout);
+            ret = async_rpc_timeout.result(message);
+            err = async_rpc_timeout.getErrorCode();
+        } else {
+            RpcCall async_rpc = bridge->call(TCP_READ_METHOD, connection_id, size);
+            ret = async_rpc.result(message);
+            err = async_rpc.getErrorCode();
+        }
 
         if (ret) {
             for (size_t i = 0; i < message.size(); ++i) {
                 temp_buffer.store_char(static_cast<char>(message[i]));
             }
         }
 
-        if (async_rpc.getErrorCode() > NO_ERR) {
+        if (err > NO_ERR) {
             _connected = false;
         }
 

src/udp_bridge.h

@@ -96,6 +96,8 @@ class BridgeUDP final: public UDP {
     }
 
     uint8_t beginMulticast(IPAddress ip, uint16_t port) override {
+        (void)ip; // unused argument
+
         if (!init()) {
             return 0;
         }
@@ -246,7 +248,7 @@ class BridgeUDP final: public UDP {
     // reading stops when the UDP package has been read completely (_remaining = 0)
     int read(unsigned char *buffer, size_t len) override {
         k_mutex_lock(&udp_mutex, K_FOREVER);
-        int i = 0;
+       	size_t i = 0;
         while (_remaining && i < len) {
             if (!temp_buffer.available() && !available()) {
                 k_msleep(1);
@@ -256,12 +258,12 @@ class BridgeUDP final: public UDP {
             _remaining--;
         }
         k_mutex_unlock(&udp_mutex);
-        return i;
+        return (int)i;
     }
 
     int read(char *buffer, size_t len) override {
         k_mutex_lock(&udp_mutex, K_FOREVER);
-        int i = 0;
+        size_t i = 0;
         while (_remaining && i < len) {
             if (!temp_buffer.available() && !available()) {
                 k_msleep(1);
@@ -271,7 +273,7 @@ class BridgeUDP final: public UDP {
             _remaining--;
         }
         k_mutex_unlock(&udp_mutex);
-        return i;
+        return (int)i;
     }
 
     int peek() override {