Added CONFIG_CAMERA_WIFI_XCLK_FREQ

components/CameraManager/CameraManager/CameraManager.cpp

@@ -18,7 +18,7 @@ void CameraManager::setupCameraPinout()
   // 10000000 stable
   // 16500000 optimal freq on ESP32-CAM (default)
   // 20000000 max freq on ESP32-CAM
-  // 24000000 optimal freq on ESP32-S3
+  // 24000000 optimal freq on ESP32-S3 // 23MHz same fps
   int xclk_freq_hz = DEFAULT_XCLK_FREQ_HZ;
 
 #if CONFIG_CAMERA_MODULE_ESP_EYE

components/CameraManager/CameraManager/CameraManager.hpp

@@ -15,8 +15,8 @@
 #include <ProjectConfig.hpp>
 
 #ifndef DEFAULT_XCLK_FREQ_HZ
-#define DEFAULT_XCLK_FREQ_HZ 16500000
+#define DEFAULT_XCLK_FREQ_HZ CONFIG_CAMERA_WIFI_XCLK_FREQ
-#define USB_DEFAULT_XCLK_FREQ_HZ CONFIG_Camera_USB_XCLK_FREQ
+#define USB_DEFAULT_XCLK_FREQ_HZ CONFIG_CAMERA_USB_XCLK_FREQ
 #define OV5640_XCLK_FREQ_HZ DEFAULT_XCLK_FREQ_HZ
 #endif
 

main/Kconfig.projbuild

@@ -21,12 +21,19 @@ endmenu
 
 menu "OpenIris: Camera Configuration"
 
-    config Camera_USB_XCLK_FREQ
+    config CAMERA_USB_XCLK_FREQ
         int "USB XCLK frequency (Hz)"
-        default 20000000
+        default 10000000 # should be set in individual board config 
-        range 1 40000000
+        range 1 24000000
         help
-            USB XCLK frequency in Hertz.
+            USB XCLK frequency in Hz.
+
+    config CAMERA_WIFI_XCLK_FREQ
+        int "WIFI XCLK frequency (Hz)"
+        default 16500000
+        range 1 24000000
+        help
+            WIFI XCLK frequency in Hz.
 
 endmenu
 

sdkconfig

@@ -497,9 +497,9 @@ CONFIG_BOOT_ROM_LOG_ALWAYS_ON=y
 # CONFIG_ESPTOOLPY_NO_STUB is not set
 # CONFIG_ESPTOOLPY_OCT_FLASH is not set
 CONFIG_ESPTOOLPY_FLASH_MODE_AUTO_DETECT=y
-# CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set
-CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
+# CONFIG_ESPTOOLPY_FLASHMODE_DIO is not set
 # CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set
 CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y
 CONFIG_ESPTOOLPY_FLASHMODE="dio"
@@ -511,13 +511,13 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M_DEFAULT=y
 CONFIG_ESPTOOLPY_FLASHFREQ="80m"
 # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE="8MB"
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
 # CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
@@ -560,7 +560,8 @@ CONFIG_GENERAL_UVC_DELAY=30
 #
 # OpenIris: Camera Configuration
 #
-CONFIG_Camera_USB_XCLK_FREQ=23000000
+CONFIG_CAMERA_USB_XCLK_FREQ=10000000
+CONFIG_CAMERA_WIFI_XCLK_FREQ=16500000
 # end of OpenIris: Camera Configuration
 
 #
@@ -577,32 +578,32 @@ CONFIG_AP_WIFI_PASSWORD="12345678"
 # OpenIris: LED Configuration
 #
 CONFIG_LED_BLINK_GPIO=8
-CONFIG_LED_EXTERNAL_GPIO=9
+CONFIG_LED_EXTERNAL_GPIO=1
 CONFIG_LED_EXTERNAL_CONTROL=y
-CONFIG_LED_EXTERNAL_PWM_FREQ=20000
+CONFIG_LED_EXTERNAL_PWM_FREQ=5000
-CONFIG_LED_EXTERNAL_PWM_DUTY_CYCLE=50
+CONFIG_LED_EXTERNAL_PWM_DUTY_CYCLE=100
 # end of OpenIris: LED Configuration
 
 #
 # Camera sensor pinout configuration
 #
-CONFIG_CAMERA_MODULE_NAME="FaceFocusVR_Face"
+CONFIG_CAMERA_MODULE_NAME="SWROOM_BABBLE_S3"
 CONFIG_PWDN_GPIO_NUM=-1
 CONFIG_RESET_GPIO_NUM=-1
-CONFIG_XCLK_GPIO_NUM=10
+CONFIG_XCLK_GPIO_NUM=4
-CONFIG_SIOD_GPIO_NUM=40
+CONFIG_SIOD_GPIO_NUM=48
-CONFIG_SIOC_GPIO_NUM=39
+CONFIG_SIOC_GPIO_NUM=47
-CONFIG_Y9_GPIO_NUM=48
+CONFIG_Y9_GPIO_NUM=13
-CONFIG_Y8_GPIO_NUM=11
+CONFIG_Y8_GPIO_NUM=5
-CONFIG_Y7_GPIO_NUM=12
+CONFIG_Y7_GPIO_NUM=6
-CONFIG_Y6_GPIO_NUM=14
+CONFIG_Y6_GPIO_NUM=15
-CONFIG_Y5_GPIO_NUM=16
+CONFIG_Y5_GPIO_NUM=17
-CONFIG_Y4_GPIO_NUM=18
+CONFIG_Y4_GPIO_NUM=8
-CONFIG_Y3_GPIO_NUM=17
+CONFIG_Y3_GPIO_NUM=18
-CONFIG_Y2_GPIO_NUM=15
+CONFIG_Y2_GPIO_NUM=16
-CONFIG_VSYNC_GPIO_NUM=38
+CONFIG_VSYNC_GPIO_NUM=21
-CONFIG_HREF_GPIO_NUM=47
+CONFIG_HREF_GPIO_NUM=14
-CONFIG_PCLK_GPIO_NUM=13
+CONFIG_PCLK_GPIO_NUM=7
 # end of Camera sensor pinout configuration
 
 #
@@ -1120,9 +1121,11 @@ CONFIG_SPIRAM=y
 #
 # SPI RAM config
 #
-# CONFIG_SPIRAM_MODE_QUAD is not set
+CONFIG_SPIRAM_MODE_QUAD=y
-CONFIG_SPIRAM_MODE_OCT=y
+# CONFIG_SPIRAM_MODE_OCT is not set
 CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
 CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
 CONFIG_SPIRAM_CLK_IO=30
@@ -1130,10 +1133,10 @@ CONFIG_SPIRAM_CS_IO=26
 # CONFIG_SPIRAM_XIP_FROM_PSRAM is not set
 # CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
 # CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_120M is not set
 CONFIG_SPIRAM_SPEED_80M=y
 # CONFIG_SPIRAM_SPEED_40M is not set
 CONFIG_SPIRAM_SPEED=80
-# CONFIG_SPIRAM_ECC_ENABLE is not set
 CONFIG_SPIRAM_BOOT_INIT=y
 # CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
 # CONFIG_SPIRAM_USE_MEMMAP is not set
@@ -2293,9 +2296,9 @@ CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y
 CONFIG_LOG_BOOTLOADER_LEVEL=3
 # CONFIG_APP_ROLLBACK_ENABLE is not set
 # CONFIG_FLASH_ENCRYPTION_ENABLED is not set
-# CONFIG_FLASHMODE_QIO is not set
+CONFIG_FLASHMODE_QIO=y
 # CONFIG_FLASHMODE_QOUT is not set
-CONFIG_FLASHMODE_DIO=y
+# CONFIG_FLASHMODE_DIO is not set
 # CONFIG_FLASHMODE_DOUT is not set
 CONFIG_MONITOR_BAUD=115200
 # CONFIG_OPTIMIZATION_LEVEL_DEBUG is not set

sdkconfig.board.xiao-esp32s3

@@ -55,3 +55,4 @@ CONFIG_SPIRAM_SPEED_80M=y
 CONFIG_SPIRAM_SPEED=80
 CONFIG_SPIRAM_SPEED_80M=y
 # CONFIG_LED_EXTERNAL_CONTROL is not set
+CONFIG_CAMERA_USB_XCLK_FREQ=23000000