From 236200a93feac869e8a4e1e925edec0182cdc820 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 6 May 2025 20:32:40 +0200 Subject: [PATCH 1/4] change(examples): remove idf version dependency --- examples/network/sta2eth/main/idf_component.yml | 2 -- .../peripherals/i2s/i2s_codec/i2s_es8311/main/idf_component.yml | 1 - .../tusb_composite_msc_serialdevice/main/idf_component.yml | 1 - .../peripherals/usb/device/tusb_console/main/idf_component.yml | 1 - examples/peripherals/usb/device/tusb_hid/main/idf_component.yml | 1 - .../peripherals/usb/device/tusb_midi/main/idf_component.yml | 1 - examples/peripherals/usb/device/tusb_msc/main/idf_component.yml | 1 - examples/peripherals/usb/device/tusb_ncm/main/idf_component.yml | 1 - .../usb/device/tusb_serial_device/main/idf_component.yml | 1 - 9 files changed, 10 deletions(-) diff --git a/examples/network/sta2eth/main/idf_component.yml b/examples/network/sta2eth/main/idf_component.yml index 21db5940d0..99f347b5e4 100644 --- a/examples/network/sta2eth/main/idf_component.yml +++ b/examples/network/sta2eth/main/idf_component.yml @@ -9,5 +9,3 @@ dependencies: path: ${IDF_PATH}/examples/protocols/http_server/captive_portal/components/dns_server ethernet_init: path: ${IDF_PATH}/examples/ethernet/basic/components/ethernet_init - - idf: "^5.0" diff --git a/examples/peripherals/i2s/i2s_codec/i2s_es8311/main/idf_component.yml b/examples/peripherals/i2s/i2s_codec/i2s_es8311/main/idf_component.yml index 12d07255d5..4f21769305 100644 --- a/examples/peripherals/i2s/i2s_codec/i2s_es8311/main/idf_component.yml +++ b/examples/peripherals/i2s/i2s_codec/i2s_es8311/main/idf_component.yml @@ -1,6 +1,5 @@ ## IDF Component Manager Manifest File dependencies: - idf: "^5.0" espressif/esp_codec_dev: ^1.3.4 i2s_examples_common: path: ${IDF_PATH}/examples/peripherals/i2s/i2s_examples_common diff --git a/examples/peripherals/usb/device/tusb_composite_msc_serialdevice/main/idf_component.yml b/examples/peripherals/usb/device/tusb_composite_msc_serialdevice/main/idf_component.yml index 06b047d6a2..2ddb7752db 100644 --- a/examples/peripherals/usb/device/tusb_composite_msc_serialdevice/main/idf_component.yml +++ b/examples/peripherals/usb/device/tusb_composite_msc_serialdevice/main/idf_component.yml @@ -1,4 +1,3 @@ ## IDF Component Manager Manifest File dependencies: espressif/esp_tinyusb: "^1.2" - idf: "^5.0" diff --git a/examples/peripherals/usb/device/tusb_console/main/idf_component.yml b/examples/peripherals/usb/device/tusb_console/main/idf_component.yml index ff67b5da1e..49f783bca7 100644 --- a/examples/peripherals/usb/device/tusb_console/main/idf_component.yml +++ b/examples/peripherals/usb/device/tusb_console/main/idf_component.yml @@ -1,4 +1,3 @@ ## IDF Component Manager Manifest File dependencies: espressif/esp_tinyusb: "^1" - idf: "^5.0" diff --git a/examples/peripherals/usb/device/tusb_hid/main/idf_component.yml b/examples/peripherals/usb/device/tusb_hid/main/idf_component.yml index b60893c81e..cea92b320d 100644 --- a/examples/peripherals/usb/device/tusb_hid/main/idf_component.yml +++ b/examples/peripherals/usb/device/tusb_hid/main/idf_component.yml @@ -1,4 +1,3 @@ ## IDF Component Manager Manifest File dependencies: espressif/esp_tinyusb: "^1.1" - idf: "^5.0" diff --git a/examples/peripherals/usb/device/tusb_midi/main/idf_component.yml b/examples/peripherals/usb/device/tusb_midi/main/idf_component.yml index b60893c81e..cea92b320d 100644 --- a/examples/peripherals/usb/device/tusb_midi/main/idf_component.yml +++ b/examples/peripherals/usb/device/tusb_midi/main/idf_component.yml @@ -1,4 +1,3 @@ ## IDF Component Manager Manifest File dependencies: espressif/esp_tinyusb: "^1.1" - idf: "^5.0" diff --git a/examples/peripherals/usb/device/tusb_msc/main/idf_component.yml b/examples/peripherals/usb/device/tusb_msc/main/idf_component.yml index 1659a1ebe3..f517b9dd35 100644 --- a/examples/peripherals/usb/device/tusb_msc/main/idf_component.yml +++ b/examples/peripherals/usb/device/tusb_msc/main/idf_component.yml @@ -1,4 +1,3 @@ ## IDF Component Manager Manifest File dependencies: espressif/esp_tinyusb: "^1.4.2" - idf: "^5.0" diff --git a/examples/peripherals/usb/device/tusb_ncm/main/idf_component.yml b/examples/peripherals/usb/device/tusb_ncm/main/idf_component.yml index 2576181c1c..fec38a9f72 100644 --- a/examples/peripherals/usb/device/tusb_ncm/main/idf_component.yml +++ b/examples/peripherals/usb/device/tusb_ncm/main/idf_component.yml @@ -2,4 +2,3 @@ dependencies: espressif/esp_tinyusb: version: "^1.3.0" - idf: "^5.0" diff --git a/examples/peripherals/usb/device/tusb_serial_device/main/idf_component.yml b/examples/peripherals/usb/device/tusb_serial_device/main/idf_component.yml index ff67b5da1e..49f783bca7 100644 --- a/examples/peripherals/usb/device/tusb_serial_device/main/idf_component.yml +++ b/examples/peripherals/usb/device/tusb_serial_device/main/idf_component.yml @@ -1,4 +1,3 @@ ## IDF Component Manager Manifest File dependencies: espressif/esp_tinyusb: "^1" - idf: "^5.0" From 7023b489a73f8d0107698d1e6d4a39670d48e253 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 6 May 2025 20:35:48 +0200 Subject: [PATCH 2/4] change(examples): temp. disable examples which need esp_wifi_remote Will be re-enabled after adding IDF 6.0 compatibility in esp_wifi_remote. --- examples/protocols/.build-test-rules.yml | 4 ++++ examples/protocols/mqtt/tcp/README.md | 4 ++-- examples/wifi/.build-test-rules.yml | 3 +++ examples/wifi/iperf/README.md | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/examples/protocols/.build-test-rules.yml b/examples/protocols/.build-test-rules.yml index de2d27dbb4..340a9a724c 100644 --- a/examples/protocols/.build-test-rules.yml +++ b/examples/protocols/.build-test-rules.yml @@ -193,6 +193,10 @@ examples/protocols/mqtt/ssl_psk: <<: *mqtt_dependencies examples/protocols/mqtt/tcp: <<: *mqtt_dependencies + disable+: + - if: IDF_TARGET in ["esp32p4", "esp32h2"] + temporary: true + reason: need to update esp_wifi_remote component to support idf-v6.0 disable_test: - if: IDF_TARGET != "esp32" reason: only test on esp32 diff --git a/examples/protocols/mqtt/tcp/README.md b/examples/protocols/mqtt/tcp/README.md index cb9f2cca07..b77bfea24a 100644 --- a/examples/protocols/mqtt/tcp/README.md +++ b/examples/protocols/mqtt/tcp/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | # ESP-MQTT sample application (See the README.md file in the upper level 'examples' directory for more information about examples.) diff --git a/examples/wifi/.build-test-rules.yml b/examples/wifi/.build-test-rules.yml index f08a88aaa5..46164a8d84 100644 --- a/examples/wifi/.build-test-rules.yml +++ b/examples/wifi/.build-test-rules.yml @@ -36,6 +36,9 @@ examples/wifi/iperf: disable: - if: (SOC_WIFI_SUPPORTED != 1) and (SOC_WIRELESS_HOST_SUPPORTED != 1) - if: (IDF_TARGET == "esp32p4") and CONFIG_NAME in ["defaults", "99"] + - if: IDF_TARGET in ["esp32p4", "esp32h2"] + temporary: true + reason: need to update esp_wifi_remote component to support idf-v6.0 disable_test: - if: IDF_TARGET not in ["esp32"] temporary: true diff --git a/examples/wifi/iperf/README.md b/examples/wifi/iperf/README.md index cdebd8865e..1b86f94ccd 100644 --- a/examples/wifi/iperf/README.md +++ b/examples/wifi/iperf/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-P4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | # Iperf Example From f019c5d5490b87f57f070d020ba624097a196a20 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 6 May 2025 20:33:49 +0200 Subject: [PATCH 3/4] change(docs): silence new Sphinx warnings after Doxygen upgrade Co-authored-by: Marius Vikhammer --- .codespellrc | 2 +- .pre-commit-config.yaml | 3 +- components/esp_wifi/include/esp_now.h | 2 +- docs/sphinx-known-warnings.txt | 308 +++++++++++++++++++++++--- 4 files changed, 287 insertions(+), 28 deletions(-) diff --git a/.codespellrc b/.codespellrc index 3e7c39a06b..2290f3c11f 100644 --- a/.codespellrc +++ b/.codespellrc @@ -1,4 +1,4 @@ [codespell] -skip = build,*.yuv,components/fatfs/src/*,alice.txt,*.rgb,components/wpa_supplicant/*,components/esp_wifi/*,*.pem,components/newlib/COPYING.* +skip = build,*.yuv,components/fatfs/src/*,alice.txt,*.rgb,components/wpa_supplicant/*,components/esp_wifi/*,*.pem,components/newlib/COPYING.*,docs/sphinx-known-warnings.txt ignore-words-list = ser,dout,rsource,fram,inout,shs,ans,aci,unstall,unstalling,hart,wheight,wel,ot,fane,assertIn,registr,oen,parms write-changes = true diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b63e94037c..975112ef9c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -51,7 +51,8 @@ repos: .*.pb-c.c| .*.yuv| .*.rgb| - .*COPYING.* + .*COPYING.*| + docs/sphinx-known-warnings\.txt )$ - id: end-of-file-fixer exclude: *whitespace_excludes diff --git a/components/esp_wifi/include/esp_now.h b/components/esp_wifi/include/esp_now.h index 3b94187c65..164e19be75 100644 --- a/components/esp_wifi/include/esp_now.h +++ b/components/esp_wifi/include/esp_now.h @@ -113,7 +113,7 @@ typedef void (*esp_now_recv_cb_t)(const esp_now_recv_info_t * esp_now_info, cons /** * @brief Callback function of sending ESPNOW data - * @param esp_now_send_info_t Sending information for ESPNOW data + * @param tx_info Sending information for ESPNOW data * @param status status of sending ESPNOW data (succeed or fail). This is will be removed later, since the tx_info->tx_status also works. */ typedef void (*esp_now_send_cb_t)(const esp_now_send_info_t *tx_info, esp_now_send_status_t status); diff --git a/docs/sphinx-known-warnings.txt b/docs/sphinx-known-warnings.txt index 86402d9554..c0630c1bc0 100644 --- a/docs/sphinx-known-warnings.txt +++ b/docs/sphinx-known-warnings.txt @@ -6,13 +6,293 @@ # # Warnings in this file must be in the same overall order as the log file. # -idf-component-manager.rst: WARNING: Badly formated string substitution: {IDF_TARGET} +esp_ble_mesh_defs.inc:line: WARNING: Invalid C++ declaration: Expected identifier in nested name. [error at 0] + + ^ +esp_ble_mesh_defs.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 78] + union esp_ble_mesh_prov_cb_param_t::ble_mesh_provisioner_prov_output_evt_param + ------------------------------------------------------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 78] + union esp_ble_mesh_prov_cb_param_t::ble_mesh_provisioner_prov_output_evt_param + ------------------------------------------------------------------------------^ + esp_ble_mesh_defs.inc:line: WARNING: Duplicate C++ declaration, also defined at api-reference/bluetooth/esp-ble-mesh:line. Declaration is '.. cpp:member:: uint16_t model_id'. +esp_ble_mesh_defs.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 24] + union esp_ble_mesh_model + ------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 24] + union esp_ble_mesh_model + ------------------------^ + +esp_ble_mesh_defs.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 34] + union esp_ble_mesh_device_delete_t + ----------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 34] + union esp_ble_mesh_device_delete_t + ----------------------------------^ + +esp_ble_mesh_defs.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 35] + union esp_ble_mesh_prov_data_info_t + -----------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 35] + union esp_ble_mesh_prov_data_info_t + -----------------------------------^ + +esp_ble_mesh_df_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 41] + union esp_ble_mesh_forwarding_table_add_t + -----------------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 41] + union esp_ble_mesh_forwarding_table_add_t + -----------------------------------------^ + +esp_ble_mesh_df_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 39] + union esp_ble_mesh_df_client_cb_param_t + ---------------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 39] + union esp_ble_mesh_df_client_cb_param_t + ---------------------------------------^ + +esp_ble_mesh_brc_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 40] + union esp_ble_mesh_brc_client_cb_param_t + ----------------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 40] + union esp_ble_mesh_brc_client_cb_param_t + ----------------------------------------^ + +esp_ble_mesh_prb_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 40] + union esp_ble_mesh_prb_client_cb_param_t + ----------------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 40] + union esp_ble_mesh_prb_client_cb_param_t + ----------------------------------------^ + +esp_ble_mesh_odp_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 40] + union esp_ble_mesh_odp_client_cb_param_t + ----------------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 40] + union esp_ble_mesh_odp_client_cb_param_t + ----------------------------------------^ + +esp_ble_mesh_sar_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 40] + union esp_ble_mesh_sar_client_cb_param_t + ----------------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 40] + union esp_ble_mesh_sar_client_cb_param_t + ----------------------------------------^ + +esp_ble_mesh_srpl_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 41] + union esp_ble_mesh_srpl_client_cb_param_t + -----------------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 41] + union esp_ble_mesh_srpl_client_cb_param_t + -----------------------------------------^ + +esp_ble_mesh_agg_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 40] + union esp_ble_mesh_agg_client_cb_param_t + ----------------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 40] + union esp_ble_mesh_agg_client_cb_param_t + ----------------------------------------^ + +esp_ble_mesh_agg_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 40] + union esp_ble_mesh_agg_server_cb_param_t + ----------------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 40] + union esp_ble_mesh_agg_server_cb_param_t + ----------------------------------------^ + +esp_ble_mesh_lcd_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 40] + union esp_ble_mesh_lcd_client_cb_param_t + ----------------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 40] + union esp_ble_mesh_lcd_client_cb_param_t + ----------------------------------------^ + esp_ble_mesh_cm_data_api.inc:line: WARNING: Duplicate C++ declaration, also defined at api-reference/bluetooth/esp-ble-mesh:line. Declaration is '.. cpp:member:: int8_t element_offset'. -esp_ble_mesh_cm_data_api.inc:line: WARNING: Duplicate C++ declaration, also defined at api-reference/bluetooth/esp-ble-mesh:line. -Declaration is '.. cpp:member:: int8_t model_item_idx'. +esp_ble_mesh_cm_data_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 40] + union esp_ble_mesh_extended_model_item_t + ----------------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 40] + union esp_ble_mesh_extended_model_item_t + ----------------------------------------^ + +esp_ble_mesh_cm_data_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 34] + union esp_ble_mesh_metadata_item_t + ----------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 34] + union esp_ble_mesh_metadata_item_t + ----------------------------------^ + +ecdsa_alt.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 25] + union esp_ecdsa_pk_conf_t + -------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 25] + union esp_ecdsa_pk_conf_t + -------------------------^ + +esp_cam_ctlr_csi.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 32] + struct esp_cam_ctlr_csi_config_t + --------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 32] + struct esp_cam_ctlr_csi_config_t + --------------------------------^ + +isp_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 32] + struct isp_demosaic_grad_ratio_t + --------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 32] + struct isp_demosaic_grad_ratio_t + --------------------------------^ + +isp_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 33] + struct isp_sharpen_h_freq_coeff_t + ---------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 33] + struct isp_sharpen_h_freq_coeff_t + ---------------------------------^ + +isp_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 31] + struct isp_sharpen_m_freq_coeff + -------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 31] + struct isp_sharpen_m_freq_coeff + -------------------------------^ + +isp_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 24] + struct isp_hist_weight_t + ------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 24] + struct isp_hist_weight_t + ------------------------^ + +isp_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 23] + struct isp_hist_coeff_t + -----------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 23] + struct isp_hist_coeff_t + -----------------------^ + +isp_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 27] + struct isp_color_contrast_t + ---------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 27] + struct isp_color_contrast_t + ---------------------------^ + +isp_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 29] + struct isp_color_saturation_t + -----------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 29] + struct isp_color_saturation_t + -----------------------------^ + +isp_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 21] + struct isp_lsc_gain_t + ---------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 21] + struct isp_lsc_gain_t + ---------------------^ + +jpeg_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 32] + struct jpeg_huffman_table_info_t + --------------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 32] + struct jpeg_huffman_table_info_t + --------------------------------^ + +rmt_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers +If pointer to member declarator: + Invalid C++ declaration: Expected identifier in nested name. [error at 24] + struct rmt_symbol_word_t + ------------------------^ +If declarator-id: + Invalid C++ declaration: Expected identifier in nested name. [error at 24] + struct rmt_symbol_word_t + ------------------------^ + mqtt_client.inc:line: WARNING: Duplicate C++ declaration, also defined at api-reference/protocols/mqtt:line. Declaration is '.. cpp:type:: struct esp_mqtt_event_t esp_mqtt_event_t'. mqtt_client.inc:line: WARNING: Duplicate C++ declaration, also defined at api-reference/protocols/mqtt:line. @@ -27,27 +307,5 @@ mqtt_client.inc:line: WARNING: Duplicate C++ declaration, also defined at api-re Declaration is '.. cpp:enum:: esp_mqtt_transport_t'. mqtt_client.inc:line: WARNING: Duplicate C++ declaration, also defined at api-reference/protocols/mqtt:line. Declaration is '.. cpp:enum:: esp_mqtt_protocol_ver_t'. -esp_heap_trace.inc:line: WARNING: Error when parsing function declaration. -If the function has no return type: - Invalid C++ declaration: Expected end of definition or ;. [error at 34] - TAILQ_ENTRY (heap_trace_record_t) tailq - ----------------------------------^ -If the function has a return type: - Error in declarator - If declarator-id with parameters-and-qualifiers: - Invalid C++ declaration: Expected identifier in nested name. [error at 12] - TAILQ_ENTRY (heap_trace_record_t) tailq - ------------^ - If parenthesis in noptr-declarator: - Error in declarator or parameters-and-qualifiers - If pointer to member declarator: - Invalid C++ declaration: Expected '::' in pointer to member (function). [error at 32] - TAILQ_ENTRY (heap_trace_record_t) tailq - --------------------------------^ - If declarator-id: - Invalid C++ declaration: Expecting "(" in parameters-and-qualifiers. [error at 32] - TAILQ_ENTRY (heap_trace_record_t) tailq - --------------------------------^ - esp_heap_trace.inc:line: WARNING: Duplicate C++ declaration, also defined at api-reference/system/heap_debug:line. Declaration is '.. cpp:type:: struct heap_trace_record_t heap_trace_record_t'. From f89d6ee5a04aa1c192d341c7f8b8e72040510e17 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 6 May 2025 20:36:32 +0200 Subject: [PATCH 4/4] change(version): Update version to v6.0-dev --- .gitlab/ci/common.yml | 8 ++++---- components/esp_common/include/esp_idf_version.h | 4 ++-- tools/cmake/version.cmake | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab/ci/common.yml b/.gitlab/ci/common.yml index 57d27a3467..f2df337d56 100644 --- a/.gitlab/ci/common.yml +++ b/.gitlab/ci/common.yml @@ -55,9 +55,9 @@ variables: CHECKOUT_REF_SCRIPT: "$CI_PROJECT_DIR/tools/ci/checkout_project_ref.py" # Docker images - ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.5:3" - ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v5.5:2-1" - TARGET_TEST_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/target-test-env-v5.5:2" + ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v6.0:1" + ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v6.0:1-1" + TARGET_TEST_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/target-test-env-v6.0:1" SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:5" PRE_COMMIT_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-pre-commit:1" @@ -70,7 +70,7 @@ variables: CI_PYTHON_CONSTRAINT_BRANCH: "" # Update the filename for a specific ESP-IDF release. It is used only with CI_PYTHON_CONSTRAINT_BRANCH. - CI_PYTHON_CONSTRAINT_FILE: "espidf.constraints.v5.5.txt" + CI_PYTHON_CONSTRAINT_FILE: "espidf.constraints.v6.0.txt" # Set this variable to repository name of a Python tool you wish to install and test in the context of ESP-IDF CI. # Keep the variable empty when not used. diff --git a/components/esp_common/include/esp_idf_version.h b/components/esp_common/include/esp_idf_version.h index d505172697..10c1a19c48 100644 --- a/components/esp_common/include/esp_idf_version.h +++ b/components/esp_common/include/esp_idf_version.h @@ -11,9 +11,9 @@ extern "C" { #endif /** Major version number (X.x.x) */ -#define ESP_IDF_VERSION_MAJOR 5 +#define ESP_IDF_VERSION_MAJOR 6 /** Minor version number (x.X.x) */ -#define ESP_IDF_VERSION_MINOR 5 +#define ESP_IDF_VERSION_MINOR 0 /** Patch version number (x.x.X) */ #define ESP_IDF_VERSION_PATCH 0 diff --git a/tools/cmake/version.cmake b/tools/cmake/version.cmake index d2ea49e4b8..149aa3364a 100644 --- a/tools/cmake/version.cmake +++ b/tools/cmake/version.cmake @@ -1,5 +1,5 @@ -set(IDF_VERSION_MAJOR 5) -set(IDF_VERSION_MINOR 5) +set(IDF_VERSION_MAJOR 6) +set(IDF_VERSION_MINOR 0) set(IDF_VERSION_PATCH 0) set(ENV{IDF_VERSION} "${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}")