Skip to content

Commit fc9a1ca

Browse files
committed
Merge branch 'fix/docs-build' into 'master'
fix(docs): update doxygen/sphinx known warnings See merge request ae_group/esp-iot-solution!1372
2 parents 3dd9eb4 + 766dcec commit fc9a1ca

File tree

6 files changed

+35
-20
lines changed

6 files changed

+35
-20
lines changed

.gitlab/ci/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env-v5.2:1-1"
2+
ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env-v5.5:1-1"
33

44
.build_docs_template:
55
image: $ESP_IDF_DOC_ENV_IMAGE

.gitlab/ci/rules.yml

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -395,20 +395,26 @@
395395
- "**/*.md"
396396

397397
.patterns-docs_inc: &patterns-docs_inc
398-
398+
- "components/audio/adc_mic/adc_mic.h"
399399
- "components/audio/dac_audio/include/dac_audio.h"
400400
- "components/audio/pwm_audio/include/pwm_audio.h"
401401
- "components/avi_player/include/avi_player.h"
402402
- "components/bluetooth/ble_conn_mgr/include/esp_ble_conn_mgr.h"
403-
- "components/bluetooth/ble_conn_mgr/include/esp_ble_conn_mgr.h"
404403
- "components/bluetooth/ble_hci/include/ble_hci.h"
404+
- "components/bluetooth/ble_profiles/std/ble_anp/include/esp_anp.h"
405+
- "components/bluetooth/ble_profiles/std/ble_hrp/include/esp_hrp.h"
406+
- "components/bluetooth/ble_profiles/std/ble_htp/include/esp_htp.h"
405407
- "components/bluetooth/ble_services/ans/include/esp_ans.h"
406408
- "components/bluetooth/ble_services/bas/include/esp_bas.h"
407409
- "components/bluetooth/ble_services/bcs/include/esp_bcs.h"
410+
- "components/bluetooth/ble_services/cts/include/esp_cts.h"
408411
- "components/bluetooth/ble_services/dis/include/esp_dis.h"
409412
- "components/bluetooth/ble_services/hrs/include/esp_hrs.h"
410413
- "components/bluetooth/ble_services/hts/include/esp_hts.h"
411414
- "components/bluetooth/ble_services/tps/include/esp_tps.h"
415+
- "components/bluetooth/ble_services/uds/include/esp_uds.h"
416+
- "components/bluetooth/ble_services/wss/include/esp_wss.h"
417+
- "components/bus/include/i2s_lcd_driver.h"
412418
- "components/button/include/iot_button.h"
413419
- "components/display/screen/interface_driver/scr_interface_driver.h"
414420
- "components/display/screen/screen_driver.h"
@@ -417,34 +423,42 @@
417423
- "components/display/tools/esp_mmap_assets/include/esp_mmap_assets.h"
418424
- "components/display/touch_panel/touch_panel.h"
419425
- "components/i2c_bus/include/i2c_bus.h"
426+
- "components/iot_eth/include/iot_eth.h"
420427
- "components/ir/ir_learn/include/ir_learn.h"
421428
- "components/keyboard_button/include/keyboard_button.h"
422429
- "components/knob/include/iot_knob.h"
423430
- "components/led/led_indicator/include/led_indicator.h"
424-
- "components/motor/esp_sensorless_bldc_control/control/include/bldc_control.h"
431+
- "components/led/lightbulb_driver/include/lightbulb.h"
425432
- "components/motor/esp_sensorless_bldc_control/control/include/bldc_control_param.h"
433+
- "components/motor/esp_sensorless_bldc_control/include/bldc_control.h"
426434
- "components/motor/esp_sensorless_bldc_control/user_cfg/bldc_user_cfg.h"
427435
- "components/motor/servo/include/iot_servo.h"
428436
- "components/openai/include/OpenAI.h"
437+
438+
.patterns-docs_inc_2: &patterns-docs_inc_2
429439
- "components/sensors/ntc_driver/include/ntc_driver.h"
440+
- "components/sensors/power_measure/include/power_measure.h"
430441
- "components/sensors/power_monitor/ina236/include/ina236.h"
431442
- "components/sensors/sensor_hub/include/hal/humiture_hal.h"
432443
- "components/sensors/sensor_hub/include/hal/imu_hal.h"
433444
- "components/sensors/sensor_hub/include/hal/light_sensor_hal.h"
434445
- "components/sensors/sensor_hub/include/iot_sensor_hub.h"
435446
- "components/sensors/sensor_hub/include/sensor_type.h"
436447
- "components/spi_bus/include/spi_bus.h"
448+
- "components/touch/touch_button_sensor/include/touch_button_sensor.h"
437449
- "components/touch/touch_proximity_sensor/include/touch_proximity_sensor.h"
450+
- "components/touch/touch_slider_sensor/include/touch_slider_sensor.h"
438451
- "components/usb/esp_msc_ota/include/esp_msc_ota.h"
439452
- "components/usb/esp_tinyuf2/esp_tinyuf2.h"
440453
- "components/usb/iot_usbh_cdc/include/iot_usbh_cdc.h"
441-
- "components/usb/iot_usbh_ecm/include/iot_usbh_ecm.h"
442-
- "components/usb/iot_usbh_rndis/include/iot_usbh_rndis.h"
443454
- "components/usb/usb_device_uac/include/usb_device_uac.h"
444455
- "components/usb/usb_device_uvc/include/usb_device_uvc.h"
445456
- "components/usb/usb_stream/include/usb_stream.h"
446457
- "components/utilities/adc_tp_calibration/include/adc_tp_calibration.h"
458+
- "components/usb/iot_usbh_rndis/include/iot_usbh_rndis.h"
459+
- "components/usb/iot_usbh_ecm/include/iot_usbh_ecm.h"
447460
- "components/zero_detection/include/zero_detection.h"
461+
448462
# examples folder, in the alphabetic order
449463
.patterns-example_ai_esp_dl_human_activity_recognition: &patterns-example_ai_esp_dl_human_activity_recognition
450464
- "examples/ai/esp_dl/human_activity_recognition/**/*"
@@ -2849,6 +2863,8 @@
28492863
changes: *patterns-docs
28502864
- <<: *if-dev-push
28512865
changes: *patterns-docs_inc
2866+
- <<: *if-dev-push
2867+
changes: *patterns-docs_inc_2
28522868

28532869
.rules:deploy:docs_preview:
28542870
rules:
@@ -2860,6 +2876,8 @@
28602876
changes: *patterns-docs
28612877
- <<: *if-dev-push
28622878
changes: *patterns-docs_inc
2879+
- <<: *if-dev-push
2880+
changes: *patterns-docs_inc_2
28632881

28642882
.rules:deploy:docs_production:
28652883
rules:

components/sensors/sensor_hub/include/iot_sensor_hub.h

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -159,16 +159,6 @@ esp_err_t iot_sensor_stop(sensor_handle_t sensor_handle);
159159
*/
160160
esp_err_t iot_sensor_delete(sensor_handle_t p_sensor_handle);
161161

162-
/**
163-
* @brief Scan for valid sensors attached on bus
164-
*
165-
* @param bus bus handle
166-
* @param buf Pointer to a buffer to save sensors' information, if NULL no information will be saved.
167-
* @param num Maximum number of sensor information to save, invalid if buf set to NULL,
168-
* latter sensors will be discarded if num less-than the total number found on the bus.
169-
* @return uint8_t total number of valid sensors found on the bus
170-
*/
171-
172162
/**
173163
* @brief Scan for valid sensors registered in the system
174164
*

docs/Doxyfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ PROJECT_NAME = "ESP IoT Solution Guide"
2020
## These files are placed in '_inc' directory
2121
## and used to include in API reference documentation
2222

23+
## IF YOU ADD NEW FILES HERE
24+
## DO NOT FORGET TO ADD THEM TO THE .patterns-docs_inc PATTERN
25+
## IN THE .gitlab/ci/rules.yml FILE
26+
2327
INPUT = \
2428
$(PROJECT_PATH)/components/audio/adc_mic/adc_mic.h \
2529
$(PROJECT_PATH)/components/audio/dac_audio/include/dac_audio.h \

docs/doxygen-known-warnings.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
bldc_control.h:line: warning: parameters of member bldc_control_config_t::@49 are not (all) documented
2+
bldc_control.h:line: warning: parameters of member bldc_control_config_t::@51 are not (all) documented
3+
sensor_type.h:line: warning: parameters of member sensor_data_t::@53 are not (all) documented

docs/sphinx-known-warnings.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ Declaration is '.. cpp:member:: lightbulb_color_mapping_data_t * table'.
33
lightbulb.inc:line: WARNING: Duplicate C++ declaration, also defined at electrical_lighting_solution/lightbulb_driver:line.
44
Declaration is '.. cpp:member:: struct lightbulb_config_t::@40::@44 precise'.
55
lightbulb.inc:line: WARNING: Duplicate C++ declaration, also defined at electrical_lighting_solution/lightbulb_driver:line.
6-
Declaration is '.. cpp:member:: lightbulb_iic_out_pin_t red'.
6+
Declaration is '.. cpp:member:: lightbulb_chip_out_pin_t red'.
77
lightbulb.inc:line: WARNING: Duplicate C++ declaration, also defined at electrical_lighting_solution/lightbulb_driver:line.
8-
Declaration is '.. cpp:member:: lightbulb_iic_out_pin_t green'.
8+
Declaration is '.. cpp:member:: lightbulb_chip_out_pin_t green'.
99
lightbulb.inc:line: WARNING: Duplicate C++ declaration, also defined at electrical_lighting_solution/lightbulb_driver:line.
10-
Declaration is '.. cpp:member:: lightbulb_iic_out_pin_t blue'.
10+
Declaration is '.. cpp:member:: lightbulb_chip_out_pin_t blue'.
1111
ir_learn.inc:line: WARNING: Error when parsing function declaration.
1212
If the function has no return type:
1313
Invalid C++ declaration: Expected end of definition or ;. [error at 34]

0 commit comments

Comments
 (0)