diff --git a/components/sensors/sensor_hub/CHANGELOG.md b/components/sensors/sensor_hub/CHANGELOG.md index 654f609fe9..316940298a 100644 --- a/components/sensors/sensor_hub/CHANGELOG.md +++ b/components/sensors/sensor_hub/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## v0.1.3 - 2025-9-11 + +### Bug Fixes: + +- Fix compilation issue of `iot_sensor_hub` when using c++ + ## v0.1.2 - 2025-3-12 ### Bug Fixes: diff --git a/components/sensors/sensor_hub/idf_component.yml b/components/sensors/sensor_hub/idf_component.yml index 6f4fdf2d59..f113ed39ca 100644 --- a/components/sensors/sensor_hub/idf_component.yml +++ b/components/sensors/sensor_hub/idf_component.yml @@ -1,4 +1,4 @@ -version: "0.1.2" +version: "0.1.3" description: Unified Framework for Sensor Management url: https://github.com/espressif/esp-iot-solution/tree/master/components/sensors/sensor_hub repository: https://github.com/espressif/esp-iot-solution.git diff --git a/components/sensors/sensor_hub/include/hal/humiture_hal.h b/components/sensors/sensor_hub/include/hal/humiture_hal.h index adb6280270..c9e12dbc6f 100644 --- a/components/sensors/sensor_hub/include/hal/humiture_hal.h +++ b/components/sensors/sensor_hub/include/hal/humiture_hal.h @@ -192,7 +192,6 @@ esp_err_t humiture_acquire(sensor_humiture_handle_t sensor, sensor_data_group_t esp_err_t humiture_control(sensor_humiture_handle_t sensor, sensor_command_t cmd, void *args); #ifdef __cplusplus -extern "C" } #endif diff --git a/components/sensors/sensor_hub/include/hal/imu_hal.h b/components/sensors/sensor_hub/include/hal/imu_hal.h index 2b8128ff5f..c14f20cd4e 100644 --- a/components/sensors/sensor_hub/include/hal/imu_hal.h +++ b/components/sensors/sensor_hub/include/hal/imu_hal.h @@ -197,7 +197,6 @@ esp_err_t imu_acquire(sensor_imu_handle_t sensor, sensor_data_group_t *data_grou esp_err_t imu_control(sensor_imu_handle_t sensor, sensor_command_t cmd, void *args); #ifdef __cplusplus -extern "C" } #endif diff --git a/components/sensors/sensor_hub/include/hal/light_sensor_hal.h b/components/sensors/sensor_hub/include/hal/light_sensor_hal.h index 37710a1667..48791c7322 100644 --- a/components/sensors/sensor_hub/include/hal/light_sensor_hal.h +++ b/components/sensors/sensor_hub/include/hal/light_sensor_hal.h @@ -220,7 +220,6 @@ esp_err_t light_sensor_acquire(sensor_light_handle_t sensor, sensor_data_group_t esp_err_t light_sensor_control(sensor_light_handle_t sensor, sensor_command_t cmd, void *args); #ifdef __cplusplus -extern "C" } #endif diff --git a/components/sensors/sensor_hub/include/iot_sensor_hub.h b/components/sensors/sensor_hub/include/iot_sensor_hub.h index 3504d827c0..28f157efe7 100644 --- a/components/sensors/sensor_hub/include/iot_sensor_hub.h +++ b/components/sensors/sensor_hub/include/iot_sensor_hub.h @@ -237,7 +237,6 @@ esp_err_t iot_sensor_handler_register_with_type(sensor_type_t sensor_type, int32 esp_err_t iot_sensor_handler_unregister_with_type(sensor_type_t sensor_type, int32_t event_id, sensor_event_handler_instance_t context); #ifdef __cplusplus -extern "C" } #endif #endif diff --git a/components/sensors/sensor_hub/include/sensor_type.h b/components/sensors/sensor_hub/include/sensor_type.h index d4dccda0dd..3790e52900 100644 --- a/components/sensors/sensor_hub/include/sensor_type.h +++ b/components/sensors/sensor_hub/include/sensor_type.h @@ -203,7 +203,7 @@ typedef struct { typedef struct { sensor_type_t type; /*!< sensor type */ sensor_driver_handle_t (*create)(bus_handle_t, const char *sensor_name, uint8_t addr); /*!< create a sensor */ - esp_err_t (*delete)(sensor_driver_handle_t *); /*!< delete a sensor */ + esp_err_t (*remove)(sensor_driver_handle_t *); /*!< delete a sensor */ esp_err_t (*acquire)(sensor_driver_handle_t, sensor_data_group_t *); /*!< acquire a group of sensor data */ esp_err_t (*control)(sensor_driver_handle_t, sensor_command_t cmd, void *args); /*!< modify the sensor configuration */ } iot_sensor_impl_t; diff --git a/components/sensors/sensor_hub/iot_sensor_hub.c b/components/sensors/sensor_hub/iot_sensor_hub.c index 887ecaa334..2b7a940f0b 100644 --- a/components/sensors/sensor_hub/iot_sensor_hub.c +++ b/components/sensors/sensor_hub/iot_sensor_hub.c @@ -101,7 +101,7 @@ static iot_sensor_impl_t s_sensor_impls[] = { { .type = HUMITURE_ID, .create = humiture_create, - .delete = humiture_delete, + .remove = humiture_delete, .acquire = humiture_acquire, .control = humiture_control, }, @@ -110,7 +110,7 @@ static iot_sensor_impl_t s_sensor_impls[] = { { .type = IMU_ID, .create = imu_create, - .delete = imu_delete, + .remove = imu_delete, .acquire = imu_acquire, .control = imu_control, }, @@ -119,7 +119,7 @@ static iot_sensor_impl_t s_sensor_impls[] = { { .type = LIGHT_SENSOR_ID, .create = light_sensor_create, - .delete = light_sensor_delete, + .remove = light_sensor_delete, .acquire = light_sensor_acquire, .control = light_sensor_control, }, @@ -567,7 +567,7 @@ esp_err_t iot_sensor_delete(sensor_handle_t p_sensor_handle) ESP_LOGW(TAG, "sensor set power failed ret = %s", esp_err_to_name(ret)); } - ret = sensor->impl->delete (&sensor->driver_handle); + ret = sensor->impl->remove(&sensor->driver_handle); SENSOR_CHECK(ret == ESP_OK && sensor->driver_handle == NULL, "sensor driver delete failed", ret); /*free the resource then set handle to NULL*/