docs: fix broken references to misc API functions and types.

components/esp_hw_support/include/esp_sleep.h

@@ -87,7 +87,7 @@ typedef esp_sleep_source_t esp_sleep_wakeup_cause_t;
  * defined as parameter of the function.
  *
  * @note This function does not modify wake up configuration in RTC.
- *       It will be performed in esp_sleep_start function.
+ *       It will be performed in esp_deep_sleep_start/esp_light_sleep_start function.
  *
  * See docs/sleep-modes.rst for details.
  *
@@ -177,7 +177,8 @@ bool esp_sleep_is_valid_wakeup_gpio(gpio_num_t gpio_num);
  * into the state given by level argument, the chip will be woken up.
  *
  * @note This function does not modify pin configuration. The pin is
- *       configured in esp_sleep_start, immediately before entering sleep mode.
+ *       configured in esp_deep_sleep_start/esp_light_sleep_start,
+ *       immediately before entering sleep mode.
  *
  * @note In revisions 0 and 1 of the ESP32, ext0 wakeup source
  *       can not be used together with touch or ULP wakeup sources.
@@ -204,8 +205,8 @@ esp_err_t esp_sleep_enable_ext0_wakeup(gpio_num_t gpio_num, int level);
  * the chip will be woken up.
  *
  * @note This function does not modify pin configuration. The pins are
- *       configured in esp_sleep_start, immediately before
+ *       configured in esp_deep_sleep_start/esp_light_sleep_start,
- *       entering sleep mode.
+ *       immediately before entering sleep mode.
  *
  * @note Internal pullups and pulldowns don't work when RTC peripherals are
  *       shut down. In this case, external resistors need to be added.
@@ -234,12 +235,12 @@ esp_err_t esp_sleep_enable_ext1_wakeup(uint64_t mask, esp_sleep_ext1_wakeup_mode
  * This function enables an IO pin to wake up the chip from deep sleep.
  *
  * @note This function does not modify pin configuration. The pins are
- *       configured in esp_sleep_start, immediately before
+ *       configured in esp_deep_sleep_start/esp_light_sleep_start,
- *       entering sleep mode.
+ *       immediately before entering sleep mode.
  *
  * @note You don't need to care to pull-up or pull-down before using this
- *       function, because this will be done in esp_sleep_start based on
+ *       function, because this will be done in esp_deep_sleep_start/esp_light_sleep_start
- *       param mask you give. BTW, when you use low level to wake up the
+ *       based on param mask you give. BTW, when you use low level to wake up the
  *       chip, we strongly recommand you to add external registors (pull-up).
  *
  * @param gpio_pin_mask  Bit mask of GPIO numbers which will cause wakeup. Only GPIOs

components/esp_timer/include/esp_timer.h

@@ -273,7 +273,7 @@ esp_err_t esp_timer_get_expiry_time(esp_timer_handle_t timer, uint64_t *expiry);
  */
 esp_err_t esp_timer_dump(FILE* stream);
 
-#ifdef CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD
+#if CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD || defined __DOXYGEN__
 /**
  * @brief Requests a context switch from a timer callback function.
  *
@@ -281,7 +281,7 @@ esp_err_t esp_timer_dump(FILE* stream);
  * The context switch will be called after all ISR dispatch timers have been processed.
  */
 void esp_timer_isr_dispatch_need_yield(void);
-#endif // CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD
+#endif // CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD || defined __DOXYGEN__
 
 /**
  * @brief Returns status of a timer, active or not

components/soc/esp32s2/include/soc/soc_caps.h

@@ -318,7 +318,6 @@
 #define SOC_SHA_SUPPORT_SHA224          (1)
 #define SOC_SHA_SUPPORT_SHA256          (1)
 #define SOC_SHA_SUPPORT_SHA384          (1)
-#define SOC_SHA_SUPPORT_SHA256          (1)
 #define SOC_SHA_SUPPORT_SHA512          (1)
 #define SOC_SHA_SUPPORT_SHA512_224      (1)
 #define SOC_SHA_SUPPORT_SHA512_256      (1)

components/spi_flash/README_legacy.rst

@@ -29,7 +29,7 @@ SPI Flash Size
 
 The SPI flash size is configured by writing a field in the software bootloader image header, flashed at offset 0x1000.
 
-By default, the SPI flash size is detected by esptool.py when this bootloader is written to flash, and the header is updated with the correct size. Alternatively, it is possible to generate a fixed flash size by setting :envvar:`CONFIG_ESPTOOLPY_FLASHSIZE` in project configuration.
+By default, the SPI flash size is detected by esptool.py when this bootloader is written to flash, and the header is updated with the correct size. Alternatively, it is possible to generate a fixed flash size by setting :ref:`CONFIG_ESPTOOLPY_FLASHSIZE` in project configuration.
 
 If it is necessary to override the configured flash size at runtime, it is possible to set the ``chip_size`` member of the ``g_rom_flashchip`` structure. This size is used by ``spi_flash_*`` functions (in both software & ROM) to check the bounds.
 

components/vfs/include/esp_vfs.h

@@ -234,7 +234,7 @@ typedef struct
         int (*tcsendbreak)(int fd, int duration);                                                   /*!< tcsendbreak without context pointer */
     };
 #endif // CONFIG_VFS_SUPPORT_TERMIOS
-#ifdef CONFIG_VFS_SUPPORT_SELECT
+#if CONFIG_VFS_SUPPORT_SELECT || defined __DOXYGEN__
     /** start_select is called for setting up synchronous I/O multiplexing of the desired file descriptors in the given VFS */
     esp_err_t (*start_select)(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, esp_vfs_select_sem_t sem, void **end_select_args);
     /** socket select function for socket FDs with the functionality of POSIX select(); this should be set only for the socket VFS */
@@ -247,7 +247,7 @@ typedef struct
     void* (*get_socket_select_semaphore)(void);
     /** get_socket_select_semaphore returns semaphore allocated in the socket driver; set only for the socket driver */
     esp_err_t (*end_select)(void *end_select_args);
-#endif // CONFIG_VFS_SUPPORT_SELECT
+#endif // CONFIG_VFS_SUPPORT_SELECT || defined __DOXYGEN__
 } esp_vfs_t;
 
 /**

docs/doxygen/Doxyfile

@@ -21,114 +21,178 @@ PROJECT_NAME = "IDF Programming Guide"
 ## and used to include in API reference documentation
 
 INPUT = \
-    $(PROJECT_PATH)/components/tinyusb/additions/include/tinyusb.h \
+    $(PROJECT_PATH)/components/app_trace/include/esp_app_trace.h \
-    $(PROJECT_PATH)/components/tinyusb/additions/include/tinyusb_types.h \
+    $(PROJECT_PATH)/components/app_trace/include/esp_sysview_trace.h \
-    $(PROJECT_PATH)/components/tinyusb/additions/include/tusb_cdc_acm.h \
+    $(PROJECT_PATH)/components/app_update/include/esp_ota_ops.h \
-    $(PROJECT_PATH)/components/tinyusb/additions/include/tusb_config.h \
+    $(PROJECT_PATH)/components/bootloader_support/include/bootloader_random.h \
-    $(PROJECT_PATH)/components/tinyusb/additions/include/tusb_console.h \
+    $(PROJECT_PATH)/components/bootloader_support/include/esp_app_format.h \
-    $(PROJECT_PATH)/components/tinyusb/additions/include/tusb_tasks.h \
+    $(PROJECT_PATH)/components/bootloader_support/include/esp_flash_encrypt.h \
-    $(PROJECT_PATH)/components/tinyusb/additions/include/vfs_tinyusb.h \
-    $(PROJECT_PATH)/components/esp_wifi/include/esp_wifi.h \
-    $(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_types.h \
-    $(PROJECT_PATH)/components/esp_wifi/include/esp_smartconfig.h \
-    $(PROJECT_PATH)/components/esp_wifi/include/esp_now.h \
-    $(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_default.h \
-    $(PROJECT_PATH)/components/esp_wifi/include/esp_mesh.h \
-    $(PROJECT_PATH)/components/wpa_supplicant/esp_supplicant/include/esp_dpp.h \
-    $(PROJECT_PATH)/components/esp_event/include/esp_event.h \
-    $(PROJECT_PATH)/components/esp_event/include/esp_event_base.h \
-    $(PROJECT_PATH)/components/bt/include/esp32/include/esp_bt.h \
     $(PROJECT_PATH)/components/bt/common/api/include/api/esp_blufi_api.h \
-    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_bt_defs.h \
-    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_bt_main.h \
-    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_bt_device.h \
-    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_gap_ble_api.h \
-    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_gatt_defs.h \
-    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_gatts_api.h \
-    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_gattc_api.h \
-    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_gap_bt_api.h \
-    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_a2dp_api.h \
-    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_avrc_api.h \
-    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_spp_api.h \
-    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_hf_defs.h \
-    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_hf_client_api.h \
-    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_hf_ag_api.h \
-    $(PROJECT_PATH)/components/bt/host/nimble/esp-hci/include/esp_nimble_hci.h \
     $(PROJECT_PATH)/components/bt/esp_ble_mesh/api/core/include/esp_ble_mesh_common_api.h \
     $(PROJECT_PATH)/components/bt/esp_ble_mesh/api/core/include/esp_ble_mesh_local_data_operation_api.h \
     $(PROJECT_PATH)/components/bt/esp_ble_mesh/api/core/include/esp_ble_mesh_low_power_api.h \
     $(PROJECT_PATH)/components/bt/esp_ble_mesh/api/core/include/esp_ble_mesh_networking_api.h \
     $(PROJECT_PATH)/components/bt/esp_ble_mesh/api/core/include/esp_ble_mesh_provisioning_api.h \
     $(PROJECT_PATH)/components/bt/esp_ble_mesh/api/core/include/esp_ble_mesh_proxy_api.h \
+    $(PROJECT_PATH)/components/bt/esp_ble_mesh/api/esp_ble_mesh_defs.h \
     $(PROJECT_PATH)/components/bt/esp_ble_mesh/api/models/include/esp_ble_mesh_config_model_api.h \
     $(PROJECT_PATH)/components/bt/esp_ble_mesh/api/models/include/esp_ble_mesh_generic_model_api.h \
     $(PROJECT_PATH)/components/bt/esp_ble_mesh/api/models/include/esp_ble_mesh_health_model_api.h \
     $(PROJECT_PATH)/components/bt/esp_ble_mesh/api/models/include/esp_ble_mesh_lighting_model_api.h \
     $(PROJECT_PATH)/components/bt/esp_ble_mesh/api/models/include/esp_ble_mesh_sensor_model_api.h \
     $(PROJECT_PATH)/components/bt/esp_ble_mesh/api/models/include/esp_ble_mesh_time_scene_model_api.h \
-    $(PROJECT_PATH)/components/bt/esp_ble_mesh/api/esp_ble_mesh_defs.h \
+    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_a2dp_api.h \
-    $(PROJECT_PATH)/components/esp_eth/include/esp_eth.h \
+    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_avrc_api.h \
+    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_bt_defs.h \
+    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_bt_device.h \
+    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_bt_main.h \
+    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_gap_ble_api.h \
+    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_gap_bt_api.h \
+    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_gatt_defs.h \
+    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_gattc_api.h \
+    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_gatts_api.h \
+    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_hf_ag_api.h \
+    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_hf_client_api.h \
+    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_hf_defs.h \
+    $(PROJECT_PATH)/components/bt/host/bluedroid/api/include/api/esp_spp_api.h \
+    $(PROJECT_PATH)/components/bt/host/nimble/esp-hci/include/esp_nimble_hci.h \
+    $(PROJECT_PATH)/components/bt/include/esp32/include/esp_bt.h \
+    $(PROJECT_PATH)/components/console/esp_console.h \
+    $(PROJECT_PATH)/components/driver/include/driver/adc.h \
+    $(PROJECT_PATH)/components/driver/include/driver/dac_common.h \
+    $(PROJECT_PATH)/components/driver/include/driver/dedic_gpio.h \
+    $(PROJECT_PATH)/components/driver/include/driver/gpio.h \
+    $(PROJECT_PATH)/components/driver/include/driver/gptimer.h \
+    $(PROJECT_PATH)/components/driver/include/driver/i2c.h \
+    $(PROJECT_PATH)/components/driver/include/driver/i2s.h \
+    $(PROJECT_PATH)/components/driver/include/driver/ledc.h \
+    $(PROJECT_PATH)/components/driver/include/driver/rmt.h \
+    $(PROJECT_PATH)/components/driver/include/driver/rtc_io.h \
+    $(PROJECT_PATH)/components/driver/include/driver/sdio_slave.h \
+    $(PROJECT_PATH)/components/driver/include/driver/sdmmc_host.h \
+    $(PROJECT_PATH)/components/driver/include/driver/sdmmc_types.h \
+    $(PROJECT_PATH)/components/driver/include/driver/sdspi_host.h \
+    $(PROJECT_PATH)/components/driver/include/driver/sigmadelta.h \
+    $(PROJECT_PATH)/components/driver/include/driver/spi_common.h \
+    $(PROJECT_PATH)/components/driver/include/driver/spi_master.h \
+    $(PROJECT_PATH)/components/driver/include/driver/spi_slave_hd.h \
+    $(PROJECT_PATH)/components/driver/include/driver/spi_slave.h \
+    $(PROJECT_PATH)/components/driver/include/driver/touch_sensor_common.h \
+    $(PROJECT_PATH)/components/driver/include/driver/twai.h \
+    $(PROJECT_PATH)/components/driver/include/driver/uart.h \
+    $(PROJECT_PATH)/components/efuse/$(IDF_TARGET)/include/esp_efuse.h \
+    $(PROJECT_PATH)/components/efuse/include/esp_efuse.h \
+    $(PROJECT_PATH)/components/esp_adc_cal/include/esp_adc_cal.h \
+    $(PROJECT_PATH)/components/esp_common/include/esp_check.h \
+    $(PROJECT_PATH)/components/esp_common/include/esp_err.h \
+    $(PROJECT_PATH)/components/esp_common/include/esp_idf_version.h \
     $(PROJECT_PATH)/components/esp_eth/include/esp_eth_com.h \
     $(PROJECT_PATH)/components/esp_eth/include/esp_eth_mac.h \
-    $(PROJECT_PATH)/components/esp_eth/include/esp_eth_phy.h \
     $(PROJECT_PATH)/components/esp_eth/include/esp_eth_netif_glue.h \
+    $(PROJECT_PATH)/components/esp_eth/include/esp_eth_phy.h \
+    $(PROJECT_PATH)/components/esp_eth/include/esp_eth.h \
+    $(PROJECT_PATH)/components/esp_event/include/esp_event_base.h \
+    $(PROJECT_PATH)/components/esp_event/include/esp_event.h \
+    $(PROJECT_PATH)/components/esp_http_client/include/esp_http_client.h \
+    $(PROJECT_PATH)/components/esp_http_server/include/esp_http_server.h \
+    $(PROJECT_PATH)/components/esp_https_ota/include/esp_https_ota.h \
+    $(PROJECT_PATH)/components/esp_https_server/include/esp_https_server.h \
+    $(PROJECT_PATH)/components/esp_hw_support/include/esp_async_memcpy.h \
+    $(PROJECT_PATH)/components/esp_hw_support/include/esp_chip_info.h \
+    $(PROJECT_PATH)/components/esp_hw_support/include/esp_cpu.h \
+    $(PROJECT_PATH)/components/esp_hw_support/include/esp_crc.h \
+    $(PROJECT_PATH)/components/esp_hw_support/include/esp_intr_alloc.h \
+    $(PROJECT_PATH)/components/esp_hw_support/include/esp_mac.h \
+    $(PROJECT_PATH)/components/esp_hw_support/include/esp_random.h \
+    $(PROJECT_PATH)/components/esp_hw_support/include/esp_sleep.h \
     $(PROJECT_PATH)/components/esp_lcd/include/esp_lcd_panel_io.h \
     $(PROJECT_PATH)/components/esp_lcd/include/esp_lcd_panel_ops.h \
     $(PROJECT_PATH)/components/esp_lcd/include/esp_lcd_panel_rgb.h \
     $(PROJECT_PATH)/components/esp_lcd/include/esp_lcd_panel_vendor.h \
     $(PROJECT_PATH)/components/esp_lcd/include/esp_lcd_types.h \
-    $(PROJECT_PATH)/components/hal/include/hal/lcd_types.h \
-    $(PROJECT_PATH)/components/hal/include/hal/adc_types.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/adc_channel.h \
-    $(PROJECT_PATH)/components/driver/include/driver/adc.h \
-    $(PROJECT_PATH)/components/esp_adc_cal/include/esp_adc_cal.h \
-    $(PROJECT_PATH)/components/hal/include/hal/dac_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/dac_common.h \
-    $(PROJECT_PATH)/components/hal/include/hal/gpio_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/gpio.h \
-    $(PROJECT_PATH)/components/driver/include/driver/dedic_gpio.h \
-    $(PROJECT_PATH)/components/hal/include/hal/rtc_io_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/rtc_io.h \
-    $(PROJECT_PATH)/components/hal/include/hal/i2c_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/i2c.h \
-    $(PROJECT_PATH)/components/hal/include/hal/i2s_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/i2s.h \
-    $(PROJECT_PATH)/components/hal/include/hal/ledc_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/ledc.h \
-    $(PROJECT_PATH)/components/hal/include/hal/rmt_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/rmt.h \
-    $(PROJECT_PATH)/components/hal/include/hal/sigmadelta_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/sigmadelta.h \
-    $(PROJECT_PATH)/components/hal/include/hal/spi_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/spi_common.h \
-    $(PROJECT_PATH)/components/driver/include/driver/spi_master.h \
-    $(PROJECT_PATH)/components/driver/include/driver/spi_slave.h \
-    $(PROJECT_PATH)/components/driver/include/driver/spi_slave_hd.h \
-    $(PROJECT_PATH)/components/hal/include/hal/timer_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/gptimer.h \
-    $(PROJECT_PATH)/components/hal/include/hal/touch_sensor_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/touch_sensor_common.h \
-    $(PROJECT_PATH)/components/hal/include/hal/twai_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/twai.h \
-    $(PROJECT_PATH)/components/hal/include/hal/uart_types.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/uart_channel.h \
-    $(PROJECT_PATH)/components/driver/include/driver/uart.h \
-    $(PROJECT_PATH)/components/esp_netif/include/esp_netif.h \
-    $(PROJECT_PATH)/components/esp_netif/include/esp_netif_net_stack.h \
-    $(PROJECT_PATH)/components/esp-tls/esp_tls.h \
-    $(PROJECT_PATH)/components/esp-tls/esp_tls_errors.h \
-    $(PROJECT_PATH)/components/mqtt/esp-mqtt/include/mqtt_client.h \
-    $(PROJECT_PATH)/components/lwip/include/apps/ping/ping_sock.h \
-    $(PROJECT_PATH)/components/lwip/include/apps/esp_sntp.h \
-    $(PROJECT_PATH)/components/mdns/include/mdns.h \
-    $(PROJECT_PATH)/components/esp_http_client/include/esp_http_client.h \
-    $(PROJECT_PATH)/components/esp_http_server/include/esp_http_server.h \
-    $(PROJECT_PATH)/components/esp_https_server/include/esp_https_server.h \
     $(PROJECT_PATH)/components/esp_local_ctrl/include/esp_local_ctrl.h \
-    $(PROJECT_PATH)/components/esp_serial_slave_link/include/esp_serial_slave_link/essl.h \
+    $(PROJECT_PATH)/components/esp_netif/include/esp_netif_ip_addr.h \
+    $(PROJECT_PATH)/components/esp_netif/include/esp_netif_net_stack.h \
+    $(PROJECT_PATH)/components/esp_netif/include/esp_netif_types.h \
+    $(PROJECT_PATH)/components/esp_netif/include/esp_netif.h \
+    $(PROJECT_PATH)/components/esp_netif/include/esp_vfs_l2tap.h \
+    $(PROJECT_PATH)/components/esp_phy/include/esp_phy_init.h \
+    $(PROJECT_PATH)/components/esp_pm/include/$(IDF_TARGET)/pm.h \
+    $(PROJECT_PATH)/components/esp_pm/include/esp_pm.h \
+    $(PROJECT_PATH)/components/esp_ringbuf/include/freertos/ringbuf.h \
+    $(PROJECT_PATH)/components/esp_rom/include/esp_rom_sys.h \
     $(PROJECT_PATH)/components/esp_serial_slave_link/include/esp_serial_slave_link/essl_sdio.h \
     $(PROJECT_PATH)/components/esp_serial_slave_link/include/esp_serial_slave_link/essl_spi.h \
+    $(PROJECT_PATH)/components/esp_serial_slave_link/include/esp_serial_slave_link/essl.h \
+    $(PROJECT_PATH)/components/esp_system/include/esp_expression_with_stack.h \
+    $(PROJECT_PATH)/components/esp_system/include/esp_freertos_hooks.h \
+    $(PROJECT_PATH)/components/esp_system/include/esp_int_wdt.h \
+    $(PROJECT_PATH)/components/esp_system/include/esp_system.h \
+    $(PROJECT_PATH)/components/esp_system/include/esp_task_wdt.h \
+    $(PROJECT_PATH)/components/esp_timer/include/esp_timer.h \
+    $(PROJECT_PATH)/components/esp_wifi/include/esp_mesh.h \
+    $(PROJECT_PATH)/components/esp_wifi/include/esp_now.h \
+    $(PROJECT_PATH)/components/esp_wifi/include/esp_smartconfig.h \
+    $(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_default.h \
+    $(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_types.h \
+    $(PROJECT_PATH)/components/esp_wifi/include/esp_wifi.h \
+    $(PROJECT_PATH)/components/esp-tls/esp_tls_errors.h \
+    $(PROJECT_PATH)/components/esp-tls/esp_tls.h \
+    $(PROJECT_PATH)/components/fatfs/diskio/diskio_impl.h \
+    $(PROJECT_PATH)/components/fatfs/diskio/diskio_rawflash.h \
+    $(PROJECT_PATH)/components/fatfs/diskio/diskio_sdmmc.h \
+    $(PROJECT_PATH)/components/fatfs/diskio/diskio_wl.h \
+    $(PROJECT_PATH)/components/fatfs/vfs/esp_vfs_fat.h \
+    $(PROJECT_PATH)/components/freemodbus/common/include/esp_modbus_common.h \
+    $(PROJECT_PATH)/components/freemodbus/common/include/esp_modbus_master.h \
+    $(PROJECT_PATH)/components/freemodbus/common/include/esp_modbus_slave.h \
+    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/event_groups.h \
+    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/message_buffer.h \
+    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/queue.h \
+    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/semphr.h \
+    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/stream_buffer.h \
+    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/task.h \
+    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/timers.h \
+    $(PROJECT_PATH)/components/hal/include/hal/adc_types.h \
+    $(PROJECT_PATH)/components/hal/include/hal/dac_types.h \
+    $(PROJECT_PATH)/components/hal/include/hal/esp_flash_err.h \
+    $(PROJECT_PATH)/components/hal/include/hal/gpio_types.h \
+    $(PROJECT_PATH)/components/hal/include/hal/i2c_types.h \
+    $(PROJECT_PATH)/components/hal/include/hal/i2s_types.h \
+    $(PROJECT_PATH)/components/hal/include/hal/lcd_types.h \
+    $(PROJECT_PATH)/components/hal/include/hal/ledc_types.h \
+    $(PROJECT_PATH)/components/hal/include/hal/rmt_types.h \
+    $(PROJECT_PATH)/components/hal/include/hal/rtc_io_types.h \
+    $(PROJECT_PATH)/components/hal/include/hal/sdio_slave_types.h \
+    $(PROJECT_PATH)/components/hal/include/hal/sigmadelta_types.h \
+    $(PROJECT_PATH)/components/hal/include/hal/spi_flash_types.h \
+    $(PROJECT_PATH)/components/hal/include/hal/spi_types.h \
+    $(PROJECT_PATH)/components/hal/include/hal/timer_types.h \
+    $(PROJECT_PATH)/components/hal/include/hal/touch_sensor_types.h \
+    $(PROJECT_PATH)/components/hal/include/hal/twai_types.h \
+    $(PROJECT_PATH)/components/hal/include/hal/uart_types.h \
+    $(PROJECT_PATH)/components/heap/include/esp_heap_caps_init.h \
+    $(PROJECT_PATH)/components/heap/include/esp_heap_caps.h \
+    $(PROJECT_PATH)/components/heap/include/esp_heap_trace.h \
+    $(PROJECT_PATH)/components/heap/include/multi_heap.h \
+    $(PROJECT_PATH)/components/ieee802154/include/esp_ieee802154_types.h \
+    $(PROJECT_PATH)/components/ieee802154/include/esp_ieee802154.h \
+    $(PROJECT_PATH)/components/log/include/esp_log.h \
+    $(PROJECT_PATH)/components/lwip/include/apps/esp_sntp.h \
+    $(PROJECT_PATH)/components/lwip/include/apps/ping/ping_sock.h \
     $(PROJECT_PATH)/components/mbedtls/esp_crt_bundle/include/esp_crt_bundle.h \
+    $(PROJECT_PATH)/components/mdns/include/mdns.h \
+    $(PROJECT_PATH)/components/mqtt/esp-mqtt/include/mqtt_client.h \
+    $(PROJECT_PATH)/components/nvs_flash/include/nvs_flash.h \
+    $(PROJECT_PATH)/components/nvs_flash/include/nvs.h \
+    $(PROJECT_PATH)/components/openthread/include/esp_openthread_border_router.h \
+    $(PROJECT_PATH)/components/openthread/include/esp_openthread_lock.h \
+    $(PROJECT_PATH)/components/openthread/include/esp_openthread_netif_glue.h \
+    $(PROJECT_PATH)/components/openthread/include/esp_openthread_types.h \
+    $(PROJECT_PATH)/components/openthread/include/esp_openthread.h \
+    $(PROJECT_PATH)/components/perfmon/include/xtensa_perfmon_access.h \
+    $(PROJECT_PATH)/components/perfmon/include/xtensa_perfmon_apis.h \
+    $(PROJECT_PATH)/components/perfmon/include/xtensa_perfmon_masks.h \
     $(PROJECT_PATH)/components/protocomm/include/common/protocomm.h \
     $(PROJECT_PATH)/components/protocomm/include/security/protocomm_security.h \
     $(PROJECT_PATH)/components/protocomm/include/security/protocomm_security0.h \
@@ -136,92 +200,38 @@ INPUT = \
     $(PROJECT_PATH)/components/protocomm/include/transports/protocomm_ble.h \
     $(PROJECT_PATH)/components/protocomm/include/transports/protocomm_console.h \
     $(PROJECT_PATH)/components/protocomm/include/transports/protocomm_httpd.h \
-    $(PROJECT_PATH)/components/wifi_provisioning/include/wifi_provisioning/manager.h \
+    $(PROJECT_PATH)/components/pthread/include/esp_pthread.h \
-    $(PROJECT_PATH)/components/wifi_provisioning/include/wifi_provisioning/scheme_ble.h \
+    $(PROJECT_PATH)/components/sdmmc/include/sdmmc_cmd.h \
-    $(PROJECT_PATH)/components/wifi_provisioning/include/wifi_provisioning/scheme_softap.h \
+    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/adc_channel.h \
-    $(PROJECT_PATH)/components/wifi_provisioning/include/wifi_provisioning/scheme_console.h \
+    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/soc_caps.h \
-    $(PROJECT_PATH)/components/wifi_provisioning/include/wifi_provisioning/wifi_config.h \
+    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/uart_channel.h \
-    $(PROJECT_PATH)/components/wifi_provisioning/include/wifi_provisioning/wifi_scan.h \
-    $(PROJECT_PATH)/components/hal/include/hal/spi_flash_types.h \
     $(PROJECT_PATH)/components/spi_flash/include/esp_flash_spi_init.h \
     $(PROJECT_PATH)/components/spi_flash/include/esp_flash.h \
     $(PROJECT_PATH)/components/spi_flash/include/esp_partition.h \
-    $(PROJECT_PATH)/components/bootloader_support/include/esp_flash_encrypt.h \
+    $(PROJECT_PATH)/components/spi_flash/include/esp_spi_flash.h \
-    $(PROJECT_PATH)/components/bootloader_support/include/bootloader_random.h \
     $(PROJECT_PATH)/components/spiffs/include/esp_spiffs.h \
-    $(PROJECT_PATH)/components/driver/include/driver/sdmmc_types.h \
+    $(PROJECT_PATH)/components/tinyusb/additions/include/tinyusb_types.h \
-    $(PROJECT_PATH)/components/sdmmc/include/sdmmc_cmd.h \
+    $(PROJECT_PATH)/components/tinyusb/additions/include/tinyusb.h \
-    $(PROJECT_PATH)/components/driver/include/driver/sdmmc_host.h \
+    $(PROJECT_PATH)/components/tinyusb/additions/include/tusb_cdc_acm.h \
-    $(PROJECT_PATH)/components/driver/include/driver/sdspi_host.h \
+    $(PROJECT_PATH)/components/tinyusb/additions/include/tusb_config.h \
-    $(PROJECT_PATH)/components/hal/include/hal/sdio_slave_types.h \
+    $(PROJECT_PATH)/components/tinyusb/additions/include/tusb_console.h \
-    $(PROJECT_PATH)/components/driver/include/driver/sdio_slave.h \
+    $(PROJECT_PATH)/components/tinyusb/additions/include/tusb_tasks.h \
-    $(PROJECT_PATH)/components/nvs_flash/include/nvs.h \
+    $(PROJECT_PATH)/components/tinyusb/additions/include/vfs_tinyusb.h \
-    $(PROJECT_PATH)/components/nvs_flash/include/nvs_flash.h \
-    $(PROJECT_PATH)/components/openthread/include/esp_openthread.h \
-    $(PROJECT_PATH)/components/openthread/include/esp_openthread_border_router.h \
-    $(PROJECT_PATH)/components/openthread/include/esp_openthread_lock.h \
-    $(PROJECT_PATH)/components/openthread/include/esp_openthread_netif_glue.h \
-    $(PROJECT_PATH)/components/openthread/include/esp_openthread_types.h \
-    $(PROJECT_PATH)/components/vfs/include/esp_vfs.h \
-    $(PROJECT_PATH)/components/vfs/include/esp_vfs_dev.h \
-    $(PROJECT_PATH)/components/vfs/include/esp_vfs_eventfd.h \
-    $(PROJECT_PATH)/components/vfs/include/esp_vfs_semihost.h \
-    $(PROJECT_PATH)/components/fatfs/vfs/esp_vfs_fat.h \
-    $(PROJECT_PATH)/components/fatfs/diskio/diskio_impl.h \
-    $(PROJECT_PATH)/components/fatfs/diskio/diskio_sdmmc.h \
-    $(PROJECT_PATH)/components/fatfs/diskio/diskio_wl.h \
-    $(PROJECT_PATH)/components/fatfs/diskio/diskio_rawflash.h \
-    $(PROJECT_PATH)/components/wear_levelling/include/wear_levelling.h \
-    $(PROJECT_PATH)/components/console/esp_console.h \
-    $(PROJECT_PATH)/components/heap/include/esp_heap_caps.h \
-    $(PROJECT_PATH)/components/heap/include/esp_heap_trace.h \
-    $(PROJECT_PATH)/components/heap/include/esp_heap_caps_init.h \
-    $(PROJECT_PATH)/components/heap/include/multi_heap.h \
-    $(PROJECT_PATH)/components/esp_hw_support/include/esp_intr_alloc.h \
-    $(PROJECT_PATH)/components/esp_system/include/esp_int_wdt.h \
-    $(PROJECT_PATH)/components/esp_system/include/esp_task_wdt.h \
-    $(PROJECT_PATH)/components/esp_hw_support/include/esp_crc.h \
-    $(PROJECT_PATH)/components/esp_hw_support/include/esp_mac.h \
-    $(PROJECT_PATH)/components/esp_system/include/esp_freertos_hooks.h \
-    $(PROJECT_PATH)/components/esp_system/include/esp_expression_with_stack.h \
-    $(PROJECT_PATH)/components/app_update/include/esp_ota_ops.h \
-    $(PROJECT_PATH)/components/esp_https_ota/include/esp_https_ota.h \
-    $(PROJECT_PATH)/components/esp_hw_support/include/esp_async_memcpy.h \
-    $(PROJECT_PATH)/components/esp_hw_support/include/esp_random.h \
-    $(PROJECT_PATH)/components/esp_hw_support/include/esp_sleep.h \
-    $(PROJECT_PATH)/components/log/include/esp_log.h \
-    $(PROJECT_PATH)/components/esp_rom/include/esp_rom_sys.h \
-    $(PROJECT_PATH)/components/esp_system/include/esp_system.h \
-    $(PROJECT_PATH)/components/esp_common/include/esp_idf_version.h \
     $(PROJECT_PATH)/components/ulp/ulp_common/include/ulp_common.h \
     $(PROJECT_PATH)/components/ulp/ulp_fsm/include/ulp_fsm_common.h \
     $(PROJECT_PATH)/components/ulp/ulp_riscv/include/ulp_riscv.h \
-    $(PROJECT_PATH)/components/app_trace/include/esp_app_trace.h \
+    $(PROJECT_PATH)/components/vfs/include/esp_vfs_dev.h \
-    $(PROJECT_PATH)/components/app_trace/include/esp_sysview_trace.h \
+    $(PROJECT_PATH)/components/vfs/include/esp_vfs_eventfd.h \
-    $(PROJECT_PATH)/components/esp_pm/include/esp_pm.h \
+    $(PROJECT_PATH)/components/vfs/include/esp_vfs_semihost.h \
-    $(PROJECT_PATH)/components/esp_pm/include/$(IDF_TARGET)/pm.h \
+    $(PROJECT_PATH)/components/vfs/include/esp_vfs.h \
-    $(PROJECT_PATH)/components/esp_timer/include/esp_timer.h \
+    $(PROJECT_PATH)/components/wear_levelling/include/wear_levelling.h \
-    $(PROJECT_PATH)/components/efuse/include/esp_efuse.h \
+    $(PROJECT_PATH)/components/wifi_provisioning/include/wifi_provisioning/manager.h \
-    $(PROJECT_PATH)/components/bootloader_support/include/esp_app_format.h \
+    $(PROJECT_PATH)/components/wifi_provisioning/include/wifi_provisioning/scheme_ble.h \
-    $(PROJECT_PATH)/components/pthread/include/esp_pthread.h \
+    $(PROJECT_PATH)/components/wifi_provisioning/include/wifi_provisioning/scheme_console.h \
-    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/task.h \
+    $(PROJECT_PATH)/components/wifi_provisioning/include/wifi_provisioning/scheme_softap.h \
-    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/queue.h \
+    $(PROJECT_PATH)/components/wifi_provisioning/include/wifi_provisioning/wifi_config.h \
-    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/semphr.h \
+    $(PROJECT_PATH)/components/wifi_provisioning/include/wifi_provisioning/wifi_scan.h \
-    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/timers.h \
+    $(PROJECT_PATH)/components/wpa_supplicant/esp_supplicant/include/esp_dpp.h
-    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/event_groups.h \
-    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/stream_buffer.h \
-    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/message_buffer.h \
-    $(PROJECT_PATH)/components/esp_ringbuf/include/freertos/ringbuf.h \
-    $(PROJECT_PATH)/components/esp_common/include/esp_err.h \
-    $(PROJECT_PATH)/components/esp_common/include/esp_check.h \
-    $(PROJECT_PATH)/components/freemodbus/common/include/esp_modbus_common.h \
-    $(PROJECT_PATH)/components/freemodbus/common/include/esp_modbus_slave.h \
-    $(PROJECT_PATH)/components/freemodbus/common/include/esp_modbus_master.h \
-    $(PROJECT_PATH)/components/perfmon/include/xtensa_perfmon_access.h \
-    $(PROJECT_PATH)/components/perfmon/include/xtensa_perfmon_apis.h \
-    $(PROJECT_PATH)/components/perfmon/include/xtensa_perfmon_masks.h \
-    $(PROJECT_PATH)/components/ieee802154/include/esp_ieee802154.h \
-    $(PROJECT_PATH)/components/ieee802154/include/esp_ieee802154_types.h
 
 
 ## Target specific headers are in seperate Doxyfile files

docs/en/api-guides/RF_calibration.rst

@@ -58,3 +58,8 @@ When using a custom partition table, make sure that PHY data partition is includ
 With default partition table, this is done automatically.
 If initialization data is stored in a partition, it has to be flashed there, otherwise runtime error will occur.
 To switch to the initialization data stored in a partition, go to ``menuconfig`` and enable :ref:`CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION`.
+
+API Reference
+-------------
+
+.. include-build-file:: inc/esp_phy_init.inc

docs/en/api-guides/error-handling.rst

@@ -48,7 +48,7 @@ This feature is enabled by default, but can be disabled to reduce application bi
 ``ESP_ERROR_CHECK`` macro
 -------------------------
 
-:cpp:func:`ESP_ERROR_CHECK` macro serves similar purpose as ``assert``, except that it checks :cpp:type:`esp_err_t` value rather than a ``bool`` condition. If the argument of :cpp:func:`ESP_ERROR_CHECK` is not equal :c:macro:`ESP_OK`, then an error message is printed on the console, and ``abort()`` is called.
+:c:macro:`ESP_ERROR_CHECK` macro serves similar purpose as ``assert``, except that it checks :cpp:type:`esp_err_t` value rather than a ``bool`` condition. If the argument of :c:macro:`ESP_ERROR_CHECK` is not equal :c:macro:`ESP_OK`, then an error message is printed on the console, and ``abort()`` is called.
 
 Error message will typically look like this::
 
@@ -64,7 +64,7 @@ Error message will typically look like this::
 
 - The first line mentions the error code as a hexadecimal value, and the identifier used for this error in source code. The latter depends on :ref:`CONFIG_ESP_ERR_TO_NAME_LOOKUP` option being set. Address in the program where error has occured is printed as well.
 
-- Subsequent lines show the location in the program where :cpp:func:`ESP_ERROR_CHECK` macro was called, and the expression which was passed to the macro as an argument.
+- Subsequent lines show the location in the program where :c:macro:`ESP_ERROR_CHECK` macro was called, and the expression which was passed to the macro as an argument.
 
 - Finally, backtrace is printed. This is part of panic handler output common to all fatal errors. See :doc:`Fatal Errors <fatal-errors>` for more information about the backtrace.
 
@@ -74,35 +74,35 @@ Error message will typically look like this::
 ``ESP_ERROR_CHECK_WITHOUT_ABORT`` macro
 ---------------------------------------
 
-:cpp:func:`ESP_ERROR_CHECK_WITHOUT_ABORT` macro serves similar purpose as ``ESP_ERROR_CHECK``, except that it won't call ``abort()``.
+:c:macro:`ESP_ERROR_CHECK_WITHOUT_ABORT` macro serves similar purpose as ``ESP_ERROR_CHECK``, except that it won't call ``abort()``.
 
 .. _esp-return-on-error-macro:
 
 ``ESP_RETURN_ON_ERROR`` macro
 -----------------------------
 
-:cpp:func:`ESP_RETURN_ON_ERROR` macro checks the error code, if the error code is not equal :c:macro:`ESP_OK`, it prints the message and returns.
+:c:macro:`ESP_RETURN_ON_ERROR` macro checks the error code, if the error code is not equal :c:macro:`ESP_OK`, it prints the message and returns.
 
 .. _esp-goto-on-error-macro:
 
 ``ESP_GOTO_ON_ERROR`` macro
 ---------------------------
 
-:cpp:func:`ESP_GOTO_ON_ERROR` macro checks the error code, if the error code is not equal :c:macro:`ESP_OK`, it prints the message, sets the local variable `ret` to the code, and then exits by jumping to `goto_tag`.
+:c:macro:`ESP_GOTO_ON_ERROR` macro checks the error code, if the error code is not equal :c:macro:`ESP_OK`, it prints the message, sets the local variable `ret` to the code, and then exits by jumping to `goto_tag`.
 
 .. _esp-return-on-false-macro:
 
 ``ESP_RETURN_ON_FALSE`` macro
 -----------------------------
 
-:cpp:func:`ESP_RETURN_ON_FALSE` macro checks the condition, if the condition is not equal `true`, it prints the message and returns with the supplied `err_code`.
+:c:macro:`ESP_RETURN_ON_FALSE` macro checks the condition, if the condition is not equal `true`, it prints the message and returns with the supplied `err_code`.
 
 .. _esp-goto-on-false-macro:
 
 ``ESP_GOTO_ON_FALSE`` macro
 ---------------------------
 
-:cpp:func:`ESP_GOTO_ON_FALSE` macro checks the condition, if the condition is not equal `true`, it prints the message, sets the local variable `ret` to the supplied `err_code`, and then exits by jumping to `goto_tag`.
+:c:macro:`ESP_GOTO_ON_FALSE` macro checks the condition, if the condition is not equal `true`, it prints the message, sets the local variable `ret` to the supplied `err_code`, and then exits by jumping to `goto_tag`.
 
 .. _check_macros_examples:
 

docs/en/api-guides/event-handling.rst

@@ -139,11 +139,11 @@ Various modules of the Bluetooth stack deliver events to applications via dedica
 
 * BLE GAP: :cpp:func:`esp_ble_gap_register_callback`, :cpp:type:`esp_gap_ble_cb_event_t`, :cpp:type:`esp_ble_gap_cb_param_t`.
 * BT GAP: :cpp:func:`esp_bt_gap_register_callback`, :cpp:type:`esp_bt_gap_cb_event_t`, :cpp:type:`esp_bt_gap_cb_param_t`.
-* GATTC: :cpp:func:`esp_ble_gattc_register_callback`, :cpp:type:`esp_bt_gattc_cb_event_t`, :cpp:type:`esp_bt_gattc_cb_param_t`.
+* GATTC: :cpp:func:`esp_ble_gattc_register_callback`, :cpp:type:`esp_ble_gattc_cb_event_t`, :cpp:type:`esp_ble_gattc_cb_param_t`.
-* GATTS: :cpp:func:`esp_ble_gatts_register_callback`, :cpp:type:`esp_bt_gatts_cb_event_t`, :cpp:type:`esp_bt_gatts_cb_param_t`.
+* GATTS: :cpp:func:`esp_ble_gatts_register_callback`, :cpp:type:`esp_ble_gatts_cb_event_t`, :cpp:type:`esp_ble_gatts_cb_param_t`.
 * SPP: :cpp:func:`esp_spp_register_callback`, :cpp:type:`esp_spp_cb_event_t`, :cpp:type:`esp_spp_cb_param_t`.
 * Blufi: :cpp:func:`esp_blufi_register_callbacks`, :cpp:type:`esp_blufi_cb_event_t`, :cpp:type:`esp_blufi_cb_param_t`.
 * A2DP: :cpp:func:`esp_a2d_register_callback`, :cpp:type:`esp_a2d_cb_event_t`, :cpp:type:`esp_a2d_cb_param_t`.
 * AVRC: :cpp:func:`esp_avrc_ct_register_callback`, :cpp:type:`esp_avrc_ct_cb_event_t`, :cpp:type:`esp_avrc_ct_cb_param_t`.
 * HFP Client: :cpp:func:`esp_hf_client_register_callback`, :cpp:type:`esp_hf_client_cb_event_t`, :cpp:type:`esp_hf_client_cb_param_t`.
-* HFP AG: :cpp:func:`esp_hf_ag_register_callback`, :cpp:type:`esp_hf_ag_cb_event_t`, :cpp:type:`esp_hf_ag_cb_param_t`.
+* HFP AG: :cpp:func:`esp_bt_hf_register_callback`, :cpp:type:`esp_hf_cb_event_t`, :cpp:type:`esp_hf_cb_param_t`.

docs/en/api-guides/performance/speed.rst

@@ -125,7 +125,7 @@ In addition to the overall performance improvements shown above, the following o
 
 .. list::
 
-   - Minimizing the :ref:`CONFIG_LOG_DEFAULT_LEVEL` and :ref:`CONFIG_BOOTLOADER_LOG_LEVEL` has a large impact on startup time. To enable more logging after the app starts up, set the :ref:`CONFIG_LOG_MAXIMUM_LEVEL` as well and then call :cpp:func:`esp_log_set_level` to restore higher level logs. The :example:`system/startup_time` main function shows how to do this.
+   - Minimizing the :ref:`CONFIG_LOG_DEFAULT_LEVEL` and :ref:`CONFIG_BOOTLOADER_LOG_LEVEL` has a large impact on startup time. To enable more logging after the app starts up, set the :ref:`CONFIG_LOG_MAXIMUM_LEVEL` as well and then call :cpp:func:`esp_log_level_set` to restore higher level logs. The :example:`system/startup_time` main function shows how to do this.
    - If using deep sleep, setting :ref:`CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP` allows a faster wake from sleep. Note that if using Secure Boot this represents a security compromise, as Secure Boot validation will not be performed on wake.
    - Setting :ref:`CONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON` will skip verifying the binary on every boot from power-on reset. How much time this saves depends on the binary size and the flash settings. Note that this setting carries some risk if the flash becomes corrupt unexpectedly. Read the help text of the :ref:`config item <CONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON>` for an explanation and recommendations if using this option.
    - It's possible to save a small amount of time during boot by disabling RTC slow clock calibration. To do so, set :ref:`CONFIG_{IDF_TARGET_CFG_PREFIX}_RTC_CLK_CAL_CYCLES` to 0. Any part of the firmware that uses RTC slow clock as a timing source will be less accurate as a result.

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

@@ -133,7 +133,7 @@ Ethernet driver is composed of two parts: MAC and PHY.
     * Some EMAC controller can generate the ``REF_CLK`` using its internal high precision PLL (as seen the option *c* in the picture). In this case, you should select ``CONFIG_ETH_RMII_CLK_OUTPUT`` in :ref:`CONFIG_ETH_RMII_CLK_MODE`.
 
     .. note::
-        ``REF_CLK`` is configured via Project Configuration as described above by default. However, it can be overwritten from user application code by appropriately setting :cpp:member:`interface` and :cpp:member:`clock_config` members of :cpp:class:`eth_mac_config_t` structure. See :cpp:enum:`emac_rmii_clock_mode_t` and :cpp:enum:`emac_rmii_clock_gpio_t` for more details.
+        ``REF_CLK`` is configured via Project Configuration as described above by default. However, it can be overwritten from user application code by appropriately setting :cpp:member:`eth_esp32_emac_config_t::interface` and :cpp:member:`eth_esp32_emac_config_t::clock_config` members. See :cpp:enum:`emac_rmii_clock_mode_t` and :cpp:enum:`emac_rmii_clock_gpio_t` for more details.
 
     .. warning::
         If the RMII clock mode is selected to ``CONFIG_ETH_RMII_CLK_OUTPUT``, then ``GPIO0`` can be used to output the ``REF_CLK`` signal. See :ref:`CONFIG_ETH_RMII_CLK_OUTPUT_GPIO0` for more information.
@@ -164,21 +164,21 @@ Configuration for MAC is described in :cpp:class:`eth_mac_config_t`, including:
 
 .. list::
 
-    * :cpp:member:`sw_reset_timeout_ms`: software reset timeout value, in milliseconds, typically MAC reset should be finished within 100ms.
+    * :cpp:member:`eth_mac_config_t::sw_reset_timeout_ms`: software reset timeout value, in milliseconds, typically MAC reset should be finished within 100ms.
-    * :cpp:member:`rx_task_stack_size` and :cpp:member:`rx_task_prio`: the MAC driver creates a dedicated task to process incoming packets, these two parameters are used to set the stack size and priority of the task.
+    * :cpp:member:`eth_mac_config_t::rx_task_stack_size` and :cpp:member:`eth_mac_config_t::rx_task_prio`: the MAC driver creates a dedicated task to process incoming packets, these two parameters are used to set the stack size and priority of the task.
-    * :cpp:member:`flags`: specifying extra features that the MAC driver should have, it could be useful in some special situations. The value of this field can be OR'd with macros prefixed with ``ETH_MAC_FLAG_``. For example, if the MAC driver should work when cache is disabled, then you should configure this field with :c:macro:`ETH_MAC_FLAG_WORK_WITH_CACHE_DISABLE`.
+    * :cpp:member:`eth_mac_config_t::flags`: specifying extra features that the MAC driver should have, it could be useful in some special situations. The value of this field can be OR'd with macros prefixed with ``ETH_MAC_FLAG_``. For example, if the MAC driver should work when cache is disabled, then you should configure this field with :c:macro:`ETH_MAC_FLAG_WORK_WITH_CACHE_DISABLE`.
-    :SOC_EMAC_SUPPORTED: * :cpp:member:`smi_mdc_gpio_num` and :cpp:member:`smi_mdio_gpio_num`: the GPIO number used to connect the SMI signals.
+    :SOC_EMAC_SUPPORTED: * :cpp:member:`eth_esp32_emac_config_t::smi_mdc_gpio_num` and :cpp:member:`eth_esp32_emac_config_t::smi_mdio_gpio_num`: the GPIO number used to connect the SMI signals.
-    :SOC_EMAC_SUPPORTED: * :cpp:member:`interface`: configuration of MAC Data interface to PHY (MII/RMII).
+    :SOC_EMAC_SUPPORTED: * :cpp:member:`eth_esp32_emac_config_t::interface`: configuration of MAC Data interface to PHY (MII/RMII).
-    :SOC_EMAC_SUPPORTED: * :cpp:member:`clock_config`: configuration of EMAC Interface clock (``REF_CLK`` mode and GPIO number in case of RMII).
+    :SOC_EMAC_SUPPORTED: * :cpp:member:`eth_esp32_emac_config_t::clock_config`: configuration of EMAC Interface clock (``REF_CLK`` mode and GPIO number in case of RMII).
 
 Configuration for PHY is described in :cpp:class:`eth_phy_config_t`, including:
 
 .. list::
 
-    * :cpp:member:`phy_addr`: multiple PHY device can share the same SMI bus, so each PHY needs a unique address. Usually this address is configured during hardware design by pulling up/down some PHY strapping pins. You can set the value from 0 to 15 based on your Ethernet board. Especially, if the SMI bus is shared by only one PHY device, setting this value to -1 can enable the driver to detect the PHY address automatically.
+    * :cpp:member:`eth_phy_config_t::phy_addr`: multiple PHY device can share the same SMI bus, so each PHY needs a unique address. Usually this address is configured during hardware design by pulling up/down some PHY strapping pins. You can set the value from 0 to 15 based on your Ethernet board. Especially, if the SMI bus is shared by only one PHY device, setting this value to -1 can enable the driver to detect the PHY address automatically.
-    * :cpp:member:`reset_timeout_ms`: reset timeout value, in milliseconds, typically PHY reset should be finished within 100ms.
+    * :cpp:member:`eth_phy_config_t::reset_timeout_ms`: reset timeout value, in milliseconds, typically PHY reset should be finished within 100ms.
-    * :cpp:member:`autonego_timeout_ms`: auto-negotiation timeout value, in milliseconds. Ethernet driver will start negotiation with the peer Ethernet node automatically, to determine to duplex and speed mode. This value usually depends on the ability of the PHY device on your board.
+    * :cpp:member:`eth_phy_config_t::autonego_timeout_ms`: auto-negotiation timeout value, in milliseconds. Ethernet driver will start negotiation with the peer Ethernet node automatically, to determine to duplex and speed mode. This value usually depends on the ability of the PHY device on your board.
-    * :cpp:member:`reset_gpio_num`: if your board also connect the PHY reset pin to one of the GPIO, then set it here. Otherwise, set this field to -1.
+    * :cpp:member:`eth_phy_config_t::reset_gpio_num`: if your board also connect the PHY reset pin to one of the GPIO, then set it here. Otherwise, set this field to -1.
 
 ESP-IDF provides a default configuration for MAC and PHY in macro :c:macro:`ETH_MAC_DEFAULT_CONFIG` and :c:macro:`ETH_PHY_DEFAULT_CONFIG`.
 
@@ -281,11 +281,11 @@ Install Driver
 
 To install the Ethernet driver, we need to combine the instance of MAC and PHY and set some additional high-level configurations (i.e. not specific to either MAC or PHY) in :cpp:class:`esp_eth_config_t`:
 
-* :cpp:member:`mac`: instance that created from MAC generator (e.g. :cpp:func:`esp_eth_mac_new_esp32`).
+* :cpp:member:`esp_eth_config_t::mac`: instance that created from MAC generator (e.g. :cpp:func:`esp_eth_mac_new_esp32`).
-* :cpp:member:`phy`: instance that created from PHY generator (e.g. :cpp:func:`esp_eth_phy_new_ip101`).
+* :cpp:member:`esp_eth_config_t::phy`: instance that created from PHY generator (e.g. :cpp:func:`esp_eth_phy_new_ip101`).
-* :cpp:member:`check_link_period_ms`: Ethernet driver starts an OS timer to check the link status periodically, this field is used to set the interval, in milliseconds.
+* :cpp:member:`esp_eth_config_t::check_link_period_ms`: Ethernet driver starts an OS timer to check the link status periodically, this field is used to set the interval, in milliseconds.
-* :cpp:member:`stack_input`: In most of Ethernet IoT applications, any Ethernet frame that received by driver should be passed to upper layer (e.g. TCP/IP stack). This field is set to a function which is responsible to deal with the incoming frames. You can even update this field at runtime via function :cpp:func:`esp_eth_update_input_path` after driver installation.
+* :cpp:member:`esp_eth_config_t::stack_input`: In most of Ethernet IoT applications, any Ethernet frame that received by driver should be passed to upper layer (e.g. TCP/IP stack). This field is set to a function which is responsible to deal with the incoming frames. You can even update this field at runtime via function :cpp:func:`esp_eth_update_input_path` after driver installation.
-* :cpp:member:`on_lowlevel_init_done` and :cpp:member:`on_lowlevel_deinit_done`: These two fields are used to specify the hooks which get invoked when low level hardware has been initialized or de-initialized.
+* :cpp:member:`esp_eth_config_t::on_lowlevel_init_done` and :cpp:member:`esp_eth_config_t::on_lowlevel_deinit_done`: These two fields are used to specify the hooks which get invoked when low level hardware has been initialized or de-initialized.
 
 ESP-IDF provides a default configuration for driver installation in macro :c:macro:`ETH_DEFAULT_CONFIG`.
 

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

@@ -263,6 +263,9 @@ API Reference
 -------------
 
 .. include-build-file:: inc/esp_netif.inc
+.. include-build-file:: inc/esp_netif_types.inc
+.. include-build-file:: inc/esp_netif_ip_addr.inc
+.. include-build-file:: inc/esp_vfs_l2tap.inc
 
 
 WiFi default API reference

docs/en/api-reference/peripherals/gptimer.rst

@@ -38,17 +38,17 @@ From driver's point of view, a GPTimer instance is represented by :cpp:type:`gpt
 
 To install a timer instance, there's a configuration structure that needs to be given in advance: :cpp:type:`gptimer_config_t`:
 
--  :cpp:member:`clk_src` selects the source clock for the timer. The available clocks are listed in :cpp:type:`gptimer_clock_source_t`, [1]_ you can only pick one of them. For the effect on power consumption of different clock source, please refer to `Power management <#power-management>`__ section.
+-  :cpp:member:`gptimer_config_t::clk_src` selects the source clock for the timer. The available clocks are listed in :cpp:type:`gptimer_clock_source_t`, [1]_ you can only pick one of them. For the effect on power consumption of different clock source, please refer to `Power management <#power-management>`__ section.
 
--  :cpp:member:`direction` sets the counting direction of the timer, supported directions are listed in :cpp:type:`gptimer_count_direction_t`, you can only pick one of them.
+-  :cpp:member:`gptimer_config_t::direction` sets the counting direction of the timer, supported directions are listed in :cpp:type:`gptimer_count_direction_t`, you can only pick one of them.
 
--  :cpp:member:`resolution_hz` sets the resolution of the internal counter. Each count step is equivalent to **1 / resolution_hz** seconds.
+-  :cpp:member:`gptimer_config_t::resolution_hz` sets the resolution of the internal counter. Each count step is equivalent to **1 / resolution_hz** seconds.
 
--  Optional :cpp:member:`intr_shared` sets whether or not mark the timer interrupt source as a shared one. For the pros/cons of a shared interrupt, you can refer to :doc:`Interrupt Handling <../../api-reference/system/intr_alloc>`.
+-  Optional :cpp:member:`gptimer_config_t::intr_shared` sets whether or not mark the timer interrupt source as a shared one. For the pros/cons of a shared interrupt, you can refer to :doc:`Interrupt Handling <../../api-reference/system/intr_alloc>`.
 
 With all the above configurations set in the structure, the structure can be passed to :cpp:func:`gptimer_new_timer` which will instantiate the timer instance and return a handle of the timer.
 
-The function can fail due to various errors such as insufficient memory, invalid arguments, etc. Specifically, when there are no more free timers (i.e. all hardware resources have been used up), then :cpp:member:`ESP_ERR_NOT_FOUND` will be returned. The total number of available timers is represented by the :c:macro:`SOC_TIMER_GROUP_TOTAL_TIMERS` and its value will depend on the ESP chip.
+The function can fail due to various errors such as insufficient memory, invalid arguments, etc. Specifically, when there are no more free timers (i.e. all hardware resources have been used up), then :c:macro:`ESP_ERR_NOT_FOUND` will be returned. The total number of available timers is represented by the :c:macro:`SOC_TIMER_GROUP_TOTAL_TIMERS` and its value will depend on the ESP chip.
 
 If a previously created GPTimer instance is no longer required, you should recycle the timer by calling :cpp:func:`gptimer_del_timer`. This will allow the underlying HW timer to be used for other purposes. Before deleting a GPTimer handle, you should stop it by :cpp:func:`gptimer_stop` in advance or make sure it has not started yet by :cpp:func:`gptimer_start`.
 
@@ -77,12 +77,12 @@ Set Up Alarm Action
 
 Most of the use cases of GPTimer should set up the alarm action before starting the timer, except for the simple wall-clock scenario, where a free running timer is enough. To set up the alarm action, one should configure several members of :cpp:type:`gptimer_alarm_config_t` based on how he takes use of the alarm event:
 
--  :cpp:member:`alarm_count` sets the target count value that will trigger the alarm event. You should also take the counting direction into consideration when setting the alarm value.
+-  :cpp:member:`gptimer_alarm_config_t::alarm_count` sets the target count value that will trigger the alarm event. You should also take the counting direction into consideration when setting the alarm value.
-   Specially, :cpp:member:`alarm_count` and :cpp:member:`reload_count` can't be set to the same value when :cpp:member:`auto_reload_on_alarm` is true, as keeping reload with a target alarm count is meaningless.
+   Specially, :cpp:member:`gptimer_alarm_config_t::alarm_count` and :cpp:member:`gptimer_alarm_config_t::reload_count` can't be set to the same value when :cpp:member:`gptimer_alarm_config_t::auto_reload_on_alarm` is true, as keeping reload with a target alarm count is meaningless.
 
--  :cpp:member:`reload_count` sets the count value to be reloaded when the alarm event happens. This configuration only takes effect when :cpp:member:`auto_reload_on_alarm` is set to true.
+-  :cpp:member:`gptimer_alarm_config_t::reload_count` sets the count value to be reloaded when the alarm event happens. This configuration only takes effect when :cpp:member:`gptimer_alarm_config_t::auto_reload_on_alarm` is set to true.
 
--  :cpp:member:`auto_reload_on_alarm` flag sets whether to enable the auto-reload feature. If enabled, the hardware timer will reload the value of :cpp:member:`reload_count` into counter immediately when alarm event happens.
+-  :cpp:member:`gptimer_alarm_config_t::auto_reload_on_alarm` flag sets whether to enable the auto-reload feature. If enabled, the hardware timer will reload the value of :cpp:member:`gptimer_alarm_config_t::reload_count` into counter immediately when alarm event happens.
 
 To make the alarm configurations take effect, one should call :cpp:func:`gptimer_set_alarm_action`. Especially, if :cpp:type:`gptimer_alarm_config_t` is set to ``NULL``, the alarm function will be disabled.
 
@@ -95,7 +95,7 @@ Register Event Callbacks
 
 After the timer starts up, it can generate specific event (e.g. the "Alarm Event") dynamically. If you have some function that should be called when event happens, you should hook your function to the interrupt service routine by calling :cpp:func:`gptimer_register_event_callbacks`. All supported event callbacks are listed in the :cpp:type:`gptimer_event_callbacks_t`:
 
--  :cpp:member:`on_alarm` sets callback function for alarm event. As this function is called within the ISR context, user must ensure that the function doesn't attempt to block (e.g., by making sure that only FreeRTOS APIs with ``ISR`` suffix are called from within the function). The function prototype is declared in :cpp:type:`gptimer_alarm_cb_t`.
+-  :cpp:member:`gptimer_event_callbacks_t::on_alarm` sets callback function for alarm event. As this function is called within the ISR context, user must ensure that the function doesn't attempt to block (e.g., by making sure that only FreeRTOS APIs with ``ISR`` suffix are called from within the function). The function prototype is declared in :cpp:type:`gptimer_alarm_cb_t`.
 
 One can save his own context to :cpp:func:`gptimer_register_event_callbacks` as well, via the parameter ``user_data``. The user data will be directly passed to the callback functions.
 
@@ -192,7 +192,7 @@ Trigger One-Shot Event
 Dynamic Alarm Update
 ~~~~~~~~~~~~~~~~~~~~
 
-Alarm value can be updated dynamically inside the ISR handler callback, by changing the :cpp:member:`alarm_value` of :cpp:type:`gptimer_alarm_event_data_t`. Then the alarm value will be updated after the callback function returns.
+Alarm value can be updated dynamically inside the ISR handler callback, by changing the :cpp:member:`gptimer_alarm_event_data_t::alarm_value`. Then the alarm value will be updated after the callback function returns.
 
 .. code:: c
 
@@ -235,7 +235,7 @@ Power Management
 
 When power management is enabled (i.e. :ref:`CONFIG_PM_ENABLE` is on), the system will adjust the APB frequency before going into light sleep, thus potentially changing the period of a GPTimer's counting step and leading to inaccurate time keeping.
 
-However, the driver can prevent the system from changing APB frequency by acquiring a power management lock of type :c:member:`ESP_PM_APB_FREQ_MAX`. Whenever the driver creates a GPTimer instance that has selected :c:member:`GPTIMER_CLK_SRC_APB` as its clock source, the driver will guarantee that the power management lock is acquired when the timer is started by :cpp:func:`gptimer_start`. Likewise, the driver releases the lock when :cpp:func:`gptimer_stop` is called for that timer. This requires that the :cpp:func:`gptimer_start` and :cpp:func:`gptimer_stop` should appear in pairs.
+However, the driver can prevent the system from changing APB frequency by acquiring a power management lock of type :cpp:enumerator:`ESP_PM_APB_FREQ_MAX`. Whenever the driver creates a GPTimer instance that has selected :cpp:enumerator:`GPTIMER_CLK_SRC_APB` as its clock source, the driver will guarantee that the power management lock is acquired when the timer is started by :cpp:func:`gptimer_start`. Likewise, the driver releases the lock when :cpp:func:`gptimer_stop` is called for that timer. This requires that the :cpp:func:`gptimer_start` and :cpp:func:`gptimer_stop` should appear in pairs.
 
 IRAM Safe
 ^^^^^^^^^
@@ -288,4 +288,4 @@ API Reference
    Some ESP chip might only support a sub-set of the clocks, if an unsupported clock source is specified, you will get a runtime error during timer installation.
 
 .. [2]
-   :cpp:member:`on_alarm` callback and the functions invoked by itself should also be placed in IRAM, users need to take care of them by themselves.
+   :cpp:member:`gptimer_event_callbacks_t::on_alarm` callback and the functions invoked by itself should also be placed in IRAM, users need to take care of them by themselves.

docs/en/api-reference/peripherals/i2c.rst

@@ -335,7 +335,7 @@ Customized Configuration
 
 As mentioned at the end of Section :ref:`i2c-api-configure-driver`, when the function :cpp:func:`i2c_param_config` initializes the driver configuration for an I2C port, it also sets several I2C communication parameters to default values defined in the `I2C specification <https://www.nxp.com/docs/en/user-guide/UM10204.pdf>`_. Some other related parameters are pre-configured in registers of the I2C controller.
 
-All these parameters can be changed to user-defined values by calling dedicated functions given in the table below. Please note that the timing values are defined in APB clock cycles. The frequency of APB is specified in :cpp:type:`I2C_APB_CLK_FREQ`.
+All these parameters can be changed to user-defined values by calling dedicated functions given in the table below. Please note that the timing values are defined in APB clock cycles. The frequency of APB is specified in :c:macro:`I2C_APB_CLK_FREQ`.
 
 .. list-table:: Other Configurable I2C Communication Parameters
    :widths: 65 35

docs/en/api-reference/peripherals/lcd.rst

@@ -9,7 +9,7 @@ ESP chips can generate various kinds of timings that needed by common LCDs on th
 Functional Overview
 -------------------
 
-In ``esp_lcd``, an LCD panel is represented by :c:type:`esp_lcd_panel_handle_t`, which plays the role of an **abstract frame buffer**, regardless of the frame memory is allocated inside ESP chip or in external LCD controller. Based on the location of the frame buffer, the LCD panel allocation functions are mainly grouped into the following categories:
+In ``esp_lcd``, an LCD panel is represented by :cpp:type:`esp_lcd_panel_handle_t`, which plays the role of an **abstract frame buffer**, regardless of the frame memory is allocated inside ESP chip or in external LCD controller. Based on the location of the frame buffer, the LCD panel allocation functions are mainly grouped into the following categories:
 
 -  ``RGB LCD panel`` - is simply based on a group of specific synchronous signals indicating where to start and stop a frame.
 

docs/en/api-reference/peripherals/pcnt.rst

@@ -41,9 +41,9 @@ Install PCNT Unit
 
 To install a PCNT unit, there's a configuration structure that needs to be given in advance: :cpp:type:`pcnt_unit_config_t`:
 
--  :cpp:member:`low_limit` and :cpp:member:`high_limit` specify the range for the internal counter. Counter will back to zero when it crosses either limit value.
+-  :cpp:member:`pcnt_unit_config_t::low_limit` and :cpp:member:`pcnt_unit_config_t::high_limit` specify the range for the internal counter. Counter will back to zero when it crosses either limit value.
 
-Unit allocation and initialization is done by calling a function :cpp:func:`pcnt_new_unit` with :cpp:type:`pcnt_unit_config_t` as an input parameter. The function will return a PCNT unit handle only when it runs correctly. Specifically, when there are no more free PCNT units in the pool (i.e. unit resources have been used up), then this function will return :cpp:member:`ESP_ERR_NOT_FOUND` error. The total number of available PCNT units is recorded by :c:macro:`SOC_PCNT_UNITS_PER_GROUP` for reference.
+Unit allocation and initialization is done by calling a function :cpp:func:`pcnt_new_unit` with :cpp:type:`pcnt_unit_config_t` as an input parameter. The function will return a PCNT unit handle only when it runs correctly. Specifically, when there are no more free PCNT units in the pool (i.e. unit resources have been used up), then this function will return :c:macro:`ESP_ERR_NOT_FOUND` error. The total number of available PCNT units is recorded by :c:macro:`SOC_PCNT_UNITS_PER_GROUP` for reference.
 
 If a previously created PCNT unit is no longer needed, it's recommended to recycle the resource by calling :cpp:func:`pcnt_del_unit`. Which in return allows the underlying unit hardware to be used for other purposes. Before deleting a PCNT unit, one should ensure the following prerequisites:
 
@@ -67,11 +67,11 @@ Install PCNT Channel
 
 To install a PCNT channel, there's a configuration structure that needs to be given in advance: :cpp:type:`pcnt_chan_config_t` as well:
 
--  :cpp:member:`edge_gpio_num` and :cpp:member:`level_gpio_num` specify the GPIO numbers used by **edge** type signal and **level** type signal. :cpp:member:`level_gpio_num` is optional and can be assigned with `-1` if it's not used whereas the :cpp:member:`edge_gpio_num` is mandatory.
+-  :cpp:member:`pcnt_chan_config_t::edge_gpio_num` and :cpp:member:`pcnt_chan_config_t::level_gpio_num` specify the GPIO numbers used by **edge** type signal and **level** type signal. :cpp:member:`pcnt_chan_config_t::level_gpio_num` is optional and can be assigned with `-1` if it's not used whereas the :cpp:member:`pcnt_chan_config_t::edge_gpio_num` is mandatory.
--  :cpp:member:`invert_edge_input` and :cpp:member:`invert_level_input` are used to decide whether to invert the input signals before they going into PCNT hardware. The invert is done by GPIO matrix instead of PCNT hardware.
+-  :cpp:member:`pcnt_chan_config_t::invert_edge_input` and :cpp:member:`pcnt_chan_config_t::invert_level_input` are used to decide whether to invert the input signals before they going into PCNT hardware. The invert is done by GPIO matrix instead of PCNT hardware.
--  :cpp:member:`io_loop_back` is for debug only, which enables both the GPIO's input and output paths. This can help to simulate the pulse signals by function :cpp:func:`gpio_set_level` on the same GPIO.
+-  :cpp:member:`pcnt_chan_config_t::io_loop_back` is for debug only, which enables both the GPIO's input and output paths. This can help to simulate the pulse signals by function :cpp:func:`gpio_set_level` on the same GPIO.
 
-Channel allocating and initialization is done by calling a function :cpp:func:`pcnt_new_channel` with the above :cpp:type:`pcnt_chan_config_t` input parameter plus a PCNT unit handle returned from :cpp:func:`pcnt_new_unit`. This function will return a PCNT channel handle if it runs correctly. Specifically, when there are no more free PCNT channel within the unit (i.e. channel resources have been used up), then this function will return :cpp:member:`ESP_ERR_NOT_FOUND` error. The total number of available PCNT channels within the unit is recorded by :c:macro:`SOC_PCNT_CHANNELS_PER_UNIT` for reference.
+Channel allocating and initialization is done by calling a function :cpp:func:`pcnt_new_channel` with the above :cpp:type:`pcnt_chan_config_t` input parameter plus a PCNT unit handle returned from :cpp:func:`pcnt_new_unit`. This function will return a PCNT channel handle if it runs correctly. Specifically, when there are no more free PCNT channel within the unit (i.e. channel resources have been used up), then this function will return :c:macro:`ESP_ERR_NOT_FOUND` error. The total number of available PCNT channels within the unit is recorded by :c:macro:`SOC_PCNT_CHANNELS_PER_UNIT` for reference.
 
 If a previously created PCNT channel is no longer needed, it's recommended to recycle the resources by calling :cpp:func:`pcnt_del_channel`. Which in return allows the underlying channel hardware to be used for other purposes.
 
@@ -92,8 +92,8 @@ Set Up Channel Actions
 
 The PCNT will increase/decrease/hold its internal count value when the input pulse signal toggles. User can set different actions for edge signal and/or level signal.
 
--  :cpp:func:`pcnt_channel_set_edge_action` function is to set specific actions for rising and falling edge of the signal attached to the :cpp:member:`edge_gpio_num`. Supported actions are listed in :cpp:type:`pcnt_channel_edge_action_t`.
+-  :cpp:func:`pcnt_channel_set_edge_action` function is to set specific actions for rising and falling edge of the signal attached to the :cpp:member:`pcnt_chan_config_t::edge_gpio_num`. Supported actions are listed in :cpp:type:`pcnt_channel_edge_action_t`.
--  :cpp:func:`pcnt_channel_set_level_action` function is to set specific actions for high and low level of the signal attached to the :cpp:member:`level_gpio_num`. Supported actions are listed in :cpp:type:`pcnt_channel_level_action_t`. This function is not mandatory if the :cpp:member:`level_gpio_num` is set to `-1` when allocating PCNT channel by :cpp:func:`pcnt_new_channel`.
+-  :cpp:func:`pcnt_channel_set_level_action` function is to set specific actions for high and low level of the signal attached to the :cpp:member:`pcnt_chan_config_t::level_gpio_num`. Supported actions are listed in :cpp:type:`pcnt_channel_level_action_t`. This function is not mandatory if the :cpp:member:`pcnt_chan_config_t::level_gpio_num` is set to `-1` when allocating PCNT channel by :cpp:func:`pcnt_new_channel`.
 
 .. code:: c
 
@@ -105,7 +105,7 @@ The PCNT will increase/decrease/hold its internal count value when the input pul
 Watch Points
 ^^^^^^^^^^^^
 
-Each PCNT unit can be configured to watch several different values that you're interested in. The value to be watched is also called **Watch Point**. The watch point itself can't exceed the range set in :cpp:type:`pcnt_unit_config_t` by :cpp:member:`low_limit` and :cpp:member:`high_limit`. When the counter reaches either watch point, a watch event will be triggered and notify user by interrupt if any watch event callback has ever registered in :cpp:func:`pcnt_unit_register_event_callbacks`. See `Register Event Callbacks <#register-event-callbacks>`__ for how to register event callbacks.
+Each PCNT unit can be configured to watch several different values that you're interested in. The value to be watched is also called **Watch Point**. The watch point itself can't exceed the range set in :cpp:type:`pcnt_unit_config_t` by :cpp:member:`pcnt_unit_config_t::low_limit` and :cpp:member:`pcnt_unit_config_t::high_limit`. When the counter reaches either watch point, a watch event will be triggered and notify user by interrupt if any watch event callback has ever registered in :cpp:func:`pcnt_unit_register_event_callbacks`. See `Register Event Callbacks <#register-event-callbacks>`__ for how to register event callbacks.
 
 The watch point can be added and removed by :cpp:func:`pcnt_unit_add_watch_point` and :cpp:func:`pcnt_unit_remove_watch_point`. The commonly used watch points are: **zero cross**, **maximum / minimum count** and other threshold values. The number of available watch point is limited, :cpp:func:`pcnt_unit_add_watch_point` will return error :c:macro:`ESP_ERR_NOT_FOUND` if it can't find any free hardware resource to save the watch point. User can't add the same watch point for multiple times, otherwise it will return error :c:macro:`ESP_ERR_INVALID_STATE`.
 
@@ -123,14 +123,14 @@ Register Event Callbacks
 
 When PCNT unit reaches any enabled watch point, specific event will be generated and notify the CPU by interrupt. If you have some function that want to get executed when event happens, you should hook your function to the interrupt service routine by calling :cpp:func:`pcnt_unit_register_event_callbacks`. All supported event callbacks are listed in the :cpp:type:`pcnt_event_callbacks_t`:
 
--  :cpp:member:`on_reach` sets a callback function for watch point event. As this function is called within the ISR context, user must ensure that the function doesn't attempt to block (e.g., by making sure that only FreeRTOS APIs with ``ISR`` suffix are called from within the function). The function prototype is declared in :cpp:type:`pcnt_watch_cb_t`.
+-  :cpp:member:`pcnt_event_callbacks_t::on_reach` sets a callback function for watch point event. As this function is called within the ISR context, user must ensure that the function doesn't attempt to block (e.g., by making sure that only FreeRTOS APIs with ``ISR`` suffix are called from within the function). The function prototype is declared in :cpp:type:`pcnt_watch_cb_t`.
 
 User can save their own context to :cpp:func:`pcnt_unit_register_event_callbacks` as well, via the parameter ``user_ctx``. This user data will be directly passed to the callback functions.
 
 In the callback function, the driver will fill in the event data of specific event. For example, the watch point event data is declared as :cpp:type:`pcnt_watch_event_data_t`:
 
--  :cpp:member:`watch_point_value` saves the watch point value that triggers the event.
+-  :cpp:member:`pcnt_watch_event_data_t::watch_point_value` saves the watch point value that triggers the event.
--  :cpp:member:`zero_cross_mode` saves how the PCNT unit crosses the zero point in the latest time. The possible zero cross modes are listed in the :cpp:type:`pcnt_unit_zero_cross_mode_t`. Usually different zero cross mode means different **counting direction** and **counting step size**.
+-  :cpp:member:`pcnt_watch_event_data_t::zero_cross_mode` saves how the PCNT unit crosses the zero point in the latest time. The possible zero cross modes are listed in the :cpp:type:`pcnt_unit_zero_cross_mode_t`. Usually different zero cross mode means different **counting direction** and **counting step size**.
 
 .. code:: c
 
@@ -156,9 +156,9 @@ Unit IO Control
 Set Glitch Filter
 ~~~~~~~~~~~~~~~~~
 
-The PCNT unit features filters to ignore possible short glitches in the signals. The parameters can to be configured for the glitch filter are listed in :cpp:type:`pcnt_glitch_filter_config_t`:
+The PCNT unit features filters to ignore possible short glitches in the signals. The parameters that can be configured for the glitch filter are listed in :cpp:type:`pcnt_glitch_filter_config_t`:
 
--  :cpp:member:`max_glitch_ns` sets the maximum glitch width, in nano seconds. If a signal pulse's width is smaller than this value, then it will be treated as noise and won't increase/decrease the internal counter.
+-  :cpp:member:`pcnt_glitch_filter_config_t::max_glitch_ns` sets the maximum glitch width, in nano seconds. If a signal pulse's width is smaller than this value, then it will be treated as noise and won't increase/decrease the internal counter.
 
 User can enable the glitch filter for PCNT unit by calling :cpp:func:`pcnt_unit_set_glitch_filter` with the filter configuration provided above. Particularly, user can disable the glitch filter later by calling :cpp:func:`pcnt_unit_set_glitch_filter` with a `NULL` filter configuration.
 
@@ -202,7 +202,7 @@ Power Management
 
 When power management is enabled (i.e. :ref:`CONFIG_PM_ENABLE` is on), the system will adjust the APB frequency before going into light sleep, thus potentially changing the behavior of PCNT glitch filter and leading to valid signal being treated as noise.
 
-However, the driver can prevent the system from changing APB frequency by acquiring a power management lock of type :c:member:`ESP_PM_APB_FREQ_MAX`. Whenever user enables the glitch filter by :cpp:func:`pcnt_unit_set_glitch_filter`, the driver will guarantee that the power management lock is acquired after the PCNT unit is started by :cpp:func:`pcnt_unit_start`. Likewise, the driver releases the lock after :cpp:func:`pcnt_unit_stop` is called. This requires that the :cpp:func:`pcnt_unit_start` and :cpp:func:`pcnt_unit_stop` should appear in pairs, otherwise the power management will be out of action.
+However, the driver can prevent the system from changing APB frequency by acquiring a power management lock of type :cpp:enumerator:`ESP_PM_APB_FREQ_MAX`. Whenever user enables the glitch filter by :cpp:func:`pcnt_unit_set_glitch_filter`, the driver will guarantee that the power management lock is acquired after the PCNT unit is started by :cpp:func:`pcnt_unit_start`. Likewise, the driver releases the lock after :cpp:func:`pcnt_unit_stop` is called. This requires that the :cpp:func:`pcnt_unit_start` and :cpp:func:`pcnt_unit_stop` should appear in pairs, otherwise the power management will be out of action.
 
 IRAM Safe
 ^^^^^^^^^
@@ -255,4 +255,4 @@ API Reference
    Different ESP chip series might have different number of PCNT units and channels. Please refer to the [`TRM <{IDF_TARGET_TRM_EN_URL}#pcnt>`__] for details. The driver won't forbid you from applying for more PCNT units and channels, but it will return error when all available hardware resources are used up. Please always check the return value when doing resource allocation (e.g. :cpp:func:`pcnt_new_unit`).
 
 .. [2]
-   :cpp:member:`on_reach` callback and the functions invoked by itself should also be placed in IRAM, users need to take care of them by themselves.
+   :cpp:member:`pcnt_event_callbacks_t::on_reach` callback and the functions invoked by itself should also be placed in IRAM, users need to take care of them by themselves.

docs/en/api-reference/peripherals/rmt.rst

@@ -170,7 +170,7 @@ Finalize Configuration
 
 Once the :cpp:type:`rmt_config_t` structure is populated with parameters, it should be then invoked with :cpp:func:`rmt_config` to make the configuration effective.
 
-The last configuration step is installation of the driver in memory by calling :cpp:func:`rmt_driver_install`. If :cpp:type:`rx_buf_size` parameter of this function is > 0, then a ring buffer for incoming data will be allocated. A default ISR handler will be installed, see a note in `Use Interrupts`_.
+The last configuration step is installation of the driver in memory by calling :cpp:func:`rmt_driver_install`. If `rx_buf_size` parameter of this function is > 0, then a ring buffer for incoming data will be allocated. A default ISR handler will be installed, see a note in `Use Interrupts`_.
 
 Now, depending on how the channel is configured, we are ready to either `Transmit Data`_ or `Receive Data`_. This is described in next two sections.
 
@@ -291,8 +291,6 @@ The RMT controller triggers interrupts on four specific events describes below.
 * The number of events the transmitter has sent matches a threshold value :cpp:func:`rmt_set_tx_thr_intr_en`
 * Ownership to the RMT memory block has been violated - :cpp:func:`rmt_set_err_intr_en`
 
-Setting or clearing an interrupt enable mask for specific channels and events may be also done by calling :cpp:func:`rmt_set_intr_enable_mask` or :cpp:func:`rmt_clr_intr_enable_mask`.
-
 When servicing an interrupt within an ISR, the interrupt need to explicitly cleared. To do so, set specific bits described as ``RMT.int_clr.val.chN_event_name`` and defined as a ``volatile struct`` in :component_file:`soc/{IDF_TARGET_PATH_NAME}/include/soc/rmt_struct.h`, where N is the RMT channel number [0, n] and the ``event_name`` is one of four events described above.
 
 If you do not need an ISR anymore, you can deregister it by calling a function :cpp:func:`rmt_isr_deregister`.

docs/en/api-reference/peripherals/spi_master.rst

@@ -118,11 +118,11 @@ An SPI Host can send full-duplex transactions, during which the read and write p
 
 While the member :cpp:member:`spi_transaction_t::rxlength` only determines the length of data received into the buffer.
 
-In half-duplex transactions, the read and write phases are not simultaneous (one direction at a time). The lengths of the write and read phases are determined by :cpp:member:`length` and :cpp:member:`rxlength` members of the struct :cpp:type:`spi_transaction_t` respectively.
+In half-duplex transactions, the read and write phases are not simultaneous (one direction at a time). The lengths of the write and read phases are determined by :cpp:member:`spi_transaction_t::length` and :cpp:member:`spi_transaction_t::rxlength` respectively.
 
-The command and address phases are optional, as not every SPI device requires a command and/or address. This is reflected in the Device's configuration: if :cpp:member:`command_bits` and/or :cpp:member:`address_bits` are set to zero, no command or address phase will occur.
+The command and address phases are optional, as not every SPI device requires a command and/or address. This is reflected in the Device's configuration: if :cpp:member:`spi_device_interface_config_t::command_bits` and/or :cpp:member:`spi_device_interface_config_t::address_bits` are set to zero, no command or address phase will occur.
 
-The read and write phases can also be optional, as not every transaction requires both writing and reading data. If :cpp:member:`rx_buffer` is NULL and :cpp:type:`SPI_TRANS_USE_RXDATA` is not set, the read phase is skipped. If :cpp:member:`tx_buffer` is NULL and :cpp:type:`SPI_TRANS_USE_TXDATA` is not set, the write phase is skipped.
+The read and write phases can also be optional, as not every transaction requires both writing and reading data. If :cpp:member:`spi_transaction_t::rx_buffer` is NULL and :c:macro:`SPI_TRANS_USE_RXDATA` is not set, the read phase is skipped. If :cpp:member:`spi_transaction_t::tx_buffer` is NULL and :c:macro:`SPI_TRANS_USE_TXDATA` is not set, the write phase is skipped.
 
 The driver supports two types of transactions: the interrupt transactions and polling transactions. The programmer can choose to use a different transaction type per Device. If your Device requires both transaction types, see :ref:`mixed_transactions`.
 
@@ -205,9 +205,9 @@ Supported line modes for {IDF_TARGET_NAME} are listed as follows, to make use of
 Command and Address Phases
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-During the command and address phases, the members :cpp:member:`cmd` and :cpp:member:`addr` in the struct :cpp:type:`spi_transaction_t` are sent to the bus, nothing is read at this time. The default lengths of the command and address phases are set in :cpp:type:`spi_device_interface_config_t` by calling :cpp:func:`spi_bus_add_device`. If the flags :cpp:type:`SPI_TRANS_VARIABLE_CMD` and :cpp:type:`SPI_TRANS_VARIABLE_ADDR` in the member :cpp:member:`spi_transaction_t::flags` are not set, the driver automatically sets the length of these phases to default values during Device initialization.
+During the command and address phases, the members :cpp:member:`spi_transaction_t::cmd` and :cpp:member:`spi_transaction_t::addr` are sent to the bus, nothing is read at this time. The default lengths of the command and address phases are set in :cpp:type:`spi_device_interface_config_t` by calling :cpp:func:`spi_bus_add_device`. If the flags :c:macro:`SPI_TRANS_VARIABLE_CMD` and :c:macro:`SPI_TRANS_VARIABLE_ADDR` in the member :cpp:member:`spi_transaction_t::flags` are not set, the driver automatically sets the length of these phases to default values during Device initialization.
 
-If the lengths of the command and address phases need to be variable, declare the struct :cpp:type:`spi_transaction_ext_t`, set the flags :cpp:type:`SPI_TRANS_VARIABLE_CMD` and/or :cpp:type:`SPI_TRANS_VARIABLE_ADDR` in the member :cpp:member:`spi_transaction_ext_t::base` and configure the rest of base as usual. Then the length of each phase will be equal to :cpp:member:`command_bits` and :cpp:member:`address_bits` set in the struct :cpp:type:`spi_transaction_ext_t`.
+If the lengths of the command and address phases need to be variable, declare the struct :cpp:type:`spi_transaction_ext_t`, set the flags :c:macro:`SPI_TRANS_VARIABLE_CMD` and/or :c:macro:`SPI_TRANS_VARIABLE_ADDR` in the member :cpp:member:`spi_transaction_ext_t::base` and configure the rest of base as usual. Then the length of each phase will be equal to :cpp:member:`spi_transaction_ext_t::command_bits` and :cpp:member:`spi_transaction_ext_t::address_bits` set in the struct :cpp:type:`spi_transaction_ext_t`.
 
 If the command and address phase need to be as the same number of lines as data phase, you need to set `SPI_TRANS_MULTILINE_CMD` and/or `SPI_TRANS_MULTILINE_ADDR` to the `flags` member in the struct :cpp:type:`spi_transaction_t`. Also see :ref:`transaction-line-mode`.
 
@@ -215,7 +215,7 @@ If the command and address phase need to be as the same number of lines as data
 Write and Read Phases
 ^^^^^^^^^^^^^^^^^^^^^
 
-Normally, the data that needs to be transferred to or from a Device will be read from or written to a chunk of memory indicated by the members :cpp:member:`rx_buffer` and :cpp:member:`tx_buffer` of the structure :cpp:type:`spi_transaction_t`. If DMA is enabled for transfers, the buffers are required to be:
+Normally, the data that needs to be transferred to or from a Device will be read from or written to a chunk of memory indicated by the members :cpp:member:`spi_transaction_t::rx_buffer` and :cpp:member:`spi_transaction_t::tx_buffer`. If DMA is enabled for transfers, the buffers are required to be:
 
   1. Allocated in DMA-capable internal memory. If :ref:`external PSRAM is enabled<dma-capable-memory>`, this means using ``pvPortMallocCaps(size, MALLOC_CAP_DMA)``.
   2. 32-bit aligned (staring from a 32-bit boundary and having a length of multiples of 4 bytes).
@@ -287,7 +287,7 @@ The example code for the SPI master driver can be found in the :example:`periphe
 Transactions with Data Not Exceeding 32 Bits
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-When the transaction data size is equal to or less than 32 bits, it will be sub-optimal to allocate a buffer for the data. The data can be directly stored in the transaction struct instead. For transmitted data, it can be achieved by using the :cpp:member:`tx_data` member and setting the :cpp:type:`SPI_TRANS_USE_TXDATA` flag on the transmission. For received data, use :cpp:member:`rx_data` and set :cpp:type:`SPI_TRANS_USE_RXDATA`. In both cases, do not touch the :cpp:member:`tx_buffer` or :cpp:member:`rx_buffer` members, because they use the same memory locations as :cpp:member:`tx_data` and :cpp:member:`rx_data`.
+When the transaction data size is equal to or less than 32 bits, it will be sub-optimal to allocate a buffer for the data. The data can be directly stored in the transaction struct instead. For transmitted data, it can be achieved by using the :cpp:member:`spi_transaction_t::tx_data` member and setting the :c:macro:`SPI_TRANS_USE_TXDATA` flag on the transmission. For received data, use :cpp:member:`spi_transaction_t::rx_data` and set :c:macro:`SPI_TRANS_USE_RXDATA`. In both cases, do not touch the :cpp:member:`spi_transaction_t::tx_buffer` or :cpp:member:`spi_transaction_t::rx_buffer` members, because they use the same memory locations as :cpp:member:`spi_transaction_t::tx_data` and :cpp:member:`spi_transaction_t::rx_data`.
 
 
 Transactions with Integers Other Than ``uint8_t``
@@ -493,7 +493,7 @@ For an interrupt transaction, the overall cost is *20+8n/Fspi[MHz]* [us] for n b
 
 When a transaction length is short, the cost of transaction interval is high. If possible, try to squash several short transactions into one transaction to achieve a higher transfer speed.
 
-Please note that the ISR is disabled during flash operation by default. To keep sending transactions during flash operations, enable :ref:`CONFIG_SPI_MASTER_ISR_IN_IRAM` and set :cpp:class:`ESP_INTR_FLAG_IRAM` in the member :cpp:member:`spi_bus_config_t::intr_flags`. In this case, all the transactions queued before starting flash operations will be handled by the ISR in parallel. Also note that the callback of each Device and their callee functions should be in IRAM, or your callback will crash due to cache miss. For more details, see :ref:`iram-safe-interrupt-handlers`.
+Please note that the ISR is disabled during flash operation by default. To keep sending transactions during flash operations, enable :ref:`CONFIG_SPI_MASTER_ISR_IN_IRAM` and set :c:macro:`ESP_INTR_FLAG_IRAM` in the member :cpp:member:`spi_bus_config_t::intr_flags`. In this case, all the transactions queued before starting flash operations will be handled by the ISR in parallel. Also note that the callback of each Device and their callee functions should be in IRAM, or your callback will crash due to cache miss. For more details, see :ref:`iram-safe-interrupt-handlers`.
 
 
 .. only:: esp32
@@ -515,7 +515,7 @@ Please note that the ISR is disabled during flash operation by default. To keep
 
     The maximum allowed frequency is dependent on:
 
-    - ``input_delay_ns`` - maximum data valid time on the MISO bus after a clock cycle on SCLK starts
+    - :cpp:member:`spi_device_interface_config_t::input_delay_ns` - maximum data valid time on the MISO bus after a clock cycle on SCLK starts
     - If the IO_MUX pin or the GPIO Matrix is used
 
     When the GPIO matrix is used, the maximum allowed frequency is reduced to about 33~77% in comparison to the existing *input delay*. To retain a higher frequency, you have to use the IO_MUX pins or the *dummy bit workaround*. You can obtain the maximum reading frequency of the master by using the function :cpp:func:`spi_get_freq_limit`.
@@ -540,7 +540,7 @@ Please note that the ISR is disabled during flash operation by default. To keep
 
     :cpp:member:`spi_device_interface_config_t::flags`
 
-    The SPI master driver still works even if the :cpp:member:`input_delay_ns` in the structure :cpp:type:`spi_device_interface_config_t` is set to 0. However, setting an accurate value helps to:
+    The SPI master driver still works even if the :cpp:member:`spi_device_interface_config_t::input_delay_ns` in the structure :cpp:type:`spi_device_interface_config_t` is set to 0. However, setting an accurate value helps to:
 
     - Calculate the frequency limit for full-duplex transactions
     - Compensate the timing correctly with dummy bits for half-duplex transactions

docs/en/api-reference/peripherals/spi_slave.rst

@@ -73,7 +73,7 @@ As not every transaction requires both writing and reading data, you have a choi
 Driver Usage
 ------------
 
-- Initialize an SPI peripheral as a Device by calling the function cpp:func:`spi_slave_initialize`. Make sure to set the correct I/O pins in the struct :cpp:type:`bus_config`. Set the unused signals to ``-1``.
+- Initialize an SPI peripheral as a Device by calling the function cpp:func:`spi_slave_initialize`. Make sure to set the correct I/O pins in the struct `bus_config`. Set the unused signals to ``-1``.
 
 .. only:: esp32
 
@@ -91,11 +91,11 @@ Driver Usage
 Transaction Data and Master/Slave Length Mismatches
 ---------------------------------------------------
 
-Normally, the data that needs to be transferred to or from a Device is read or written to a chunk of memory indicated by the :cpp:member:`rx_buffer` and :cpp:member:`tx_buffer` members of the :cpp:type:`spi_transaction_t` structure. The SPI driver can be configured to use DMA for transfers, in which case these buffers must be allocated in DMA-capable memory using ``pvPortMallocCaps(size, MALLOC_CAP_DMA)``.
+Normally, the data that needs to be transferred to or from a Device is read or written to a chunk of memory indicated by the :cpp:member:`spi_slave_transaction_t::rx_buffer` and :cpp:member:`spi_slave_transaction_t::tx_buffer`. The SPI driver can be configured to use DMA for transfers, in which case these buffers must be allocated in DMA-capable memory using ``pvPortMallocCaps(size, MALLOC_CAP_DMA)``.
 
-The amount of data that the driver can read or write to the buffers is limited by the member :cpp:member:`spi_transaction_t::length`. However, this member does not define the actual length of an SPI transaction. A transaction's length is determined by a Host which drives the clock and CS lines. The actual length of the transmission can be read only after a transaction is finished from the member :cpp:member:`spi_slave_transaction_t::trans_len`.
+The amount of data that the driver can read or write to the buffers is limited by :cpp:member:`spi_slave_transaction_t::length`. However, this member does not define the actual length of an SPI transaction. A transaction's length is determined by a Host which drives the clock and CS lines. The actual length of the transmission can be read only after a transaction is finished from the member :cpp:member:`spi_slave_transaction_t::trans_len`.
 
-If the length of the transmission is greater than the buffer length, only the initial number of bits specified in the :cpp:member:`length` member will be sent and received. In this case, :cpp:member:`trans_len` is set to :cpp:member:`length` instead of the actual transaction length. To meet the actual transaction length requirements, set :cpp:member:`length` to a value greater than the maximum :cpp:member:`trans_len` expected. If the transmission length is shorter than the buffer length, only the data equal to the length of the buffer will be transmitted.
+If the length of the transmission is greater than the buffer length, only the initial number of bits specified in the :cpp:member:`spi_slave_transaction_t::length` member will be sent and received. In this case, :cpp:member:`spi_slave_transaction_t::trans_len` is set to :cpp:member:`spi_slave_transaction_t::length` instead of the actual transaction length. To meet the actual transaction length requirements, set :cpp:member:`spi_slave_transaction_t::length` to a value greater than the maximum :cpp:member:`spi_slave_transaction_t::trans_len` expected. If the transmission length is shorter than the buffer length, only the data equal to the length of the buffer will be transmitted.
 
 .. only:: esp32
 

docs/en/api-reference/peripherals/uart.rst

@@ -217,7 +217,7 @@ The UART controller supports a number of communication modes. A mode can be sele
 Using Interrupts
 ^^^^^^^^^^^^^^^^
 
-There are many interrupts that can be generated following specific UART states or detected errors. The full list of available interrupts is provided in *{IDF_TARGET_NAME} Technical Reference Manual* > *UART Controller (UART)* > *UART Interrupts* and *UHCI Interrupts* [`PDF <{IDF_TARGET_TRM_EN_URL}#uart>`__]. You can enable or disable specific interrupts by calling :cpp:func:`uart_enable_intr_mask` or :cpp:func:`uart_disable_intr_mask` respectively. The mask of all interrupts is available as :c:macro:`UART_INTR_MASK`.
+There are many interrupts that can be generated following specific UART states or detected errors. The full list of available interrupts is provided in *{IDF_TARGET_NAME} Technical Reference Manual* > *UART Controller (UART)* > *UART Interrupts* and *UHCI Interrupts* [`PDF <{IDF_TARGET_TRM_EN_URL}#uart>`__]. You can enable or disable specific interrupts by calling :cpp:func:`uart_enable_intr_mask` or :cpp:func:`uart_disable_intr_mask` respectively.
 
 The :cpp:func:`uart_driver_install` function installs the driver's internal interrupt handler to manage the Tx and Rx ring buffers and provides high-level API functions like events (see below).
 

docs/en/api-reference/protocols/esp_https_server.rst

@@ -23,9 +23,9 @@ The following API of `esp_http_server` should not be used with `esp_https_server
   * :cpp:func:`httpd_sess_get_transport_ctx` - returns SSL used for the session
   * :cpp:func:`httpd_sess_set_transport_ctx`
   * :cpp:func:`httpd_get_global_transport_ctx` - returns the shared SSL context
-  * :c:member:`httpd_config_t.global_transport_ctx`
+  * :cpp:member:`httpd_config::global_transport_ctx`
-  * :c:member:`httpd_config_t.global_transport_ctx_free_fn`
+  * :cpp:member:`httpd_config::global_transport_ctx_free_fn`
-  * :c:member:`httpd_config_t.open_fn` - used to set up secure sockets
+  * :cpp:member:`httpd_config::open_fn` - used to set up secure sockets
 
 Everything else can be used without limitations.
 
@@ -36,7 +36,7 @@ Please see the example :example:`protocols/https_server` to learn how to set up
 
 Basically all you need is to generate a certificate, embed it in the firmware, and provide its pointers and lengths to the start function via the init struct.
 
-The server can be started with or without SSL by changing a flag in the init struct - :c:member:`httpd_ssl_config.transport_mode`. This could be used e.g. for testing or in trusted environments where you prefer speed over security.
+The server can be started with or without SSL by changing a flag in the init struct - :cpp:member:`httpd_ssl_config::transport_mode`. This could be used e.g. for testing or in trusted environments where you prefer speed over security.
 
 Performance
 -----------

docs/en/api-reference/protocols/esp_serial_slave_link.rst

@@ -153,7 +153,7 @@ TX FIFO
    receive data from the master. This is optional. The master will poll `tx_buffer_num` when it try
    to send packets to the slave, until the slave has enough buffer or timeout.
 
-2. Call :cpp:func:`essl_send_paket` to send data to the slave.
+2. Call :cpp:func:`essl_send_packet` to send data to the slave.
 
 RX FIFO
 ^^^^^^^

docs/en/api-reference/storage/fatfs.rst

@@ -56,6 +56,7 @@ The header file :component_file:`fatfs/vfs/esp_vfs_fat.h` defines convenience fu
 The convenience function :cpp:func:`esp_vfs_fat_sdmmc_unmount` unmounts the filesystem and releases the resources acquired by :cpp:func:`esp_vfs_fat_sdmmc_mount`.
 
 .. doxygenfunction:: esp_vfs_fat_sdmmc_mount
+.. doxygenfunction:: esp_vfs_fat_sdmmc_unmount
 .. doxygenfunction:: esp_vfs_fat_sdspi_mount
 .. doxygenstruct:: esp_vfs_fat_mount_config_t
     :members:

docs/en/api-reference/storage/spi_flash.rst

@@ -99,7 +99,7 @@ This is the set of API functions for working with data in flash:
 - :cpp:func:`esp_flash_write` writes data from RAM to flash
 - :cpp:func:`esp_flash_erase_region` erases specific region of flash
 - :cpp:func:`esp_flash_erase_chip` erases the whole flash
-- :cpp:func:`esp_flash_get_chip_size` returns flash chip size, in bytes, as configured in menuconfig
+- :cpp:func:`spi_flash_get_chip_size` returns flash chip size, in bytes, as configured in menuconfig
 
 Generally, try to avoid using the raw SPI flash functions to the "main" SPI flash chip in favour of :ref:`partition-specific functions <flash-partition-apis>`.
 
@@ -108,7 +108,7 @@ SPI Flash Size
 
 The SPI flash size is configured by writing a field in the software bootloader image header, flashed at offset 0x1000.
 
-By default, the SPI flash size is detected by esptool.py when this bootloader is written to flash, and the header is updated with the correct size. Alternatively, it is possible to generate a fixed flash size by setting :envvar:`CONFIG_ESPTOOLPY_FLASHSIZE` in project configuration.
+By default, the SPI flash size is detected by esptool.py when this bootloader is written to flash, and the header is updated with the correct size. Alternatively, it is possible to generate a fixed flash size by setting :ref:`CONFIG_ESPTOOLPY_FLASHSIZE` in project configuration.
 
 If it is necessary to override the configured flash size at runtime, it is possible to set the ``chip_size`` member of the ``g_rom_flashchip`` structure. This size is used by ``esp_flash_*`` functions (in both software & ROM) to check the bounds.
 
@@ -273,7 +273,9 @@ API Reference - SPI Flash
 
 .. include-build-file:: inc/esp_flash_spi_init.inc
 .. include-build-file:: inc/esp_flash.inc
+.. include-build-file:: inc/esp_spi_flash.inc
 .. include-build-file:: inc/spi_flash_types.inc
+.. include-build-file:: inc/esp_flash_err.inc
 
 .. _api-reference-partition-table:
 

docs/en/api-reference/storage/spi_flash_concurrency.rst

@@ -55,7 +55,7 @@ If a function or symbol is not correctly put into IRAM/DRAM, and the interrupt h
 
 .. note::
 
-   When working with string in ISRs, it is not advised to use ``printf`` and other output functions. For debugging purposes, use :cpp:func:`ESP_DRAM_LOGE` and similar macros when logging from ISRs. Make sure that both ``TAG`` and format string are placed into ``DRAM`` in that case.
+   When working with string in ISRs, it is not advised to use ``printf`` and other output functions. For debugging purposes, use :c:macro:`ESP_DRAM_LOGE` and similar macros when logging from ISRs. Make sure that both ``TAG`` and format string are placed into ``DRAM`` in that case.
 
 Non-IRAM-Safe Interrupt Handlers
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

docs/en/api-reference/storage/vfs.rst

@@ -140,7 +140,7 @@ A socket VFS driver needs to be registered with the following functions defined:
 Please see :component_file:`lwip/port/esp32/vfs_lwip.c` for a reference socket driver implementation using LWIP.
 
 .. note::
-    If you use :cpp:func:`select` for socket file descriptors only then you can disable the :envvar:`CONFIG_VFS_SUPPORT_SELECT` option to reduce the code size and improve performance.
+    If you use :cpp:func:`select` for socket file descriptors only then you can disable the :ref:`CONFIG_VFS_SUPPORT_SELECT` option to reduce the code size and improve performance.
     You should not change the socket driver during an active :cpp:func:`select` call or you might experience some undefined behavior.
 
 Paths

docs/en/api-reference/system/app_image_format.rst

@@ -11,7 +11,7 @@ An application image consists of the following structures:
  * offset for 2 Segment = offset for 1 Segment + length of 1 Segment + sizeof(:cpp:type:`esp_image_segment_header_t`).
  * ...
 
-The count of each segment is defined in the ``segment_count`` field that is stored in :cpp:type:`esp_image_header_t`. The count cannot be more than :cpp:type:`ESP_IMAGE_MAX_SEGMENTS`.
+The count of each segment is defined in the ``segment_count`` field that is stored in :cpp:type:`esp_image_header_t`. The count cannot be more than :c:macro:`ESP_IMAGE_MAX_SEGMENTS`.
 
 To get the list of your image segments, please run the following command:
 

docs/en/api-reference/system/efuse.rst

@@ -377,4 +377,5 @@ esptool includes a useful tool for reading/writing {IDF_TARGET_NAME} eFuse bits
    .. include:: inc/espefuse_summary_{IDF_TARGET_NAME}.rst
 
 
-.. include-build-file:: inc/esp_efuse.inc
+.. include-build-file:: inc/components/efuse/{IDF_TARGET_PATH_NAME}/include/esp_efuse.inc
+.. include-build-file:: inc/components/efuse/include/esp_efuse.inc

docs/en/api-reference/system/esp_err.rst

@@ -10,5 +10,5 @@ For the full list of error codes defined in ESP-IDF, see :doc:`Error Code Refere
 API Reference
 -------------
 
+.. include-build-file:: inc/esp_check.inc
 .. include-build-file:: inc/esp_err.inc
-

docs/en/api-reference/system/himem.rst

@@ -13,8 +13,8 @@ mapped into the CPU address space by a MMU, which maps a configurable 32K bank/p
 4MiB region accessed by the CPU. For external memories that are <=4MiB, this MMU is configured to unity mapping, effectively mapping each
 CPU address 1-to-1 to the external SPI RAM address.
 
-In order to use the himem API, you have to enable it in the menuconfig using :envvar:`CONFIG_SPIRAM_BANKSWITCH_ENABLE`, as well as set the amount 
+In order to use the himem API, you have to enable it in the menuconfig using :ref:`CONFIG_SPIRAM_BANKSWITCH_ENABLE`, as well as set the amount
-of banks reserved for this in :envvar:`CONFIG_SPIRAM_BANKSWITCH_RESERVE`. This decreases
+of banks reserved for this in :ref:`CONFIG_SPIRAM_BANKSWITCH_RESERVE`. This decreases
 the amount of external memory allocated by functions like ``malloc()``, but it allows you to use the himem api to map any of the remaining memory
 into the reserved banks.
 

docs/en/api-reference/system/index.rst

@@ -24,6 +24,7 @@ System API
     intr_alloc
     log
     system
+    soc_caps
     ota
     :CONFIG_IDF_TARGET_ARCH_XTENSA: perfmon
     power_management
@@ -38,4 +39,5 @@ System API
     wdts
 
 
+
 Code examples for this API section are provided in the :example:`system` directory of ESP-IDF examples.

docs/en/api-reference/system/mem_alloc.rst

@@ -153,7 +153,7 @@ Knowledge about the regions of memory in the chip comes from the "soc" component
 
 Each contiguous region of memory contains its own memory heap. The heaps are created using the `multi_heap <API Reference - Multi Heap API>`_ functionality. multi_heap allows any contiguous region of memory to be used as a heap.
 
-The heap capabilities allocator uses knowledge of the memory regions to initialize each individual heap. Allocation functions in the heap capabilities API will find the most appropriate heap for the allocation (based on desired capabilities, available space, and preferences for each region's use) and then calling :cpp:func:`multi_heap_malloc` or :cpp:func:`multi_heap_calloc` for the heap situated in that particular region.
+The heap capabilities allocator uses knowledge of the memory regions to initialize each individual heap. Allocation functions in the heap capabilities API will find the most appropriate heap for the allocation (based on desired capabilities, available space, and preferences for each region's use) and then calling :cpp:func:`multi_heap_malloc` for the heap situated in that particular region.
 
 Calling ``free()`` involves finding the particular heap corresponding to the freed address, and then calling :cpp:func:`multi_heap_free` on that particular multi_heap instance.
 

docs/en/api-reference/system/power_management.rst

@@ -100,10 +100,10 @@ When DFS is enabled, the APB frequency can be changed multiple times within a si
 
 The following peripherals work normally even when the APB frequency is changing:
 
-- **UART**: if REF_TICK is used as a clock source. See `use_ref_tick` member of :cpp:class:`uart_config_t`.
+- **UART**: if REF_TICK is used as a clock source. See cpp:member:`uart_config_t::use_ref_tick`.
 - **LEDC**: if REF_TICK is used as a clock source. See :cpp:func:`ledc_timer_config` function.
-- **RMT**: if REF_TICK or XTAL is used as a clock source. See `flags` member of :cpp:class:`rmt_config_t` and macro `RMT_CHANNEL_FLAGS_AWARE_DFS`.
+- **RMT**: if REF_TICK or XTAL is used as a clock source. See :cpp:member:`rmt_config_t::flags` and macro `RMT_CHANNEL_FLAGS_AWARE_DFS`.
-- **GPTimer**: if APB is used as the clock source. See :c:member:`clk_src` member of :c:type:`gptimer_config_t`.
+- **GPTimer**: if APB is used as the clock source. See :cpp:member:`gptimer_config_t::clk_src`.
 - **TSENS**: XTAL or RTC_8M is used as a clock source. So, APB frequency changing will not influence it.
 
 Currently, the following peripheral drivers are aware of DFS and will use the ``ESP_PM_APB_FREQ_MAX`` lock for the duration of the transaction:

docs/en/api-reference/system/sleep_modes.rst

@@ -78,7 +78,7 @@ This wakeup mode doesn't require RTC peripherals or RTC memories to be powered o
 
     RTC IO module contains logic to trigger wakeup when one of RTC GPIOs is set to a predefined logic level. RTC IO is part of RTC peripherals power domain, so RTC peripherals will be kept powered on during deep sleep if this wakeup source is requested.
 
-    Because RTC IO module is enabled in this mode, internal pullup or pulldown resistors can also be used. They need to be configured by the application using :cpp:func:`rtc_gpio_pullup_en` and :cpp:func:`rtc_gpio_pulldown_en` functions, before calling :cpp:func:`esp_sleep_start`.
+    Because RTC IO module is enabled in this mode, internal pullup or pulldown resistors can also be used. They need to be configured by the application using :cpp:func:`rtc_gpio_pullup_en` and :cpp:func:`rtc_gpio_pulldown_en` functions, before calling :cpp:func:`esp_deep_sleep_start`.
 
     .. only:: esp32
 

docs/en/api-reference/system/soc_caps.rst

@@ -0,0 +1,14 @@
+SoC Capabilities
+================
+
+This section lists definitions of the {IDF_TARGET_NAME}'s SoC hardware capabilities. These definitions are commonly used in IDF to control which hardware dependent features are supported and thus compiled into the binary.
+
+.. note::
+
+    These defines are currently not considered to be part of the public API, and may be changed at any time.
+
+
+API Reference
+-------------
+
+.. include-build-file:: inc/soc_caps.inc

docs/en/api-reference/system/system.rst

@@ -204,3 +204,5 @@ API Reference
 .. include-build-file:: inc/esp_system.inc
 .. include-build-file:: inc/esp_idf_version.inc
 .. include-build-file:: inc/esp_mac.inc
+.. include-build-file:: inc/esp_chip_info.inc
+.. include-build-file:: inc/esp_cpu.inc

docs/en/api-reference/system/system_time.rst

@@ -114,7 +114,7 @@ To start synchronization via SNTP, just call the following three functions.
     sntp_setservername(0, "pool.ntp.org");
     sntp_init();
 
-An application with this initialization code will periodically synchronize the time. The time synchronization period is determined by :envvar:`CONFIG_LWIP_SNTP_UPDATE_DELAY` (default value is one hour). To modify the variable, set :ref:`CONFIG_LWIP_SNTP_UPDATE_DELAY` in project configuration.
+An application with this initialization code will periodically synchronize the time. The time synchronization period is determined by :ref:`CONFIG_LWIP_SNTP_UPDATE_DELAY` (default value is one hour). To modify the variable, set :ref:`CONFIG_LWIP_SNTP_UPDATE_DELAY` in project configuration.
 
 A code example that demonstrates the implementation of time synchronization based on the lwIP SNTP library is provided in :example:`protocols/sntp` directory.
 

docs/en/migration-guides/ethernet.rst

@@ -39,8 +39,8 @@ KSZ8041/81 and LAN8720 Drivers were updated to support more devices (generations
 
 As a result, the specific "chip number" functions calls were replaced by generic ones as follows:
 
-* :cpp:func:`esp_eth_phy_new_ksz8041` and :cpp:func:`esp_eth_phy_new_ksz8081` were removed, use :cpp:func:`esp_eth_phy_new_ksz80xx` instead
+* `esp_eth_phy_new_ksz8041` and `esp_eth_phy_new_ksz8081` were removed, use :cpp:func:`esp_eth_phy_new_ksz80xx` instead
-* :cpp:func:`esp_eth_phy_new_lan8720` was removed, use :cpp:func:`esp_eth_phy_new_lan87xx` instead
+* `esp_eth_phy_new_lan8720` was removed, use :cpp:func:`esp_eth_phy_new_lan87xx` instead
 
 
 ESP NETIF Glue Event Handlers

docs/en/migration-guides/peripherals.rst

@@ -42,7 +42,7 @@ Breaking Changes in Concepts
 -  Definition of timer source clock is moved to :cpp:type:`gptimer_clock_source_t`, the previous ``timer_src_clk_t`` is not used.
 -  Definition of timer count direction is moved to :cpp:type:`gptimer_count_direction_t`, the previous ``timer_count_dir_t`` is not used.
 -  Only level interrupt is supported, ``timer_intr_t`` and ``timer_intr_mode_t`` are not used.
--  Auto-reload is enabled by set the :cpp:member:`auto_reload_on_alarm` flag. ``timer_autoreload_t`` is not used.
+-  Auto-reload is enabled by set the :cpp:member:`gptimer_alarm_config_t::auto_reload_on_alarm` flag. ``timer_autoreload_t`` is not used.
 
 Breaking Changes in Usage
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -50,19 +50,19 @@ Breaking Changes in Usage
 -  Timer initialization is done by creating a timer instance from :cpp:func:`gptimer_new_timer`. Basic configurations like clock source, resolution and direction should be set in :cpp:type:`gptimer_config_t`. Note that, alarm event specific configurations are not needed during the driver install stage.
 -  Alarm event is configured by :cpp:func:`gptimer_set_alarm_action`, with parameters set in the :cpp:type:`gptimer_alarm_config_t`.
 -  Setting and getting count value are done by :cpp:func:`gptimer_get_raw_count` and :cpp:func:`gptimer_set_raw_count`. The driver doesn't help convert the raw value into UTC time-stamp. Instead, the conversion should be done form user's side as the timer resolution is also known to the user.
--  The driver will install the interrupt service as well if :cpp:member:`on_alarm` is set to a valid callback function. In the callback, user doesn't have to deal with the low level registers (like "clear interrupt status", "re-enable alarm event" and so on). So functions like ``timer_group_get_intr_status_in_isr`` and ``timer_group_get_auto_reload_in_isr`` are not used anymore.
+-  The driver will install the interrupt service as well if :cpp:member:`gptimer_event_callbacks_t::on_alarm` is set to a valid callback function. In the callback, user doesn't have to deal with the low level registers (like "clear interrupt status", "re-enable alarm event" and so on). So functions like ``timer_group_get_intr_status_in_isr`` and ``timer_group_get_auto_reload_in_isr`` are not used anymore.
 -  To update the alarm configurations when alarm event happens, one can call :cpp:func:`gptimer_set_alarm_action` in the interrupt callback, then the alarm will be re-enabled again.
--  Alarm will always be re-enabled by the driver if :cpp:member:`auto_reload_on_alarm` is set to true.
+-  Alarm will always be re-enabled by the driver if :cpp:member:`gptimer_alarm_config_t::auto_reload_on_alarm` is set to true.
 
 UART
 ----
 
-- :cpp:member:`uart_isr_register` and :cpp:member:`uart_isr_free` have been removed as the UART interrupt handling is closely related to the driver implementation.
+- ``uart_isr_register`` and ``uart_isr_free`` have been removed as the UART interrupt handling is closely related to the driver implementation.
 
 I2C
 ---
 
-- :cpp:member:`i2c_isr_register` and :cpp:member:`i2c_isr_free` have been removed as the I2C interrupt handling is closely related to the driver implementation.
+- ``i2c_isr_register`` and ``i2c_isr_free`` have been removed as the I2C interrupt handling is closely related to the driver implementation.
 
 .. only:: SOC_PCNT_SUPPORTED
 

docs/en/migration-guides/protocols.rst

@@ -73,10 +73,10 @@ Breaking Changes (Summary)
 Names of variables holding different certs in :cpp:type:`httpd_ssl_config_t` structure have been updated.
 
 .. list::
-    * :cpp:member:`servercert` variable inherits role of :cpp:member:`cacert_pem` variable.
+    * :cpp:member:`httpd_ssl_config::servercert` variable inherits role of `cacert_pem` variable.
-    * :cpp:member:`servercert_len` variable inherits role of :cpp:member:`cacert_len` variable
+    * :cpp:member:`httpd_ssl_config::servercert_len` variable inherits role of `cacert_len` variable
-    * :cpp:member:`cacert_pem` variable inherits role of :cpp:member:`client_verify_cert_pem` variable
+    * :cpp:member:`httpd_ssl_config::cacert_pem` variable inherits role of `client_verify_cert_pem` variable
-    * :cpp:member:`cacert_len` variable inherits role of :cpp:member:`client_verify_cert_len` variable
+    * :cpp:member:`httpd_ssl_config::cacert_len` variable inherits role of `client_verify_cert_len` variable
 
 
 ESP HTTPS OTA

docs/en/security/flash-encryption.rst

@@ -623,8 +623,6 @@ You can also use the following SPI flash API functions:
 - :cpp:func:`esp_flash_read` to read raw (encrypted) data which will not be decrypted
 - :cpp:func:`esp_flash_read_encrypted` to read and decrypt data
 
-The ROM function :cpp:func:`SPIRead` can read data without decryption, however, this function is not supported in esp-idf applications.
-
 Data stored using the Non-Volatile Storage (NVS) API is always stored and read decrypted from the perspective of flash encryption. It is up to the library to provide encryption feature if required. Refer to :ref:`NVS Encryption <nvs_encryption>` for more details.
 
 

docs/requirements.txt

@@ -1 +1 @@
-esp-docs==0.2.1
+esp-docs==0.2.2

docs/zh_CN/api-guides/error-handling.rst

@@ -48,7 +48,7 @@ ESP-IDF 中大多数函数会返回 :cpp:type:`esp_err_t` 类型的错误码，
 ``ESP_ERROR_CHECK`` 宏
 ----------------------
 
-宏 :cpp:func:`ESP_ERROR_CHECK` 的功能和 ``assert`` 类似，不同之处在于：这个宏会检查 :cpp:type:`esp_err_t` 的值，而非判断 ``bool`` 条件。如果传给 :cpp:func:`ESP_ERROR_CHECK` 的参数不等于 :c:macro:`ESP_OK` ，则会在控制台上打印错误消息，然后调用 ``abort()`` 函数。
+宏 :c:macro:`ESP_ERROR_CHECK` 的功能和 ``assert`` 类似，不同之处在于：这个宏会检查 :cpp:type:`esp_err_t` 的值，而非判断 ``bool`` 条件。如果传给 :c:macro:`ESP_ERROR_CHECK` 的参数不等于 :c:macro:`ESP_OK` ，则会在控制台上打印错误消息，然后调用 ``abort()`` 函数。
 
 错误消息通常如下所示::
 
@@ -64,7 +64,7 @@ ESP-IDF 中大多数函数会返回 :cpp:type:`esp_err_t` 类型的错误码，
 
 -  第一行打印错误代码的十六进制表示，及该错误在源代码中的标识符。这个标识符取决于 :ref:`CONFIG_ESP_ERR_TO_NAME_LOOKUP` 选项的设定。最后，第一行还会打印程序中该错误发生的具体位置。
 
--  下面几行显示了程序中调用 :cpp:func:`ESP_ERROR_CHECK` 宏的具体位置，以及传递给该宏的参数。
+-  下面几行显示了程序中调用 :c:macro:`ESP_ERROR_CHECK` 宏的具体位置，以及传递给该宏的参数。
 
 -  最后一行打印回溯结果。对于所有不可恢复错误，这里在应急处理程序中打印的内容都是一样的。更多有关回溯结果的详细信息，请参阅 :doc:`不可恢复错误 <fatal-errors>` 。
 
@@ -74,35 +74,35 @@ ESP-IDF 中大多数函数会返回 :cpp:type:`esp_err_t` 类型的错误码，
 ``ESP_ERROR_CHECK_WITHOUT_ABORT`` 宏
 ------------------------------------
 
-宏 :cpp:func:`ESP_ERROR_CHECK_WITHOUT_ABORT` 的功能和 ``ESP_ERROR_CHECK`` 类似, 不同之处在于它不会调用 ``abort()``.
+宏 :c:macro:`ESP_ERROR_CHECK_WITHOUT_ABORT` 的功能和 ``ESP_ERROR_CHECK`` 类似, 不同之处在于它不会调用 ``abort()``.
 
 .. _esp-return-on-error-macro:
 
 ``ESP_RETURN_ON_ERROR`` 宏
 --------------------------
 
-宏 :cpp:func:`ESP_RETURN_ON_ERROR` 用于错误码检查, 如果错误码不等于 :c:macro:`ESP_OK`, 该宏会打印错误信息，并使原函数立刻返回。
+宏 :c:macro:`ESP_RETURN_ON_ERROR` 用于错误码检查, 如果错误码不等于 :c:macro:`ESP_OK`, 该宏会打印错误信息，并使原函数立刻返回。
 
 .. _esp-goto-on-error-macro:
 
 ``ESP_GOTO_ON_ERROR`` 宏
 ------------------------
 
-宏 :cpp:func:`ESP_GOTO_ON_ERROR` 用于错误码检查, 如果错误码不等于 :c:macro:`ESP_OK`, 该宏会打印错误信息，将局部变量 `ret` 赋值为该错误码, 并使原函数跳转至给定的 `goto_tag`.
+宏 :c:macro:`ESP_GOTO_ON_ERROR` 用于错误码检查, 如果错误码不等于 :c:macro:`ESP_OK`, 该宏会打印错误信息，将局部变量 `ret` 赋值为该错误码, 并使原函数跳转至给定的 `goto_tag`.
 
 .. _esp-return-on-false-macro:
 
 ``ESP_RETURN_ON_FALSE`` 宏
 --------------------------
 
-宏 :cpp:func:`ESP_RETURN_ON_FALSE` 用于条件检查, 如果给定条件不等于 `true`, 该宏会打印错误信息，并使原函数立刻返回，返回值为给定的 `err_code`.
+宏 :c:macro:`ESP_RETURN_ON_FALSE` 用于条件检查, 如果给定条件不等于 `true`, 该宏会打印错误信息，并使原函数立刻返回，返回值为给定的 `err_code`.
 
 .. _esp-goto-on-false-macro:
 
 ``ESP_GOTO_ON_FALSE`` 宏
 ------------------------
 
-宏 :cpp:func:`ESP_GOTO_ON_FALSE` 用于条件检查, 如果给定条件不等于 `true`, 该宏会打印错误信息，将局部变量 `ret` 赋值为给定的 `err_code`, 并使原函数跳转至给定的 `goto_tag`.
+宏 :c:macro:`ESP_GOTO_ON_FALSE` 用于条件检查, 如果给定条件不等于 `true`, 该宏会打印错误信息，将局部变量 `ret` 赋值为给定的 `err_code`, 并使原函数跳转至给定的 `goto_tag`.
 
 .. _check_macros_examples:
 

docs/zh_CN/api-reference/peripherals/i2c.rst

@@ -312,7 +312,7 @@ API 为从机提供以下功能：
 
 如本节末尾所述 :ref:`i2c-api-configure-driver`，函数 :cpp:func:`i2c_param_config` 在初始化 I2C 端口的驱动程序配置时，也会将几个 I2C 通信参数设置为 `I2C 总线协议规范 <https://www.nxp.com/docs/en/user-guide/UM10204.pdf>`_ 规定的默认值。 其他一些相关参数已在 I2C 控制器的寄存器中预先配置。
 
-通过调用下表中提供的专用函数，可以将所有这些参数更改为用户自定义值。请注意，时序值是在 APB 时钟周期中定义。APB 的频率在 :cpp:type:`I2C_APB_CLK_FREQ` 中指定。
+通过调用下表中提供的专用函数，可以将所有这些参数更改为用户自定义值。请注意，时序值是在 APB 时钟周期中定义。APB 的频率在 :c:macro:`I2C_APB_CLK_FREQ` 中指定。
 
 .. list-table:: 其他可配置的 I2C 通信参数
    :widths: 65 35

docs/zh_CN/api-reference/storage/fatfs.rst

@@ -56,6 +56,7 @@ FatFs 与 VFS 和 SD 卡配合使用
 便捷函数 :cpp:func:`esp_vfs_fat_sdmmc_unmount` 用于卸载文件系统并释放从 :cpp:func:`esp_vfs_fat_sdmmc_mount` 函数获取的资源。
 
 .. doxygenfunction:: esp_vfs_fat_sdmmc_mount
+.. doxygenfunction:: esp_vfs_fat_sdmmc_unmount
 .. doxygenfunction:: esp_vfs_fat_sdspi_mount
 .. doxygenstruct:: esp_vfs_fat_mount_config_t
     :members:

docs/zh_CN/api-reference/storage/spi_flash.rst

@@ -99,7 +99,7 @@ SPI Flash 访问 API
 - :cpp:func:`esp_flash_write`：将数据从 RAM 写入到 flash；
 - :cpp:func:`esp_flash_erase_region`：擦除 flash 中指定区域的数据；
 - :cpp:func:`esp_flash_erase_chip`：擦除整个 flash；
-- :cpp:func:`esp_flash_get_chip_size`：返回 menuconfig 中设置的 flash 芯片容量（以字节为单位）。
+- :cpp:func:`spi_flash_get_chip_size`：返回 menuconfig 中设置的 flash 芯片容量（以字节为单位）。
 
 一般来说，请尽量避免对主 SPI flash 芯片直接使用原始 SPI flash 函数，如需对主 SPI flash 芯片进行操作，请使用 :ref:`分区专用函数 <flash-partition-apis>`。
 
@@ -108,7 +108,7 @@ SPI Flash 容量
 
 SPI flash 容量存储于引导程序镜像头部（烧录偏移量为 0x1000）的一个字段。
 
-默认情况下，引导程序写入 flash 时，esptool.py 将引导程序写入 flash 时，会自动检测 SPI flash 容量，同时使用正确容量更新引导程序的头部。您也可以在工程配置中设置 :envvar:`CONFIG_ESPTOOLPY_FLASHSIZE`，生成固定的 flash 容量。
+默认情况下，引导程序写入 flash 时，esptool.py 将引导程序写入 flash 时，会自动检测 SPI flash 容量，同时使用正确容量更新引导程序的头部。您也可以在工程配置中设置 :ref:`CONFIG_ESPTOOLPY_FLASHSIZE`，生成固定的 flash 容量。
 
 如需在运行时覆盖已配置的 flash 容量，请配置 ``g_rom_flashchip`` 结构中的 ``chip_size``。``esp_flash_*`` 函数使用此容量（于软件和 ROM 中）进行边界检查。
 
@@ -261,7 +261,9 @@ SPI Flash API 参考
 
 .. include-build-file:: inc/esp_flash_spi_init.inc
 .. include-build-file:: inc/esp_flash.inc
+.. include-build-file:: inc/esp_spi_flash.inc
 .. include-build-file:: inc/spi_flash_types.inc
+.. include-build-file:: inc/esp_flash_err.inc
 
 .. _api-reference-partition-table:
 

docs/zh_CN/api-reference/storage/vfs.rst

@@ -140,7 +140,7 @@ VFS 组件支持通过 :cpp:func:`select` 进行同步输入/输出多路复用
 请参考 :component_file:`lwip/port/esp32/vfs_lwip.c` 以了解使用 LWIP 的套接字驱动参考实现。
 
 .. note::
-    如果 :cpp:func:`select` 用于套接字文件描述符，您可以禁用 :envvar:`CONFIG_VFS_SUPPORT_SELECT` 选项来减少代码量，提高性能。
+    如果 :cpp:func:`select` 用于套接字文件描述符，您可以禁用 :ref:`CONFIG_VFS_SUPPORT_SELECT` 选项来减少代码量，提高性能。
     不要在 :cpp:func:`select` 调用过程中更改套接字驱动，否则会出现一些未定义行为。
 
 路径

docs/zh_CN/api-reference/system/index.rst

@@ -24,6 +24,7 @@ System API
     intr_alloc
     log
     system
+    soc_caps
     ota
     :CONFIG_IDF_TARGET_ARCH_XTENSA: perfmon
     power_management

docs/zh_CN/api-reference/system/power_management.rst

@@ -100,10 +100,10 @@ ESP-IDF 中集成的电源管理算法可以根据应用程序组件的需求，
 
 以下外设不受 APB 频率变更的影响：
 
-- **UART**：如果 REF_TICK 用作时钟源，则 UART 不受 APB 频率变更影响。请查看 :cpp:class:`uart_config_t` 中的 `use_ref_tick`。
+- **UART**：如果 REF_TICK 用作时钟源，则 UART 不受 APB 频率变更影响。请查看 :cpp:member:`uart_config_t::use_ref_tick`。
 - **LEDC**：如果 REF_TICK 用作时钟源，则 LEDC 不受 APB 频率变更影响。请查看 :cpp:func:`ledc_timer_config` 函数。
-- **RMT**：如果 REF_TICK 或者 XTAL 被用作时钟源，则 RMT 不受 APB 频率变更影响。请查看 :cpp:class:`rmt_config_t` 结构体中的 `flags` 成员以及 `RMT_CHANNEL_FLAGS_AWARE_DFS` 宏。
+- **RMT**：如果 REF_TICK 或者 XTAL 被用作时钟源，则 RMT 不受 APB 频率变更影响。请查看 :cpp:member:`rmt_config_t::flags` 以及 `RMT_CHANNEL_FLAGS_AWARE_DFS` 宏。
-- **GPTimer**：如果 XTAL 用作时钟源，则 GPTimer 不受 APB 频率变更影响。请查看 :c:type:`gptimer_config_t` 结构体中的 :c:member:`clk_src` 成员。
+- **GPTimer**：如果 XTAL 用作时钟源，则 GPTimer 不受 APB 频率变更影响。请查看 :cpp:member:`gptimer_config_t::clk_src`。
 - **TSENS**：XTAL 或 RTC_8M 用作时钟源，因此不受 APB 频率变化影响。
 
 目前以下外设驱动程序可感知动态调频，并在调频期间使用 ``ESP_PM_APB_FREQ_MAX`` 锁：

docs/zh_CN/api-reference/system/soc_caps.rst

@@ -0,0 +1 @@
+.. include:: ../../../en/api-reference/system/soc_caps.rst

docs/zh_CN/security/flash-encryption.rst

@@ -623,8 +623,6 @@ Flash 加密范围
 - 通过函数 :cpp:func:`esp_flash_read` 读取不会被解密的原（加密）数据。
 - 通过函数 :cpp:func:`esp_flash_read_encrypted` 读取和解密数据。
 
-ROM 函数 :cpp:func:`SPIRead` 可以在不解密的情况下读取数据，但是在 esp-idf 应用程序中不支持该函数。
-
 使用非易失性存储器 (NVS) API 存储的数据始终从 flash 加密的角度进行存储和读取解密。如有需要，则由库提供加密功能。详情可参考 :ref:`NVS 加密 <nvs_encryption>`。