Skip to content

Commit 9efd0a9

Browse files
me-no-devme-no-dev
committed
IDF release/v4.4 c4ce15b33d
1 parent 2695ff6 commit 9efd0a9

File tree

347 files changed

+4686
-1442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

347 files changed

+4686
-1442
lines changed

‎platform.txt

+4-4
Large diffs are not rendered by default.

‎tools/platformio-build-esp32.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334
"UNITY_INCLUDE_CONFIG_H",
335335
"WITH_POSIX",
336336
"_GNU_SOURCE",
337-
("IDF_VER", '\\"v4.4.7-34-g0eb7ad2032-dirty\\"'),
337+
("IDF_VER", '\\"v4.4.7-44-gc4ce15b33d-dirty\\"'),
338338
"ESP_PLATFORM",
339339
"_POSIX_READER_WRITER_LOCKS",
340340
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32c3.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@
331331
"UNITY_INCLUDE_CONFIG_H",
332332
"WITH_POSIX",
333333
"_GNU_SOURCE",
334-
("IDF_VER", '\\"v4.4.7-34-g0eb7ad2032-dirty\\"'),
334+
("IDF_VER", '\\"v4.4.7-44-gc4ce15b33d-dirty\\"'),
335335
"ESP_PLATFORM",
336336
"_POSIX_READER_WRITER_LOCKS",
337337
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32s2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@
317317
"UNITY_INCLUDE_CONFIG_H",
318318
"WITH_POSIX",
319319
"_GNU_SOURCE",
320-
("IDF_VER", '\\"v4.4.7-34-g0eb7ad2032-dirty\\"'),
320+
("IDF_VER", '\\"v4.4.7-44-gc4ce15b33d-dirty\\"'),
321321
"ESP_PLATFORM",
322322
"_POSIX_READER_WRITER_LOCKS",
323323
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32s3.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@
333333
"UNITY_INCLUDE_CONFIG_H",
334334
"WITH_POSIX",
335335
"_GNU_SOURCE",
336-
("IDF_VER", '\\"v4.4.7-34-g0eb7ad2032-dirty\\"'),
336+
("IDF_VER", '\\"v4.4.7-44-gc4ce15b33d-dirty\\"'),
337337
"ESP_PLATFORM",
338338
"_POSIX_READER_WRITER_LOCKS",
339339
"ARDUINO_ARCH_ESP32",

‎tools/sdk/esp32/dio_qspi/include/sdkconfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -845,5 +845,5 @@
845845
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
846846
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
847847
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
848-
#define CONFIG_ARDUINO_IDF_COMMIT "0eb7ad2032"
848+
#define CONFIG_ARDUINO_IDF_COMMIT "c4ce15b33d"
849849
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

‎tools/sdk/esp32/dout_qspi/include/sdkconfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -845,5 +845,5 @@
845845
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
846846
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
847847
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
848-
#define CONFIG_ARDUINO_IDF_COMMIT "0eb7ad2032"
848+
#define CONFIG_ARDUINO_IDF_COMMIT "c4ce15b33d"
849849
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

‎tools/sdk/esp32/include/bt/esp_ble_mesh/api/esp_ble_mesh_defs.h

+20-14
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,14 @@ typedef uint8_t esp_ble_mesh_octet8_t[ESP_BLE_MESH_OCTET8_LEN];
6868
#define ESP_BLE_MESH_KEY_PRIMARY 0x0000
6969
#define ESP_BLE_MESH_KEY_ANY 0xFFFF
7070

71+
/*!< Internal macros used to initialize array members */
72+
#define ESP_BLE_MESH_KEY_UNUSED_ELT_(IDX, _) ESP_BLE_MESH_KEY_UNUSED
73+
#define ESP_BLE_MESH_ADDR_UNASSIGNED_ELT_(IDX, _) ESP_BLE_MESH_ADDR_UNASSIGNED
74+
#define ESP_BLE_MESH_MODEL_KEYS_UNUSED \
75+
{ LISTIFY(CONFIG_BLE_MESH_MODEL_KEY_COUNT, ESP_BLE_MESH_KEY_UNUSED_ELT_, (,)) }
76+
#define ESP_BLE_MESH_MODEL_GROUPS_UNASSIGNED \
77+
{ LISTIFY(CONFIG_BLE_MESH_MODEL_GROUP_COUNT, ESP_BLE_MESH_ADDR_UNASSIGNED_ELT_, (,)) }
78+
7179
/*!< Primary Network Key index */
7280
#define ESP_BLE_MESH_NET_PRIMARY 0x000
7381

@@ -264,26 +272,24 @@ typedef enum {
264272
#define ESP_BLE_MESH_SIG_MODEL(_id, _op, _pub, _user_data) \
265273
{ \
266274
.model_id = (_id), \
267-
.op = _op, \
268-
.keys = { [0 ... (CONFIG_BLE_MESH_MODEL_KEY_COUNT - 1)] = \
269-
ESP_BLE_MESH_KEY_UNUSED }, \
270275
.pub = _pub, \
271-
.groups = { [0 ... (CONFIG_BLE_MESH_MODEL_GROUP_COUNT - 1)] = \
272-
ESP_BLE_MESH_ADDR_UNASSIGNED }, \
276+
.keys = ESP_BLE_MESH_MODEL_KEYS_UNUSED, \
277+
.groups = ESP_BLE_MESH_MODEL_GROUPS_UNASSIGNED, \
278+
.op = _op, \
273279
.user_data = _user_data, \
274280
}
275281

276282
/*!< This macro is associated with BLE_MESH_MODEL_VND_CB in mesh_access.h */
277283
#define ESP_BLE_MESH_VENDOR_MODEL(_company, _id, _op, _pub, _user_data) \
278284
{ \
279-
.vnd.company_id = (_company), \
280-
.vnd.model_id = (_id), \
281-
.op = _op, \
285+
.vnd = { \
286+
.company_id = (_company), \
287+
.model_id = (_id), \
288+
}, \
282289
.pub = _pub, \
283-
.keys = { [0 ... (CONFIG_BLE_MESH_MODEL_KEY_COUNT - 1)] = \
284-
ESP_BLE_MESH_KEY_UNUSED }, \
285-
.groups = { [0 ... (CONFIG_BLE_MESH_MODEL_GROUP_COUNT - 1)] = \
286-
ESP_BLE_MESH_ADDR_UNASSIGNED }, \
290+
.keys = ESP_BLE_MESH_MODEL_KEYS_UNUSED, \
291+
.groups = ESP_BLE_MESH_MODEL_GROUPS_UNASSIGNED, \
292+
.op = _op, \
287293
.user_data = _user_data, \
288294
}
289295

@@ -302,8 +308,8 @@ typedef enum {
302308
{ \
303309
.location = (_loc), \
304310
.sig_model_count = ARRAY_SIZE(_mods), \
305-
.sig_models = (_mods), \
306311
.vnd_model_count = ARRAY_SIZE(_vnd_mods), \
312+
.sig_models = (_mods), \
307313
.vnd_models = (_vnd_mods), \
308314
}
309315

@@ -416,8 +422,8 @@ typedef struct {
416422
#define ESP_BLE_MESH_MODEL_PUB_DEFINE(_name, _msg_len, _role) \
417423
NET_BUF_SIMPLE_DEFINE_STATIC(bt_mesh_pub_msg_##_name, _msg_len); \
418424
static esp_ble_mesh_model_pub_t _name = { \
419-
.update = (uint32_t)NULL, \
420425
.msg = &bt_mesh_pub_msg_##_name, \
426+
.update = (uint32_t)NULL, \
421427
.dev_role = _role, \
422428
}
423429

‎tools/sdk/esp32/include/bt/esp_ble_mesh/mesh_common/include/mesh_buf.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -840,22 +840,22 @@ struct net_buf_pool {
840840
#if defined(CONFIG_BLE_MESH_NET_BUF_POOL_USAGE)
841841
#define NET_BUF_POOL_INITIALIZER(_pool, _alloc, _bufs, _count, _destroy) \
842842
{ \
843-
.alloc = _alloc, \
844-
.__bufs = (struct net_buf *)_bufs, \
845843
.buf_count = _count, \
846844
.uninit_count = _count, \
847845
.avail_count = _count, \
848-
.destroy = _destroy, \
849846
.name = STRINGIFY(_pool), \
847+
.destroy = _destroy, \
848+
.alloc = _alloc, \
849+
.__bufs = (struct net_buf *)_bufs, \
850850
}
851851
#else
852852
#define NET_BUF_POOL_INITIALIZER(_pool, _alloc, _bufs, _count, _destroy) \
853853
{ \
854-
.alloc = _alloc, \
855-
.__bufs = (struct net_buf *)_bufs, \
856854
.buf_count = _count, \
857855
.uninit_count = _count, \
858856
.destroy = _destroy, \
857+
.alloc = _alloc, \
858+
.__bufs = (struct net_buf *)_bufs, \
859859
}
860860
#endif /* CONFIG_BLE_MESH_NET_BUF_POOL_USAGE */
861861

‎tools/sdk/esp32/include/bt/esp_ble_mesh/mesh_common/include/mesh_util.h

+35
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <stddef.h>
1818
#include "esp_bit_defs.h"
1919
#include "mesh_types.h"
20+
#include "mesh_utils_loops.h"
2021

2122
#ifdef __cplusplus
2223
extern "C" {
@@ -180,6 +181,40 @@ extern "C" {
180181
*/
181182
#define Z_IS_ENABLED3(ignore_this, val, ...) val
182183

184+
/* Used to remove brackets from around a single argument. */
185+
#define __DEBRACKET(...) __VA_ARGS__
186+
187+
#define UTIL_CAT(a, ...) UTIL_PRIMITIVE_CAT(a, __VA_ARGS__)
188+
#define UTIL_PRIMITIVE_CAT(a, ...) a##__VA_ARGS__
189+
190+
/**
191+
* @brief Generates a sequence of code with configurable separator.
192+
*
193+
* Example:
194+
*
195+
* #define FOO(i, _) MY_PWM ## i
196+
* { LISTIFY(PWM_COUNT, FOO, (,)) }
197+
*
198+
* The above two lines expand to:
199+
*
200+
* { MY_PWM0 , MY_PWM1 }
201+
*
202+
* @param LEN The length of the sequence. Must be an integer literal less
203+
* than 255.
204+
* @param F A macro function that accepts at least two arguments:
205+
* <tt>F(i, ...)</tt>. @p F is called repeatedly in the expansion.
206+
* Its first argument @p i is the index in the sequence, and
207+
* the variable list of arguments passed to LISTIFY are passed
208+
* through to @p F.
209+
*
210+
* @param sep Separator (e.g. comma or semicolon). Must be in parentheses;
211+
* this is required to enable providing a comma as separator.
212+
*
213+
* @note Calling LISTIFY with undefined arguments has undefined
214+
* behavior.
215+
*/
216+
#define LISTIFY(LEN, F, sep, ...) UTIL_CAT(Z_UTIL_LISTIFY_, LEN)(F, sep, __VA_ARGS__)
217+
183218
const char *bt_hex(const void *buf, size_t len);
184219

185220
void mem_rcopy(uint8_t *dst, uint8_t const *src, uint16_t len);

0 commit comments

Comments
 (0)