From 27e95fb727eb521bbd5b33b979f1ed3e64642ede Mon Sep 17 00:00:00 2001 From: zhufangluo Date: Wed, 5 Nov 2025 21:27:03 +0800 Subject: [PATCH] fix: add prefix for sensor functions name --- driver/esp_camera.c | 34 +++++++++++++++--------------- sensors/bf20a6.c | 4 ++-- sensors/bf3005.c | 4 ++-- sensors/gc0308.c | 4 ++-- sensors/gc032a.c | 4 ++-- sensors/gc2145.c | 4 ++-- sensors/hm0360.c | 4 ++-- sensors/hm1055.c | 4 ++-- sensors/mega_ccm.c | 4 ++-- sensors/nt99141.c | 4 ++-- sensors/ov2640.c | 4 ++-- sensors/ov3660.c | 4 ++-- sensors/ov5640.c | 4 ++-- sensors/ov7670.c | 4 ++-- sensors/ov7725.c | 4 ++-- sensors/private_include/bf20a6.h | 4 ++-- sensors/private_include/bf3005.h | 4 ++-- sensors/private_include/gc0308.h | 4 ++-- sensors/private_include/gc032a.h | 4 ++-- sensors/private_include/gc2145.h | 4 ++-- sensors/private_include/hm0360.h | 4 ++-- sensors/private_include/hm1055.h | 4 ++-- sensors/private_include/mega_ccm.h | 4 ++-- sensors/private_include/nt99141.h | 4 ++-- sensors/private_include/ov2640.h | 4 ++-- sensors/private_include/ov3660.h | 4 ++-- sensors/private_include/ov5640.h | 4 ++-- sensors/private_include/ov7670.h | 4 ++-- sensors/private_include/ov7725.h | 4 ++-- sensors/private_include/sc030iot.h | 4 ++-- sensors/private_include/sc031gs.h | 4 ++-- sensors/private_include/sc101iot.h | 4 ++-- sensors/sc030iot.c | 4 ++-- sensors/sc031gs.c | 4 ++-- sensors/sc101iot.c | 4 ++-- 35 files changed, 85 insertions(+), 85 deletions(-) diff --git a/driver/esp_camera.c b/driver/esp_camera.c index 6fb7a98024..4dc8f5a443 100644 --- a/driver/esp_camera.c +++ b/driver/esp_camera.c @@ -112,55 +112,55 @@ typedef struct { static const sensor_func_t g_sensors[] = { #if CONFIG_OV7725_SUPPORT - {ov7725_detect, ov7725_init}, + {esp32_camera_ov7725_detect, esp32_camera_ov7725_init}, #endif #if CONFIG_OV7670_SUPPORT - {ov7670_detect, ov7670_init}, + {esp32_camera_ov7670_detect, esp32_camera_ov7670_init}, #endif #if CONFIG_OV2640_SUPPORT - {ov2640_detect, ov2640_init}, + {esp32_camera_ov2640_detect, esp32_camera_ov2640_init}, #endif #if CONFIG_OV3660_SUPPORT - {ov3660_detect, ov3660_init}, + {esp32_camera_ov3660_detect, esp32_camera_ov3660_init}, #endif #if CONFIG_OV5640_SUPPORT - {ov5640_detect, ov5640_init}, + {esp32_camera_ov5640_detect, esp32_camera_ov5640_init}, #endif #if CONFIG_NT99141_SUPPORT - {nt99141_detect, nt99141_init}, + {esp32_camera_nt99141_detect, esp32_camera_nt99141_init}, #endif #if CONFIG_GC2145_SUPPORT - {gc2145_detect, gc2145_init}, + {esp32_camera_gc2145_detect, esp32_camera_gc2145_init}, #endif #if CONFIG_GC032A_SUPPORT - {gc032a_detect, gc032a_init}, + {esp32_camera_gc032a_detect, esp32_camera_gc032a_init}, #endif #if CONFIG_GC0308_SUPPORT - {gc0308_detect, gc0308_init}, + {esp32_camera_gc0308_detect, esp32_camera_gc0308_init}, #endif #if CONFIG_BF3005_SUPPORT - {bf3005_detect, bf3005_init}, + {esp32_camera_bf3005_detect, esp32_camera_bf3005_init}, #endif #if CONFIG_BF20A6_SUPPORT - {bf20a6_detect, bf20a6_init}, + {esp32_camera_bf20a6_detect, esp32_camera_bf20a6_init}, #endif #if CONFIG_SC101IOT_SUPPORT - {sc101iot_detect, sc101iot_init}, + {esp32_camera_sc101iot_detect, esp32_camera_sc101iot_init}, #endif #if CONFIG_SC030IOT_SUPPORT - {sc030iot_detect, sc030iot_init}, + {esp32_camera_sc030iot_detect, esp32_camera_sc030iot_init}, #endif #if CONFIG_SC031GS_SUPPORT - {sc031gs_detect, sc031gs_init}, + {esp32_camera_sc031gs_detect, esp32_camera_sc031gs_init}, #endif #if CONFIG_MEGA_CCM_SUPPORT - {mega_ccm_detect, mega_ccm_init}, + {esp32_camera_mega_ccm_detect, esp32_camera_mega_ccm_init}, #endif #if CONFIG_HM1055_SUPPORT - {hm1055_detect, hm1055_init}, + {esp32_camera_hm1055_detect, esp32_camera_hm1055_init}, #endif #if CONFIG_HM0360_SUPPORT - {hm0360_detect, hm0360_init}, + {esp32_camera_hm0360_detect, esp32_camera_hm0360_init}, #endif }; diff --git a/sensors/bf20a6.c b/sensors/bf20a6.c index f8eb127d54..99c48f9f80 100644 --- a/sensors/bf20a6.c +++ b/sensors/bf20a6.c @@ -347,7 +347,7 @@ static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val) return -1; } -int bf20a6_detect(int slv_addr, sensor_id_t *id) +int esp32_camera_bf20a6_detect(int slv_addr, sensor_id_t *id) { if (BF20A6_SCCB_ADDR == slv_addr) { uint8_t MIDL = SCCB_Read(slv_addr, SENSOR_ID_LOW); @@ -363,7 +363,7 @@ int bf20a6_detect(int slv_addr, sensor_id_t *id) return 0; } -int bf20a6_init(sensor_t *sensor) +int esp32_camera_bf20a6_init(sensor_t *sensor) { sensor->init_status = init_status; sensor->reset = reset; diff --git a/sensors/bf3005.c b/sensors/bf3005.c index 5a6166e49d..b492f35331 100644 --- a/sensors/bf3005.c +++ b/sensors/bf3005.c @@ -476,7 +476,7 @@ static int set_xclk(sensor_t *sensor, int timer, int xclk) return ret; } -int bf3005_detect(int slv_addr, sensor_id_t *id) +int esp32_camera_bf3005_detect(int slv_addr, sensor_id_t *id) { if (BF3005_SCCB_ADDR == slv_addr) { uint16_t PID = SCCB_Read(slv_addr, 0xFC); @@ -493,7 +493,7 @@ int bf3005_detect(int slv_addr, sensor_id_t *id) return 0; } -int bf3005_init(sensor_t *sensor) +int esp32_camera_bf3005_init(sensor_t *sensor) { // Set function pointers sensor->reset = reset; diff --git a/sensors/gc0308.c b/sensors/gc0308.c index 337626cc14..469f0385e2 100644 --- a/sensors/gc0308.c +++ b/sensors/gc0308.c @@ -411,7 +411,7 @@ static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val) return -1; } -int gc0308_detect(int slv_addr, sensor_id_t *id) +int esp32_camera_gc0308_detect(int slv_addr, sensor_id_t *id) { if (GC0308_SCCB_ADDR == slv_addr) { write_reg(slv_addr, 0xfe, 0x00); @@ -426,7 +426,7 @@ int gc0308_detect(int slv_addr, sensor_id_t *id) return 0; } -int gc0308_init(sensor_t *sensor) +int esp32_camera_gc0308_init(sensor_t *sensor) { sensor->init_status = init_status; sensor->reset = reset; diff --git a/sensors/gc032a.c b/sensors/gc032a.c index 612e17b1ed..669960dc64 100644 --- a/sensors/gc032a.c +++ b/sensors/gc032a.c @@ -328,7 +328,7 @@ static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val) return -1; } -int gc032a_detect(int slv_addr, sensor_id_t *id) +int esp32_camera_gc032a_detect(int slv_addr, sensor_id_t *id) { if (GC032A_SCCB_ADDR == slv_addr) { uint8_t MIDL = SCCB_Read(slv_addr, SENSOR_ID_LOW); @@ -344,7 +344,7 @@ int gc032a_detect(int slv_addr, sensor_id_t *id) return 0; } -int gc032a_init(sensor_t *sensor) +int esp32_camera_gc032a_init(sensor_t *sensor) { sensor->init_status = init_status; sensor->reset = reset; diff --git a/sensors/gc2145.c b/sensors/gc2145.c index 3a066cd941..1ab50c21f5 100644 --- a/sensors/gc2145.c +++ b/sensors/gc2145.c @@ -414,7 +414,7 @@ static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val) return -1; } -int gc2145_detect(int slv_addr, sensor_id_t *id) +int esp32_camera_gc2145_detect(int slv_addr, sensor_id_t *id) { if (GC2145_SCCB_ADDR == slv_addr) { uint8_t MIDL = SCCB_Read(slv_addr, CHIP_ID_LOW); @@ -430,7 +430,7 @@ int gc2145_detect(int slv_addr, sensor_id_t *id) return 0; } -int gc2145_init(sensor_t *sensor) +int esp32_camera_gc2145_init(sensor_t *sensor) { sensor->init_status = init_status; sensor->reset = reset; diff --git a/sensors/hm0360.c b/sensors/hm0360.c index faf6d22580..7013902e92 100755 --- a/sensors/hm0360.c +++ b/sensors/hm0360.c @@ -418,7 +418,7 @@ static int init_status(sensor_t *sensor) return 0; } -int hm0360_detect(int slv_addr, sensor_id_t *id) +int esp32_camera_hm0360_detect(int slv_addr, sensor_id_t *id) { if (HM1055_SCCB_ADDR == slv_addr) { uint8_t h = SCCB_Read16(slv_addr, MODEL_ID_H); @@ -435,7 +435,7 @@ int hm0360_detect(int slv_addr, sensor_id_t *id) return 0; } -int hm0360_init(sensor_t *sensor) +int esp32_camera_hm0360_init(sensor_t *sensor) { sensor->reset = reset; sensor->set_pixformat = set_pixformat; diff --git a/sensors/hm1055.c b/sensors/hm1055.c index 97c6e082dc..2529297fd5 100755 --- a/sensors/hm1055.c +++ b/sensors/hm1055.c @@ -772,7 +772,7 @@ static int init_status(sensor_t *sensor) return 0; } -int hm1055_detect(int slv_addr, sensor_id_t *id) +int esp32_camera_hm1055_detect(int slv_addr, sensor_id_t *id) { if (HM1055_SCCB_ADDR == slv_addr) { @@ -792,7 +792,7 @@ int hm1055_detect(int slv_addr, sensor_id_t *id) return 0; } -int hm1055_init(sensor_t *sensor) +int esp32_camera_hm1055_init(sensor_t *sensor) { sensor->reset = reset; sensor->set_pixformat = set_pixformat; diff --git a/sensors/mega_ccm.c b/sensors/mega_ccm.c index 159c3922be..bdd1903542 100644 --- a/sensors/mega_ccm.c +++ b/sensors/mega_ccm.c @@ -344,7 +344,7 @@ static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val) return -1; } -int mega_ccm_detect(int slv_addr, sensor_id_t *id) +int esp32_camera_mega_ccm_detect(int slv_addr, sensor_id_t *id) { if (MEGA_CCM_SCCB_ADDR == slv_addr) { uint8_t h = read_reg(slv_addr, SENSOR_ID_HIGH); @@ -360,7 +360,7 @@ int mega_ccm_detect(int slv_addr, sensor_id_t *id) return 0; } -int mega_ccm_init(sensor_t *sensor) +int esp32_camera_mega_ccm_init(sensor_t *sensor) { sensor->init_status = init_status; sensor->reset = reset; diff --git a/sensors/nt99141.c b/sensors/nt99141.c index 86a8b8a0b5..b440cb3bae 100644 --- a/sensors/nt99141.c +++ b/sensors/nt99141.c @@ -934,7 +934,7 @@ static int set_xclk(sensor_t *sensor, int timer, int xclk) return ret; } -int nt99141_detect(int slv_addr, sensor_id_t *id) +int esp32_camera_nt99141_detect(int slv_addr, sensor_id_t *id) { if (NT99141_SCCB_ADDR == slv_addr) { SCCB_Write16(slv_addr, 0x3008, 0x01);//bank sensor @@ -981,7 +981,7 @@ static int init_status(sensor_t *sensor) return 0; } -int nt99141_init(sensor_t *sensor) +int esp32_camera_nt99141_init(sensor_t *sensor) { sensor->reset = reset; sensor->set_pixformat = set_pixformat; diff --git a/sensors/ov2640.c b/sensors/ov2640.c index 7e3d77174d..d35aceee31 100755 --- a/sensors/ov2640.c +++ b/sensors/ov2640.c @@ -545,7 +545,7 @@ static int init_status(sensor_t *sensor){ return 0; } -int ov2640_detect(int slv_addr, sensor_id_t *id) +int esp32_camera_ov2640_detect(int slv_addr, sensor_id_t *id) { if (OV2640_SCCB_ADDR == slv_addr) { SCCB_Write(slv_addr, 0xFF, 0x01);//bank sensor @@ -563,7 +563,7 @@ int ov2640_detect(int slv_addr, sensor_id_t *id) return 0; } -int ov2640_init(sensor_t *sensor) +int esp32_camera_ov2640_init(sensor_t *sensor) { sensor->reset = reset; sensor->init_status = init_status; diff --git a/sensors/ov3660.c b/sensors/ov3660.c index b9ebdba3ba..9bbcd6f8d7 100755 --- a/sensors/ov3660.c +++ b/sensors/ov3660.c @@ -996,7 +996,7 @@ static int init_status(sensor_t *sensor) return 0; } -int ov3660_detect(int slv_addr, sensor_id_t *id) +int esp32_camera_ov3660_detect(int slv_addr, sensor_id_t *id) { if (OV3660_SCCB_ADDR == slv_addr) { uint8_t h = SCCB_Read16(slv_addr, 0x300A); @@ -1012,7 +1012,7 @@ int ov3660_detect(int slv_addr, sensor_id_t *id) return 0; } -int ov3660_init(sensor_t *sensor) +int esp32_camera_ov3660_init(sensor_t *sensor) { sensor->reset = reset; sensor->set_pixformat = set_pixformat; diff --git a/sensors/ov5640.c b/sensors/ov5640.c index a32b374f54..ffa5b5a97c 100755 --- a/sensors/ov5640.c +++ b/sensors/ov5640.c @@ -1073,7 +1073,7 @@ static int init_status(sensor_t *sensor) return 0; } -int ov5640_detect(int slv_addr, sensor_id_t *id) +int esp32_camera_ov5640_detect(int slv_addr, sensor_id_t *id) { if (OV5640_SCCB_ADDR == slv_addr) { uint8_t h = SCCB_Read16(slv_addr, 0x300A); @@ -1089,7 +1089,7 @@ int ov5640_detect(int slv_addr, sensor_id_t *id) return 0; } -int ov5640_init(sensor_t *sensor) +int esp32_camera_ov5640_init(sensor_t *sensor) { sensor->reset = reset; sensor->set_pixformat = set_pixformat; diff --git a/sensors/ov7670.c b/sensors/ov7670.c index c683eda041..043df65cbd 100644 --- a/sensors/ov7670.c +++ b/sensors/ov7670.c @@ -393,7 +393,7 @@ static int init_status(sensor_t *sensor) static int set_dummy(sensor_t *sensor, int val){ return -1; } static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val){ return -1; } -int ov7670_detect(int slv_addr, sensor_id_t *id) +int esp32_camera_ov7670_detect(int slv_addr, sensor_id_t *id) { if (OV7670_SCCB_ADDR == slv_addr) { SCCB_Write(slv_addr, 0xFF, 0x01);//bank sensor @@ -411,7 +411,7 @@ int ov7670_detect(int slv_addr, sensor_id_t *id) return 0; } -int ov7670_init(sensor_t *sensor) +int esp32_camera_ov7670_init(sensor_t *sensor) { // Set function pointers sensor->reset = reset; diff --git a/sensors/ov7725.c b/sensors/ov7725.c index 9418a82f3f..dd0ea62fcb 100755 --- a/sensors/ov7725.c +++ b/sensors/ov7725.c @@ -502,7 +502,7 @@ static int set_xclk(sensor_t *sensor, int timer, int xclk) return ret; } -int ov7725_detect(int slv_addr, sensor_id_t *id) +int esp32_camera_ov7725_detect(int slv_addr, sensor_id_t *id) { if (OV7725_SCCB_ADDR == slv_addr) { SCCB_Write(slv_addr, 0xFF, 0x01);//bank sensor @@ -520,7 +520,7 @@ int ov7725_detect(int slv_addr, sensor_id_t *id) return 0; } -int ov7725_init(sensor_t *sensor) +int esp32_camera_ov7725_init(sensor_t *sensor) { // Set function pointers sensor->reset = reset; diff --git a/sensors/private_include/bf20a6.h b/sensors/private_include/bf20a6.h index 8c925eb5e5..743138be7b 100644 --- a/sensors/private_include/bf20a6.h +++ b/sensors/private_include/bf20a6.h @@ -13,7 +13,7 @@ * 0: Can't detect this sensor * Nonzero: This sensor has been detected */ -int bf20a6_detect(int slv_addr, sensor_id_t *id); +int esp32_camera_bf20a6_detect(int slv_addr, sensor_id_t *id); /** * @brief initialize sensor function pointers @@ -22,6 +22,6 @@ int bf20a6_detect(int slv_addr, sensor_id_t *id); * @return * Always 0 */ -int bf20a6_init(sensor_t *sensor); +int esp32_camera_bf20a6_init(sensor_t *sensor); #endif // __BF20A6_H__ diff --git a/sensors/private_include/bf3005.h b/sensors/private_include/bf3005.h index 3d1bfdf00d..bd562a7050 100644 --- a/sensors/private_include/bf3005.h +++ b/sensors/private_include/bf3005.h @@ -19,7 +19,7 @@ * 0: Can't detect this sensor * Nonzero: This sensor has been detected */ -int bf3005_detect(int slv_addr, sensor_id_t *id); +int esp32_camera_bf3005_detect(int slv_addr, sensor_id_t *id); /** * @brief initialize sensor function pointers @@ -28,6 +28,6 @@ int bf3005_detect(int slv_addr, sensor_id_t *id); * @return * Always 0 */ -int bf3005_init(sensor_t *sensor); +int esp32_camera_bf3005_init(sensor_t *sensor); #endif // __BF3005_H__ \ No newline at end of file diff --git a/sensors/private_include/gc0308.h b/sensors/private_include/gc0308.h index edffca1e00..eae260320a 100644 --- a/sensors/private_include/gc0308.h +++ b/sensors/private_include/gc0308.h @@ -15,7 +15,7 @@ extern "C" { * 0: Can't detect this sensor * Nonzero: This sensor has been detected */ -int gc0308_detect(int slv_addr, sensor_id_t *id); +int esp32_camera_gc0308_detect(int slv_addr, sensor_id_t *id); /** * @brief initialize sensor function pointers @@ -24,7 +24,7 @@ int gc0308_detect(int slv_addr, sensor_id_t *id); * @return * Always 0 */ -int gc0308_init(sensor_t *sensor); +int esp32_camera_gc0308_init(sensor_t *sensor); #ifdef __cplusplus } diff --git a/sensors/private_include/gc032a.h b/sensors/private_include/gc032a.h index 7679f07089..8955ed4731 100644 --- a/sensors/private_include/gc032a.h +++ b/sensors/private_include/gc032a.h @@ -17,7 +17,7 @@ * 0: Can't detect this sensor * Nonzero: This sensor has been detected */ -int gc032a_detect(int slv_addr, sensor_id_t *id); +int esp32_camera_gc032a_detect(int slv_addr, sensor_id_t *id); /** * @brief initialize sensor function pointers @@ -26,6 +26,6 @@ int gc032a_detect(int slv_addr, sensor_id_t *id); * @return * Always 0 */ -int gc032a_init(sensor_t *sensor); +int esp32_camera_gc032a_init(sensor_t *sensor); #endif // __GC032A_H__ diff --git a/sensors/private_include/gc2145.h b/sensors/private_include/gc2145.h index 6c5b60f703..db649f9198 100644 --- a/sensors/private_include/gc2145.h +++ b/sensors/private_include/gc2145.h @@ -13,7 +13,7 @@ * 0: Can't detect this sensor * Nonzero: This sensor has been detected */ -int gc2145_detect(int slv_addr, sensor_id_t *id); +int esp32_camera_gc2145_detect(int slv_addr, sensor_id_t *id); /** * @brief initialize sensor function pointers @@ -22,6 +22,6 @@ int gc2145_detect(int slv_addr, sensor_id_t *id); * @return * Always 0 */ -int gc2145_init(sensor_t *sensor); +int esp32_camera_gc2145_init(sensor_t *sensor); #endif // __GC2145_H__ diff --git a/sensors/private_include/hm0360.h b/sensors/private_include/hm0360.h index 822ecab2d4..2163cbe467 100755 --- a/sensors/private_include/hm0360.h +++ b/sensors/private_include/hm0360.h @@ -13,7 +13,7 @@ * 0: Can't detect this sensor * Nonzero: This sensor has been detected */ -int hm0360_detect(int slv_addr, sensor_id_t *id); +int esp32_camera_hm0360_detect(int slv_addr, sensor_id_t *id); /** * @brief initialize sensor function pointers @@ -22,6 +22,6 @@ int hm0360_detect(int slv_addr, sensor_id_t *id); * @return * Always 0 */ -int hm0360_init(sensor_t *sensor); +int esp32_camera_hm0360_init(sensor_t *sensor); #endif // __HM1055_H__ diff --git a/sensors/private_include/hm1055.h b/sensors/private_include/hm1055.h index dd6d44d753..4ddf1f8171 100755 --- a/sensors/private_include/hm1055.h +++ b/sensors/private_include/hm1055.h @@ -13,7 +13,7 @@ * 0: Can't detect this sensor * Nonzero: This sensor has been detected */ -int hm1055_detect(int slv_addr, sensor_id_t *id); +int esp32_camera_hm1055_detect(int slv_addr, sensor_id_t *id); /** * @brief initialize sensor function pointers @@ -22,6 +22,6 @@ int hm1055_detect(int slv_addr, sensor_id_t *id); * @return * Always 0 */ -int hm1055_init(sensor_t *sensor); +int esp32_camera_hm1055_init(sensor_t *sensor); #endif // __HM1055_H__ diff --git a/sensors/private_include/mega_ccm.h b/sensors/private_include/mega_ccm.h index bbad247b53..0f5efb21ec 100644 --- a/sensors/private_include/mega_ccm.h +++ b/sensors/private_include/mega_ccm.h @@ -17,7 +17,7 @@ * 0: Can't detect this sensor * Nonzero: This sensor has been detected */ -int mega_ccm_detect(int slv_addr, sensor_id_t *id); +int esp32_camera_mega_ccm_detect(int slv_addr, sensor_id_t *id); /** * @brief initialize sensor function pointers @@ -26,6 +26,6 @@ int mega_ccm_detect(int slv_addr, sensor_id_t *id); * @return * Always 0 */ -int mega_ccm_init(sensor_t *sensor); +int esp32_camera_mega_ccm_init(sensor_t *sensor); #endif // __MEGA_CCM_H__ diff --git a/sensors/private_include/nt99141.h b/sensors/private_include/nt99141.h index 8b0c562b94..0e7cb52a01 100644 --- a/sensors/private_include/nt99141.h +++ b/sensors/private_include/nt99141.h @@ -20,7 +20,7 @@ * 0: Can't detect this sensor * Nonzero: This sensor has been detected */ -int nt99141_detect(int slv_addr, sensor_id_t *id); +int esp32_camera_nt99141_detect(int slv_addr, sensor_id_t *id); /** * @brief initialize sensor function pointers @@ -29,6 +29,6 @@ int nt99141_detect(int slv_addr, sensor_id_t *id); * @return * Always 0 */ -int nt99141_init(sensor_t *sensor); +int esp32_camera_nt99141_init(sensor_t *sensor); #endif // __NT99141_H__ diff --git a/sensors/private_include/ov2640.h b/sensors/private_include/ov2640.h index 342ab21328..4622c1a004 100755 --- a/sensors/private_include/ov2640.h +++ b/sensors/private_include/ov2640.h @@ -18,7 +18,7 @@ * 0: Can't detect this sensor * Nonzero: This sensor has been detected */ -int ov2640_detect(int slv_addr, sensor_id_t *id); +int esp32_camera_ov2640_detect(int slv_addr, sensor_id_t *id); /** * @brief initialize sensor function pointers @@ -27,6 +27,6 @@ int ov2640_detect(int slv_addr, sensor_id_t *id); * @return * Always 0 */ -int ov2640_init(sensor_t *sensor); +int esp32_camera_ov2640_init(sensor_t *sensor); #endif // __OV2640_H__ diff --git a/sensors/private_include/ov3660.h b/sensors/private_include/ov3660.h index 341d688616..1bb5beb537 100755 --- a/sensors/private_include/ov3660.h +++ b/sensors/private_include/ov3660.h @@ -20,7 +20,7 @@ * 0: Can't detect this sensor * Nonzero: This sensor has been detected */ -int ov3660_detect(int slv_addr, sensor_id_t *id); +int esp32_camera_ov3660_detect(int slv_addr, sensor_id_t *id); /** * @brief initialize sensor function pointers @@ -29,6 +29,6 @@ int ov3660_detect(int slv_addr, sensor_id_t *id); * @return * Always 0 */ -int ov3660_init(sensor_t *sensor); +int esp32_camera_ov3660_init(sensor_t *sensor); #endif // __OV3660_H__ diff --git a/sensors/private_include/ov5640.h b/sensors/private_include/ov5640.h index 120ae72054..307f19df0c 100755 --- a/sensors/private_include/ov5640.h +++ b/sensors/private_include/ov5640.h @@ -13,7 +13,7 @@ * 0: Can't detect this sensor * Nonzero: This sensor has been detected */ -int ov5640_detect(int slv_addr, sensor_id_t *id); +int esp32_camera_ov5640_detect(int slv_addr, sensor_id_t *id); /** * @brief initialize sensor function pointers @@ -22,6 +22,6 @@ int ov5640_detect(int slv_addr, sensor_id_t *id); * @return * Always 0 */ -int ov5640_init(sensor_t *sensor); +int esp32_camera_ov5640_init(sensor_t *sensor); #endif // __OV5640_H__ diff --git a/sensors/private_include/ov7670.h b/sensors/private_include/ov7670.h index b3a645a70d..cfd8b4792d 100644 --- a/sensors/private_include/ov7670.h +++ b/sensors/private_include/ov7670.h @@ -19,7 +19,7 @@ * 0: Can't detect this sensor * Nonzero: This sensor has been detected */ -int ov7670_detect(int slv_addr, sensor_id_t *id); +int esp32_camera_ov7670_detect(int slv_addr, sensor_id_t *id); /** * @brief initialize sensor function pointers @@ -28,6 +28,6 @@ int ov7670_detect(int slv_addr, sensor_id_t *id); * @return * Always 0 */ -int ov7670_init(sensor_t *sensor); +int esp32_camera_ov7670_init(sensor_t *sensor); #endif // __OV7670_H__ diff --git a/sensors/private_include/ov7725.h b/sensors/private_include/ov7725.h index 291b266800..6ab41db8e5 100755 --- a/sensors/private_include/ov7725.h +++ b/sensors/private_include/ov7725.h @@ -19,7 +19,7 @@ * 0: Can't detect this sensor * Nonzero: This sensor has been detected */ -int ov7725_detect(int slv_addr, sensor_id_t *id); +int esp32_camera_ov7725_detect(int slv_addr, sensor_id_t *id); /** * @brief initialize sensor function pointers @@ -28,6 +28,6 @@ int ov7725_detect(int slv_addr, sensor_id_t *id); * @return * Always 0 */ -int ov7725_init(sensor_t *sensor); +int esp32_camera_ov7725_init(sensor_t *sensor); #endif // __OV7725_H__ diff --git a/sensors/private_include/sc030iot.h b/sensors/private_include/sc030iot.h index 19298b76c2..824d2d6cf4 100644 --- a/sensors/private_include/sc030iot.h +++ b/sensors/private_include/sc030iot.h @@ -17,7 +17,7 @@ * 0: Can't detect this sensor * Nonzero: This sensor has been detected */ -int sc030iot_detect(int slv_addr, sensor_id_t *id); +int esp32_camera_sc030iot_detect(int slv_addr, sensor_id_t *id); /** * @brief initialize sensor function pointers @@ -26,6 +26,6 @@ int sc030iot_detect(int slv_addr, sensor_id_t *id); * @return * Always 0 */ -int sc030iot_init(sensor_t *sensor); +int esp32_camera_sc030iot_init(sensor_t *sensor); #endif // __SC030IOT_H__ diff --git a/sensors/private_include/sc031gs.h b/sensors/private_include/sc031gs.h index 93652d58a1..4a8c300926 100644 --- a/sensors/private_include/sc031gs.h +++ b/sensors/private_include/sc031gs.h @@ -17,7 +17,7 @@ * 0: Can't detect this sensor * Nonzero: This sensor has been detected */ -int sc031gs_detect(int slv_addr, sensor_id_t *id); +int esp32_camera_sc031gs_detect(int slv_addr, sensor_id_t *id); /** * @brief initialize sensor function pointers @@ -26,6 +26,6 @@ int sc031gs_detect(int slv_addr, sensor_id_t *id); * @return * Always 0 */ -int sc031gs_init(sensor_t *sensor); +int esp32_camera_sc031gs_init(sensor_t *sensor); #endif // __SC031GS_H__ diff --git a/sensors/private_include/sc101iot.h b/sensors/private_include/sc101iot.h index 85858498ec..c6c9eea609 100644 --- a/sensors/private_include/sc101iot.h +++ b/sensors/private_include/sc101iot.h @@ -17,7 +17,7 @@ * 0: Can't detect this sensor * Nonzero: This sensor has been detected */ -int sc101iot_detect(int slv_addr, sensor_id_t *id); +int esp32_camera_sc101iot_detect(int slv_addr, sensor_id_t *id); /** * @brief initialize sensor function pointers @@ -26,6 +26,6 @@ int sc101iot_detect(int slv_addr, sensor_id_t *id); * @return * Always 0 */ -int sc101iot_init(sensor_t *sensor); +int esp32_camera_sc101iot_init(sensor_t *sensor); #endif // __SC101IOT_H__ diff --git a/sensors/sc030iot.c b/sensors/sc030iot.c index 86f525f376..e7054c1aee 100644 --- a/sensors/sc030iot.c +++ b/sensors/sc030iot.c @@ -284,7 +284,7 @@ static int set_xclk(sensor_t *sensor, int timer, int xclk) return ret; } -int sc030iot_detect(int slv_addr, sensor_id_t *id) +int esp32_camera_sc030iot_detect(int slv_addr, sensor_id_t *id) { if (SC030IOT_SCCB_ADDR == slv_addr) { uint8_t MIDL = SCCB_Read(slv_addr, SC030_SENSOR_ID_LOW_REG); @@ -300,7 +300,7 @@ int sc030iot_detect(int slv_addr, sensor_id_t *id) return 0; } -int sc030iot_init(sensor_t *sensor) +int esp32_camera_sc030iot_init(sensor_t *sensor) { // Set function pointers sensor->reset = reset; diff --git a/sensors/sc031gs.c b/sensors/sc031gs.c index 627b70136d..307fa4232b 100644 --- a/sensors/sc031gs.c +++ b/sensors/sc031gs.c @@ -292,7 +292,7 @@ static int set_xclk(sensor_t *sensor, int timer, int xclk) return ret; } -int sc031gs_detect(int slv_addr, sensor_id_t *id) +int esp32_camera_sc031gs_detect(int slv_addr, sensor_id_t *id) { if (SC031GS_SCCB_ADDR == slv_addr) { uint8_t MIDL = SCCB_Read16(slv_addr, SC031GS_PID_HIGH_REG); @@ -308,7 +308,7 @@ int sc031gs_detect(int slv_addr, sensor_id_t *id) return 0; } -int sc031gs_init(sensor_t *sensor) +int esp32_camera_sc031gs_init(sensor_t *sensor) { // Set function pointers sensor->reset = reset; diff --git a/sensors/sc101iot.c b/sensors/sc101iot.c index 310a04768b..e27e4793ff 100644 --- a/sensors/sc101iot.c +++ b/sensors/sc101iot.c @@ -291,7 +291,7 @@ static int set_xclk(sensor_t *sensor, int timer, int xclk) return ret; } -int sc101iot_detect(int slv_addr, sensor_id_t *id) +int esp32_camera_sc101iot_detect(int slv_addr, sensor_id_t *id) { if (SC101IOT_SCCB_ADDR == slv_addr) { uint8_t MIDL = SCCB_Read(slv_addr, SC101_SENSOR_ID_LOW_REG); @@ -307,7 +307,7 @@ int sc101iot_detect(int slv_addr, sensor_id_t *id) return 0; } -int sc101iot_init(sensor_t *sensor) +int esp32_camera_sc101iot_init(sensor_t *sensor) { // Set function pointers sensor->reset = reset;