Skip to content

Commit e1a92dd

Browse files
fpistmfpistm
authored
Merge pull request stm32duino#38
Rework the STM32CubeWB FW files to ease update
2 parents 095fe18 + 14c0f73 commit e1a92dd

16 files changed

+1395
-1306
lines changed

‎README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ https://github.com/arduino-libraries/ArduinoBLE
1919
# Configuration
2020
STM32Cube_WPAN has several configuration options, which are set in the `app_conf.h`.
2121
This package has a default configuration named `app_conf_default.h`.
22-
The user can include the file `app_conf_custom.h` to customize the ble application. Options wrapped in `#ifndef, #endif` in `app_conf_default.h` can be overwritten. Additional options can be added.
22+
The user can include the file `app_conf_custom.h` to customize the BLE application.
23+
Options wrapped in `#ifndef`, `#endif` in `app_conf_default.h` can be overwritten.
24+
Additional options can be added.
2325

2426
## License
2527

‎src/utility/STM32Cube_FW/app_conf.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
#ifndef APP_CONF_H
1010
#define APP_CONF_H
1111

12-
#include "ble_bufsize.h"
1312
#include "hw.h"
13+
#include "ble_bufsize.h"
1414

1515
#if __has_include("app_conf_custom.h")
16-
#include "app_conf_custom.h"
16+
#include "app_conf_custom.h"
1717
#endif
1818
#include "app_conf_default.h"
1919

20-
#endif /* APP_CONF_H */
20+
#endif /* APP_CONF_H */

‎src/utility/STM32Cube_FW/app_conf_default.h

+15-15
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434
#define HCI_RESET 0x0C03
3535

3636
#ifndef BLE_SHARED_MEM_BYTE_ORDER
37-
#define BLE_SHARED_MEM_BYTE_ORDER MSBFIRST
37+
#define BLE_SHARED_MEM_BYTE_ORDER MSBFIRST
3838
#endif
3939
#define BLE_MODULE_SHARED_MEM_BUFFER_SIZE 128
4040

4141
/**
4242
* Define Tx Power
4343
*/
4444
#ifndef CFG_TX_POWER
45-
#define CFG_TX_POWER (0x18) /* -0.15dBm */
45+
#define CFG_TX_POWER (0x18) /* -0.15dBm */
4646
#endif
4747

4848
/******************************************************************************
@@ -53,7 +53,7 @@
5353
* Valid values are from 1 to 8
5454
*/
5555
#ifndef CFG_BLE_NUM_LINK
56-
#define CFG_BLE_NUM_LINK 8
56+
#define CFG_BLE_NUM_LINK 8
5757
#endif
5858

5959
/**
@@ -62,7 +62,7 @@
6262
* services
6363
*/
6464
#ifndef CFG_BLE_NUM_GATT_SERVICES
65-
#define CFG_BLE_NUM_GATT_SERVICES 8
65+
#define CFG_BLE_NUM_GATT_SERVICES 8
6666
#endif
6767

6868
/**
@@ -72,14 +72,14 @@
7272
* added automatically during device initialization so this parameters should be 9 plus the number of user Attributes
7373
*/
7474
#ifndef CFG_BLE_NUM_GATT_ATTRIBUTES
75-
#define CFG_BLE_NUM_GATT_ATTRIBUTES 68
75+
#define CFG_BLE_NUM_GATT_ATTRIBUTES 68
7676
#endif
7777

7878
/**
7979
* Maximum supported ATT_MTU size
8080
*/
8181
#ifndef CFG_BLE_MAX_ATT_MTU
82-
#define CFG_BLE_MAX_ATT_MTU (156)
82+
#define CFG_BLE_MAX_ATT_MTU (156)
8383
#endif
8484

8585
/**
@@ -94,15 +94,15 @@
9494
* The total amount of memory needed is the sum of the above quantities for each attribute.
9595
*/
9696
#ifndef CFG_BLE_ATT_VALUE_ARRAY_SIZE
97-
#define CFG_BLE_ATT_VALUE_ARRAY_SIZE (1344)
97+
#define CFG_BLE_ATT_VALUE_ARRAY_SIZE (1344)
9898
#endif
9999

100100
/**
101101
* Prepare Write List size in terms of number of packet
102102
*/
103103
//#define CFG_BLE_PREPARE_WRITE_LIST_SIZE BLE_PREP_WRITE_X_ATT(CFG_BLE_MAX_ATT_MTU)
104104
#ifndef CFG_BLE_PREPARE_WRITE_LIST_SIZE
105-
#define CFG_BLE_PREPARE_WRITE_LIST_SIZE (0x3A)
105+
#define CFG_BLE_PREPARE_WRITE_LIST_SIZE (0x3A)
106106
#endif
107107

108108
/**
@@ -111,21 +111,21 @@
111111
//#define CFG_BLE_MBLOCK_COUNT (BLE_MBLOCKS_CALC(CFG_BLE_PREPARE_WRITE_LIST_SIZE, CFG_BLE_MAX_ATT_MTU,
112112
// CFG_BLE_NUM_LINK))
113113
#ifndef CFG_BLE_MBLOCK_COUNT
114-
#define CFG_BLE_MBLOCK_COUNT (0x79)
114+
#define CFG_BLE_MBLOCK_COUNT (0x79)
115115
#endif
116116

117117
/**
118118
* Enable or disable the Extended Packet length feature. Valid values are 0 or 1.
119119
*/
120120
#ifndef CFG_BLE_DATA_LENGTH_EXTENSION
121-
#define CFG_BLE_DATA_LENGTH_EXTENSION 1
121+
#define CFG_BLE_DATA_LENGTH_EXTENSION 1
122122
#endif
123123

124124
/**
125125
* Sleep clock accuracy in Slave mode (ppm value)
126126
*/
127127
#ifndef CFG_BLE_SLAVE_SCA
128-
#define CFG_BLE_SLAVE_SCA 500
128+
#define CFG_BLE_SLAVE_SCA 500
129129
#endif
130130

131131
/**
@@ -140,7 +140,7 @@
140140
* 7 : 0 ppm to 20 ppm
141141
*/
142142
#ifndef CFG_BLE_MASTER_SCA
143-
#define CFG_BLE_MASTER_SCA 0
143+
#define CFG_BLE_MASTER_SCA 0
144144
#endif
145145

146146
/**
@@ -149,21 +149,21 @@
149149
* 0 : external crystal ( no calibration )
150150
*/
151151
#ifndef CFG_BLE_LSE_SOURCE
152-
#define CFG_BLE_LSE_SOURCE 0
152+
#define CFG_BLE_LSE_SOURCE 0
153153
#endif
154154

155155
/**
156156
* Start up time of the high speed (16 or 32 MHz) crystal oscillator in units of 625/256 us (~2.44 us)
157157
*/
158158
#ifndef CFG_BLE_HSE_STARTUP_TIME
159-
#define CFG_BLE_HSE_STARTUP_TIME 0x148
159+
#define CFG_BLE_HSE_STARTUP_TIME 0x148
160160
#endif
161161

162162
/**
163163
* Maximum duration of the connection event when the device is in Slave mode in units of 625/256 us (~2.44 us)
164164
*/
165165
#ifndef CFG_BLE_MAX_CONN_EVENT_LENGTH
166-
#define CFG_BLE_MAX_CONN_EVENT_LENGTH (0xFFFFFFFF)
166+
#define CFG_BLE_MAX_CONN_EVENT_LENGTH (0xFFFFFFFF)
167167
#endif
168168

169169
/**

‎src/utility/STM32Cube_FW/ble_bufsize.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -90,35 +90,35 @@
9090

9191
/*
9292
* BLE_FIXED_BUFFER_SIZE_BYTES:
93-
* A part of the RAM, is dynamically allocated by initializing all the pointers
93+
* A part of the RAM, is dynamically allocated by initializing all the pointers
9494
* defined in a global context variable "mem_alloc_ctx_p".
95-
* This initialization is made in the Dynamic_allocator functions, which
95+
* This initialization is made in the Dynamic_allocator functions, which
9696
* assign a portion of RAM given by the external application to the above
9797
* mentioned "global pointers".
9898
*
99-
* The size of this Dynamic RAM is made of 2 main components:
99+
* The size of this Dynamic RAM is made of 2 main components:
100100
* - a part that is parameters-dependent (num of links, GATT buffers, ...),
101101
* and which value is defined by the following macro;
102102
* - a part, that may be considered "fixed", i.e. independent from the above
103103
* mentioned parameters.
104104
*/
105105
#if (SLAVE_ONLY == 0) && (LL_ONLY == 0)
106-
#define BLE_FIXED_BUFFER_SIZE_BYTES 6960 /* Full stack */
106+
#define BLE_FIXED_BUFFER_SIZE_BYTES 6960 /* Full stack */
107107
#elif SLAVE_ONLY == 0
108-
#define BLE_FIXED_BUFFER_SIZE_BYTES 6256 /* LL only */
108+
#define BLE_FIXED_BUFFER_SIZE_BYTES 6256 /* LL only */
109109
#else
110-
#define BLE_FIXED_BUFFER_SIZE_BYTES 6696 /* Slave only */
110+
#define BLE_FIXED_BUFFER_SIZE_BYTES 6696 /* Slave only */
111111
#endif
112112

113113
/*
114114
* BLE_PER_LINK_SIZE_BYTES: additional memory size used per link
115115
*/
116116
#if (SLAVE_ONLY == 0) && (LL_ONLY == 0)
117-
#define BLE_PER_LINK_SIZE_BYTES 380 /* Full stack */
117+
#define BLE_PER_LINK_SIZE_BYTES 380 /* Full stack */
118118
#elif SLAVE_ONLY == 0
119-
#define BLE_PER_LINK_SIZE_BYTES 196 /* LL only */
119+
#define BLE_PER_LINK_SIZE_BYTES 196 /* LL only */
120120
#else
121-
#define BLE_PER_LINK_SIZE_BYTES 332 /* Slave only */
121+
#define BLE_PER_LINK_SIZE_BYTES 332 /* Slave only */
122122
#endif
123123

124124
/*

‎src/utility/STM32Cube_FW/hw.h

+51-51
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
extern "C" {
2727
#endif
2828

29-
/* Includes ------------------------------------------------------------------*/
29+
/* Includes ------------------------------------------------------------------*/
3030
#include "stm32_def.h"
3131
#include "stm32wbxx_ll_bus.h"
3232
#include "stm32wbxx_ll_exti.h"
@@ -37,56 +37,56 @@ extern "C" {
3737
#include "stm32wbxx_ll_utils.h"
3838
#include "stm32wbxx_ll_pwr.h"
3939

40-
/******************************************************************************
41-
* HW IPCC
42-
******************************************************************************/
43-
void HW_IPCC_Enable(void);
44-
void HW_IPCC_Init(void);
45-
46-
void HW_IPCC_BLE_Init(void);
47-
void HW_IPCC_BLE_SendCmd(void);
48-
void HW_IPCC_MM_SendFreeBuf(void (*cb)(void));
49-
void HW_IPCC_BLE_RxEvtNot(void);
50-
void HW_IPCC_BLE_SendAclData(void);
51-
void HW_IPCC_BLE_AclDataAckNot(void);
52-
53-
void HW_IPCC_SYS_Init(void);
54-
void HW_IPCC_SYS_SendCmd(void);
55-
void HW_IPCC_SYS_CmdEvtNot(void);
56-
void HW_IPCC_SYS_EvtNot(void);
57-
58-
void HW_IPCC_THREAD_Init(void);
59-
void HW_IPCC_OT_SendCmd(void);
60-
void HW_IPCC_CLI_SendCmd(void);
61-
void HW_IPCC_THREAD_SendAck(void);
62-
void HW_IPCC_OT_CmdEvtNot(void);
63-
void HW_IPCC_CLI_CmdEvtNot(void);
64-
void HW_IPCC_THREAD_EvtNot(void);
65-
void HW_IPCC_THREAD_CliSendAck(void);
66-
void HW_IPCC_THREAD_CliEvtNot(void);
67-
68-
69-
void HW_IPCC_LLDTESTS_Init(void);
70-
void HW_IPCC_LLDTESTS_SendCliCmd(void);
71-
void HW_IPCC_LLDTESTS_ReceiveCliRsp(void);
72-
void HW_IPCC_LLDTESTS_SendCliRspAck(void);
73-
void HW_IPCC_LLDTESTS_ReceiveM0Cmd(void);
74-
void HW_IPCC_LLDTESTS_SendM0CmdAck(void);
75-
76-
77-
void HW_IPCC_LLD_BLE_Init(void);
78-
void HW_IPCC_LLD_BLE_SendCliCmd(void);
79-
void HW_IPCC_LLD_BLE_ReceiveCliRsp(void);
80-
void HW_IPCC_LLD_BLE_SendCliRspAck(void);
81-
void HW_IPCC_LLD_BLE_ReceiveM0Cmd(void);
82-
void HW_IPCC_LLD_BLE_SendM0CmdAck(void);
83-
void HW_IPCC_LLD_BLE_SendCmd(void);
84-
void HW_IPCC_LLD_BLE_ReceiveRsp(void);
85-
void HW_IPCC_LLD_BLE_SendRspAck(void);
86-
87-
88-
void HW_IPCC_TRACES_Init(void);
89-
void HW_IPCC_TRACES_EvtNot(void);
40+
/******************************************************************************
41+
* HW IPCC
42+
******************************************************************************/
43+
void HW_IPCC_Enable( void );
44+
void HW_IPCC_Init( void );
45+
46+
void HW_IPCC_BLE_Init( void );
47+
void HW_IPCC_BLE_SendCmd( void );
48+
void HW_IPCC_MM_SendFreeBuf( void (*cb)( void ) );
49+
void HW_IPCC_BLE_RxEvtNot( void );
50+
void HW_IPCC_BLE_SendAclData( void );
51+
void HW_IPCC_BLE_AclDataAckNot( void );
52+
53+
void HW_IPCC_SYS_Init( void );
54+
void HW_IPCC_SYS_SendCmd( void );
55+
void HW_IPCC_SYS_CmdEvtNot( void );
56+
void HW_IPCC_SYS_EvtNot( void );
57+
58+
void HW_IPCC_THREAD_Init( void );
59+
void HW_IPCC_OT_SendCmd( void );
60+
void HW_IPCC_CLI_SendCmd( void );
61+
void HW_IPCC_THREAD_SendAck( void );
62+
void HW_IPCC_OT_CmdEvtNot( void );
63+
void HW_IPCC_CLI_CmdEvtNot( void );
64+
void HW_IPCC_THREAD_EvtNot( void );
65+
void HW_IPCC_THREAD_CliSendAck( void );
66+
void HW_IPCC_THREAD_CliEvtNot( void );
67+
68+
69+
void HW_IPCC_LLDTESTS_Init( void );
70+
void HW_IPCC_LLDTESTS_SendCliCmd( void );
71+
void HW_IPCC_LLDTESTS_ReceiveCliRsp( void );
72+
void HW_IPCC_LLDTESTS_SendCliRspAck( void );
73+
void HW_IPCC_LLDTESTS_ReceiveM0Cmd( void );
74+
void HW_IPCC_LLDTESTS_SendM0CmdAck( void );
75+
76+
77+
void HW_IPCC_LLD_BLE_Init( void );
78+
void HW_IPCC_LLD_BLE_SendCliCmd( void );
79+
void HW_IPCC_LLD_BLE_ReceiveCliRsp( void );
80+
void HW_IPCC_LLD_BLE_SendCliRspAck( void );
81+
void HW_IPCC_LLD_BLE_ReceiveM0Cmd( void );
82+
void HW_IPCC_LLD_BLE_SendM0CmdAck( void );
83+
void HW_IPCC_LLD_BLE_SendCmd( void );
84+
void HW_IPCC_LLD_BLE_ReceiveRsp( void );
85+
void HW_IPCC_LLD_BLE_SendRspAck( void );
86+
87+
88+
void HW_IPCC_TRACES_Init( void );
89+
void HW_IPCC_TRACES_EvtNot( void );
9090

9191
#ifdef __cplusplus
9292
}

0 commit comments

Comments
 (0)