Merge branch 'espressif:release/v5.2' into release/v5.2

tasmota · Mar 26, 2024 · f45c55c · f45c55c
2 parents 23df3fb + 8c5ccec
commit f45c55c
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 16 deletions.
diff --git a/components/bt/esp_ble_mesh/README.md b/components/bt/esp_ble_mesh/README.md
@@ -16,6 +16,6 @@ The ESP-BLE-MESH networking enables many-to-many (m:m) device communications and
 - [API Reference](https://docs.espressif.com/projects/esp-idf/en/latest/api-reference/bluetooth/esp-ble-mesh.html)
 
 
-### [ESP-BLE-MESH Examples](https://github.com/espressif/esp-idf/tree/master/examples/bluetooth/esp_ble_mesh)
+### [ESP-BLE-MESH Examples](../../../examples/bluetooth/esp_ble_mesh)
 
 - Refer to **ESP-BLE-MESH Examples** of [Getting Started](https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/esp-ble-mesh/ble-mesh-index.html#getting-started-with-esp-ble-mesh) for the tutorials of ESP BLE Mesh examples.
diff --git a/components/bt/esp_ble_mesh/core/net.c b/components/bt/esp_ble_mesh/core/net.c
@@ -1751,9 +1751,7 @@ static bool ignore_net_msg(uint16_t src, uint16_t dst)
     }
 
     if (IS_ENABLED(CONFIG_BLE_MESH_PROVISIONER) &&
-        bt_mesh_is_provisioner_en() &&
-        BLE_MESH_ADDR_IS_UNICAST(dst) &&
-        bt_mesh_elem_find(dst)) {
+        bt_mesh_is_provisioner_en()) {
         /* If the destination address of the message is the element
          * address of Provisioner, but Provisioner fails to find the
          * node in its provisioning database, then this message will
@@ -1810,7 +1808,7 @@ void bt_mesh_net_recv(struct net_buf_simple *data, int8_t rssi,
                       bt_mesh_elem_find(rx.ctx.recv_dst));
 
     if (IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_SERVER) &&
-        bt_mesh_private_gatt_proxy_state_get() == BLE_MESH_PRIVATE_GATT_PROXY_DISABLED &&
+        bt_mesh_private_gatt_proxy_state_get() != BLE_MESH_PRIVATE_GATT_PROXY_ENABLED &&
         net_if == BLE_MESH_NET_IF_PROXY) {
         bt_mesh_proxy_server_addr_add(data, rx.ctx.addr);
 

diff --git a/components/bt/esp_ble_mesh/core/transport.enh.c b/components/bt/esp_ble_mesh/core/transport.enh.c
@@ -368,7 +368,6 @@ static void seg_tx_reset(struct seg_tx *tx)
     tx->cb_data = NULL;
     tx->seq_auth = 0U;
     tx->sub = NULL;
-    tx->seg_n = 0;
     tx->last_seg_n = 0;
     tx->lsn_updated = 0;
     tx->dst = BLE_MESH_ADDR_UNASSIGNED;
@@ -385,6 +384,7 @@ static void seg_tx_reset(struct seg_tx *tx)
     }
 
     tx->nack_count = 0U;
+    tx->seg_n = 0;
 
     bt_mesh_seg_tx_unlock();
 

diff --git a/components/esp_coex/lib b/components/esp_coex/lib
diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1474,7 +1474,7 @@ ebuf_list_remove = 0x40001adc;
 GetAccess = 0x40001aec;
 hal_mac_is_low_rate_enabled = 0x40001af0;
 hal_mac_tx_get_blockack = 0x40001af4;
-hal_mac_tx_set_ppdu = 0x40001af8;
+/*hal_mac_tx_set_ppdu = 0x40001af8;*/
 ic_get_trc = 0x40001afc;
 /* ic_mac_deinit = 0x40001b00; */
 ic_mac_init = 0x40001b04;
@@ -1561,7 +1561,7 @@ ppTask = 0x40001c44;
 ppTxPkt = 0x40001c48;
 ppTxProtoProc = 0x40001c4c;
 ppTxqUpdateBitmap = 0x40001c50;
-pp_coex_tx_request = 0x40001c54;
+/*pp_coex_tx_request = 0x40001c54;*/
 pp_hdrsize = 0x40001c58;
 pp_post = 0x40001c5c;
 pp_process_hmac_waiting_txq = 0x40001c60;

diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
@@ -6,7 +6,7 @@
 esf_buf_alloc = 0x400015bc;
 esf_buf_alloc_dynamic = 0x400015c0;
 esf_buf_recycle = 0x400015c4;
-hal_mac_tx_set_ppdu = 0x400015d4;
+/*hal_mac_tx_set_ppdu = 0x400015d4;*/
 ic_mac_deinit = 0x400015dc;
 lmacDiscardMSDU = 0x400015f4;
 /*lmacSetTxFrame = 0x40001628;*/

diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1591,7 +1591,7 @@ ppTask = 0x40001720;
 ppTxPkt = 0x40001724;
 ppTxProtoProc = 0x40001728;
 ppTxqUpdateBitmap = 0x4000172c;
-pp_coex_tx_request = 0x40001730;
+/*pp_coex_tx_request = 0x40001730;*/
 pp_hdrsize = 0x40001734;
 pp_post = 0x40001738;
 pp_process_hmac_waiting_txq = 0x4000173c;

diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
@@ -111,7 +111,7 @@ ppSubFromAMPDU = 0x40000d38;
 //ppTxPkt = 0x40000d40;
 ppTxProtoProc = 0x40000d44;
 ppTxqUpdateBitmap = 0x40000d48;
-pp_coex_tx_request = 0x40000d4c;
+/*pp_coex_tx_request = 0x40000d4c;*/
 pp_hdrsize = 0x40000d50;
 pp_post = 0x40000d54;
 pp_process_hmac_waiting_txq = 0x40000d58;

diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -1894,7 +1894,7 @@ ppSubFromAMPDU = 0x40005694;
 ppTxPkt = 0x400056ac;
 ppTxProtoProc = 0x400056b8;
 ppTxqUpdateBitmap = 0x400056c4;
-pp_coex_tx_request = 0x400056d0;
+/*pp_coex_tx_request = 0x400056d0;*/
 pp_hdrsize = 0x400056dc;
 pp_post = 0x400056e8;
 pp_process_hmac_waiting_txq = 0x400056f4;

diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
diff --git a/components/freertos/esp_additions/freertos_tasks_c_additions.h b/components/freertos/esp_additions/freertos_tasks_c_additions.h
@@ -936,7 +936,7 @@ static List_t * pxGetTaskListByIndex( UBaseType_t uxListIndex )
     {
         pxTaskList = &pxReadyTasksLists[ configMAX_PRIORITIES - 1 - uxListIndex ];
     }
-    else if( uxListIndex < configMAX_PRIORITIES + xNonReadyTaskListsCnt + 1 )
+    else if( uxListIndex < configMAX_PRIORITIES + xNonReadyTaskListsCnt )
     {
         pxTaskList = non_ready_task_lists[ uxListIndex - configMAX_PRIORITIES ];
     }

diff --git a/...luetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/tutorial/EspBleMesh.md b/...luetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/tutorial/EspBleMesh.md
@@ -12,7 +12,7 @@ A video of this example can be seen from [here](https://dl.espressif.com/BLE/pub
 
 > Note:
 > 
-> 1. Please flash the [`fast_prov_server`](https://github.com/espressif/esp-idf/tree/master/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server) to the development boards first;
+> 1. Please flash the [`fast_prov_server`](../../) to the development boards first;
 > 2. To have a better understanding of the performance of the BLE Mesh network, we recommend that at least 3 devices should be added in your network.
 > 3. We recommend that you solder LED indicators if your development board does not come with lights. 
 > 4. Please check the type of board and LED pin definition enabled in `Example BLE Mesh Config` by running `idf.py menuconfig`

diff --git a/examples/mesh/manual_networking/partitions.csv b/examples/mesh/manual_networking/partitions.csv
@@ -0,0 +1,5 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+# Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap
+nvs,      data, nvs,     0x9000,  0x6000,
+phy_init, data, phy,     0xf000,  0x1000,
+factory,  app,  factory, 0x10000, 1200K,
diff --git a/examples/mesh/manual_networking/sdkconfig.defaults b/examples/mesh/manual_networking/sdkconfig.defaults
@@ -0,0 +1,5 @@
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_OFFSET=0x8000
+CONFIG_PARTITION_TABLE_MD5=y
+ −		esp32/libcoexist.a
+ −		esp32c2/libcoexist.a
+ −		esp32c3/libcoexist.a
+ −		esp32c6/libcoexist.a
+ −		esp32h2/libcoexist.a
+ −		esp32s2/libcoexist.a
+ −		esp32s3/libcoexist.a
+ −		esp32/libcore.a
+ −		esp32/libespnow.a
+ −		esp32/libmesh.a
+ −		esp32/libnet80211.a
+ −		esp32/libpp.a
+ −		esp32/libsmartconfig.a
+ −		esp32/libwapi.a
+ −		esp32c2/libcore.a
+ −		esp32c2/libespnow.a
+ −		esp32c2/libnet80211.a
+ −		esp32c2/libpp.a
+ −		esp32c2/libsmartconfig.a
+ −		esp32c3/libcore.a
+ −		esp32c3/libespnow.a
+ −		esp32c3/libmesh.a
+ −		esp32c3/libnet80211.a
+ −		esp32c3/libpp.a
+ −		esp32c3/libsmartconfig.a
+ −		esp32c3/libwapi.a
+ −		esp32c6/libcore.a
+ −		esp32c6/libespnow.a
+ −		esp32c6/libmesh.a
+ −		esp32c6/libnet80211.a
+ −		esp32c6/libpp.a
+ −		esp32c6/libsmartconfig.a
+ −		esp32c6/libwapi.a
+ −		esp32s2/libcore.a
+ −		esp32s2/libespnow.a
+ −		esp32s2/libmesh.a
+ −		esp32s2/libnet80211.a
+ −		esp32s2/libpp.a
+ −		esp32s2/libsmartconfig.a
+ −		esp32s2/libwapi.a
+ −		esp32s3/libcore.a
+ −		esp32s3/libespnow.a
+ −		esp32s3/libmesh.a
+ −		esp32s3/libnet80211.a
+ −		esp32s3/libpp.a
+ −		esp32s3/libsmartconfig.a
+ −		esp32s3/libwapi.a