Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2017ab4

Browse files
authored
Merge pull request#59 from fpistm/stm32CubeWB_1.17.0
chore: update to STM32Cube_FW v1.17.0
2 parentseab1891 +370e108 commit2017ab4

File tree

9 files changed

+25
-30
lines changed

9 files changed

+25
-30
lines changed

‎src/utility/STM32Cube_FW/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
##Source
33

4-
[STMicroelectronics/STM32CubeWB Release v1.16.0](https://github.com/STMicroelectronics/STM32CubeWB/releases/tag/v1.16.0)
5-
- Application:[BLE_TransparentMode](https://github.com/STMicroelectronics/STM32CubeWB/tree/v1.16.0/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode)
4+
[STMicroelectronics/STM32CubeWB Release v1.17.0](https://github.com/STMicroelectronics/STM32CubeWB/releases/tag/v1.17.0)
5+
- Application:[BLE_TransparentMode](https://github.com/STMicroelectronics/STM32CubeWB/tree/v1.17.0/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode)
66

‎src/utility/STM32Cube_FW/app_conf_default.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -730,5 +730,6 @@ typedef enum
730730
#defineCFG_OTP_BASE_ADDRESS OTP_AREA_BASE
731731

732732
#defineCFG_OTP_END_ADRESS OTP_AREA_END_ADDR
733+
733734
#endif
734735
#endif/*APP_CONF_DEFAULT_H */

‎src/utility/STM32Cube_FW/ble_bufsize.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@
103103
#elif (LL_ONLY!=0)
104104
#defineBLE_FIXED_BUFFER_SIZE_BYTES 6036/* LL only Full */
105105
#elif (SLAVE_ONLY!=0)
106-
#defineBLE_FIXED_BUFFER_SIZE_BYTES6292/* Peripheral only */
106+
#defineBLE_FIXED_BUFFER_SIZE_BYTES6300/* Peripheral only */
107107
#elif (BASIC_FEATURES!=0)
108-
#defineBLE_FIXED_BUFFER_SIZE_BYTES6624/* Basic Features */
108+
#defineBLE_FIXED_BUFFER_SIZE_BYTES6632/* Basic Features */
109109
#else
110-
#defineBLE_FIXED_BUFFER_SIZE_BYTES7144/* Full stack */
110+
#defineBLE_FIXED_BUFFER_SIZE_BYTES7152/* Full stack */
111111
#endif
112112

113113
/*

‎src/utility/STM32Cube_FW/hw_ipcc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
******************************************************************************
1818
*/
1919
/* USER CODE END Header */
20-
2120
#if defined(STM32WBxx)
2221
/* Includes ------------------------------------------------------------------*/
2322
#include"hw.h"

‎src/utility/STM32Cube_FW/shci.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
uint8_tSHCI_C2_FUS_GetState(SHCI_FUS_GetState_ErrorCode_t*p_error_code )
4141
{
4242
/**
43-
*A command status event + payload has the same size than the expectedcommand complete
43+
*Buffer is large enough to holdcommand complete with payload
4444
*/
45-
uint8_tlocal_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
45+
uint8_tlocal_buffer[TL_BLEEVT_CC_BUFFER_SIZE+1];
4646
TL_EvtPacket_t*p_rsp;
4747

4848
p_rsp= (TL_EvtPacket_t*)local_buffer;
@@ -63,7 +63,7 @@ uint8_t SHCI_C2_FUS_GetState( SHCI_FUS_GetState_ErrorCode_t *p_error_code )
6363
SHCI_CmdStatus_tSHCI_C2_FUS_FwUpgrade(uint32_tfw_src_add,uint32_tfw_dest_add )
6464
{
6565
/**
66-
*TL_BLEEVT_CS_BUFFER_SIZE is15 bytes so it is large enough to hold the 8 bytes of command parameters
66+
*TL_BLEEVT_CC_BUFFER_SIZE is16 bytes so it is large enough to hold the 8 bytes of command parameters
6767
* Buffer is large enough to hold command complete without payload
6868
*/
6969
uint8_tlocal_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
@@ -153,9 +153,9 @@ SHCI_CmdStatus_t SHCI_C2_FUS_LockAuthKey( void )
153153
SHCI_CmdStatus_tSHCI_C2_FUS_StoreUsrKey(SHCI_C2_FUS_StoreUsrKey_Cmd_Param_t*pParam,uint8_t*p_key_index )
154154
{
155155
/**
156-
* Buffer is large enough to hold command completewithout payload
156+
* Buffer is large enough to hold command completewith payload
157157
*/
158-
uint8_tlocal_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
158+
uint8_tlocal_buffer[TL_BLEEVT_CC_BUFFER_SIZE+1];
159159
TL_EvtPacket_t*p_rsp;
160160
uint8_tlocal_payload_len;
161161

@@ -431,9 +431,9 @@ SHCI_CmdStatus_t SHCI_C2_CONCURRENT_SetMode( SHCI_C2_CONCURRENT_Mode_Param_t Mod
431431
SHCI_CmdStatus_tSHCI_C2_CONCURRENT_GetNextBleEvtTime(SHCI_C2_CONCURRENT_GetNextBleEvtTime_Param_t*pParam )
432432
{
433433
/**
434-
* Buffer is large enough to hold command completewithout payload
434+
* Buffer is large enough to hold command completewith payload
435435
*/
436-
uint8_tlocal_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
436+
uint8_tlocal_buffer[TL_BLEEVT_CC_BUFFER_SIZE+4];
437437
TL_EvtPacket_t*p_rsp;
438438

439439
p_rsp= (TL_EvtPacket_t*)local_buffer;
@@ -566,7 +566,7 @@ SHCI_CmdStatus_t SHCI_C2_Reinit( void )
566566
SHCI_CmdStatus_tSHCI_C2_ExtpaConfig(uint32_tgpio_port,uint16_tgpio_pin_number,uint8_tgpio_polarity,uint8_tgpio_status)
567567
{
568568
/**
569-
*TL_BLEEVT_CS_BUFFER_SIZE is15 bytes so it is large enough to hold the 8 bytes of command parameters
569+
*TL_BLEEVT_CC_BUFFER_SIZE is16 bytes so it is large enough to hold the 8 bytes of command parameters
570570
* Buffer is large enough to hold command complete without payload
571571
*/
572572
uint8_tlocal_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
@@ -590,7 +590,7 @@ SHCI_CmdStatus_t SHCI_C2_ExtpaConfig(uint32_t gpio_port, uint16_t gpio_pin_numbe
590590
SHCI_CmdStatus_tSHCI_C2_SetFlashActivityControl(SHCI_C2_SET_FLASH_ACTIVITY_CONTROL_Source_tSource)
591591
{
592592
/**
593-
*TL_BLEEVT_CS_BUFFER_SIZE is15 bytes so it is large enough to hold the 1 byte of command parameter
593+
*TL_BLEEVT_CC_BUFFER_SIZE is16 bytes so it is large enough to hold the 1 byte of command parameter
594594
* Buffer is large enough to hold command complete without payload
595595
*/
596596
uint8_tlocal_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

‎src/utility/STM32Cube_FW/shci.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ extern "C" {
535535
* - bit 4: 1: CS Algo #2 supported 0: CS Algo #2 not supported
536536
* - bit 5: 1: Reduced GATT database in NVM 0: Full GATT database in NVM
537537
* - bit 6: 1: GATT caching is used 0: GATT caching is not used
538-
* - bit 7: 1: LE Power Class 1 0: LE PowerClasse 2-3
538+
* - bit 7: 1: LE Power Class 1 0: LE PowerClass 2-3
539539
* - other bits: complete with Options_extension flag
540540
*/
541541
uint8_tOptions;
@@ -668,6 +668,7 @@ extern "C" {
668668
*/
669669
#defineSHCI_C2_BLE_INIT_BLE_CORE_5_2 11
670670
#defineSHCI_C2_BLE_INIT_BLE_CORE_5_3 12
671+
#defineSHCI_C2_BLE_INIT_BLE_CORE_5_4 13
671672

672673
/**
673674
* LsSource information
@@ -904,7 +905,7 @@ extern "C" {
904905
#defineFUS_DEVICE_INFO_TABLE_VALIDITY_KEYWORD (0xA94656B9)
905906

906907
/*
907-
* At startup, theinformations relative to the wireless binary are stored in RAMtrough a structure defined by
908+
* At startup, theinformation relative to the wireless binary are stored in RAMthrough a structure defined by
908909
* MB_WirelessFwInfoTable_t.This structure contains 4 fields (Version,MemorySize, Stack_info and a reserved part)
909910
* each of those coded on 32 bits as shown on the table below:
910911
*
@@ -1150,7 +1151,7 @@ typedef struct {
11501151
* @brief Starts the LLD tests CLI
11511152
*
11521153
* @param param_size : Nb of bytes
1153-
* @param p_param :pointeur with data to give from M4 to M0
1154+
* @param p_param :pointer with data to give from M4 to M0
11541155
* @retval Status
11551156
*/
11561157
SHCI_CmdStatus_tSHCI_C2_LLDTESTS_Init(uint8_tparam_size,uint8_t*p_param );
@@ -1160,7 +1161,7 @@ typedef struct {
11601161
* @brief Starts the LLD tests BLE
11611162
*
11621163
* @param param_size : Nb of bytes
1163-
* @param p_param :pointeur with data to give from M4 to M0
1164+
* @param p_param :pointer with data to give from M4 to M0
11641165
* @retval Status
11651166
*/
11661167
SHCI_CmdStatus_tSHCI_C2_BLE_LLD_Init(uint8_tparam_size,uint8_t*p_param );
@@ -1260,7 +1261,7 @@ typedef struct {
12601261

12611262
/**
12621263
* SHCI_GetWirelessFwInfo
1263-
* @brief This function read back theinformations relative to the wireless binary loaded.
1264+
* @brief This function read back theinformation relative to the wireless binary loaded.
12641265
* Refer yourself to MB_WirelessFwInfoTable_t structure to get the significance
12651266
* of the different parameters returned.
12661267
* @param pWirelessInfo : Pointer to WirelessFwInfo_t.

‎src/utility/STM32Cube_FW/shci_tl.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ void shci_send( uint16_t cmd_code, uint8_t len_cmd_payload, uint8_t * p_cmd_payl
154154
pCmdBuffer->cmdserial.cmd.plen=len_cmd_payload;
155155

156156
memcpy(pCmdBuffer->cmdserial.cmd.payload,p_cmd_payload,len_cmd_payload );
157-
157+
CmdRspStatusFlag=SHCI_TL_CMD_RESP_WAIT;
158158
shciContext.io.Send(0,0);
159159

160160
shci_cmd_resp_wait(SHCI_TL_DEFAULT_TIMEOUT);
@@ -251,7 +251,6 @@ static void TlUserEvtReceived(TL_EvtPacket_t *shcievt)
251251
/* Weak implementation ----------------------------------------------------------------*/
252252
__WEAKvoidshci_cmd_resp_wait(uint32_ttimeout)
253253
{
254-
CmdRspStatusFlag=SHCI_TL_CMD_RESP_WAIT;
255254
for (unsigned longstart=millis(); (millis()-start)<timeout;) {
256255
if (CmdRspStatusFlag==SHCI_TL_CMD_RESP_RELEASE) {
257256
break;

‎src/utility/STM32Cube_FW/tl.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,8 @@ extern "C" {
5858
#defineTL_BLEEVT_CS_OPCODE (0x0F)
5959
#defineTL_BLEEVT_VS_OPCODE (0xFF)
6060

61-
#defineTL_BLEEVT_CS_PACKET_SIZE (TL_EVT_HDR_SIZE + sizeof(TL_CsEvt_t))
62-
#defineTL_BLEEVT_CS_BUFFER_SIZE (sizeof(TL_PacketHeader_t) + TL_BLEEVT_CS_PACKET_SIZE)
63-
6461
#defineTL_BLEEVT_CC_PACKET_SIZE (TL_EVT_HDR_SIZE + sizeof(TL_CcEvt_t))
6562
#defineTL_BLEEVT_CC_BUFFER_SIZE (sizeof(TL_PacketHeader_t) + TL_BLEEVT_CC_PACKET_SIZE)
66-
6763
/* Exported types ------------------------------------------------------------*/
6864
/**< Packet header */
6965
typedefPACKED_STRUCT
@@ -93,7 +89,7 @@ typedef PACKED_STRUCT
9389
{
9490
uint8_tnumcmd;
9591
uint16_tcmdcode;
96-
uint8_tpayload[255];
92+
uint8_tpayload[2];
9793
}TL_CcEvt_t;
9894

9995
/**
@@ -102,7 +98,7 @@ typedef PACKED_STRUCT
10298
typedefPACKED_STRUCT
10399
{
104100
uint16_tsubevtcode;
105-
uint8_tpayload[255];
101+
uint8_tpayload[2];
106102
}TL_AsynchEvt_t;
107103

108104
/**
@@ -112,7 +108,7 @@ typedef PACKED_STRUCT
112108
{
113109
uint8_tevtcode;
114110
uint8_tplen;
115-
uint8_tpayload[255];
111+
uint8_tpayload[2];
116112
}TL_Evt_t;
117113

118114
typedefPACKED_STRUCT

‎src/utility/STM32Cube_FW/tl_mbox.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ void TL_Init( void )
9999
TL_RefTable.p_sys_table=&TL_SysTable;
100100
TL_RefTable.p_mem_manager_table=&TL_MemManagerTable;
101101
TL_RefTable.p_traces_table=&TL_TracesTable;
102-
103102
#if0
104103
TL_RefTable.p_mac_802_15_4_table=&TL_Mac_802_15_4_Table;
105104
TL_RefTable.p_zigbee_table=&TL_Zigbee_Table;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp