Skip to content

Commit 28ac024

Browse files
committed
Merge branch 'update/v5.5_esp-idf-doc-env-v5.5_ubuntu_24.04' into 'release/v5.5'
Update esp-idf-docs-env-v5.5 image See merge request espressif/esp-idf!38956
2 parents c61f36d + 269f1d1 commit 28ac024

File tree

4 files changed

+289
-28
lines changed

4 files changed

+289
-28
lines changed

.gitlab/ci/common.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ variables:
5656

5757
# Docker images
5858
ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.5:3"
59-
ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v5.5:2-1"
59+
ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v5.5:3-1"
6060
TARGET_TEST_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/target-test-env-v5.5:2"
6161
SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:5"
6262
PRE_COMMIT_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-pre-commit:1"

.pre-commit-config.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ repos:
5151
.*.pb-c.c|
5252
.*.yuv|
5353
.*.rgb|
54-
.*COPYING.*
54+
.*COPYING.*|
55+
docs/sphinx-known-warnings\.txt
5556
)$
5657
- id: end-of-file-fixer
5758
exclude: *whitespace_excludes
@@ -69,6 +70,7 @@ repos:
6970
rev: v2.3.0
7071
hooks:
7172
- id: codespell
73+
exclude: ^docs/sphinx-known-warnings\.txt$
7274
- repo: local
7375
hooks:
7476
- id: check-executables

components/esp_wifi/include/esp_now.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ typedef void (*esp_now_recv_cb_t)(const esp_now_recv_info_t * esp_now_info, cons
113113

114114
/**
115115
* @brief Callback function of sending ESPNOW data
116-
* @param esp_now_send_info_t Sending information for ESPNOW data
116+
* @param tx_info Sending information for ESPNOW data
117117
* @param status status of sending ESPNOW data (succeed or fail). This is will be removed later, since the tx_info->tx_status also works.
118118
*/
119119
typedef void (*esp_now_send_cb_t)(const esp_now_send_info_t *tx_info, esp_now_send_status_t status);

docs/sphinx-known-warnings.txt

Lines changed: 284 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,294 @@
66
#
77
# Warnings in this file must be in the same overall order as the log file.
88
#
9-
idf-component-manager.rst: WARNING: Badly formated string substitution: {IDF_TARGET}
9+
# !!! Preserve the whitespace (two spaces in the line after the following line (before ' ^') !!!
10+
esp_ble_mesh_defs.inc:line: WARNING: Invalid C++ declaration: Expected identifier in nested name. [error at 0]
11+
12+
^
13+
esp_ble_mesh_defs.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
14+
If pointer to member declarator:
15+
Invalid C++ declaration: Expected identifier in nested name. [error at 78]
16+
union esp_ble_mesh_prov_cb_param_t::ble_mesh_provisioner_prov_output_evt_param
17+
------------------------------------------------------------------------------^
18+
If declarator-id:
19+
Invalid C++ declaration: Expected identifier in nested name. [error at 78]
20+
union esp_ble_mesh_prov_cb_param_t::ble_mesh_provisioner_prov_output_evt_param
21+
------------------------------------------------------------------------------^
22+
1023
esp_ble_mesh_defs.inc:line: WARNING: Duplicate C++ declaration, also defined at api-reference/bluetooth/esp-ble-mesh:line.
1124
Declaration is '.. cpp:member:: uint16_t model_id'.
25+
esp_ble_mesh_defs.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
26+
If pointer to member declarator:
27+
Invalid C++ declaration: Expected identifier in nested name. [error at 24]
28+
union esp_ble_mesh_model
29+
------------------------^
30+
If declarator-id:
31+
Invalid C++ declaration: Expected identifier in nested name. [error at 24]
32+
union esp_ble_mesh_model
33+
------------------------^
34+
35+
esp_ble_mesh_defs.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
36+
If pointer to member declarator:
37+
Invalid C++ declaration: Expected identifier in nested name. [error at 34]
38+
union esp_ble_mesh_device_delete_t
39+
----------------------------------^
40+
If declarator-id:
41+
Invalid C++ declaration: Expected identifier in nested name. [error at 34]
42+
union esp_ble_mesh_device_delete_t
43+
----------------------------------^
44+
45+
esp_ble_mesh_defs.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
46+
If pointer to member declarator:
47+
Invalid C++ declaration: Expected identifier in nested name. [error at 35]
48+
union esp_ble_mesh_prov_data_info_t
49+
-----------------------------------^
50+
If declarator-id:
51+
Invalid C++ declaration: Expected identifier in nested name. [error at 35]
52+
union esp_ble_mesh_prov_data_info_t
53+
-----------------------------------^
54+
55+
esp_ble_mesh_df_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
56+
If pointer to member declarator:
57+
Invalid C++ declaration: Expected identifier in nested name. [error at 41]
58+
union esp_ble_mesh_forwarding_table_add_t
59+
-----------------------------------------^
60+
If declarator-id:
61+
Invalid C++ declaration: Expected identifier in nested name. [error at 41]
62+
union esp_ble_mesh_forwarding_table_add_t
63+
-----------------------------------------^
64+
65+
esp_ble_mesh_df_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
66+
If pointer to member declarator:
67+
Invalid C++ declaration: Expected identifier in nested name. [error at 39]
68+
union esp_ble_mesh_df_client_cb_param_t
69+
---------------------------------------^
70+
If declarator-id:
71+
Invalid C++ declaration: Expected identifier in nested name. [error at 39]
72+
union esp_ble_mesh_df_client_cb_param_t
73+
---------------------------------------^
74+
75+
esp_ble_mesh_brc_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
76+
If pointer to member declarator:
77+
Invalid C++ declaration: Expected identifier in nested name. [error at 40]
78+
union esp_ble_mesh_brc_client_cb_param_t
79+
----------------------------------------^
80+
If declarator-id:
81+
Invalid C++ declaration: Expected identifier in nested name. [error at 40]
82+
union esp_ble_mesh_brc_client_cb_param_t
83+
----------------------------------------^
84+
85+
esp_ble_mesh_prb_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
86+
If pointer to member declarator:
87+
Invalid C++ declaration: Expected identifier in nested name. [error at 40]
88+
union esp_ble_mesh_prb_client_cb_param_t
89+
----------------------------------------^
90+
If declarator-id:
91+
Invalid C++ declaration: Expected identifier in nested name. [error at 40]
92+
union esp_ble_mesh_prb_client_cb_param_t
93+
----------------------------------------^
94+
95+
esp_ble_mesh_odp_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
96+
If pointer to member declarator:
97+
Invalid C++ declaration: Expected identifier in nested name. [error at 40]
98+
union esp_ble_mesh_odp_client_cb_param_t
99+
----------------------------------------^
100+
If declarator-id:
101+
Invalid C++ declaration: Expected identifier in nested name. [error at 40]
102+
union esp_ble_mesh_odp_client_cb_param_t
103+
----------------------------------------^
104+
105+
esp_ble_mesh_sar_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
106+
If pointer to member declarator:
107+
Invalid C++ declaration: Expected identifier in nested name. [error at 40]
108+
union esp_ble_mesh_sar_client_cb_param_t
109+
----------------------------------------^
110+
If declarator-id:
111+
Invalid C++ declaration: Expected identifier in nested name. [error at 40]
112+
union esp_ble_mesh_sar_client_cb_param_t
113+
----------------------------------------^
114+
115+
esp_ble_mesh_srpl_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
116+
If pointer to member declarator:
117+
Invalid C++ declaration: Expected identifier in nested name. [error at 41]
118+
union esp_ble_mesh_srpl_client_cb_param_t
119+
-----------------------------------------^
120+
If declarator-id:
121+
Invalid C++ declaration: Expected identifier in nested name. [error at 41]
122+
union esp_ble_mesh_srpl_client_cb_param_t
123+
-----------------------------------------^
124+
125+
esp_ble_mesh_agg_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
126+
If pointer to member declarator:
127+
Invalid C++ declaration: Expected identifier in nested name. [error at 40]
128+
union esp_ble_mesh_agg_client_cb_param_t
129+
----------------------------------------^
130+
If declarator-id:
131+
Invalid C++ declaration: Expected identifier in nested name. [error at 40]
132+
union esp_ble_mesh_agg_client_cb_param_t
133+
----------------------------------------^
134+
135+
esp_ble_mesh_agg_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
136+
If pointer to member declarator:
137+
Invalid C++ declaration: Expected identifier in nested name. [error at 40]
138+
union esp_ble_mesh_agg_server_cb_param_t
139+
----------------------------------------^
140+
If declarator-id:
141+
Invalid C++ declaration: Expected identifier in nested name. [error at 40]
142+
union esp_ble_mesh_agg_server_cb_param_t
143+
----------------------------------------^
144+
145+
esp_ble_mesh_lcd_model_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
146+
If pointer to member declarator:
147+
Invalid C++ declaration: Expected identifier in nested name. [error at 40]
148+
union esp_ble_mesh_lcd_client_cb_param_t
149+
----------------------------------------^
150+
If declarator-id:
151+
Invalid C++ declaration: Expected identifier in nested name. [error at 40]
152+
union esp_ble_mesh_lcd_client_cb_param_t
153+
----------------------------------------^
154+
12155
esp_ble_mesh_cm_data_api.inc:line: WARNING: Duplicate C++ declaration, also defined at api-reference/bluetooth/esp-ble-mesh:line.
13156
Declaration is '.. cpp:member:: int8_t element_offset'.
14-
esp_ble_mesh_cm_data_api.inc:line: WARNING: Duplicate C++ declaration, also defined at api-reference/bluetooth/esp-ble-mesh:line.
15-
Declaration is '.. cpp:member:: int8_t model_item_idx'.
157+
esp_ble_mesh_cm_data_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
158+
If pointer to member declarator:
159+
Invalid C++ declaration: Expected identifier in nested name. [error at 40]
160+
union esp_ble_mesh_extended_model_item_t
161+
----------------------------------------^
162+
If declarator-id:
163+
Invalid C++ declaration: Expected identifier in nested name. [error at 40]
164+
union esp_ble_mesh_extended_model_item_t
165+
----------------------------------------^
166+
167+
esp_ble_mesh_cm_data_api.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
168+
If pointer to member declarator:
169+
Invalid C++ declaration: Expected identifier in nested name. [error at 34]
170+
union esp_ble_mesh_metadata_item_t
171+
----------------------------------^
172+
If declarator-id:
173+
Invalid C++ declaration: Expected identifier in nested name. [error at 34]
174+
union esp_ble_mesh_metadata_item_t
175+
----------------------------------^
176+
177+
ecdsa_alt.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
178+
If pointer to member declarator:
179+
Invalid C++ declaration: Expected identifier in nested name. [error at 25]
180+
union esp_ecdsa_pk_conf_t
181+
-------------------------^
182+
If declarator-id:
183+
Invalid C++ declaration: Expected identifier in nested name. [error at 25]
184+
union esp_ecdsa_pk_conf_t
185+
-------------------------^
186+
187+
esp_cam_ctlr_csi.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
188+
If pointer to member declarator:
189+
Invalid C++ declaration: Expected identifier in nested name. [error at 32]
190+
struct esp_cam_ctlr_csi_config_t
191+
--------------------------------^
192+
If declarator-id:
193+
Invalid C++ declaration: Expected identifier in nested name. [error at 32]
194+
struct esp_cam_ctlr_csi_config_t
195+
--------------------------------^
196+
197+
isp_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
198+
If pointer to member declarator:
199+
Invalid C++ declaration: Expected identifier in nested name. [error at 32]
200+
struct isp_demosaic_grad_ratio_t
201+
--------------------------------^
202+
If declarator-id:
203+
Invalid C++ declaration: Expected identifier in nested name. [error at 32]
204+
struct isp_demosaic_grad_ratio_t
205+
--------------------------------^
206+
207+
isp_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
208+
If pointer to member declarator:
209+
Invalid C++ declaration: Expected identifier in nested name. [error at 33]
210+
struct isp_sharpen_h_freq_coeff_t
211+
---------------------------------^
212+
If declarator-id:
213+
Invalid C++ declaration: Expected identifier in nested name. [error at 33]
214+
struct isp_sharpen_h_freq_coeff_t
215+
---------------------------------^
216+
217+
isp_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
218+
If pointer to member declarator:
219+
Invalid C++ declaration: Expected identifier in nested name. [error at 31]
220+
struct isp_sharpen_m_freq_coeff
221+
-------------------------------^
222+
If declarator-id:
223+
Invalid C++ declaration: Expected identifier in nested name. [error at 31]
224+
struct isp_sharpen_m_freq_coeff
225+
-------------------------------^
226+
227+
isp_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
228+
If pointer to member declarator:
229+
Invalid C++ declaration: Expected identifier in nested name. [error at 24]
230+
struct isp_hist_weight_t
231+
------------------------^
232+
If declarator-id:
233+
Invalid C++ declaration: Expected identifier in nested name. [error at 24]
234+
struct isp_hist_weight_t
235+
------------------------^
236+
237+
isp_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
238+
If pointer to member declarator:
239+
Invalid C++ declaration: Expected identifier in nested name. [error at 23]
240+
struct isp_hist_coeff_t
241+
-----------------------^
242+
If declarator-id:
243+
Invalid C++ declaration: Expected identifier in nested name. [error at 23]
244+
struct isp_hist_coeff_t
245+
-----------------------^
246+
247+
isp_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
248+
If pointer to member declarator:
249+
Invalid C++ declaration: Expected identifier in nested name. [error at 27]
250+
struct isp_color_contrast_t
251+
---------------------------^
252+
If declarator-id:
253+
Invalid C++ declaration: Expected identifier in nested name. [error at 27]
254+
struct isp_color_contrast_t
255+
---------------------------^
256+
257+
isp_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
258+
If pointer to member declarator:
259+
Invalid C++ declaration: Expected identifier in nested name. [error at 29]
260+
struct isp_color_saturation_t
261+
-----------------------------^
262+
If declarator-id:
263+
Invalid C++ declaration: Expected identifier in nested name. [error at 29]
264+
struct isp_color_saturation_t
265+
-----------------------------^
266+
267+
isp_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
268+
If pointer to member declarator:
269+
Invalid C++ declaration: Expected identifier in nested name. [error at 21]
270+
struct isp_lsc_gain_t
271+
---------------------^
272+
If declarator-id:
273+
Invalid C++ declaration: Expected identifier in nested name. [error at 21]
274+
struct isp_lsc_gain_t
275+
---------------------^
276+
277+
jpeg_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
278+
If pointer to member declarator:
279+
Invalid C++ declaration: Expected identifier in nested name. [error at 32]
280+
struct jpeg_huffman_table_info_t
281+
--------------------------------^
282+
If declarator-id:
283+
Invalid C++ declaration: Expected identifier in nested name. [error at 32]
284+
struct jpeg_huffman_table_info_t
285+
--------------------------------^
286+
287+
rmt_types.inc:line: WARNING: Error in declarator or parameters-and-qualifiers
288+
If pointer to member declarator:
289+
Invalid C++ declaration: Expected identifier in nested name. [error at 24]
290+
struct rmt_symbol_word_t
291+
------------------------^
292+
If declarator-id:
293+
Invalid C++ declaration: Expected identifier in nested name. [error at 24]
294+
struct rmt_symbol_word_t
295+
------------------------^
296+
16297
mqtt_client.inc:line: WARNING: Duplicate C++ declaration, also defined at api-reference/protocols/mqtt:line.
17298
Declaration is '.. cpp:type:: struct esp_mqtt_event_t esp_mqtt_event_t'.
18299
mqtt_client.inc:line: WARNING: Duplicate C++ declaration, also defined at api-reference/protocols/mqtt:line.
@@ -27,27 +308,5 @@ mqtt_client.inc:line: WARNING: Duplicate C++ declaration, also defined at api-re
27308
Declaration is '.. cpp:enum:: esp_mqtt_transport_t'.
28309
mqtt_client.inc:line: WARNING: Duplicate C++ declaration, also defined at api-reference/protocols/mqtt:line.
29310
Declaration is '.. cpp:enum:: esp_mqtt_protocol_ver_t'.
30-
esp_heap_trace.inc:line: WARNING: Error when parsing function declaration.
31-
If the function has no return type:
32-
Invalid C++ declaration: Expected end of definition or ;. [error at 34]
33-
TAILQ_ENTRY (heap_trace_record_t) tailq
34-
----------------------------------^
35-
If the function has a return type:
36-
Error in declarator
37-
If declarator-id with parameters-and-qualifiers:
38-
Invalid C++ declaration: Expected identifier in nested name. [error at 12]
39-
TAILQ_ENTRY (heap_trace_record_t) tailq
40-
------------^
41-
If parenthesis in noptr-declarator:
42-
Error in declarator or parameters-and-qualifiers
43-
If pointer to member declarator:
44-
Invalid C++ declaration: Expected '::' in pointer to member (function). [error at 32]
45-
TAILQ_ENTRY (heap_trace_record_t) tailq
46-
--------------------------------^
47-
If declarator-id:
48-
Invalid C++ declaration: Expecting "(" in parameters-and-qualifiers. [error at 32]
49-
TAILQ_ENTRY (heap_trace_record_t) tailq
50-
--------------------------------^
51-
52311
esp_heap_trace.inc:line: WARNING: Duplicate C++ declaration, also defined at api-reference/system/heap_debug:line.
53312
Declaration is '.. cpp:type:: struct heap_trace_record_t heap_trace_record_t'.

0 commit comments

Comments
 (0)