diff --git a/.vscode/settings.json b/.vscode/settings.json index 42542f6..fd8e4d6 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -79,6 +79,7 @@ "thread": "cpp", "cinttypes": "cpp", "typeinfo": "cpp", - "variant": "cpp" + "variant": "cpp", + "uvc_frame_config.h": "c" } } diff --git a/dependencies.lock b/dependencies.lock index ff98666..35a5d5e 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -10,12 +10,12 @@ dependencies: type: service version: 0.5.3 espressif/esp32-camera: - component_hash: 4aadd189e9ca97298f1d69920f2d8c6b07cb3cbca014584b60e96de8a3cbb249 + component_hash: 154da98781f3ee98f6dbbdd3aaec97497051fb1a570c300fc0fd3a946874a02e dependencies: [] source: registry_url: https://components.espressif.com/ type: service - version: 2.0.10 + version: 2.0.12 espressif/led_strip: component_hash: 28c6509a727ef74925b372ed404772aeedf11cce10b78c3f69b3c66799095e2d dependencies: diff --git a/sdkconfig b/sdkconfig index 214e588..3c38ae3 100644 --- a/sdkconfig +++ b/sdkconfig @@ -529,7 +529,7 @@ CONFIG_PARTITION_TABLE_MD5=y # end of Partition Table # -# Example Configuration +# OpenIris basic configuration # CONFIG_ENV_GPIO_RANGE_MIN=0 CONFIG_ENV_GPIO_RANGE_MAX=48 @@ -541,7 +541,29 @@ CONFIG_BLINK_GPIO=21 CONFIG_BLINK_PERIOD=1000 CONFIG_WIFI_SSID="UPC7878684" CONFIG_WIFI_PASSOWRD="j3ttQPpfvhep" -# end of Example Configuration +# end of OpenIris basic configuration + +# +# Camera sensor pinout configuration +# +CONFIG_CAMERA_MODULE_NAME="ESP32S3_XIAO_SENSE" +CONFIG_PWDN_GPIO_NUM=-1 +CONFIG_RESET_GPIO_NUM=-1 +CONFIG_XCLK_GPIO_NUM=10 +CONFIG_SIOD_GPIO_NUM=40 +CONFIG_SIOC_GPIO_NUM=39 +CONFIG_Y9_GPIO_NUM=48 +CONFIG_Y8_GPIO_NUM=11 +CONFIG_Y7_GPIO_NUM=12 +CONFIG_Y6_GPIO_NUM=14 +CONFIG_Y5_GPIO_NUM=16 +CONFIG_Y4_GPIO_NUM=18 +CONFIG_Y3_GPIO_NUM=17 +CONFIG_Y2_GPIO_NUM=15 +CONFIG_VSYNC_GPIO_NUM=38 +CONFIG_HREF_GPIO_NUM=47 +CONFIG_PCLK_GPIO_NUM=13 +# end of Camera sensor pinout configuration # # Compiler options @@ -1038,9 +1060,9 @@ 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_80M is not set -CONFIG_SPIRAM_SPEED_40M=y -CONFIG_SPIRAM_SPEED=40 +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 @@ -1048,7 +1070,7 @@ CONFIG_SPIRAM_BOOT_INIT=y # CONFIG_SPIRAM_USE_CAPS_ALLOC is not set CONFIG_SPIRAM_USE_MALLOC=y CONFIG_SPIRAM_MEMTEST=y -CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384 +CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=32768 # CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768 # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set @@ -2045,26 +2067,24 @@ CONFIG_CU_DIAGNOSTICS_COLOR_ALWAYS=y # # Camera configuration # -CONFIG_OV7670_SUPPORT=y -CONFIG_OV7725_SUPPORT=y -CONFIG_NT99141_SUPPORT=y +# CONFIG_OV7670_SUPPORT is not set +# CONFIG_OV7725_SUPPORT is not set +# CONFIG_NT99141_SUPPORT is not set CONFIG_OV2640_SUPPORT=y -CONFIG_OV3660_SUPPORT=y +# CONFIG_OV3660_SUPPORT is not set CONFIG_OV5640_SUPPORT=y -CONFIG_GC2145_SUPPORT=y -CONFIG_GC032A_SUPPORT=y -CONFIG_GC0308_SUPPORT=y -CONFIG_BF3005_SUPPORT=y -CONFIG_BF20A6_SUPPORT=y +# CONFIG_GC2145_SUPPORT is not set +# CONFIG_GC032A_SUPPORT is not set +# CONFIG_GC0308_SUPPORT is not set +# CONFIG_BF3005_SUPPORT is not set +# CONFIG_BF20A6_SUPPORT is not set # CONFIG_SC101IOT_SUPPORT is not set -CONFIG_SC030IOT_SUPPORT=y +# CONFIG_SC030IOT_SUPPORT is not set # CONFIG_SC031GS_SUPPORT is not set # CONFIG_SCCB_HARDWARE_I2C_PORT0 is not set CONFIG_SCCB_HARDWARE_I2C_PORT1=y CONFIG_SCCB_CLK_FREQ=100000 -# CONFIG_GC_SENSOR_WINDOWING_MODE is not set -CONFIG_GC_SENSOR_SUBSAMPLE_MODE=y -CONFIG_CAMERA_TASK_STACK_SIZE=2048 +CONFIG_CAMERA_TASK_STACK_SIZE=30720 CONFIG_CAMERA_CORE0=y # CONFIG_CAMERA_CORE1 is not set # CONFIG_CAMERA_NO_AFFINITY is not set @@ -2110,8 +2130,8 @@ CONFIG_MDNS_PREDEF_NETIF_ETH=y # CONFIG_TUSB_VID=0x303A CONFIG_TUSB_PID=0x8000 -CONFIG_TUSB_MANUFACTURER="Espressif" -CONFIG_TUSB_PRODUCT="ESP UVC Device" +CONFIG_TUSB_MANUFACTURER="ETVR" +CONFIG_TUSB_PRODUCT="OpenIris Camera" CONFIG_TUSB_SERIAL_NUM="12345678" # CONFIG_UVC_SUPPORT_TWO_CAM is not set @@ -2123,13 +2143,13 @@ CONFIG_FORMAT_MJPEG_CAM1=y # CONFIG_FORMAT_UNCOMPR_CAM1 is not set CONFIG_UVC_MODE_ISOC_CAM1=y # CONFIG_UVC_MODE_BULK_CAM1 is not set -# CONFIG_FRAMESIZE_QVGA is not set +CONFIG_FRAMESIZE_QVGA=y # CONFIG_FRAMESIZE_HVGA is not set # CONFIG_FRAMESIZE_VGA is not set # CONFIG_FRAMESIZE_SVGA is not set -CONFIG_FRAMESIZE_HD=y +# CONFIG_FRAMESIZE_HD is not set # CONFIG_FRAMESIZE_FHD is not set -CONFIG_UVC_CAM1_FRAMERATE=15 +CONFIG_UVC_CAM1_FRAMERATE=70 CONFIG_UVC_CAM1_FRAMESIZE_WIDTH=1280 CONFIG_UVC_CAM1_FRAMESIZE_HEIGT=720 CONFIG_UVC_CAM1_MULTI_FRAMESIZE=y diff --git a/sdkconfig.defaults b/sdkconfig.defaults index e3549bc..d1a3217 100644 --- a/sdkconfig.defaults +++ b/sdkconfig.defaults @@ -1,3 +1,9 @@ +CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y +CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y +CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y + +CONFIG_FREERTOS_HZ=1000 + CONFIG_BLINK_LED_GPIO=y CONFIG_BLINK_GPIO=21 diff --git a/sdkconfig.old b/sdkconfig.old index fe2ef8b..84ce667 100644 --- a/sdkconfig.old +++ b/sdkconfig.old @@ -520,16 +520,16 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 # # CONFIG_PARTITION_TABLE_SINGLE_APP is not set # CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set -CONFIG_PARTITION_TABLE_TWO_OTA=y -# CONFIG_PARTITION_TABLE_CUSTOM is not set -CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_FILENAME="partitions_two_ota.csv" +# CONFIG_PARTITION_TABLE_TWO_OTA is not set +CONFIG_PARTITION_TABLE_CUSTOM=y +CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="min_spiffs.csv" +CONFIG_PARTITION_TABLE_FILENAME="min_spiffs.csv" CONFIG_PARTITION_TABLE_OFFSET=0x8000 CONFIG_PARTITION_TABLE_MD5=y # end of Partition Table # -# Example Configuration +# OpenIris basic configuration # CONFIG_ENV_GPIO_RANGE_MIN=0 CONFIG_ENV_GPIO_RANGE_MAX=48 @@ -541,7 +541,29 @@ CONFIG_BLINK_GPIO=21 CONFIG_BLINK_PERIOD=1000 CONFIG_WIFI_SSID="UPC7878684" CONFIG_WIFI_PASSOWRD="j3ttQPpfvhep" -# end of Example Configuration +# end of OpenIris basic configuration + +# +# Camera sensor pinout configuration +# +CONFIG_CAMERA_MODULE_NAME="ESP32S3_XIAO_SENSE" +CONFIG_PWDN_GPIO_NUM=-1 +CONFIG_RESET_GPIO_NUM=-1 +CONFIG_XCLK_GPIO_NUM=10 +CONFIG_SIOD_GPIO_NUM=40 +CONFIG_SIOC_GPIO_NUM=39 +CONFIG_Y9_GPIO_NUM=48 +CONFIG_Y8_GPIO_NUM=11 +CONFIG_Y7_GPIO_NUM=12 +CONFIG_Y6_GPIO_NUM=14 +CONFIG_Y5_GPIO_NUM=16 +CONFIG_Y4_GPIO_NUM=18 +CONFIG_Y3_GPIO_NUM=17 +CONFIG_Y2_GPIO_NUM=15 +CONFIG_VSYNC_GPIO_NUM=38 +CONFIG_HREF_GPIO_NUM=47 +CONFIG_PCLK_GPIO_NUM=13 +# end of Camera sensor pinout configuration # # Compiler options @@ -1038,9 +1060,9 @@ 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_80M is not set -CONFIG_SPIRAM_SPEED_40M=y -CONFIG_SPIRAM_SPEED=40 +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 @@ -1048,7 +1070,7 @@ CONFIG_SPIRAM_BOOT_INIT=y # CONFIG_SPIRAM_USE_CAPS_ALLOC is not set CONFIG_SPIRAM_USE_MALLOC=y CONFIG_SPIRAM_MEMTEST=y -CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384 +CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=32768 # CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768 # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set