fix: add gc0308 output only Y format support

WangYuxin-esp · WangYuxin-esp · commit 27741fd2c265 · 2023-10-30T14:19:29.000+08:00
diff --git a/sensors/gc0308.c b/sensors/gc0308.c
@@ -160,6 +160,10 @@ static int set_pixformat(sensor_t *sensor, pixformat_t pixformat)
         write_reg(sensor->slv_addr, 0xfe, 0x00);
         ret = set_reg_bits(sensor->slv_addr, 0x24, 0, 0x0f, 2); //yuv422 Y Cb Y Cr
         break;
+    case PIXFORMAT_GRAYSCALE:
+        write_reg(sensor->slv_addr, 0xfe, 0x00);
+        ret = write_reg(sensor->slv_addr, 0x24, 0xb1);
+        break;
     default:
         ESP_LOGW(TAG, "unsupport format");
         ret = -1;
diff --git a/target/esp32/ll_cam.c b/target/esp32/ll_cam.c
@@ -491,7 +491,7 @@ size_t IRAM_ATTR ll_cam_memcpy(cam_obj_t *cam, uint8_t *out, const uint8_t *in,
 esp_err_t ll_cam_set_sample_mode(cam_obj_t *cam, pixformat_t pix_format, uint32_t xclk_freq_hz, uint16_t sensor_pid)
 {
     if (pix_format == PIXFORMAT_GRAYSCALE) {
-        if (sensor_pid == OV3660_PID || sensor_pid == OV5640_PID || sensor_pid == NT99141_PID || sensor_pid == SC031GS_PID || sensor_pid == BF20A6_PID) {
+        if (sensor_pid == OV3660_PID || sensor_pid == OV5640_PID || sensor_pid == NT99141_PID || sensor_pid == SC031GS_PID || sensor_pid == BF20A6_PID || sensor_pid == GC0308_PID) {
             if (xclk_freq_hz > 10000000) {
                 sampling_mode = SM_0A00_0B00;
                 dma_filter = ll_cam_dma_filter_yuyv_highspeed;
diff --git a/target/esp32s2/ll_cam.c b/target/esp32s2/ll_cam.c
@@ -394,7 +394,7 @@ size_t IRAM_ATTR ll_cam_memcpy(cam_obj_t *cam, uint8_t *out, const uint8_t *in,
 esp_err_t ll_cam_set_sample_mode(cam_obj_t *cam, pixformat_t pix_format, uint32_t xclk_freq_hz, uint16_t sensor_pid)
 {
     if (pix_format == PIXFORMAT_GRAYSCALE) {
-        if (sensor_pid == OV3660_PID || sensor_pid == OV5640_PID || sensor_pid == NT99141_PID || sensor_pid == SC031GS_PID || sensor_pid == BF20A6_PID) {
+        if (sensor_pid == OV3660_PID || sensor_pid == OV5640_PID || sensor_pid == NT99141_PID || sensor_pid == SC031GS_PID || sensor_pid == BF20A6_PID || sensor_pid == GC0308_PID) {
             cam->in_bytes_per_pixel = 1;       // camera sends Y8
         } else {
             cam->in_bytes_per_pixel = 2;       // camera sends YU/YV
diff --git a/target/esp32s3/ll_cam.c b/target/esp32s3/ll_cam.c
@@ -493,7 +493,7 @@ size_t IRAM_ATTR ll_cam_memcpy(cam_obj_t *cam, uint8_t *out, const uint8_t *in,
 esp_err_t ll_cam_set_sample_mode(cam_obj_t *cam, pixformat_t pix_format, uint32_t xclk_freq_hz, uint16_t sensor_pid)
 {
     if (pix_format == PIXFORMAT_GRAYSCALE) {
-        if (sensor_pid == OV3660_PID || sensor_pid == OV5640_PID || sensor_pid == NT99141_PID || sensor_pid == SC031GS_PID || sensor_pid == BF20A6_PID) {
+        if (sensor_pid == OV3660_PID || sensor_pid == OV5640_PID || sensor_pid == NT99141_PID || sensor_pid == SC031GS_PID || sensor_pid == BF20A6_PID || sensor_pid == GC0308_PID) {
             cam->in_bytes_per_pixel = 1;       // camera sends Y8
         } else {
             cam->in_bytes_per_pixel = 2;       // camera sends YU/YV

Original file line number	Diff line number	Diff line change
`@@ -491,7 +491,7 @@ size_t IRAM_ATTR ll_cam_memcpy(cam_obj_t cam, uint8_t out, const uint8_t *in,`
`491`	`491`	`esp_err_t ll_cam_set_sample_mode(cam_obj_t *cam, pixformat_t pix_format, uint32_t xclk_freq_hz, uint16_t sensor_pid)`
`492`	`492`	`{`
`493`	`493`	`if (pix_format == PIXFORMAT_GRAYSCALE) {`
`494`		`- if (sensor_pid == OV3660_PID \|\| sensor_pid == OV5640_PID \|\| sensor_pid == NT99141_PID \|\| sensor_pid == SC031GS_PID \|\| sensor_pid == BF20A6_PID) {`
	`494`	`+ if (sensor_pid == OV3660_PID \|\| sensor_pid == OV5640_PID \|\| sensor_pid == NT99141_PID \|\| sensor_pid == SC031GS_PID \|\| sensor_pid == BF20A6_PID \|\| sensor_pid == GC0308_PID) {`
`495`	`495`	`if (xclk_freq_hz > 10000000) {`
`496`	`496`	`sampling_mode = SM_0A00_0B00;`
`497`	`497`	`dma_filter = ll_cam_dma_filter_yuyv_highspeed;`
Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ size_t IRAM_ATTR ll_cam_memcpy(cam_obj_t cam, uint8_t out, const uint8_t *in,`
`394`	`394`	`esp_err_t ll_cam_set_sample_mode(cam_obj_t *cam, pixformat_t pix_format, uint32_t xclk_freq_hz, uint16_t sensor_pid)`
`395`	`395`	`{`
`396`	`396`	`if (pix_format == PIXFORMAT_GRAYSCALE) {`
`397`		`- if (sensor_pid == OV3660_PID \|\| sensor_pid == OV5640_PID \|\| sensor_pid == NT99141_PID \|\| sensor_pid == SC031GS_PID \|\| sensor_pid == BF20A6_PID) {`
	`397`	`+ if (sensor_pid == OV3660_PID \|\| sensor_pid == OV5640_PID \|\| sensor_pid == NT99141_PID \|\| sensor_pid == SC031GS_PID \|\| sensor_pid == BF20A6_PID \|\| sensor_pid == GC0308_PID) {`
`398`	`398`	`cam->in_bytes_per_pixel = 1; // camera sends Y8`
`399`	`399`	`} else {`
`400`	`400`	`cam->in_bytes_per_pixel = 2; // camera sends YU/YV`
Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ size_t IRAM_ATTR ll_cam_memcpy(cam_obj_t cam, uint8_t out, const uint8_t *in,`
`493`	`493`	`esp_err_t ll_cam_set_sample_mode(cam_obj_t *cam, pixformat_t pix_format, uint32_t xclk_freq_hz, uint16_t sensor_pid)`
`494`	`494`	`{`
`495`	`495`	`if (pix_format == PIXFORMAT_GRAYSCALE) {`
`496`		`- if (sensor_pid == OV3660_PID \|\| sensor_pid == OV5640_PID \|\| sensor_pid == NT99141_PID \|\| sensor_pid == SC031GS_PID \|\| sensor_pid == BF20A6_PID) {`
	`496`	`+ if (sensor_pid == OV3660_PID \|\| sensor_pid == OV5640_PID \|\| sensor_pid == NT99141_PID \|\| sensor_pid == SC031GS_PID \|\| sensor_pid == BF20A6_PID \|\| sensor_pid == GC0308_PID) {`
`497`	`497`	`cam->in_bytes_per_pixel = 1; // camera sends Y8`
`498`	`498`	`} else {`
`499`	`499`	`cam->in_bytes_per_pixel = 2; // camera sends YU/YV`