Skip to content

Commit dcc31f8

Browse files
author
Jiang Jiang Jian
committed
Merge branch 'doc/update_espnow_doc' into 'master'
docs(wifi/espnow): update the documentation for EPS-NOW ERSU and phy rate Closes IDFGH-11035, DOC-3366, WIFI-6682, and DOC-8550 See merge request espressif/esp-idf!31285
2 parents a155b98 + a68cf14 commit dcc31f8

File tree

7 files changed

+604
-457
lines changed

7 files changed

+604
-457
lines changed

components/esp_wifi/include/esp_mesh.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,8 @@ esp_err_t esp_mesh_stop(void);
637637
* @param[in] to the address of the final destination of the packet
638638
* - If the packet is to the root, set this parameter to NULL.
639639
* - If the packet is to an external IP network, set this parameter to the IPv4:PORT combination.
640-
* This packet will be delivered to the root firstly, then the root will forward this packet to the final IP server address.
640+
* This packet will be delivered to the root firstly, then users need to call esp_mesh_recv_toDS() on the root node to forward this
641+
* packet to the final IP server address.
641642
* @param[in] data pointer to a sending mesh packet
642643
* - Field size should not exceed MESH_MPS. Note that the size of one mesh packet should not exceed MESH_MTU.
643644
* - Field proto should be set to data protocol in use (default is MESH_PROTO_BIN for binary).

components/esp_wifi/include/esp_now.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,10 @@ typedef struct esp_now_recv_info {
9898
*/
9999
typedef struct esp_now_rate_config {
100100
wifi_phy_mode_t phymode; /**< ESPNOW phymode of specified interface */
101-
wifi_phy_rate_t rate; /**< ESPNOW rate of specified interface*/
102-
bool ersu; /**< ESPNOW using ersu send frame*/
103-
bool dcm; /**< ESPNOW using dcm rate to send frame*/
101+
wifi_phy_rate_t rate; /**< ESPNOW rate of specified interface */
102+
bool ersu; /**< ESPNOW using ERSU to send frame, ERSU is a transmission mode related to 802.11 ax.
103+
ERSU is always used in long distance transmission, and its frame has lower rate compared with SU mode */
104+
bool dcm; /**< ESPNOW using dcm rate to send frame */
104105
} esp_now_rate_config_t;
105106

106107
/**

components/esp_wifi/include/esp_wifi_types_generic.h

Lines changed: 593 additions & 452 deletions
Large diffs are not rendered by default.

docs/doxygen/Doxyfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,12 @@ INPUT = \
212212
$(PROJECT_PATH)/components/esp_wifi/include/esp_mesh.h \
213213
$(PROJECT_PATH)/components/esp_wifi/include/esp_now.h \
214214
$(PROJECT_PATH)/components/esp_wifi/include/esp_smartconfig.h \
215+
$(PROJECT_PATH)/components/esp_wifi/include/local/esp_wifi_types_native.h \
215216
$(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_ap_get_sta_list.h \
216217
$(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_crypto_types.h \
217218
$(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_default.h \
218219
$(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_netif.h \
220+
$(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_types_generic.h \
219221
$(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_types.h \
220222
$(PROJECT_PATH)/components/esp_wifi/include/esp_wifi.h \
221223
$(PROJECT_PATH)/components/wpa_supplicant/esp_supplicant/include/esp_mbo.h \

docs/en/api-reference/network/esp_wifi.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ API Reference
2828

2929
.. include-build-file:: inc/esp_wifi.inc
3030
.. include-build-file:: inc/esp_wifi_types.inc
31+
.. include-build-file:: inc/esp_wifi_types_generic.inc
3132
.. include-build-file:: inc/esp_eap_client.inc
3233
.. include-build-file:: inc/esp_wps.inc
3334
.. include-build-file:: inc/esp_rrm.inc

docs/zh_CN/api-reference/network/esp_wifi.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ API 参考
2828

2929
.. include-build-file:: inc/esp_wifi.inc
3030
.. include-build-file:: inc/esp_wifi_types.inc
31+
.. include-build-file:: inc/esp_wifi_types_generic.inc
3132
.. include-build-file:: inc/esp_eap_client.inc
3233
.. include-build-file:: inc/esp_wps.inc
3334
.. include-build-file:: inc/esp_rrm.inc

0 commit comments

Comments
 (0)