Merge pull request #91 from fpistm/sync_1.5.0

Sync to ArduinoBLE 1.5.0

Author: fpistm

.github/workflows/spell-check.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Spell check
         uses: codespell-project/actions-codespell@v2

examples/Peripheral/CallbackLED/CallbackLED.ino

@@ -81,6 +81,10 @@ void blePeripheralDisconnectHandler(BLEDevice central) {
 }
 
 void switchCharacteristicWritten(BLEDevice central, BLECharacteristic characteristic) {
+  // unused parameters
+  (void)central;
+  (void)characteristic;
+
   // central wrote new value to characteristic, update LED
   Serial.print("Characteristic event, written: ");
 

extras/STM32_WPAN/0001-chore-adapt-STM32_WPAN-sources.patch

@@ -1,7 +1,7 @@
-From dca5f9d1a4246cd158d38e1eb140bb40513618fc Mon Sep 17 00:00:00 2001
+From 3bce4e86b826f59faf048b8b140b4193a3c99cd5 Mon Sep 17 00:00:00 2001
 From: Frederic Pillon <frederic.pillon@st.com>
 Date: Wed, 10 Jan 2024 18:16:01 +0100
-Subject: [PATCH 1/6] chore: adapt STM32_WPAN sources
+Subject: [PATCH 1/4] chore: adapt STM32_WPAN sources
 
 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
 ---
@@ -15,7 +15,7 @@ Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
  7 files changed, 85 insertions(+), 12 deletions(-)
 
 diff --git a/src/utility/STM32_WPAN/app_conf_default.h b/src/utility/STM32_WPAN/app_conf_default.h
-index 8356f0d..8db164d 100644
+index 49b957b..706ef5f 100644
 --- a/src/utility/STM32_WPAN/app_conf_default.h
 +++ b/src/utility/STM32_WPAN/app_conf_default.h
 @@ -1,9 +1,9 @@
@@ -90,7 +90,7 @@ index 8356f0d..8db164d 100644
 
  /**
   * BLE stack Options_extension flags to be configured with:
-@@ -299,7 +322,11 @@
+@@ -305,7 +328,11 @@
   * This parameter is considered by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
   */
 
@@ -103,7 +103,7 @@ index 8356f0d..8db164d 100644
 
   /* Maximum advertising data length (in bytes)
   * Range: 31 .. 1650 with limitation:
-@@ -308,7 +335,11 @@
+@@ -314,7 +341,11 @@
   * This parameter is considered by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
   */
 
@@ -116,15 +116,15 @@ index 8356f0d..8db164d 100644
 
   /* RF TX Path Compensation Value (16-bit signed integer). Units: 0.1 dB.
    * Range: -1280 .. 1280
-@@ -331,6 +362,7 @@
+@@ -337,6 +368,7 @@
 
  #define CFG_BLE_CORE_VERSION   (SHCI_C2_BLE_INIT_BLE_CORE_5_4)
 
 +#if 0
  /******************************************************************************
   * Transport Layer
   ******************************************************************************/
-@@ -667,4 +699,5 @@ typedef enum
+@@ -673,4 +705,5 @@ typedef enum
 
  #define CFG_OTP_END_ADRESS      OTP_AREA_END_ADDR
 
@@ -182,7 +182,7 @@ index 6a311b1..ad3c9d4 100644
  __weak void HW_IPCC_TRACES_EvtNot( void ){};
 +#endif /* STM32WBxx */
 diff --git a/src/utility/STM32_WPAN/shci.c b/src/utility/STM32_WPAN/shci.c
-index 5c32555..40110f4 100644
+index e04a2b4..e641530 100644
 --- a/src/utility/STM32_WPAN/shci.c
 +++ b/src/utility/STM32_WPAN/shci.c
 @@ -17,6 +17,7 @@
@@ -193,7 +193,7 @@ index 5c32555..40110f4 100644
  /* Includes ------------------------------------------------------------------*/
  #include "stm32_wpan_common.h"
 
-@@ -759,3 +760,4 @@ SHCI_CmdStatus_t SHCI_GetWirelessFwInfo( WirelessFwInfo_t* pWirelessInfo )
+@@ -777,3 +778,4 @@ SHCI_CmdStatus_t SHCI_GetWirelessFwInfo( WirelessFwInfo_t* pWirelessInfo )
 
    return (SHCI_Success);
  }
@@ -267,7 +267,7 @@ index 4c92864..df6c215 100644
  }
 +#endif /* STM32WBxx */
 diff --git a/src/utility/STM32_WPAN/tl_mbox.c b/src/utility/STM32_WPAN/tl_mbox.c
-index c13f098..e2a0400 100644
+index 8c059cf..21fa35f 100644
 --- a/src/utility/STM32_WPAN/tl_mbox.c
 +++ b/src/utility/STM32_WPAN/tl_mbox.c
 @@ -16,6 +16,7 @@

extras/STM32_WPAN/0002-fix-include-a-timeout-when-waiting-for-the-cmd_resp.patch

@@ -1,26 +1,31 @@
-From 1af1d327b5532597512216349abb0d1edef1d89e Mon Sep 17 00:00:00 2001
+From c8eb16c6412dc617e6e7d97fbedf86133557800f Mon Sep 17 00:00:00 2001
 From: Frederic Pillon <frederic.pillon@st.com>
 Date: Thu, 13 Jul 2023 17:16:40 +0200
-Subject: [PATCH 2/6] fix: include a timeout when waiting for the cmd_resp
+Subject: [PATCH 2/4] fix: include a timeout when waiting for the cmd_resp
 
 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
 ---
- src/utility/STM32_WPAN/shci_tl.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
+ src/utility/STM32_WPAN/shci_tl.c | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
 
 diff --git a/src/utility/STM32_WPAN/shci_tl.c b/src/utility/STM32_WPAN/shci_tl.c
-index daa988c..25e1a21 100644
+index daa988c..38dfb57 100644
 --- a/src/utility/STM32_WPAN/shci_tl.c
 +++ b/src/utility/STM32_WPAN/shci_tl.c
-@@ -24,6 +24,7 @@
+@@ -24,7 +24,11 @@
  #include "stm_list.h"
  #include "shci_tl.h"
  #include "stm32_def.h"
+-
++#if defined(STM32_CORE_VERSION) && (STM32_CORE_VERSION  <= 0x020C0000)
 +#include "wiring_time.h"
- 
++#else
++#include "wiring.h"
++#endif
  /* Private typedef -----------------------------------------------------------*/
  typedef enum
-@@ -251,10 +252,11 @@ static void TlUserEvtReceived(TL_EvtPacket_t *shcievt)
+ {
+@@ -251,10 +255,11 @@ static void TlUserEvtReceived(TL_EvtPacket_t *shcievt)
  /* Weak implementation ----------------------------------------------------------------*/
  __WEAK void shci_cmd_resp_wait(uint32_t timeout)
  {

extras/STM32_WPAN/0003-chore-add-support-for-customize-app_conf_default.h.patch

@@ -1,15 +1,15 @@
-From 4a42f3ebb91d4065d2ed54a80baab22d6feb5bad Mon Sep 17 00:00:00 2001
+From c08c3314fbb5eab1932f3be17e2b8fc77eeb0d06 Mon Sep 17 00:00:00 2001
 From: Frederic Pillon <frederic.pillon@st.com>
 Date: Wed, 10 Jan 2024 18:45:17 +0100
-Subject: [PATCH 3/6] chore: add support for customize app_conf_default.h
+Subject: [PATCH 3/4] chore: add support for customize app_conf_default.h
 
 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
 ---
  src/utility/STM32_WPAN/app_conf_default.h | 58 ++++++++++++++++++-----
  1 file changed, 45 insertions(+), 13 deletions(-)
 
 diff --git a/src/utility/STM32_WPAN/app_conf_default.h b/src/utility/STM32_WPAN/app_conf_default.h
-index 8db164d..2fd67c7 100644
+index 706ef5f..5fbb234 100644
 --- a/src/utility/STM32_WPAN/app_conf_default.h
 +++ b/src/utility/STM32_WPAN/app_conf_default.h
 @@ -50,7 +50,9 @@

extras/STM32_WPAN/0004-fix-TL_Evt_t-payload-size-for-reset.patch

@@ -1,7 +1,7 @@
-From 8da8c8da4c1f62efc3f49690e8bb42c52c4ffc64 Mon Sep 17 00:00:00 2001
+From f534d3f62f405156476ea56ea83b20c4e1117851 Mon Sep 17 00:00:00 2001
 From: Frederic Pillon <frederic.pillon@st.com>
 Date: Mon, 24 Jul 2023 10:55:20 +0200
-Subject: [PATCH 4/6] fix: TL_Evt_t payload size for reset
+Subject: [PATCH 4/4] fix: TL_Evt_t payload size for reset
 
 Within STM32CubeWB v1.17.0 update TL_Evt_t payload size was reduced.
 This produce a warning -Warray-bounds due to the reset management

library.properties

@@ -1,5 +1,5 @@
 name=STM32duinoBLE
-version=1.4.2
+version=1.5.0
 author=Arduino, SRA
 maintainer=stm32duino
 sentence=Fork of ArduinoBLE library to add the support of STM32WB, SPBTLE-RF, SPBTLE-1S, BLUENRG-M2SP, BLUENRG-LP and BLUENRG-M0 BLE modules.

src/local/BLELocalDevice.cpp

@@ -25,6 +25,19 @@
 
 #include "BLELocalDevice.h"
 
+#ifdef __ZEPHYR__
+#undef ARDUINO_PORTENTA_H7_M7
+#undef ARDUINO_OPTA
+#undef ARDUINO_GIGA
+#undef ARDUINO_NICLA_VISION
+#undef ARDUINO_PORTENTA_C33
+#undef ARDUINO_UNO_Q
+#endif
+
+#if defined(ARDUINO_PORTENTA_C33)
+#include <EspChipManager.h>
+#endif
+
 #if defined(PORTENTA_H7_PINS) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_OPTA)
 #ifndef BT_REG_ON
 #define BT_REG_ON PJ_12
@@ -77,17 +90,9 @@ int BLELocalDevice::begin()
   digitalWrite(BT_REG_ON, HIGH);
   delay(500);
 #elif defined(ARDUINO_PORTENTA_C33)
-#define NINA_GPIO0      (100)
-#define NINA_RESETN     (101)
-  pinMode(NINA_GPIO0, OUTPUT);
-  pinMode(NINA_RESETN, OUTPUT);
-  Serial5.begin(921600);
 
-  digitalWrite(NINA_GPIO0, HIGH);
-  delay(100);
-  digitalWrite(NINA_RESETN, HIGH);
-  digitalWrite(NINA_RESETN, LOW);
-  digitalWrite(NINA_RESETN, HIGH);
+  Serial5.begin(921600);
+  CEspChipManager::getInstance().initialize();
   auto _start = millis();
   while (millis() - _start < 500) {
     if (Serial5.available()) {

src/utility/HCIVirtualTransportRPC.cpp

@@ -0,0 +1,114 @@
+/*
+  This file is part of the ArduinoBLE library.
+  Copyright (c) 2018-2025 Arduino SA. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#if defined(ARDUINO_UNO_Q)
+
+#include "HCIVirtualTransportRPC.h"
+
+HCIVirtualTransportRPCClass::HCIVirtualTransportRPCClass() : initialized(false) {
+}
+
+HCIVirtualTransportRPCClass::~HCIVirtualTransportRPCClass() {
+}
+
+int HCIVirtualTransportRPCClass::begin() {
+  // Initialize the Bridge if not already started
+  if (!Bridge) {
+    if (!Bridge.begin()) {
+      return 0;
+    }
+  }
+
+  // Open HCI device through Bridge RPC
+  if (!HCI.begin("hci0")) {
+    return 0;
+  }
+
+  rxbuf.clear();
+  initialized = true;
+
+  return 1;
+}
+
+void HCIVirtualTransportRPCClass::end() {
+  if (initialized) {
+    HCI.end();
+    initialized = false;
+  }
+}
+
+void HCIVirtualTransportRPCClass::wait(unsigned long timeout) {
+  delay(timeout);
+}
+
+int HCIVirtualTransportRPCClass::available() {
+  if (!initialized) {
+    return 0;
+  }
+
+  // Return buffered data if available
+  if (rxbuf.available()) {
+    return rxbuf.available();
+  }
+
+  // Check if data is available from Bridge HCI and buffer it
+  if (HCI.available()) {
+    uint8_t packet[258];
+    int received = HCI.recv(packet, sizeof(packet));
+
+    if (received > 0) {
+      // Store received data in ring buffer
+      for (int i = 0; i < received; i++) {
+        rxbuf.store_char(packet[i]);
+      }
+    }
+  }
+
+  return rxbuf.available();
+}
+
+int HCIVirtualTransportRPCClass::peek() {
+  return -1;
+}
+
+int HCIVirtualTransportRPCClass::read() {
+  if (rxbuf.available()) {
+    return rxbuf.read_char();
+  }
+
+  return -1;
+}
+
+size_t HCIVirtualTransportRPCClass::write(const uint8_t* data, size_t length) {
+  if (!initialized) {
+    return 0;
+  }
+
+  int sent = HCI.send(data, length);
+  if (sent < 0) {
+    return 0;
+  }
+
+  return sent;
+}
+
+HCIVirtualTransportRPCClass HCIVirtualTransportRPC;
+HCITransportInterface& HCITransport = HCIVirtualTransportRPC;
+
+#endif

src/utility/HCIVirtualTransportRPC.h

@@ -0,0 +1,53 @@
+/*
+  This file is part of the ArduinoBLE library.
+  Copyright (c) 2018-2025 Arduino SA. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _HCI_VIRTUAL_TRANSPORT_RPC_H_
+#define _HCI_VIRTUAL_TRANSPORT_RPC_H_
+
+#include "HCITransport.h"
+#include "api/RingBuffer.h"
+#include <Arduino_RouterBridge.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+class HCIVirtualTransportRPCClass : public HCITransportInterface {
+  public:
+    HCIVirtualTransportRPCClass();
+    virtual ~HCIVirtualTransportRPCClass();
+
+    virtual int begin();
+    virtual void end();
+
+    virtual void wait(unsigned long timeout);
+
+    virtual int available();
+    virtual int peek();
+    virtual int read();
+
+    virtual size_t write(const uint8_t* data, size_t length);
+
+  private:
+    RingBufferN<258> rxbuf;
+    bool initialized;
+};
+
+extern HCIVirtualTransportRPCClass HCIVirtualTransportRPC;
+
+#endif