Modify the XCLK parameters of the camera, and modify the config.txt to be compatible with 2640 and 5640.

Y1hsiaochunnn · Y1hsiaochunnn · commit 21327a9dde9b · 2025-10-17T10:33:28.000+08:00
diff --git a/main/boards/esp32-s3-touch-lcd-3.5/config.json b/main/boards/esp32-s3-touch-lcd-3.5/config.json
@@ -2,10 +2,9 @@
     "target": "esp32s3",
     "builds": [
         {
-            "name": "esp32-s3-touch-lcd-3.5-ov5640",
+            "name": "esp32-s3-touch-lcd-3.5",
             "sdkconfig_append": [
                 "CONFIG_USE_WECHAT_MESSAGE_STYLE=y",
-                "CONFIG_XIAOZHI_ENABLE_CAMERA_ENDIANNESS_SWAP=y",
                 "CONFIG_CAMERA_OV2640=y",
                 "CONFIG_CAMERA_OV2640_AUTO_DETECT_DVP_INTERFACE_SENSOR=y",
                 "CONFIG_CAMERA_OV2640_DVP_YUV422_640X480_6FPS=y",
@@ -15,16 +14,6 @@
                 "CONFIG_CAMERA_OV5640_DVP_YUV422_800X600_10FPS=y",
                 "CONFIG_CAMERA_OV5640_DVP_IF_FORMAT_INDEX_DEFAULT=0"
             ]
-        },
-        {
-            "name": "esp32-s3-touch-lcd-3.5-ov2640",
-            "sdkconfig_append": [
-                "CONFIG_USE_WECHAT_MESSAGE_STYLE=y",
-                "CONFIG_CAMERA_OV2640=y",
-                "CONFIG_CAMERA_OV2640_AUTO_DETECT_DVP_INTERFACE_SENSOR=y",
-                "CONFIG_CAMERA_OV2640_DVP_YUV422_640X480_6FPS=y",
-                "CONFIG_CAMERA_OV2640_DVP_IF_FORMAT_INDEX_DEFAULT=1"
-            ]
         }
     ]
 }
diff --git a/main/boards/esp32-s3-touch-lcd-3.5/esp32-s3-touch-lcd-3.5.cc b/main/boards/esp32-s3-touch-lcd-3.5/esp32-s3-touch-lcd-3.5.cc
@@ -203,7 +203,7 @@ class CustomBoard : public WifiBoard {
             .reset_pin = CAM_PIN_RESET,
             .pwdn_pin = CAM_PIN_PWDN,
             .dvp_pin = dvp_pin_config,
-            .xclk_freq = 10000000,
+            .xclk_freq = 12000000,
         };
 
         esp_video_init_config_t video_config = {
diff --git a/main/boards/waveshare-s3-audio-board/config.json b/main/boards/waveshare-s3-audio-board/config.json
@@ -2,10 +2,9 @@
     "target": "esp32s3",
     "builds": [
         {
-            "name": "waveshare-s3-audio-board-ov5640",
+            "name": "waveshare-s3-audio-board",
             "sdkconfig_append": [
                 "CONFIG_USE_WECHAT_MESSAGE_STYLE=y",
-                "CONFIG_XIAOZHI_ENABLE_CAMERA_ENDIANNESS_SWAP=y",
                 "CONFIG_CAMERA_OV2640=y",
                 "CONFIG_CAMERA_OV2640_AUTO_DETECT_DVP_INTERFACE_SENSOR=y",
                 "CONFIG_CAMERA_OV2640_DVP_YUV422_640X480_6FPS=y",
@@ -15,16 +14,6 @@
                 "CONFIG_CAMERA_OV5640_DVP_YUV422_800X600_10FPS=y",
                 "CONFIG_CAMERA_OV5640_DVP_IF_FORMAT_INDEX_DEFAULT=0"
             ]
-        },
-        {
-            "name": "waveshare-s3-audio-board-ov2640",
-            "sdkconfig_append": [
-                "CONFIG_USE_WECHAT_MESSAGE_STYLE=y",
-                "CONFIG_CAMERA_OV2640=y",
-                "CONFIG_CAMERA_OV2640_AUTO_DETECT_DVP_INTERFACE_SENSOR=y",
-                "CONFIG_CAMERA_OV2640_DVP_YUV422_640X480_6FPS=y",
-                "CONFIG_CAMERA_OV2640_DVP_IF_FORMAT_INDEX_DEFAULT=1"
-            ]
         }
     ]
 }
diff --git a/main/boards/waveshare-s3-audio-board/esp32-s3-audio_board.cc b/main/boards/waveshare-s3-audio-board/esp32-s3-audio_board.cc
@@ -185,7 +185,7 @@ class CustomBoard : public WifiBoard {
             .reset_pin = CAMERA_PIN_RESET,
             .pwdn_pin = CAMERA_PIN_PWDN,
             .dvp_pin = dvp_pin_config,
-            .xclk_freq = 10000000,
+            .xclk_freq = 12000000,
         };
 
         esp_video_init_config_t video_config = {
diff --git a/main/boards/waveshare-s3-touch-lcd-3.5b/config.json b/main/boards/waveshare-s3-touch-lcd-3.5b/config.json
@@ -2,10 +2,9 @@
     "target": "esp32s3",
     "builds": [
         {
-            "name": "waveshare-s3-touch-lcd-3.5b-ov5640",
+            "name": "waveshare-s3-touch-lcd-3.5b",
             "sdkconfig_append": [
                 "CONFIG_USE_WECHAT_MESSAGE_STYLE=y",
-                "CONFIG_XIAOZHI_ENABLE_CAMERA_ENDIANNESS_SWAP=y",
                 "CONFIG_CAMERA_OV2640=y",
                 "CONFIG_CAMERA_OV2640_AUTO_DETECT_DVP_INTERFACE_SENSOR=y",
                 "CONFIG_CAMERA_OV2640_DVP_YUV422_640X480_6FPS=y",
@@ -15,16 +14,6 @@
                 "CONFIG_CAMERA_OV5640_DVP_YUV422_800X600_10FPS=y",
                 "CONFIG_CAMERA_OV5640_DVP_IF_FORMAT_INDEX_DEFAULT=0"
             ]
-        },
-        {
-            "name": "waveshare-s3-touch-lcd-3.5b-ov2640",
-            "sdkconfig_append": [
-                "CONFIG_USE_WECHAT_MESSAGE_STYLE=y",
-                "CONFIG_CAMERA_OV2640=y",
-                "CONFIG_CAMERA_OV2640_AUTO_DETECT_DVP_INTERFACE_SENSOR=y",
-                "CONFIG_CAMERA_OV2640_DVP_YUV422_640X480_6FPS=y",
-                "CONFIG_CAMERA_OV2640_DVP_IF_FORMAT_INDEX_DEFAULT=1"
-            ]
         }
     ]
 }
diff --git a/main/boards/waveshare-s3-touch-lcd-3.5b/waveshare-s3-touch-lcd-3.5b.cc b/main/boards/waveshare-s3-touch-lcd-3.5b/waveshare-s3-touch-lcd-3.5b.cc
@@ -206,7 +206,7 @@ class CustomBoard : public WifiBoard {
             .reset_pin = CAM_PIN_RESET,
             .pwdn_pin = CAM_PIN_PWDN,
             .dvp_pin = dvp_pin_config,
-            .xclk_freq = 10000000,
+            .xclk_freq = 12000000,
         };
 
         esp_video_init_config_t video_config = {

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,9 @@`
`2`	`2`	`"target": "esp32s3",`
`3`	`3`	`"builds": [`
`4`	`4`	`{`
`5`		`- "name": "esp32-s3-touch-lcd-3.5-ov5640",`
	`5`	`+ "name": "esp32-s3-touch-lcd-3.5",`
`6`	`6`	`"sdkconfig_append": [`
`7`	`7`	`"CONFIG_USE_WECHAT_MESSAGE_STYLE=y",`
`8`		`- "CONFIG_XIAOZHI_ENABLE_CAMERA_ENDIANNESS_SWAP=y",`
`9`	`8`	`"CONFIG_CAMERA_OV2640=y",`
`10`	`9`	`"CONFIG_CAMERA_OV2640_AUTO_DETECT_DVP_INTERFACE_SENSOR=y",`
`11`	`10`	`"CONFIG_CAMERA_OV2640_DVP_YUV422_640X480_6FPS=y",`
`@@ -15,16 +14,6 @@`
`15`	`14`	`"CONFIG_CAMERA_OV5640_DVP_YUV422_800X600_10FPS=y",`
`16`	`15`	`"CONFIG_CAMERA_OV5640_DVP_IF_FORMAT_INDEX_DEFAULT=0"`
`17`	`16`	`]`
`18`		`- },`
`19`		`- {`
`20`		`- "name": "esp32-s3-touch-lcd-3.5-ov2640",`
`21`		`- "sdkconfig_append": [`
`22`		`- "CONFIG_USE_WECHAT_MESSAGE_STYLE=y",`
`23`		`- "CONFIG_CAMERA_OV2640=y",`
`24`		`- "CONFIG_CAMERA_OV2640_AUTO_DETECT_DVP_INTERFACE_SENSOR=y",`
`25`		`- "CONFIG_CAMERA_OV2640_DVP_YUV422_640X480_6FPS=y",`
`26`		`- "CONFIG_CAMERA_OV2640_DVP_IF_FORMAT_INDEX_DEFAULT=1"`
`27`		`- ]`
`28`	`17`	`}`
`29`	`18`	`]`
`30`	`19`	`}`