Skip to content

Commit 80e01a5

Browse files
wujiangangwujiangang
committed
Merge branch 'fix/fix_sc2336_exp_val_default' into 'master'
fix: update sc2336 default exp val See merge request espressif/esp-video-components!344
2 parents b914e8c + 459fe07 commit 80e01a5

File tree

3 files changed

+43
-39
lines changed

3 files changed

+43
-39
lines changed

‎esp_cam_sensor/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
- Revised the default exposure value for SC2336.
6+
37
## 1.5.1
48

59
- Added byte swap option and RGB565 format support for OV5640.

‎esp_cam_sensor/sensors/sc2336/private_include/sc2336_settings.h‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ static const sc2336_reginfo_t init_reglist_MIPI_2lane_720p_25fps[] = {
139139
{0x3943, 0xc6},
140140
{0x3952, 0x02},
141141
{0x3953, 0x0f},
142-
{0x3e01, 0x70},
143-
{0x3e02, 0x20},
142+
{0x3e01, 0x37},
143+
{0x3e02, 0xe0},
144144
{0x3e08, 0x1f},
145145
{0x3e1b, 0x14},
146146
{0x440e, 0x02},
@@ -310,8 +310,8 @@ static const sc2336_reginfo_t init_reglist_MIPI_2lane_720p_30fps[] = {
310310
{0x3943, 0xc6},
311311
{0x3952, 0x02},
312312
{0x3953, 0x0f},
313-
{0x3e01, 0x5d},
314-
{0x3e02, 0x60},
313+
{0x3e01, 0x37},
314+
{0x3e02, 0xe0},
315315
{0x3e08, 0x1f},
316316
{0x3e1b, 0x14},
317317
{0x440e, 0x02},
@@ -652,8 +652,8 @@ static const sc2336_reginfo_t init_reglist_MIPI_2lane_720p_60fps[] = {
652652
{0x3943, 0xc6},
653653
{0x3952, 0x02},
654654
{0x3953, 0x0f},
655-
{0x3e01, 0x2e},
656-
{0x3e02, 0x80},
655+
{0x3e01, 0x37},
656+
{0x3e02, 0xe0},
657657
{0x3e08, 0x1f},
658658
{0x3e1b, 0x14},
659659
{0x440e, 0x02},
@@ -806,8 +806,8 @@ static const sc2336_reginfo_t init_reglist_MIPI_2lane_1080p_15fps[] = {
806806
{0x3943, 0xc6},
807807
{0x3952, 0x02},
808808
{0x3953, 0x0f},
809-
{0x3e01, 0x4a},
810-
{0x3e02, 0xa0},
809+
{0x3e01, 0x37},
810+
{0x3e02, 0xe0},
811811
{0x3e08, 0x1f},
812812
{0x3e1b, 0x14},
813813
{0x440e, 0x02},
@@ -954,8 +954,8 @@ static const sc2336_reginfo_t init_reglist_MIPI_1lane_1080p_25fps[] = {
954954
{0x3943, 0xc6},
955955
{0x3952, 0x02},
956956
{0x3953, 0x0f},
957-
{0x3e01, 0x4a},
958-
{0x3e02, 0xf0},
957+
{0x3e01, 0x37},
958+
{0x3e02, 0xe0},
959959
{0x3e08, 0x1f},
960960
{0x3e1b, 0x14},
961961
{0x440e, 0x02},
@@ -1099,8 +1099,8 @@ static const sc2336_reginfo_t init_reglist_MIPI_2lane_1080p_25fps[] = {
10991099
{0x3943, 0xc6},
11001100
{0x3952, 0x02},
11011101
{0x3953, 0x0f},
1102-
{0x3e01, 0x4a},
1103-
{0x3e02, 0xf0},
1102+
{0x3e01, 0x37},
1103+
{0x3e02, 0xe0},
11041104
{0x3e08, 0x1f},
11051105
{0x3e1b, 0x14},
11061106
{0x440e, 0x02},
@@ -1244,8 +1244,8 @@ static const sc2336_reginfo_t init_reglist_MIPI_2lane_1080p_30fps[] = {
12441244
{0x3943, 0xc6},
12451245
{0x3952, 0x02},
12461246
{0x3953, 0x0f},
1247-
{0x3e01, 0x4a},
1248-
{0x3e02, 0xa0},
1247+
{0x3e01, 0x37},
1248+
{0x3e02, 0xe0},
12491249
{0x3e08, 0x1f},
12501250
{0x3e1b, 0x14},
12511251
{0x440e, 0x02},
@@ -1416,8 +1416,8 @@ static const sc2336_reginfo_t init_reglist_MIPI_2lane_8bit_800x800_30fps[] = {
14161416
{0x3943, 0xc6},
14171417
{0x3952, 0x02},
14181418
{0x3953, 0x0f},
1419-
{0x3e01, 0x4d},
1420-
{0x3e02, 0xc0},
1419+
{0x3e01, 0x37},
1420+
{0x3e02, 0xe0},
14211421
{0x3e08, 0x1f},
14221422
{0x3e1b, 0x14},
14231423
{0x440e, 0x02},
@@ -1588,8 +1588,8 @@ static const sc2336_reginfo_t init_reglist_MIPI_2lane_10bit_800x800_30fps[] = {
15881588
{0x3943, 0xc6},
15891589
{0x3952, 0x02},
15901590
{0x3953, 0x0f},
1591-
{0x3e01, 0x3e},
1592-
{0x3e02, 0x20},
1591+
{0x3e01, 0x37},
1592+
{0x3e02, 0xe0},
15931593
{0x3e08, 0x1f},
15941594
{0x3e1b, 0x14},
15951595
{0x440e, 0x02},
@@ -1916,8 +1916,8 @@ static const sc2336_reginfo_t init_reglist_MIPI_2lane_1080p_raw8_30fps[] = {
19161916
{0x3943, 0xc6},
19171917
{0x3952, 0x02},
19181918
{0x3953, 0x0f},
1919-
{0x3e01, 0x4d},
1920-
{0x3e02, 0xc0},
1919+
{0x3e01, 0x37},
1920+
{0x3e02, 0xe0},
19211921
{0x3e08, 0x1f},
19221922
{0x3e1b, 0x14},
19231923
{0x4509, 0x38},
@@ -2087,8 +2087,8 @@ static const sc2336_reginfo_t init_reglist_MIPI_2lane_720p_raw8_30fps[] = {
20872087
{0x3943, 0xc6},
20882088
{0x3952, 0x02},
20892089
{0x3953, 0x0f},
2090-
{0x3e01, 0x4d},
2091-
{0x3e02, 0xc0},
2090+
{0x3e01, 0x37},
2091+
{0x3e02, 0xe0},
20922092
{0x3e08, 0x1f},
20932093
{0x3e1b, 0x14},
20942094
{0x4509, 0x38},
@@ -2258,8 +2258,8 @@ static const sc2336_reginfo_t init_reglist_MIPI_2lane_800x800_raw8_30fps[] = {
22582258
{0x3943, 0xc6},
22592259
{0x3952, 0x02},
22602260
{0x3953, 0x0f},
2261-
{0x3e01, 0x4d},
2262-
{0x3e02, 0xc0},
2261+
{0x3e01, 0x37},
2262+
{0x3e02, 0xe0},
22632263
{0x3e08, 0x1f},
22642264
{0x3e1b, 0x14},
22652265
{0x440e, 0x02},
@@ -2430,8 +2430,8 @@ static const sc2336_reginfo_t init_reglist_MIPI_2lane_1024x600_raw8_30fps[] = {
24302430
{0x3943, 0xc6},
24312431
{0x3952, 0x02},
24322432
{0x3953, 0x0f},
2433-
{0x3e01, 0x3e},
2434-
{0x3e02, 0x20},
2433+
{0x3e01, 0x37},
2434+
{0x3e02, 0xe0},
24352435
{0x3e08, 0x1f},
24362436
{0x3e1b, 0x14},
24372437
{0x4509, 0x38},
@@ -2609,8 +2609,8 @@ static const sc2336_reginfo_t init_reglist_DVP_720p_30fps[] = {
26092609
{0x3943, 0xc6},
26102610
{0x3952, 0x02},
26112611
{0x3953, 0x0f},
2612-
{0x3e01, 0x2e},
2613-
{0x3e02, 0x90},
2612+
{0x3e01, 0x37},
2613+
{0x3e02, 0xe0},
26142614
{0x3e08, 0x1f},
26152615
{0x3e1b, 0x14},
26162616
{0x440e, 0x02},

‎esp_cam_sensor/sensors/sc2336/sc2336.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ static const esp_cam_sensor_isp_info_t sc2336_isp_info_mipi[] = {
963963
.hts = 1800,
964964
.tline_ns = 22222,
965965
.gain_def = 0, // gain index, depend on {0x3e06, 0x3e07, 0x3e09}, since these registers are not set in format reg_list, the default values ​​are used here.
966-
.exp_def = 0x5d6, // depend on {0x3e00, 0x3e01, 0x3e02}, see format_reg_list to get the default value.
966+
.exp_def = 0x37e, // depend on {0x3e00, 0x3e01, 0x3e02}, see format_reg_list to get the default value.
967967
.bayer_type = ESP_CAM_SENSOR_BAYER_BGGR,
968968
}
969969
},
@@ -987,7 +987,7 @@ static const esp_cam_sensor_isp_info_t sc2336_isp_info_mipi[] = {
987987
.hts = 1800,
988988
.tline_ns = 22222,
989989
.gain_def = 0,
990-
.exp_def = 0x2e8,
990+
.exp_def = 0x37e,
991991
.bayer_type = ESP_CAM_SENSOR_BAYER_BGGR,
992992
},
993993
},
@@ -999,7 +999,7 @@ static const esp_cam_sensor_isp_info_t sc2336_isp_info_mipi[] = {
999999
.hts = 1125,
10001000
.tline_ns = 33333,
10011001
.gain_def = 0,
1002-
.exp_def = 0x4af,
1002+
.exp_def = 0x37e,
10031003
.bayer_type = ESP_CAM_SENSOR_BAYER_BGGR,
10041004
},
10051005
},
@@ -1011,7 +1011,7 @@ static const esp_cam_sensor_isp_info_t sc2336_isp_info_mipi[] = {
10111011
.hts = 2250,
10121012
.tline_ns = 33333,
10131013
.gain_def = 0,
1014-
.exp_def = 0x4af,
1014+
.exp_def = 0x37e,
10151015
.bayer_type = ESP_CAM_SENSOR_BAYER_BGGR,
10161016
},
10171017
},
@@ -1023,7 +1023,7 @@ static const esp_cam_sensor_isp_info_t sc2336_isp_info_mipi[] = {
10231023
.hts = 2250,
10241024
.tline_ns = 27777,
10251025
.gain_def = 0,
1026-
.exp_def = 0x4aa,
1026+
.exp_def = 0x37e,
10271027
.bayer_type = ESP_CAM_SENSOR_BAYER_BGGR,
10281028
},
10291029
},
@@ -1035,7 +1035,7 @@ static const esp_cam_sensor_isp_info_t sc2336_isp_info_mipi[] = {
10351035
.hts = 750,
10361036
.tline_ns = 33333,
10371037
.gain_def = 0,
1038-
.exp_def = 0x3e2,
1038+
.exp_def = 0x37e,
10391039
.bayer_type = ESP_CAM_SENSOR_BAYER_BGGR,
10401040
}
10411041
},
@@ -1047,7 +1047,7 @@ static const esp_cam_sensor_isp_info_t sc2336_isp_info_mipi[] = {
10471047
.hts = 2240,
10481048
.tline_ns = 16000,
10491049
.gain_def = 0,
1050-
.exp_def = 0x207,
1050+
.exp_def = 0x37e,
10511051
.bayer_type = ESP_CAM_SENSOR_BAYER_BGGR,
10521052
}
10531053
},
@@ -1059,7 +1059,7 @@ static const esp_cam_sensor_isp_info_t sc2336_isp_info_mipi[] = {
10591059
.hts = 2240,
10601060
.tline_ns = 26666,
10611061
.gain_def = 0,
1062-
.exp_def = 0x4dc,
1062+
.exp_def = 0x37e,
10631063
.bayer_type = ESP_CAM_SENSOR_BAYER_BGGR,
10641064
}
10651065
},
@@ -1071,7 +1071,7 @@ static const esp_cam_sensor_isp_info_t sc2336_isp_info_mipi[] = {
10711071
.hts = 2240,
10721072
.tline_ns = 26666,
10731073
.gain_def = 0,
1074-
.exp_def = 0x4dc,
1074+
.exp_def = 0x37e,
10751075
.bayer_type = ESP_CAM_SENSOR_BAYER_BGGR,
10761076
}
10771077
},
@@ -1083,7 +1083,7 @@ static const esp_cam_sensor_isp_info_t sc2336_isp_info_mipi[] = {
10831083
.hts = 2240,
10841084
.tline_ns = 26666,
10851085
.gain_def = 0,
1086-
.exp_def = 0x4dc,
1086+
.exp_def = 0x37e,
10871087
.bayer_type = ESP_CAM_SENSOR_BAYER_BGGR,
10881088
}
10891089
},
@@ -1095,7 +1095,7 @@ static const esp_cam_sensor_isp_info_t sc2336_isp_info_mipi[] = {
10951095
.hts = 2400,
10961096
.tline_ns = 33333,
10971097
.gain_def = 0,
1098-
.exp_def = 0x3e2,
1098+
.exp_def = 0x37e,
10991099
.bayer_type = ESP_CAM_SENSOR_BAYER_BGGR,
11001100
}
11011101
},

0 commit comments

Comments
 (0)