Skip to content

Commit 9f656c6

Browse files
authored
Merge pull request #83 from fpistm/sync_1.4.1
Sync to ArduinoBLE 1.4.1
2 parents 8de2038 + 78ae009 commit 9f656c6

11 files changed

+195
-75
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ License along with this library; if not, write to the Free Software
122122
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
123123
```
124124
125-
126125
[B-L475E-IOT01A]: https://www.st.com/en/evaluation-tools/b-l475e-iot01a.html
127126
[B-L4S5I-IOT01A]: https://www.st.com/en/evaluation-tools/b-l4s5i-iot01a.html
128127
[NUCLEO-F401RE]: https://www.st.com/en/evaluation-tools/nucleo-f401re.html

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 7f99c89e8a6f834daf4a76bf98307e9ebcd01c91 Mon Sep 17 00:00:00 2001
1+
From dca5f9d1a4246cd158d38e1eb140bb40513618fc Mon Sep 17 00:00:00 2001
22
From: Frederic Pillon <frederic.pillon@st.com>
33
Date: Wed, 10 Jan 2024 18:16:01 +0100
4-
Subject: [PATCH 1/4] chore: adapt STM32_WPAN sources
4+
Subject: [PATCH 1/6] chore: adapt STM32_WPAN sources
55

66
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
77
---
@@ -15,7 +15,7 @@ Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1515
7 files changed, 85 insertions(+), 12 deletions(-)
1616

1717
diff --git a/src/utility/STM32_WPAN/app_conf_default.h b/src/utility/STM32_WPAN/app_conf_default.h
18-
index 71fc107..bf2274a 100644
18+
index 8356f0d..8db164d 100644
1919
--- a/src/utility/STM32_WPAN/app_conf_default.h
2020
+++ b/src/utility/STM32_WPAN/app_conf_default.h
2121
@@ -1,9 +1,9 @@
@@ -90,7 +90,7 @@ index 71fc107..bf2274a 100644
9090

9191
/**
9292
* BLE stack Options_extension flags to be configured with:
93-
@@ -292,7 +315,11 @@
93+
@@ -299,7 +322,11 @@
9494
* This parameter is considered by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
9595
*/
9696

@@ -103,7 +103,7 @@ index 71fc107..bf2274a 100644
103103

104104
/* Maximum advertising data length (in bytes)
105105
* Range: 31 .. 1650 with limitation:
106-
@@ -301,7 +328,11 @@
106+
@@ -308,7 +335,11 @@
107107
* This parameter is considered by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
108108
*/
109109

@@ -116,15 +116,15 @@ index 71fc107..bf2274a 100644
116116

117117
/* RF TX Path Compensation Value (16-bit signed integer). Units: 0.1 dB.
118118
* Range: -1280 .. 1280
119-
@@ -324,6 +355,7 @@
119+
@@ -331,6 +362,7 @@
120120

121121
#define CFG_BLE_CORE_VERSION (SHCI_C2_BLE_INIT_BLE_CORE_5_4)
122122

123123
+#if 0
124124
/******************************************************************************
125125
* Transport Layer
126126
******************************************************************************/
127-
@@ -660,4 +692,5 @@ typedef enum
127+
@@ -667,4 +699,5 @@ typedef enum
128128

129129
#define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR
130130

@@ -267,7 +267,7 @@ index 4c92864..df6c215 100644
267267
}
268268
+#endif /* STM32WBxx */
269269
diff --git a/src/utility/STM32_WPAN/tl_mbox.c b/src/utility/STM32_WPAN/tl_mbox.c
270-
index df07a19..9a2a297 100644
270+
index c13f098..e2a0400 100644
271271
--- a/src/utility/STM32_WPAN/tl_mbox.c
272272
+++ b/src/utility/STM32_WPAN/tl_mbox.c
273273
@@ -16,6 +16,7 @@
@@ -278,7 +278,7 @@ index df07a19..9a2a297 100644
278278
/* Includes ------------------------------------------------------------------*/
279279
#include "stm32_wpan_common.h"
280280
#include "hw.h"
281-
@@ -51,8 +52,10 @@ PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_BleLldTable_t TL_BleLldTable;
281+
@@ -53,8 +54,10 @@ PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_BleLldTable_t TL_BleLldTable;
282282
PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_SysTable_t TL_SysTable;
283283
PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_MemManagerTable_t TL_MemManagerTable;
284284
PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_TracesTable_t TL_TracesTable;
@@ -289,7 +289,7 @@ index df07a19..9a2a297 100644
289289

290290
/**< tables */
291291
PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode FreeBufQueue;
292-
@@ -97,8 +100,10 @@ void TL_Init( void )
292+
@@ -99,8 +102,10 @@ void TL_Init( void )
293293
TL_RefTable.p_sys_table = &TL_SysTable;
294294
TL_RefTable.p_mem_manager_table = &TL_MemManagerTable;
295295
TL_RefTable.p_traces_table = &TL_TracesTable;
@@ -300,7 +300,7 @@ index df07a19..9a2a297 100644
300300
HW_IPCC_Init();
301301

302302
return;
303-
@@ -847,3 +852,4 @@ static void OutputDbgTrace(TL_MB_PacketType_t packet_type, uint8_t* buffer)
303+
@@ -874,3 +879,4 @@ static void OutputDbgTrace(TL_MB_PacketType_t packet_type, uint8_t* buffer)
304304

305305
return;
306306
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From a33328182e334e1ddedd368a047d75cf1662e330 Mon Sep 17 00:00:00 2001
1+
From 1af1d327b5532597512216349abb0d1edef1d89e Mon Sep 17 00:00:00 2001
22
From: Frederic Pillon <frederic.pillon@st.com>
33
Date: Thu, 13 Jul 2023 17:16:40 +0200
4-
Subject: [PATCH 2/4] fix: include a timeout when waiting for the cmd_resp
4+
Subject: [PATCH 2/6] fix: include a timeout when waiting for the cmd_resp
55

66
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
77
---

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
From a973b405bf34a93b0c300c8bbc4aa5d59fa182e5 Mon Sep 17 00:00:00 2001
1+
From 4a42f3ebb91d4065d2ed54a80baab22d6feb5bad Mon Sep 17 00:00:00 2001
22
From: Frederic Pillon <frederic.pillon@st.com>
33
Date: Wed, 10 Jan 2024 18:45:17 +0100
4-
Subject: [PATCH 3/4] chore: add support for customize app_conf_default.h
4+
Subject: [PATCH 3/6] chore: add support for customize app_conf_default.h
55

66
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
77
---
88
src/utility/STM32_WPAN/app_conf_default.h | 58 ++++++++++++++++++-----
99
1 file changed, 45 insertions(+), 13 deletions(-)
1010

1111
diff --git a/src/utility/STM32_WPAN/app_conf_default.h b/src/utility/STM32_WPAN/app_conf_default.h
12-
index bf2274a..ff2dc01 100644
12+
index 8db164d..2fd67c7 100644
1313
--- a/src/utility/STM32_WPAN/app_conf_default.h
1414
+++ b/src/utility/STM32_WPAN/app_conf_default.h
1515
@@ -50,7 +50,9 @@

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 324eef795bfd0a754aae4d5f9b528d4c8ad706c8 Mon Sep 17 00:00:00 2001
1+
From 8da8c8da4c1f62efc3f49690e8bb42c52c4ffc64 Mon Sep 17 00:00:00 2001
22
From: Frederic Pillon <frederic.pillon@st.com>
33
Date: Mon, 24 Jul 2023 10:55:20 +0200
4-
Subject: [PATCH 4/4] fix: TL_Evt_t payload size for reset
4+
Subject: [PATCH 4/6] fix: TL_Evt_t payload size for reset
55

66
Within STM32CubeWB v1.17.0 update TL_Evt_t payload size was reduced.
77
This produce a warning -Warray-bounds due to the reset management
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From bc5be381098042469ed0f922d6178681dee2b8db Mon Sep 17 00:00:00 2001
2+
From: Frederic Pillon <frederic.pillon@st.com>
3+
Date: Thu, 10 Jul 2025 15:40:53 +0200
4+
Subject: [PATCH 5/6] fix: add missing semicolon
5+
6+
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
7+
---
8+
src/utility/STM32_WPAN/tl_mbox.c | 4 ++--
9+
1 file changed, 2 insertions(+), 2 deletions(-)
10+
11+
diff --git a/src/utility/STM32_WPAN/tl_mbox.c b/src/utility/STM32_WPAN/tl_mbox.c
12+
index e2a0400..cfd62c7 100644
13+
--- a/src/utility/STM32_WPAN/tl_mbox.c
14+
+++ b/src/utility/STM32_WPAN/tl_mbox.c
15+
@@ -747,8 +747,8 @@ static void OutputDbgTrace(TL_MB_PacketType_t packet_type, uint8_t* buffer)
16+
break;
17+
18+
case TL_MB_ACL_DATA_RSP:
19+
- TL_HCI_CMD_DBG_MSG(" ACL Data Tx Ack received")
20+
- TL_HCI_CMD_DBG_MSG("\r\n");
21+
+ TL_HCI_CMD_DBG_MSG(" ACL Data Tx Ack received");
22+
+ TL_HCI_CMD_DBG_MSG("\r\n");
23+
break;
24+
25+
case TL_MB_BLE_CMD_RSP:
26+
--
27+
2.34.1
28+
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From 8de2038c50527d4c3f6ea649383214b63ebc0904 Mon Sep 17 00:00:00 2001
2+
From: Frederic Pillon <frederic.pillon@st.com>
3+
Date: Fri, 18 Jul 2025 14:15:20 +0200
4+
Subject: [PATCH 6/6] chore: add new field ATT bearers
5+
6+
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
7+
---
8+
src/utility/HCISharedMemTransport.cpp | 3 ++-
9+
1 file changed, 2 insertions(+), 1 deletion(-)
10+
11+
diff --git a/src/utility/HCISharedMemTransport.cpp b/src/utility/HCISharedMemTransport.cpp
12+
index 1544871..6821493 100644
13+
--- a/src/utility/HCISharedMemTransport.cpp
14+
+++ b/src/utility/HCISharedMemTransport.cpp
15+
@@ -665,7 +665,8 @@ int HCISharedMemTransportClass::stm32wb_start_ble(void)
16+
CFG_BLE_TX_PATH_COMPENS,
17+
CFG_BLE_RX_PATH_COMPENS,
18+
CFG_BLE_CORE_VERSION,
19+
- CFG_BLE_OPTIONS_EXT
20+
+ CFG_BLE_OPTIONS_EXT,
21+
+ CFG_BLE_MAX_ADD_EATT_BEARERS
22+
};
23+
/**
24+
* Starts the BLE Stack on CPU2
25+
--
26+
2.34.1
27+

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=STM32duinoBLE
2-
version=1.4.0
2+
version=1.4.1
33
author=Arduino, SRA
44
maintainer=stm32duino
55
sentence=Fork of ArduinoBLE library to add the support of STM32WB, SPBTLE-RF, SPBTLE-1S, BLUENRG-M2SP, BLUENRG-LP and BLUENRG-M0 BLE modules.

0 commit comments

Comments
 (0)