Skip to content

Commit

Permalink
IDF release/v4.4 27ec26d2d3
Browse files Browse the repository at this point in the history
  • Loading branch information
me-no-dev committed Jan 30, 2024
1 parent 3726b48 commit a1461aa
Show file tree
Hide file tree
Showing 205 changed files with 1,092 additions and 436 deletions.
8 changes: 4 additions & 4 deletions platform.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tools/platformio-build-esp32.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
"UNITY_INCLUDE_CONFIG_H",
"WITH_POSIX",
"_GNU_SOURCE",
("IDF_VER", '\\"v4.4.6-374-gbb8dd9d35b-dirty\\"'),
("IDF_VER", '\\"v4.4.6-440-g27ec26d2d3-dirty\\"'),
"ESP_PLATFORM",
"_POSIX_READER_WRITER_LOCKS",
"ARDUINO_ARCH_ESP32",
Expand Down
2 changes: 1 addition & 1 deletion tools/platformio-build-esp32c3.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@
"UNITY_INCLUDE_CONFIG_H",
"WITH_POSIX",
"_GNU_SOURCE",
("IDF_VER", '\\"v4.4.6-374-gbb8dd9d35b-dirty\\"'),
("IDF_VER", '\\"v4.4.6-440-g27ec26d2d3-dirty\\"'),
"ESP_PLATFORM",
"_POSIX_READER_WRITER_LOCKS",
"ARDUINO_ARCH_ESP32",
Expand Down
2 changes: 1 addition & 1 deletion tools/platformio-build-esp32s2.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@
"UNITY_INCLUDE_CONFIG_H",
"WITH_POSIX",
"_GNU_SOURCE",
("IDF_VER", '\\"v4.4.6-374-gbb8dd9d35b-dirty\\"'),
("IDF_VER", '\\"v4.4.6-440-g27ec26d2d3-dirty\\"'),
"ESP_PLATFORM",
"_POSIX_READER_WRITER_LOCKS",
"ARDUINO_ARCH_ESP32",
Expand Down
2 changes: 1 addition & 1 deletion tools/platformio-build-esp32s3.py
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@
"UNITY_INCLUDE_CONFIG_H",
"WITH_POSIX",
"_GNU_SOURCE",
("IDF_VER", '\\"v4.4.6-374-gbb8dd9d35b-dirty\\"'),
("IDF_VER", '\\"v4.4.6-440-g27ec26d2d3-dirty\\"'),
"ESP_PLATFORM",
"_POSIX_READER_WRITER_LOCKS",
"ARDUINO_ARCH_ESP32",
Expand Down
3 changes: 2 additions & 1 deletion tools/sdk/esp32/dio_qspi/include/sdkconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@
#define CONFIG_LWIP_SO_REUSE 1
#define CONFIG_LWIP_SO_REUSE_RXTOALL 1
#define CONFIG_LWIP_SO_RCVBUF 1
#define CONFIG_LWIP_IP_DEFAULT_TTL 64
#define CONFIG_LWIP_IP4_FRAG 1
#define CONFIG_LWIP_IP6_FRAG 1
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
Expand Down Expand Up @@ -842,5 +843,5 @@
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
#define CONFIG_ARDUINO_IDF_COMMIT "bb8dd9d35b"
#define CONFIG_ARDUINO_IDF_COMMIT "27ec26d2d3"
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"
3 changes: 2 additions & 1 deletion tools/sdk/esp32/dout_qspi/include/sdkconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@
#define CONFIG_LWIP_SO_REUSE 1
#define CONFIG_LWIP_SO_REUSE_RXTOALL 1
#define CONFIG_LWIP_SO_RCVBUF 1
#define CONFIG_LWIP_IP_DEFAULT_TTL 64
#define CONFIG_LWIP_IP4_FRAG 1
#define CONFIG_LWIP_IP6_FRAG 1
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
Expand Down Expand Up @@ -842,5 +843,5 @@
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
#define CONFIG_ARDUINO_IDF_COMMIT "bb8dd9d35b"
#define CONFIG_ARDUINO_IDF_COMMIT "27ec26d2d3"
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"
3 changes: 3 additions & 0 deletions tools/sdk/esp32/include/bt/esp_ble_mesh/mesh_core/net.h
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,9 @@ struct bt_mesh_net_rx {
ctl:1, /* Network Control */
net_if:2, /* Network interface */
local_match:1, /* Matched a local element */
#if CONFIG_BLE_MESH_NOT_RELAY_REPLAY_MSG
replay_msg:1, /* Replayed messages */
#endif
friend_match:1; /* Matched an LPN we're friends for */
uint16_t msg_cache_idx; /* Index of entry in message cache */
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down Expand Up @@ -419,7 +419,10 @@ typedef enum {
typedef enum {
BLE_SCAN_DUPLICATE_DISABLE = 0x0, /*!< the Link Layer should generate advertising reports to the host for each packet received */
BLE_SCAN_DUPLICATE_ENABLE = 0x1, /*!< the Link Layer should filter out duplicate advertising reports to the Host */
BLE_SCAN_DUPLICATE_MAX = 0x2, /*!< 0x02 – 0xFF, Reserved for future use */
#if (BLE_50_FEATURE_SUPPORT == TRUE)
BLE_SCAN_DUPLICATE_ENABLE_RESET, /*!< Duplicate filtering enabled, reset for each scan period, only supported in BLE 5.0. */
#endif
BLE_SCAN_DUPLICATE_MAX /*!< Reserved for future use. */
} esp_ble_scan_duplicate_t;
#if (BLE_42_FEATURE_SUPPORT == TRUE)
/// Ble scan parameters
Expand Down Expand Up @@ -1411,6 +1414,15 @@ typedef void (* esp_gap_ble_cb_t)(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_p
*/
esp_err_t esp_ble_gap_register_callback(esp_gap_ble_cb_t callback);

/**
* @brief This function is called to get the current gap callback
*
* @return
* - esp_gap_ble_cb_t : callback function
*
*/
esp_gap_ble_cb_t esp_ble_gap_get_callback(void);

#if (BLE_42_FEATURE_SUPPORT == TRUE)
/**
* @brief This function is called to override the BTA default ADV parameters.
Expand Down Expand Up @@ -2210,8 +2222,9 @@ esp_err_t esp_ble_gap_set_ext_scan_params(const esp_ble_ext_scan_params_t *param
/**
* @brief This function is used to enable scanning.
*
* @param[in] duration : Scan duration
* @param[in] period : Time interval from when the Controller started its last Scan Duration until it begins the subsequent Scan Duration.
* @param[in] duration Scan duration time, where Time = N * 10 ms. Range: 0x0001 to 0xFFFF.
* @param[in] period Time interval from when the Controller started its last Scan Duration until it begins the subsequent Scan Duration.
* Time = N * 1.28 sec. Range: 0x0001 to 0xFFFF.
*
* @return - ESP_OK : success
* - other : failed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,15 @@ typedef void (* esp_gattc_cb_t)(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_
*/
esp_err_t esp_ble_gattc_register_callback(esp_gattc_cb_t callback);

/**
* @brief This function is called to get the current application callbacks
* with BTA GATTC module.
*
* @return
* - esp_gattC_cb_t : current callback
*
*/
esp_gattc_cb_t esp_ble_gattc_get_callback(void);

/**
* @brief This function is called to register application callbacks
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,16 @@ typedef void (* esp_gatts_cb_t)(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_
*/
esp_err_t esp_ble_gatts_register_callback(esp_gatts_cb_t callback);

/**
* @brief This function is called to get the current application callbacks
* with BTA GATTS module.
*
* @return
* - esp_gatts_cb_t : current callback
*
*/
esp_gatts_cb_t esp_ble_gatts_get_callback(void);

/**
* @brief This function is called to register application identifier
*
Expand Down
4 changes: 2 additions & 2 deletions tools/sdk/esp32/include/esp_littlefs/include/esp_littlefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
extern "C" {
#endif

#define ESP_LITTLEFS_VERSION_NUMBER "1.13.0"
#define ESP_LITTLEFS_VERSION_NUMBER "1.14.0"
#define ESP_LITTLEFS_VERSION_MAJOR 1
#define ESP_LITTLEFS_VERSION_MINOR 13
#define ESP_LITTLEFS_VERSION_MINOR 14
#define ESP_LITTLEFS_VERSION_PATCH 0

#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 2) && CONFIG_VFS_SUPPORT_DIR
Expand Down
26 changes: 26 additions & 0 deletions tools/sdk/esp32/include/esp_wifi/include/esp_wifi.h
Original file line number Diff line number Diff line change
Expand Up @@ -1264,6 +1264,32 @@ esp_err_t esp_wifi_config_11b_rate(wifi_interface_t ifx, bool disable);
*/
esp_err_t esp_wifi_set_connectionless_wake_interval(uint16_t interval);

/**
* @brief Request extra reference of Wi-Fi radio.
* Wi-Fi keep active state(RF opened) to be able to receive packets.
*
* @attention Please pair the use of `esp_wifi_force_wakeup_acquire` with `esp_wifi_force_wakeup_release`.
*
* @return
* - ESP_OK: succeed
* - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init
* - ESP_ERR_WIFI_NOT_STARTED: WiFi is not started by esp_wifi_start
*/
esp_err_t esp_wifi_force_wakeup_acquire(void);

/**
* @brief Release extra reference of Wi-Fi radio.
* Wi-Fi go to sleep state(RF closed) if no more use of radio.
*
* @attention Please pair the use of `esp_wifi_force_wakeup_acquire` with `esp_wifi_force_wakeup_release`.
*
* @return
* - ESP_OK: succeed
* - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init
* - ESP_ERR_WIFI_NOT_STARTED: WiFi is not started by esp_wifi_start
*/
esp_err_t esp_wifi_force_wakeup_release(void);

/**
* @brief configure country
*
Expand Down
9 changes: 8 additions & 1 deletion tools/sdk/esp32/include/json/cJSON/cJSON.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJ
/* project version */
#define CJSON_VERSION_MAJOR 1
#define CJSON_VERSION_MINOR 7
#define CJSON_VERSION_PATCH 15
#define CJSON_VERSION_PATCH 17

#include <stddef.h>

Expand Down Expand Up @@ -279,6 +279,13 @@ CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number);
/* Change the valuestring of a cJSON_String object, only takes effect when type of object is cJSON_String */
CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring);

/* If the object is not a boolean type this does nothing and returns cJSON_Invalid else it returns the new type*/
#define cJSON_SetBoolValue(object, boolValue) ( \
(object != NULL && ((object)->type & (cJSON_False|cJSON_True))) ? \
(object)->type=((object)->type &(~(cJSON_False|cJSON_True)))|((boolValue)?cJSON_True:cJSON_False) : \
cJSON_Invalid\
)

/* Macro for iterating over an array or object */
#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)

Expand Down
5 changes: 5 additions & 0 deletions tools/sdk/esp32/include/lwip/port/esp32/include/lwipopts.h
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,11 @@ extern "C"
*/
#define IP_REASS_MAX_PBUFS 10

/**
* IP_DEFAULT_TTL: Default value for Time-To-Live used by transport layers.
*/
#define IP_DEFAULT_TTL CONFIG_LWIP_IP_DEFAULT_TTL

/**
* IP_FORWARD==1: Enables the ability to forward IP packets across network
* interfaces. If you are going to run lwIP on a device with only one network
Expand Down
Binary file modified tools/sdk/esp32/ld/libbtdm_app.a
Binary file not shown.
2 changes: 1 addition & 1 deletion tools/sdk/esp32/ld/sections.ld
Original file line number Diff line number Diff line change
Expand Up @@ -638,8 +638,8 @@ SECTIONS
_bss_start = ABSOLUTE(.);

*(EXCLUDE_FILE(*libbt.a *libbtdm_app.a *libnimble.a) .bss EXCLUDE_FILE(*libbt.a *libbtdm_app.a *libnimble.a) .bss.*)
*(.ext_ram.bss .ext_ram.bss.*)
*(.dynbss .dynsbss .gnu.linkonce.b .gnu.linkonce.b.* .gnu.linkonce.sb .gnu.linkonce.sb.* .gnu.linkonce.sb2 .gnu.linkonce.sb2.* .sbss .sbss.* .sbss2 .sbss2.* .scommon .share.mem)
*(.ext_ram.bss .ext_ram.bss.*)
*(EXCLUDE_FILE(*libbt.a *libbtdm_app.a *libnimble.a) COMMON)
. = ALIGN(4);
_bt_bss_start = ABSOLUTE(.);
Expand Down
Binary file modified tools/sdk/esp32/lib/libapp_update.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libbt.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libcoexist.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libconsole.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libcore.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libesp32-camera.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libesp_hid.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libesp_insights.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libesp_littlefs.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libesp_phy.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libesp_pm.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libesp_rainmaker.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libesp_system.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libesp_wifi.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libespnow.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libhal.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libjson.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/liblwip.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libmesh.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libnet80211.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libpp.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libprotocomm.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/librmaker_common.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libsmartconfig.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libwapi.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libwifi_provisioning.a
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libwpa_supplicant.a
Binary file not shown.
3 changes: 2 additions & 1 deletion tools/sdk/esp32/qio_qspi/include/sdkconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@
#define CONFIG_LWIP_SO_REUSE 1
#define CONFIG_LWIP_SO_REUSE_RXTOALL 1
#define CONFIG_LWIP_SO_RCVBUF 1
#define CONFIG_LWIP_IP_DEFAULT_TTL 64
#define CONFIG_LWIP_IP4_FRAG 1
#define CONFIG_LWIP_IP6_FRAG 1
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
Expand Down Expand Up @@ -842,5 +843,5 @@
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
#define CONFIG_ARDUINO_IDF_COMMIT "bb8dd9d35b"
#define CONFIG_ARDUINO_IDF_COMMIT "27ec26d2d3"
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"
3 changes: 2 additions & 1 deletion tools/sdk/esp32/qout_qspi/include/sdkconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@
#define CONFIG_LWIP_SO_REUSE 1
#define CONFIG_LWIP_SO_REUSE_RXTOALL 1
#define CONFIG_LWIP_SO_RCVBUF 1
#define CONFIG_LWIP_IP_DEFAULT_TTL 64
#define CONFIG_LWIP_IP4_FRAG 1
#define CONFIG_LWIP_IP6_FRAG 1
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
Expand Down Expand Up @@ -842,5 +843,5 @@
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
#define CONFIG_ARDUINO_IDF_COMMIT "bb8dd9d35b"
#define CONFIG_ARDUINO_IDF_COMMIT "27ec26d2d3"
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"
3 changes: 3 additions & 0 deletions tools/sdk/esp32/sdkconfig
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,8 @@ CONFIG_BLE_MESH_DISCARD_OLD_SEQ_AUTH=y
# CONFIG_BLE_MESH_DEBUG is not set
# end of BLE Mesh specific test option

# CONFIG_BLE_MESH_EXPERIMENTAL is not set

#
# CoAP Configuration
#
Expand Down Expand Up @@ -1234,6 +1236,7 @@ CONFIG_LWIP_SO_REUSE=y
CONFIG_LWIP_SO_REUSE_RXTOALL=y
CONFIG_LWIP_SO_RCVBUF=y
# CONFIG_LWIP_NETBUF_RECVINFO is not set
CONFIG_LWIP_IP_DEFAULT_TTL=64
CONFIG_LWIP_IP4_FRAG=y
CONFIG_LWIP_IP6_FRAG=y
# CONFIG_LWIP_IP4_REASSEMBLY is not set
Expand Down
5 changes: 3 additions & 2 deletions tools/sdk/esp32c3/dio_qspi/include/sdkconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
#define CONFIG_BT_BLUEDROID_ENABLED 1
#define CONFIG_BT_BTC_TASK_STACK_SIZE 3072
#define CONFIG_BT_BLUEDROID_PINNED_TO_CORE 0
#define CONFIG_BT_BTU_TASK_STACK_SIZE 4096
#define CONFIG_BT_BTU_TASK_STACK_SIZE 4352
#define CONFIG_BT_BLE_ENABLED 1
#define CONFIG_BT_GATTS_ENABLE 1
#define CONFIG_BT_BLE_BLUFI_ENABLE 1
Expand Down Expand Up @@ -439,6 +439,7 @@
#define CONFIG_LWIP_SO_REUSE 1
#define CONFIG_LWIP_SO_REUSE_RXTOALL 1
#define CONFIG_LWIP_SO_RCVBUF 1
#define CONFIG_LWIP_IP_DEFAULT_TTL 64
#define CONFIG_LWIP_IP4_FRAG 1
#define CONFIG_LWIP_IP6_FRAG 1
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
Expand Down Expand Up @@ -846,5 +847,5 @@
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
#define CONFIG_ARDUINO_IDF_COMMIT "bb8dd9d35b"
#define CONFIG_ARDUINO_IDF_COMMIT "27ec26d2d3"
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"
5 changes: 3 additions & 2 deletions tools/sdk/esp32c3/dout_qspi/include/sdkconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
#define CONFIG_BT_BLUEDROID_ENABLED 1
#define CONFIG_BT_BTC_TASK_STACK_SIZE 3072
#define CONFIG_BT_BLUEDROID_PINNED_TO_CORE 0
#define CONFIG_BT_BTU_TASK_STACK_SIZE 4096
#define CONFIG_BT_BTU_TASK_STACK_SIZE 4352
#define CONFIG_BT_BLE_ENABLED 1
#define CONFIG_BT_GATTS_ENABLE 1
#define CONFIG_BT_BLE_BLUFI_ENABLE 1
Expand Down Expand Up @@ -439,6 +439,7 @@
#define CONFIG_LWIP_SO_REUSE 1
#define CONFIG_LWIP_SO_REUSE_RXTOALL 1
#define CONFIG_LWIP_SO_RCVBUF 1
#define CONFIG_LWIP_IP_DEFAULT_TTL 64
#define CONFIG_LWIP_IP4_FRAG 1
#define CONFIG_LWIP_IP6_FRAG 1
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
Expand Down Expand Up @@ -846,5 +847,5 @@
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
#define CONFIG_ARDUINO_IDF_COMMIT "bb8dd9d35b"
#define CONFIG_ARDUINO_IDF_COMMIT "27ec26d2d3"
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"
3 changes: 3 additions & 0 deletions tools/sdk/esp32c3/include/bt/esp_ble_mesh/mesh_core/net.h
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,9 @@ struct bt_mesh_net_rx {
ctl:1, /* Network Control */
net_if:2, /* Network interface */
local_match:1, /* Matched a local element */
#if CONFIG_BLE_MESH_NOT_RELAY_REPLAY_MSG
replay_msg:1, /* Replayed messages */
#endif
friend_match:1; /* Matched an LPN we're friends for */
uint16_t msg_cache_idx; /* Index of entry in message cache */
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down Expand Up @@ -419,7 +419,10 @@ typedef enum {
typedef enum {
BLE_SCAN_DUPLICATE_DISABLE = 0x0, /*!< the Link Layer should generate advertising reports to the host for each packet received */
BLE_SCAN_DUPLICATE_ENABLE = 0x1, /*!< the Link Layer should filter out duplicate advertising reports to the Host */
BLE_SCAN_DUPLICATE_MAX = 0x2, /*!< 0x02 – 0xFF, Reserved for future use */
#if (BLE_50_FEATURE_SUPPORT == TRUE)
BLE_SCAN_DUPLICATE_ENABLE_RESET, /*!< Duplicate filtering enabled, reset for each scan period, only supported in BLE 5.0. */
#endif
BLE_SCAN_DUPLICATE_MAX /*!< Reserved for future use. */
} esp_ble_scan_duplicate_t;
#if (BLE_42_FEATURE_SUPPORT == TRUE)
/// Ble scan parameters
Expand Down Expand Up @@ -1411,6 +1414,15 @@ typedef void (* esp_gap_ble_cb_t)(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_p
*/
esp_err_t esp_ble_gap_register_callback(esp_gap_ble_cb_t callback);

/**
* @brief This function is called to get the current gap callback
*
* @return
* - esp_gap_ble_cb_t : callback function
*
*/
esp_gap_ble_cb_t esp_ble_gap_get_callback(void);

#if (BLE_42_FEATURE_SUPPORT == TRUE)
/**
* @brief This function is called to override the BTA default ADV parameters.
Expand Down Expand Up @@ -2210,8 +2222,9 @@ esp_err_t esp_ble_gap_set_ext_scan_params(const esp_ble_ext_scan_params_t *param
/**
* @brief This function is used to enable scanning.
*
* @param[in] duration : Scan duration
* @param[in] period : Time interval from when the Controller started its last Scan Duration until it begins the subsequent Scan Duration.
* @param[in] duration Scan duration time, where Time = N * 10 ms. Range: 0x0001 to 0xFFFF.
* @param[in] period Time interval from when the Controller started its last Scan Duration until it begins the subsequent Scan Duration.
* Time = N * 1.28 sec. Range: 0x0001 to 0xFFFF.
*
* @return - ESP_OK : success
* - other : failed
Expand Down
Loading

0 comments on commit a1461aa

Please sign in to comment.