Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions driver/esp_camera.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
};

Expand Down
4 changes: 2 additions & 2 deletions sensors/bf20a6.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions sensors/bf3005.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions sensors/gc0308.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions sensors/gc032a.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions sensors/gc2145.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions sensors/hm0360.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions sensors/hm1055.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions sensors/mega_ccm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions sensors/nt99141.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions sensors/ov2640.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions sensors/ov3660.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions sensors/ov5640.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions sensors/ov7670.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions sensors/ov7725.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions sensors/private_include/bf20a6.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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__
4 changes: 2 additions & 2 deletions sensors/private_include/bf3005.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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__
4 changes: 2 additions & 2 deletions sensors/private_include/gc0308.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions sensors/private_include/gc032a.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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__
Loading