Skip to content

Commit 00c3042

Browse files
jimforrzhufangluome-no-dev
authored
fix: add prefix for sensor functions name (#815)
Co-authored-by: zhufangluo <[email protected]> Co-authored-by: Me No Dev <[email protected]>
1 parent 3294767 commit 00c3042

35 files changed

+85
-85
lines changed

‎driver/esp_camera.c‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -112,55 +112,55 @@ typedef struct {
112112

113113
static const sensor_func_t g_sensors[] = {
114114
#if CONFIG_OV7725_SUPPORT
115-
{ov7725_detect, ov7725_init},
115+
{esp32_camera_ov7725_detect, esp32_camera_ov7725_init},
116116
#endif
117117
#if CONFIG_OV7670_SUPPORT
118-
{ov7670_detect, ov7670_init},
118+
{esp32_camera_ov7670_detect, esp32_camera_ov7670_init},
119119
#endif
120120
#if CONFIG_OV2640_SUPPORT
121-
{ov2640_detect, ov2640_init},
121+
{esp32_camera_ov2640_detect, esp32_camera_ov2640_init},
122122
#endif
123123
#if CONFIG_OV3660_SUPPORT
124-
{ov3660_detect, ov3660_init},
124+
{esp32_camera_ov3660_detect, esp32_camera_ov3660_init},
125125
#endif
126126
#if CONFIG_OV5640_SUPPORT
127-
{ov5640_detect, ov5640_init},
127+
{esp32_camera_ov5640_detect, esp32_camera_ov5640_init},
128128
#endif
129129
#if CONFIG_NT99141_SUPPORT
130-
{nt99141_detect, nt99141_init},
130+
{esp32_camera_nt99141_detect, esp32_camera_nt99141_init},
131131
#endif
132132
#if CONFIG_GC2145_SUPPORT
133-
{gc2145_detect, gc2145_init},
133+
{esp32_camera_gc2145_detect, esp32_camera_gc2145_init},
134134
#endif
135135
#if CONFIG_GC032A_SUPPORT
136-
{gc032a_detect, gc032a_init},
136+
{esp32_camera_gc032a_detect, esp32_camera_gc032a_init},
137137
#endif
138138
#if CONFIG_GC0308_SUPPORT
139-
{gc0308_detect, gc0308_init},
139+
{esp32_camera_gc0308_detect, esp32_camera_gc0308_init},
140140
#endif
141141
#if CONFIG_BF3005_SUPPORT
142-
{bf3005_detect, bf3005_init},
142+
{esp32_camera_bf3005_detect, esp32_camera_bf3005_init},
143143
#endif
144144
#if CONFIG_BF20A6_SUPPORT
145-
{bf20a6_detect, bf20a6_init},
145+
{esp32_camera_bf20a6_detect, esp32_camera_bf20a6_init},
146146
#endif
147147
#if CONFIG_SC101IOT_SUPPORT
148-
{sc101iot_detect, sc101iot_init},
148+
{esp32_camera_sc101iot_detect, esp32_camera_sc101iot_init},
149149
#endif
150150
#if CONFIG_SC030IOT_SUPPORT
151-
{sc030iot_detect, sc030iot_init},
151+
{esp32_camera_sc030iot_detect, esp32_camera_sc030iot_init},
152152
#endif
153153
#if CONFIG_SC031GS_SUPPORT
154-
{sc031gs_detect, sc031gs_init},
154+
{esp32_camera_sc031gs_detect, esp32_camera_sc031gs_init},
155155
#endif
156156
#if CONFIG_MEGA_CCM_SUPPORT
157-
{mega_ccm_detect, mega_ccm_init},
157+
{esp32_camera_mega_ccm_detect, esp32_camera_mega_ccm_init},
158158
#endif
159159
#if CONFIG_HM1055_SUPPORT
160-
{hm1055_detect, hm1055_init},
160+
{esp32_camera_hm1055_detect, esp32_camera_hm1055_init},
161161
#endif
162162
#if CONFIG_HM0360_SUPPORT
163-
{hm0360_detect, hm0360_init},
163+
{esp32_camera_hm0360_detect, esp32_camera_hm0360_init},
164164
#endif
165165
};
166166

‎sensors/bf20a6.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val)
347347
return -1;
348348
}
349349

350-
int bf20a6_detect(int slv_addr, sensor_id_t *id)
350+
int esp32_camera_bf20a6_detect(int slv_addr, sensor_id_t *id)
351351
{
352352
if (BF20A6_SCCB_ADDR == slv_addr) {
353353
uint8_t MIDL = SCCB_Read(slv_addr, SENSOR_ID_LOW);
@@ -363,7 +363,7 @@ int bf20a6_detect(int slv_addr, sensor_id_t *id)
363363
return 0;
364364
}
365365

366-
int bf20a6_init(sensor_t *sensor)
366+
int esp32_camera_bf20a6_init(sensor_t *sensor)
367367
{
368368
sensor->init_status = init_status;
369369
sensor->reset = reset;

‎sensors/bf3005.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ static int set_xclk(sensor_t *sensor, int timer, int xclk)
476476
return ret;
477477
}
478478

479-
int bf3005_detect(int slv_addr, sensor_id_t *id)
479+
int esp32_camera_bf3005_detect(int slv_addr, sensor_id_t *id)
480480
{
481481
if (BF3005_SCCB_ADDR == slv_addr) {
482482
uint16_t PID = SCCB_Read(slv_addr, 0xFC);
@@ -493,7 +493,7 @@ int bf3005_detect(int slv_addr, sensor_id_t *id)
493493
return 0;
494494
}
495495

496-
int bf3005_init(sensor_t *sensor)
496+
int esp32_camera_bf3005_init(sensor_t *sensor)
497497
{
498498
// Set function pointers
499499
sensor->reset = reset;

‎sensors/gc0308.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val)
411411
return -1;
412412
}
413413

414-
int gc0308_detect(int slv_addr, sensor_id_t *id)
414+
int esp32_camera_gc0308_detect(int slv_addr, sensor_id_t *id)
415415
{
416416
if (GC0308_SCCB_ADDR == slv_addr) {
417417
write_reg(slv_addr, 0xfe, 0x00);
@@ -426,7 +426,7 @@ int gc0308_detect(int slv_addr, sensor_id_t *id)
426426
return 0;
427427
}
428428

429-
int gc0308_init(sensor_t *sensor)
429+
int esp32_camera_gc0308_init(sensor_t *sensor)
430430
{
431431
sensor->init_status = init_status;
432432
sensor->reset = reset;

‎sensors/gc032a.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val)
328328
return -1;
329329
}
330330

331-
int gc032a_detect(int slv_addr, sensor_id_t *id)
331+
int esp32_camera_gc032a_detect(int slv_addr, sensor_id_t *id)
332332
{
333333
if (GC032A_SCCB_ADDR == slv_addr) {
334334
uint8_t MIDL = SCCB_Read(slv_addr, SENSOR_ID_LOW);
@@ -344,7 +344,7 @@ int gc032a_detect(int slv_addr, sensor_id_t *id)
344344
return 0;
345345
}
346346

347-
int gc032a_init(sensor_t *sensor)
347+
int esp32_camera_gc032a_init(sensor_t *sensor)
348348
{
349349
sensor->init_status = init_status;
350350
sensor->reset = reset;

‎sensors/gc2145.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val)
414414
return -1;
415415
}
416416

417-
int gc2145_detect(int slv_addr, sensor_id_t *id)
417+
int esp32_camera_gc2145_detect(int slv_addr, sensor_id_t *id)
418418
{
419419
if (GC2145_SCCB_ADDR == slv_addr) {
420420
uint8_t MIDL = SCCB_Read(slv_addr, CHIP_ID_LOW);
@@ -430,7 +430,7 @@ int gc2145_detect(int slv_addr, sensor_id_t *id)
430430
return 0;
431431
}
432432

433-
int gc2145_init(sensor_t *sensor)
433+
int esp32_camera_gc2145_init(sensor_t *sensor)
434434
{
435435
sensor->init_status = init_status;
436436
sensor->reset = reset;

‎sensors/hm0360.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ static int init_status(sensor_t *sensor)
418418
return 0;
419419
}
420420

421-
int hm0360_detect(int slv_addr, sensor_id_t *id)
421+
int esp32_camera_hm0360_detect(int slv_addr, sensor_id_t *id)
422422
{
423423
if (HM1055_SCCB_ADDR == slv_addr) {
424424
uint8_t h = SCCB_Read16(slv_addr, MODEL_ID_H);
@@ -435,7 +435,7 @@ int hm0360_detect(int slv_addr, sensor_id_t *id)
435435
return 0;
436436
}
437437

438-
int hm0360_init(sensor_t *sensor)
438+
int esp32_camera_hm0360_init(sensor_t *sensor)
439439
{
440440
sensor->reset = reset;
441441
sensor->set_pixformat = set_pixformat;

‎sensors/hm1055.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ static int init_status(sensor_t *sensor)
772772
return 0;
773773
}
774774

775-
int hm1055_detect(int slv_addr, sensor_id_t *id)
775+
int esp32_camera_hm1055_detect(int slv_addr, sensor_id_t *id)
776776
{
777777
if (HM1055_SCCB_ADDR == slv_addr)
778778
{
@@ -792,7 +792,7 @@ int hm1055_detect(int slv_addr, sensor_id_t *id)
792792
return 0;
793793
}
794794

795-
int hm1055_init(sensor_t *sensor)
795+
int esp32_camera_hm1055_init(sensor_t *sensor)
796796
{
797797
sensor->reset = reset;
798798
sensor->set_pixformat = set_pixformat;

‎sensors/mega_ccm.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val)
344344
return -1;
345345
}
346346

347-
int mega_ccm_detect(int slv_addr, sensor_id_t *id)
347+
int esp32_camera_mega_ccm_detect(int slv_addr, sensor_id_t *id)
348348
{
349349
if (MEGA_CCM_SCCB_ADDR == slv_addr) {
350350
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)
360360
return 0;
361361
}
362362

363-
int mega_ccm_init(sensor_t *sensor)
363+
int esp32_camera_mega_ccm_init(sensor_t *sensor)
364364
{
365365
sensor->init_status = init_status;
366366
sensor->reset = reset;

‎sensors/nt99141.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ static int set_xclk(sensor_t *sensor, int timer, int xclk)
934934
return ret;
935935
}
936936

937-
int nt99141_detect(int slv_addr, sensor_id_t *id)
937+
int esp32_camera_nt99141_detect(int slv_addr, sensor_id_t *id)
938938
{
939939
if (NT99141_SCCB_ADDR == slv_addr) {
940940
SCCB_Write16(slv_addr, 0x3008, 0x01);//bank sensor
@@ -981,7 +981,7 @@ static int init_status(sensor_t *sensor)
981981
return 0;
982982
}
983983

984-
int nt99141_init(sensor_t *sensor)
984+
int esp32_camera_nt99141_init(sensor_t *sensor)
985985
{
986986
sensor->reset = reset;
987987
sensor->set_pixformat = set_pixformat;

0 commit comments

Comments
 (0)