Merge remote-tracking branch 'origin/main' into 14-add-a-class-for-udp-client

# Conflicts:
#	src/Arduino_RouterBridge.h
#	src/tcp_client.h

Author: eigen-value

examples/hci/hci.ino

@@ -0,0 +1,108 @@
+/*
+    This file is part of the Arduino_RouterBridge 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_RouterBridge.h>
+
+void setup() {
+    Serial.begin(115200);
+    while (!Serial) {
+        delay(10);
+    }
+
+    Serial.println("Arduino HCI Example - Read Local Version");
+
+    if (!Bridge.begin()) {
+        Serial.println("Failed to setup Bridge");
+        return;
+    }
+
+    if (!HCI.begin("hci0")) {
+        Serial.println("Failed to open HCI device");
+        return;
+    }
+
+    Serial.println("HCI device opened successfully");
+
+    delay(1000);
+    readLocalVersion();
+}
+
+void loop() {
+    // Nothing to do in loop
+    delay(1000);
+}
+
+void readLocalVersion() {
+    uint8_t cmd[4];
+    cmd[0] = 0x01;  // HCI Command Packet Type
+    cmd[1] = 0x01;  // OCF = 0x0001 (lower byte)
+    cmd[2] = 0x10;  // OGF = 0x04 (0x04 << 2 = 0x10 in upper 6 bits)
+    cmd[3] = 0x00;  // Parameter length = 0
+
+    Serial.println("Sending HCI Read Local Version command...");
+
+    int sent = HCI.send(cmd, sizeof(cmd));
+    if (sent < 0) {
+        Serial.println("Failed to send HCI command");
+        return;
+    }
+
+    Serial.print("Sent ");
+    Serial.print(sent);
+    Serial.println(" bytes");
+
+    // Wait for response with timeout
+    Serial.println("Waiting for response...");
+    int avail = 0;
+    unsigned long startTime = millis();
+    while (avail == 0 && (millis() - startTime) < 1000) {  // 1 second timeout
+        avail = HCI.available();
+        if (avail == 0) {
+            delay(10);  // Small delay between polls
+        }
+    }
+
+    Serial.print("Available bytes: ");
+    Serial.println(avail);
+
+    if (avail == 0) {
+        Serial.println("Timeout: No response received");
+        return;
+    }
+
+    // Read response
+    uint8_t response[255];
+    int received = HCI.recv(response, sizeof(response));
+
+    if (received > 0) {
+        Serial.print("Received ");
+        Serial.print(received);
+        Serial.println(" bytes:");
+
+        // Print response in hex
+        for (int i = 0; i < received; i++) {
+            if (response[i] < 0x10) Serial.print("0");
+            Serial.print(response[i], HEX);
+            Serial.print(" ");
+        }
+        Serial.println();
+
+        // Parse Command Complete Event
+        // Event format: Packet Type, Event Code, Param Length, Num_HCI_Command_Packets, Opcode, Status, ...
+        if (received >= 6 && response[0] == 0x04 && response[1] == 0x0E) {
+            Serial.println("Command Complete Event received");
+            Serial.print("Status: 0x");
+            Serial.println(response[6], HEX);
+        }
+    } else {
+        Serial.println("No response received");
+    }
+}

examples/simple_bridge/simple_bridge.ino

@@ -49,8 +49,6 @@ void loop() {
     float res;
     if (!Bridge.call("multiply", 1.0, 2.0).result(res)) {
         Serial.println("Error calling method: multiply");
-        Serial.println(Bridge.get_error_code());
-        Serial.println(Bridge.get_error_message());
     };
 
     // Call with deferred response check
@@ -61,8 +59,8 @@ void loop() {
         Serial.print("Result of the operation is: ");
         Serial.println(res);
     } else {
-        Serial.println(Bridge.get_error_code());
-        Serial.println(Bridge.get_error_message());
+        Serial.println(outcome.error.code);
+        Serial.println(outcome.error.traceback);
     }
 
     Bridge.notify("signal", 200);

library.json

@@ -4,19 +4,19 @@
   "description": "A RPC bridge for Arduino UNO Q boards",
   "repository": {
     "type": "git",
-    "url": "https://github.com/bcmi-labs/Arduino_RouterBridge"
+    "url": "https://github.com/arduino-libraries/Arduino_RouterBridge"
   },
   "authors": {
-    "name": "BCMI-labs",
-    "url": "https://github.com/bcmi-labs/Arduino_RouterBridge",
+    "name": "Arduino",
+    "url": "https://github.com/arduino-libraries/Arduino_RouterBridge",
     "maintainer": true
   },
-  "version": "0.2.1",
+  "version": "0.2.2",
   "license": "MPL2.0",
   "frameworks": "arduino",
   "platforms": "*",
   "dependencies":
   {
-    "name": "bcmi-labs/Arduino_RPClite"
+    "name": "arduino-libraries/Arduino_RPClite"
   }
 }

library.properties

@@ -1,7 +1,7 @@
 name=Arduino_RouterBridge
-version=0.2.1
-author=BCMI-labs
-maintainer=BCMI-labs
+version=0.2.2
+author=Arduino
+maintainer=Arduino
 sentence=A RPC bridge for Arduino UNO Q boards
 paragraph=This library provides a simple RPC bridge for Arduino UNO Q boards, allowing communication between the board and other devices using MsgPack serialization.
 category=Communication

src/bridge.h

@@ -106,6 +106,7 @@ class BridgeClass {
 
     struct k_mutex read_mutex{};
     struct k_mutex write_mutex{};
+    struct k_mutex bridge_mutex{};
 
     k_tid_t upd_tid{};
     k_thread_stack_t *upd_stack_area{};
@@ -119,17 +120,27 @@ class BridgeClass {
         serial_ptr = &serial;
     }
 
-    operator bool() const {
-        return started;
+    operator bool() {
+        return is_started();
+    }
+
+    bool is_started() {
+        k_mutex_lock(&bridge_mutex, K_FOREVER);
+        bool out = started;
+        k_mutex_unlock(&bridge_mutex);
+        return out;
     }
 
     // Initialize the bridge
     bool begin(unsigned long baud=DEFAULT_SERIAL_BAUD) {
-        serial_ptr->begin(baud);
-        transport = new SerialTransport(*serial_ptr);
-
         k_mutex_init(&read_mutex);
         k_mutex_init(&write_mutex);
+        k_mutex_init(&bridge_mutex);
+
+        if (is_started()) return true;
+
+        serial_ptr->begin(baud);
+        transport = new SerialTransport(*serial_ptr);
 
         client = new RPCClient(*transport);
         server = new RPCServer(*transport);
@@ -140,33 +151,31 @@ class BridgeClass {
                                 updateEntryPoint,
                                 NULL, NULL, NULL,
                                 UPDATE_THREAD_PRIORITY, 0, K_NO_WAIT);
+        k_thread_name_set(upd_tid, "bridge");
 
-        bool res;
-        call(RESET_METHOD).result(res);
-        if (res) {
-            started = true;
-        }
+        k_mutex_lock(&bridge_mutex, K_FOREVER);
+        bool res = false;
+        started = call(RESET_METHOD).result(res) && res;
+        k_mutex_unlock(&bridge_mutex);
         return res;
     }
 
     template<typename F>
     bool provide(const MsgPack::str_t& name, F&& func) {
+        k_mutex_lock(&bridge_mutex, K_FOREVER);
         bool res;
-        if (!call(BIND_METHOD, name).result(res)) {
-            return false;
-        }
-        return server->bind(name, func);
+        bool out = call(BIND_METHOD, name).result(res) && res && server->bind(name, func);
+        k_mutex_unlock(&bridge_mutex);
+        return out;
     }
 
     template<typename F>
     bool provide_safe(const MsgPack::str_t& name, F&& func) {
+        k_mutex_lock(&bridge_mutex, K_FOREVER);
         bool res;
-        if (!call(BIND_METHOD, name).result(res)) {
-            return false;
-        }
-
-        return server->bind(name, func, "__safe__");
-
+        bool out = call(BIND_METHOD, name).result(res) && res && server->bind(name, func, "__safe__");
+        k_mutex_unlock(&bridge_mutex);
+        return out;
     }
 
     void update() {