USB Descriptor Rework

components/ProjectConfig/ProjectConfig/Models.hpp

@@ -32,7 +32,7 @@ struct DeviceMode_t : BaseConfigModel {
   explicit DeviceMode_t(  Preferences *pref) : BaseConfigModel(pref), mode(StreamingMode::AUTO){}
 
   void load() {
-    int stored_mode = this->pref->getInt("mode", 0);
+    int stored_mode = this->pref->getInt("mode", 1);
     this->mode = static_cast<StreamingMode>(stored_mode);
     ESP_LOGI("DeviceMode", "Loaded device mode: %d", stored_mode);
   }

components/usb_device_uvc/tusb/usb_descriptors.c

@@ -22,14 +22,26 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *
+ * ---------------------------------------------------------------------------
+ * USB Video Class (UVC) Descriptor Definitions for TinyUSB device stack.
+ *
+ * This file describes the device, configuration, and string descriptors for
+ * a single UVC camera. Build-time options (Kconfig) select whether UVC data
+ * streams use BULK or ISO endpoints, the pixel format (MJPEG / H.264 /
+ * Uncompressed), and whether multiple frame sizes are exposed.
+ *
+ * Goal: keep the same behavior while making the structure easier to read and
+ * maintain. Comments explain why each block exists and what each macro does.
  */
 
 #include "tusb.h"
 #include "usb_descriptors.h"
+#include <string.h> // memcpy, strlen
 
 //--------------------------------------------------------------------+
 // Device Descriptors
 //--------------------------------------------------------------------+
+// Device descriptor: identifies this as a composite device using IAD for UVC
 tusb_desc_device_t const desc_device = {
     .bLength = sizeof(tusb_desc_device_t),
     .bDescriptorType = TUSB_DESC_DEVICE,
@@ -63,6 +75,16 @@ uint8_t const *tud_descriptor_device_cb(void)
 //--------------------------------------------------------------------+
 // Configuration Descriptor
 //--------------------------------------------------------------------+
+// String descriptor indices used in interface descriptors
+#define STRID_LANGID        0
+#define STRID_MANUFACTURER  1
+#define STRID_PRODUCT       2
+#define STRID_SERIAL        3
+#define STRID_UVC_CAM1      4
+
+// Endpoint numbers for UVC video IN endpoints (device -> host)
+#define EPNUM_CAM1_VIDEO_IN 0x81
+
 #if CFG_TUD_CAM1_VIDEO_STREAMING_BULK
 
 #if CONFIG_UVC_CAM1_MULTI_FRAMESIZE
@@ -101,76 +123,38 @@ uint8_t const *tud_descriptor_device_cb(void)
 
 #endif // CFG_TUD_CAM1_VIDEO_STREAMING_BULK
 
-#if CONFIG_UVC_SUPPORT_TWO_CAM
+// Total length of this configuration
-#if CFG_TUD_CAM2_VIDEO_STREAMING_BULK
+#define CONFIG_TOTAL_LEN (TUD_CONFIG_DESC_LEN + TUD_CAM1_VIDEO_CAPTURE_DESC_LEN)
 
-#if CONFIG_UVC_CAM2_MULTI_FRAMESIZE
+// Full-speed configuration descriptor
-#if CONFIG_FORMAT_MJPEG_CAM2
+static uint8_t const desc_fs_configuration[] = {
-#define TUD_CAM2_VIDEO_CAPTURE_DESC_LEN (TUD_VIDEO_CAPTURE_DESC_MULTI_MJPEG_BULK_LEN(4))
+    // TUD_CONFIG_DESCRIPTOR(config_number, interface_count, string_index,
-#elif CONFIG_FORMAT_H264_CAM2
+    //                       total_length, attributes, power_mA)
-#define TUD_CAM2_VIDEO_CAPTURE_DESC_LEN (TUD_VIDEO_CAPTURE_DESC_MULTI_FRAME_BASED_BULK_LEN(4))
-#endif
-#else
-#if CONFIG_FORMAT_MJPEG_CAM2
-#define TUD_CAM2_VIDEO_CAPTURE_DESC_LEN (TUD_VIDEO_CAPTURE_DESC_MJPEG_BULK_LEN)
-#elif CONFIG_FORMAT_H264_CAM2
-#define TUD_CAM2_VIDEO_CAPTURE_DESC_LEN (TUD_VIDEO_CAPTURE_DESC_FRAME_BASED_BULK_LEN)
-#else
-#define TUD_CAM2_VIDEO_CAPTURE_DESC_LEN (TUD_VIDEO_CAPTURE_DESC_UNCOMPR_BULK_LEN)
-#endif
-#endif // CONFIG_UVC_CAM2_MULTI_FRAMESIZE
-
-#else
-
-#if CONFIG_UVC_CAM2_MULTI_FRAMESIZE
-#if CONFIG_FORMAT_MJPEG_CAM2
-#define TUD_CAM2_VIDEO_CAPTURE_DESC_LEN (TUD_VIDEO_CAPTURE_DESC_MULTI_MJPEG_LEN(4))
-#elif CONFIG_FORMAT_H264_CAM2
-#define TUD_CAM2_VIDEO_CAPTURE_DESC_LEN (TUD_VIDEO_CAPTURE_DESC_MULTI_FRAME_BASED_LEN(4))
-#endif
-#else
-#if CONFIG_FORMAT_MJPEG_CAM2
-#define TUD_CAM2_VIDEO_CAPTURE_DESC_LEN (TUD_VIDEO_CAPTURE_DESC_MJPEG_LEN)
-#elif CONFIG_FORMAT_H264_CAM2
-#define TUD_CAM2_VIDEO_CAPTURE_DESC_LEN (TUD_VIDEO_CAPTURE_DESC_FRAME_BASED_LEN)
-#else
-#define TUD_CAM2_VIDEO_CAPTURE_DESC_LEN (TUD_VIDEO_CAPTURE_DESC_UNCOMPR_LEN)
-#endif
-#endif // CONFIG_UVC_CAM2_MULTI_FRAMESIZE
-
-#endif // CFG_TUD_CAM2_VIDEO_STREAMING_BULK
-#else
-#define TUD_CAM2_VIDEO_CAPTURE_DESC_LEN 0
-#endif
-
-#define CONFIG_TOTAL_LEN (TUD_CONFIG_DESC_LEN + TUD_CAM1_VIDEO_CAPTURE_DESC_LEN + TUD_CAM2_VIDEO_CAPTURE_DESC_LEN)
-#define EPNUM_CAM1_VIDEO_IN 0x81
-#if CONFIG_UVC_SUPPORT_TWO_CAM
-#define EPNUM_CAM2_VIDEO_IN 0x82
-#endif
-
-uint8_t const desc_fs_configuration[] = {
-    // Config number, interface count, string index, total length, attribute, power in mA
     TUD_CONFIG_DESCRIPTOR(1, ITF_NUM_TOTAL, 0, CONFIG_TOTAL_LEN, 0, 500),
 // IAD for Video Control
 #if CFG_TUD_CAM1_VIDEO_STREAMING_BULK
 #if CONFIG_UVC_CAM1_MULTI_FRAMESIZE
 #if CONFIG_FORMAT_MJPEG_CAM1
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_MJPEG_BULK(4, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN, CFG_TUD_CAM1_VIDEO_STREAMING_EP_BUFSIZE),
+    // Camera 1, multi-size MJPEG over BULK
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_MJPEG_BULK(STRID_UVC_CAM1, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN, CFG_TUD_CAM1_VIDEO_STREAMING_EP_BUFSIZE),
 #elif CONFIG_FORMAT_H264_CAM1
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_H264_BULK(4, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN, CFG_TUD_CAM1_VIDEO_STREAMING_EP_BUFSIZE),
+    // Camera 1, multi-size H.264 over BULK
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_H264_BULK(STRID_UVC_CAM1, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN, CFG_TUD_CAM1_VIDEO_STREAMING_EP_BUFSIZE),
 #endif
 #else
 #if CONFIG_FORMAT_MJPEG_CAM1
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MJPEG_BULK(4, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN,
+    // Camera 1, single-size MJPEG over BULK
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_MJPEG_BULK(STRID_UVC_CAM1, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN,
                                             UVC_CAM1_FRAME_WIDTH, UVC_CAM1_FRAME_HEIGHT, UVC_CAM1_FRAME_RATE,
                                             CFG_TUD_CAM1_VIDEO_STREAMING_EP_BUFSIZE),
 #elif CONFIG_FORMAT_H264_CAM1
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_H264_BULK(4, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN,
+    // Camera 1, single-size H.264 over BULK
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_H264_BULK(STRID_UVC_CAM1, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN,
                                            UVC_CAM1_FRAME_WIDTH, UVC_CAM1_FRAME_HEIGHT, UVC_CAM1_FRAME_RATE,
                                            CFG_TUD_CAM1_VIDEO_STREAMING_EP_BUFSIZE),
 #else
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_UNCOMPR_BULK(4, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN,
+    // Camera 1, single-size Uncompressed (YUY2/etc) over BULK
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_UNCOMPR_BULK(STRID_UVC_CAM1, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN,
                                               UVC_CAM1_FRAME_WIDTH, UVC_CAM1_FRAME_HEIGHT, UVC_CAM1_FRAME_RATE,
                                               CFG_TUD_CAM1_VIDEO_STREAMING_EP_BUFSIZE),
 #endif
@@ -178,75 +162,32 @@ uint8_t const desc_fs_configuration[] = {
 #else
 #if CONFIG_UVC_CAM1_MULTI_FRAMESIZE
 #if CONFIG_FORMAT_MJPEG_CAM1
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_MJPEG(4, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN, CFG_TUD_CAM1_VIDEO_STREAMING_EP_BUFSIZE),
+    // Camera 1, multi-size MJPEG over ISO
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_MJPEG(STRID_UVC_CAM1, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN, CFG_TUD_CAM1_VIDEO_STREAMING_EP_BUFSIZE),
 #elif CONFIG_FORMAT_H264_CAM1
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_H264(4, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN, CFG_TUD_CAM1_VIDEO_STREAMING_EP_BUFSIZE),
+    // Camera 1, multi-size H.264 over ISO
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_H264(STRID_UVC_CAM1, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN, CFG_TUD_CAM1_VIDEO_STREAMING_EP_BUFSIZE),
 #endif
 #else
 #if CONFIG_FORMAT_MJPEG_CAM1
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MJPEG(4, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN,
+    // Camera 1, single-size MJPEG over ISO
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_MJPEG(STRID_UVC_CAM1, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN,
                                        UVC_CAM1_FRAME_WIDTH, UVC_CAM1_FRAME_HEIGHT, UVC_CAM1_FRAME_RATE,
                                        CFG_TUD_CAM1_VIDEO_STREAMING_EP_BUFSIZE),
 #elif CONFIG_FORMAT_H264_CAM1
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_H264(4, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN,
+    // Camera 1, single-size H.264 over ISO
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_H264(STRID_UVC_CAM1, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN,
                                       UVC_CAM1_FRAME_WIDTH, UVC_CAM1_FRAME_HEIGHT, UVC_CAM1_FRAME_RATE,
                                       CFG_TUD_CAM1_VIDEO_STREAMING_EP_BUFSIZE),
 #else
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_UNCOMPR(4, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN,
+    // Camera 1, single-size Uncompressed over ISO
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_UNCOMPR(STRID_UVC_CAM1, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM1_VIDEO_IN,
                                          UVC_CAM1_FRAME_WIDTH, UVC_CAM1_FRAME_HEIGHT, UVC_CAM1_FRAME_RATE,
                                          CFG_TUD_CAM1_VIDEO_STREAMING_EP_BUFSIZE),
 #endif
 #endif // CONFIG_UVC_CAM1_MULTI_FRAMESIZE
 #endif // CFG_TUD_CAM1_VIDEO_STREAMING_BULK
 
-#if CONFIG_UVC_SUPPORT_TWO_CAM
-#if CFG_TUD_CAM2_VIDEO_STREAMING_BULK
-#if CONFIG_UVC_CAM2_MULTI_FRAMESIZE
-#if CONFIG_FORMAT_MJPEG_CAM2
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_MJPEG_BULK(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN, CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
-#elif CONFIG_FORMAT_H264_CAM2
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_H264_BULK(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN, CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
-#endif
-#else
-#if CONFIG_FORMAT_MJPEG_CAM2
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MJPEG_BULK(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN,
-                                            UVC_CAM2_FRAME_WIDTH, UVC_CAM2_FRAME_HEIGHT, UVC_CAM2_FRAME_RATE,
-                                            CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
-#elif CONFIG_FORMAT_H264_CAM2
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_H264_BULK(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN,
-                                           UVC_CAM2_FRAME_WIDTH, UVC_CAM2_FRAME_HEIGHT, UVC_CAM2_FRAME_RATE,
-                                           CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
-#else
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_UNCOMPR_BULK(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN,
-                                              UVC_CAM2_FRAME_WIDTH, UVC_CAM2_FRAME_HEIGHT, UVC_CAM2_FRAME_RATE,
-                                              CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
-#endif
-#endif // CONFIG_UVC_CAM2_MULTI_FRAMESIZE
-#else
-#if CONFIG_UVC_CAM2_MULTI_FRAMESIZE
-#if CONFIG_FORMAT_MJPEG_CAM2
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_MJPEG(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN, CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
-#elif CONFIG_FORMAT_H264_CAM2
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_H264(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN, CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
-#endif
-#else
-#if CONFIG_FORMAT_MJPEG_CAM2
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MJPEG(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN,
-                                       UVC_CAM2_FRAME_WIDTH, UVC_CAM2_FRAME_HEIGHT, UVC_CAM2_FRAME_RATE,
-                                       CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
-#elif CONFIG_FORMAT_H264_CAM2
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_H264(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN,
-                                      UVC_CAM2_FRAME_WIDTH, UVC_CAM2_FRAME_HEIGHT, UVC_CAM2_FRAME_RATE,
-                                      CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
-#else
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_UNCOMPR(4, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM2_VIDEO_IN,
-                                         UVC_CAM2_FRAME_WIDTH, UVC_CAM2_FRAME_HEIGHT, UVC_CAM2_FRAME_RATE,
-                                         CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
-#endif
-#endif // CONFIG_UVC_CAM2_MULTI_FRAMESIZE
-#endif // CFG_TUD_CAM2_VIDEO_STREAMING_BULK
-#endif
-
 };
 
 // Invoked when received GET CONFIGURATION DESCRIPTOR
@@ -263,30 +204,26 @@ uint8_t const *tud_descriptor_configuration_cb(uint8_t index)
 // String Descriptors
 //--------------------------------------------------------------------+
 
-// array of pointer to string descriptors
+// Array of pointers to string literals. Indices must match STRID_* above.
 char const *string_desc_arr[] = {
-    (const char[]){0x09, 0x04}, // 0: is supported language is English (0x0409)
+    (const char[]){0x09, 0x04}, // 0: Supported language: English (0x0409)
     CONFIG_TUSB_MANUFACTURER,   // 1: Manufacturer
     CONFIG_TUSB_PRODUCT,        // 2: Product
-    CONFIG_TUSB_SERIAL_NUM,     // 3: Serials, should use chip ID, overridden with get_serial_number()
+    CONFIG_TUSB_SERIAL_NUM,     // 3: Serial (overridden by get_serial_number())
-    "UVC CAM1",                 // 4: UVC Interface, default, because we're overriding it get_uvc_device_name(), but we still have to keep the structure
+    "UVC CAM1",                 // 4: UVC Interface name for Cam1 (overridden by get_uvc_device_name())
-#if CONFIG_UVC_SUPPORT_TWO_CAM
-    "UVC CAM2", // 5: UVC Interface
-#endif
 };
 
 static uint16_t _desc_str[32];
 
 __attribute__((weak)) const char *get_uvc_device_name(void)
 {
-    // ETVR Override, by default we're reporting ourselves as this, users can override it
+    // Default UVC device name, can be overridden by application
     return "UVC OpenIris Camera";
 }
 
 __attribute__((weak)) const char *get_serial_number(void)
 {
-    // ETVR Override, by default we're reporting ourselves as the predefined serial number
+    // Default serial number, can be overridden by application (e.g., chip ID)
-    // this should get overwritten with a better implementation
     return CONFIG_TUSB_SERIAL_NUM;
 }
 
@@ -294,7 +231,6 @@ __attribute__((weak)) const char *get_serial_number(void)
 // Application return pointer to descriptor, whose contents must exist long enough for transfer to complete
 uint16_t const *tud_descriptor_string_cb(uint8_t index, uint16_t langid)
 {
-    printf("am I being asked for this?");
     (void)langid;
 
     uint8_t chr_count;
@@ -309,15 +245,16 @@ uint16_t const *tud_descriptor_string_cb(uint8_t index, uint16_t langid)
         // Note: the 0xEE index string is a Microsoft OS 1.0 Descriptors.
         // https://docs.microsoft.com/en-us/windows-hardware/drivers/usbcon/microsoft-defined-usb-descriptors
 
-        if (!(index < sizeof(string_desc_arr) / sizeof(string_desc_arr[0])))
+    if (!(index < sizeof(string_desc_arr) / sizeof(string_desc_arr[0])))
         {
             return NULL;
         }
 
         const char *str = string_desc_arr[index];
-        if (index == 3)
+    // Allow dynamic overrides for specific indices
+    if (index == STRID_SERIAL)
             str = get_serial_number();
-        if (index == 4)
+    if (index == STRID_UVC_CAM1)
             str = get_uvc_device_name();
         if (str == NULL)
             str = string_desc_arr[index];
@@ -340,4 +277,4 @@ uint16_t const *tud_descriptor_string_cb(uint8_t index, uint16_t langid)
     _desc_str[0] = (uint16_t)((TUSB_DESC_STRING << 8) | (2 * chr_count + 2));
 
     return _desc_str;
-}
+}

dependencies.lock

@@ -53,7 +53,7 @@ dependencies:
   idf:
     source:
       type: idf
-    version: 5.4.2
+    version: 5.3.3
 direct_dependencies:
 - espressif/cmake_utilities
 - espressif/esp32-camera

sdkconfig

@@ -1,6 +1,6 @@
 #
 # Automatically generated file. DO NOT EDIT.
-# Espressif IoT Development Framework (ESP-IDF) 5.4.2 Project Configuration
+# Espressif IoT Development Framework (ESP-IDF) 5.3.3 Project Configuration
 #
 CONFIG_SOC_MPU_MIN_REGION_SIZE=0x20000000
 CONFIG_SOC_MPU_REGIONS_MAX_NUM=8
@@ -138,7 +138,6 @@ CONFIG_SOC_I2C_SUPPORT_RTC=y
 CONFIG_SOC_I2C_SUPPORT_10BIT_ADDR=y
 CONFIG_SOC_I2C_SLAVE_SUPPORT_BROADCAST=y
 CONFIG_SOC_I2C_SLAVE_SUPPORT_I2CRAM_ACCESS=y
-CONFIG_SOC_I2C_SLAVE_CAN_GET_STRETCH_CAUSE=y
 CONFIG_SOC_I2S_NUM=2
 CONFIG_SOC_I2S_HW_VERSION_2=y
 CONFIG_SOC_I2S_SUPPORTS_XTAL=y
@@ -152,7 +151,6 @@ CONFIG_SOC_I2S_PDM_MAX_RX_LINES=4
 CONFIG_SOC_I2S_SUPPORTS_TDM=y
 CONFIG_SOC_LEDC_SUPPORT_APB_CLOCK=y
 CONFIG_SOC_LEDC_SUPPORT_XTAL_CLOCK=y
-CONFIG_SOC_LEDC_TIMER_NUM=4
 CONFIG_SOC_LEDC_CHANNEL_NUM=8
 CONFIG_SOC_LEDC_TIMER_BIT_WIDTH=14
 CONFIG_SOC_LEDC_SUPPORT_FADE_STOP=y
@@ -309,7 +307,6 @@ CONFIG_SOC_CONFIGURABLE_VDDSDIO_SUPPORTED=y
 CONFIG_SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY=y
 CONFIG_SOC_PM_CPU_RETENTION_BY_RTCCNTL=y
 CONFIG_SOC_PM_MODEM_RETENTION_BY_BACKUPDMA=y
-CONFIG_SOC_PM_MODEM_PD_BY_SW=y
 CONFIG_SOC_CLK_RC_FAST_D256_SUPPORTED=y
 CONFIG_SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256=y
 CONFIG_SOC_CLK_RC_FAST_SUPPORT_CALIBRATION=y
@@ -371,11 +368,10 @@ CONFIG_SOC_ULP_HAS_ADC=y
 CONFIG_SOC_PHY_COMBO_MODULE=y
 CONFIG_IDF_CMAKE=y
 CONFIG_IDF_TOOLCHAIN="gcc"
-CONFIG_IDF_TOOLCHAIN_GCC=y
 CONFIG_IDF_TARGET_ARCH_XTENSA=y
 CONFIG_IDF_TARGET_ARCH="xtensa"
 CONFIG_IDF_TARGET="esp32s3"
-CONFIG_IDF_INIT_VERSION="$IDF_INIT_VERSION"
+CONFIG_IDF_INIT_VERSION="5.3.3"
 CONFIG_IDF_TARGET_ESP32S3=y
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0009
 
@@ -407,10 +403,6 @@ CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set
 # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set
 # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE is not set
-
-#
-# Log
-#
 # CONFIG_BOOTLOADER_LOG_LEVEL_NONE is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set
@@ -419,14 +411,6 @@ CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y
 # CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
 CONFIG_BOOTLOADER_LOG_LEVEL=3
 
-#
-# Format
-#
-# CONFIG_BOOTLOADER_LOG_COLORS is not set
-CONFIG_BOOTLOADER_LOG_TIMESTAMP_SOURCE_CPU_TICKS=y
-# end of Format
-# end of Log
-
 #
 # Serial Flash Configurations
 #
@@ -497,7 +481,6 @@ CONFIG_ESP_ROM_HAS_CACHE_WRITEBACK_BUG=y
 CONFIG_ESP_ROM_HAS_SW_FLOAT=y
 CONFIG_ESP_ROM_HAS_VERSION=y
 CONFIG_ESP_ROM_SUPPORT_DEEP_SLEEP_WAKEUP_STUB=y
-CONFIG_ESP_ROM_HAS_OUTPUT_PUTC_FUNC=y
 
 #
 # Boot ROM Behavior
@@ -514,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=y
+# CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set
 # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set
-# CONFIG_ESPTOOLPY_FLASHMODE_DIO is not set
+CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
 # CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set
 CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y
 CONFIG_ESPTOOLPY_FLASHMODE="dio"
@@ -524,16 +507,17 @@ CONFIG_ESPTOOLPY_FLASHMODE="dio"
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 # CONFIG_ESPTOOLPY_FLASHFREQ_40M is not set
 # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
+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=y
+# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
 # 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="4MB"
+CONFIG_ESPTOOLPY_FLASHSIZE="8MB"
 # CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
@@ -550,7 +534,6 @@ 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 is not set
-# CONFIG_PARTITION_TABLE_TWO_OTA_LARGE is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="min_spiffs.csv"
 CONFIG_PARTITION_TABLE_FILENAME="min_spiffs.csv"
@@ -595,32 +578,32 @@ CONFIG_WIFI_AP_PASSWORD="12345678"
 # OpenIris: LED Configuration
 #
 CONFIG_LED_BLINK_GPIO=8
-CONFIG_LED_EXTERNAL_GPIO=1
+CONFIG_LED_EXTERNAL_GPIO=9
 CONFIG_LED_EXTERNAL_CONTROL=y
-CONFIG_LED_EXTERNAL_PWM_FREQ=5000
+CONFIG_LED_EXTERNAL_PWM_FREQ=20000
-CONFIG_LED_EXTERNAL_PWM_DUTY_CYCLE=100
+CONFIG_LED_EXTERNAL_PWM_DUTY_CYCLE=50
 # end of OpenIris: LED Configuration
 
 #
 # Camera sensor pinout configuration
 #
-CONFIG_CAMERA_MODULE_NAME="SWROOM_BABBLE_S3"
+CONFIG_CAMERA_MODULE_NAME="FaceFocusVR_Face"
 CONFIG_PWDN_GPIO_NUM=-1
 CONFIG_RESET_GPIO_NUM=-1
-CONFIG_XCLK_GPIO_NUM=4
+CONFIG_XCLK_GPIO_NUM=10
-CONFIG_SIOD_GPIO_NUM=48
+CONFIG_SIOD_GPIO_NUM=40
-CONFIG_SIOC_GPIO_NUM=47
+CONFIG_SIOC_GPIO_NUM=39
-CONFIG_Y9_GPIO_NUM=13
+CONFIG_Y9_GPIO_NUM=48
-CONFIG_Y8_GPIO_NUM=5
+CONFIG_Y8_GPIO_NUM=11
-CONFIG_Y7_GPIO_NUM=6
+CONFIG_Y7_GPIO_NUM=12
-CONFIG_Y6_GPIO_NUM=15
+CONFIG_Y6_GPIO_NUM=14
-CONFIG_Y5_GPIO_NUM=17
+CONFIG_Y5_GPIO_NUM=16
-CONFIG_Y4_GPIO_NUM=8
+CONFIG_Y4_GPIO_NUM=18
-CONFIG_Y3_GPIO_NUM=18
+CONFIG_Y3_GPIO_NUM=17
-CONFIG_Y2_GPIO_NUM=16
+CONFIG_Y2_GPIO_NUM=15
-CONFIG_VSYNC_GPIO_NUM=21
+CONFIG_VSYNC_GPIO_NUM=38
-CONFIG_HREF_GPIO_NUM=14
+CONFIG_HREF_GPIO_NUM=47
-CONFIG_PCLK_GPIO_NUM=7
+CONFIG_PCLK_GPIO_NUM=13
 # end of Camera sensor pinout configuration
 
 #
@@ -633,7 +616,6 @@ CONFIG_COMPILER_OPTIMIZATION_PERF=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
 # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set
 # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set
-CONFIG_COMPILER_ASSERT_NDEBUG_EVALUATE=y
 CONFIG_COMPILER_FLOAT_LIB_FROM_GCCLIB=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL=2
 # CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT is not set
@@ -644,18 +626,14 @@ CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
 # CONFIG_COMPILER_STACK_CHECK_MODE_NORM is not set
 # CONFIG_COMPILER_STACK_CHECK_MODE_STRONG is not set
 # CONFIG_COMPILER_STACK_CHECK_MODE_ALL is not set
-# CONFIG_COMPILER_NO_MERGE_CONSTANTS is not set
 # CONFIG_COMPILER_WARN_WRITE_STRINGS is not set
-CONFIG_COMPILER_DISABLE_DEFAULT_ERRORS=y
 # CONFIG_COMPILER_DISABLE_GCC12_WARNINGS is not set
 # CONFIG_COMPILER_DISABLE_GCC13_WARNINGS is not set
-# CONFIG_COMPILER_DISABLE_GCC14_WARNINGS is not set
 # CONFIG_COMPILER_DUMP_RTL_FILES is not set
 CONFIG_COMPILER_RT_LIB_GCCLIB=y
 CONFIG_COMPILER_RT_LIB_NAME="gcc"
 # CONFIG_COMPILER_ORPHAN_SECTIONS_WARNING is not set
 CONFIG_COMPILER_ORPHAN_SECTIONS_PLACE=y
-# CONFIG_COMPILER_STATIC_ANALYZER is not set
 # end of Compiler options
 
 #
@@ -745,12 +723,6 @@ CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM=y
 # CONFIG_I2S_SKIP_LEGACY_CONFLICT_CHECK is not set
 # end of Legacy I2S Driver Configurations
 
-#
-# Legacy I2C Driver Configurations
-#
-# CONFIG_I2C_SKIP_LEGACY_CONFLICT_CHECK is not set
-# end of Legacy I2C Driver Configurations
-
 #
 # Legacy PCNT Driver Configurations
 #
@@ -838,7 +810,6 @@ CONFIG_GPTIMER_OBJ_CACHE_SAFE=y
 #
 # CONFIG_I2C_ISR_IRAM_SAFE is not set
 # CONFIG_I2C_ENABLE_DEBUG_LOG is not set
-# CONFIG_I2C_ENABLE_SLAVE_DRIVER_VERSION_2 is not set
 # end of ESP-Driver:I2C Configurations
 
 #
@@ -963,7 +934,6 @@ CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
 # CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH is not set
 # CONFIG_ESP_HTTP_CLIENT_ENABLE_DIGEST_AUTH is not set
 # CONFIG_ESP_HTTP_CLIENT_ENABLE_CUSTOM_TRANSPORT is not set
-CONFIG_ESP_HTTP_CLIENT_EVENT_POST_TIMEOUT=2000
 # end of ESP HTTP client
 
 #
@@ -976,7 +946,6 @@ CONFIG_HTTPD_PURGE_BUF_LEN=32
 # CONFIG_HTTPD_LOG_PURGE_DATA is not set
 CONFIG_HTTPD_WS_SUPPORT=y
 # CONFIG_HTTPD_QUEUE_WORK_BLOCKING is not set
-CONFIG_HTTPD_SERVER_EVENT_POST_TIMEOUT=2000
 # end of HTTP Server
 
 #
@@ -984,14 +953,12 @@ CONFIG_HTTPD_SERVER_EVENT_POST_TIMEOUT=2000
 #
 # CONFIG_ESP_HTTPS_OTA_DECRYPT_CB is not set
 # CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP is not set
-CONFIG_ESP_HTTPS_OTA_EVENT_POST_TIMEOUT=2000
 # end of ESP HTTPS OTA
 
 #
 # ESP HTTPS server
 #
 # CONFIG_ESP_HTTPS_SERVER_ENABLE is not set
-CONFIG_ESP_HTTPS_SERVER_EVENT_POST_TIMEOUT=2000
 # end of ESP HTTPS server
 
 #
@@ -1069,10 +1036,8 @@ CONFIG_PERIPH_CTRL_FUNC_IN_IRAM=y
 # GDMA Configurations
 #
 CONFIG_GDMA_CTRL_FUNC_IN_IRAM=y
-CONFIG_GDMA_ISR_HANDLER_IN_IRAM=y
-CONFIG_GDMA_OBJ_DRAM_SAFE=y
-# CONFIG_GDMA_ENABLE_DEBUG_LOG is not set
 # CONFIG_GDMA_ISR_IRAM_SAFE is not set
+# CONFIG_GDMA_ENABLE_DEBUG_LOG is not set
 # end of GDMA Configurations
 
 #
@@ -1086,28 +1051,29 @@ CONFIG_ESP_SPI_BUS_LOCK_ISR_FUNCS_IN_IRAM=y
 # end of Hardware Settings
 
 #
-# ESP-Driver:LCD Controller Configurations
+# LCD and Touch Panel
+#
+
+#
+# LCD Touch Drivers are maintained in the IDF Component Registry
+#
+
+#
+# LCD Peripheral Configuration
 #
 # CONFIG_LCD_ENABLE_DEBUG_LOG is not set
 # CONFIG_LCD_RGB_ISR_IRAM_SAFE is not set
 # CONFIG_LCD_RGB_RESTART_IN_VSYNC is not set
-# end of ESP-Driver:LCD Controller Configurations
+# end of LCD Peripheral Configuration
-
+# end of LCD and Touch Panel
-#
-# ESP-MM: Memory Management Configurations
-#
-# CONFIG_ESP_MM_CACHE_MSYNC_C2M_CHUNKED_OPS is not set
-# end of ESP-MM: Memory Management Configurations
 
 #
 # ESP NETIF Adapter
 #
 CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120
-# CONFIG_ESP_NETIF_PROVIDE_CUSTOM_IMPLEMENTATION is not set
 CONFIG_ESP_NETIF_TCPIP_LWIP=y
 # CONFIG_ESP_NETIF_LOOPBACK is not set
 CONFIG_ESP_NETIF_USES_TCPIP_WITH_BSD_API=y
-CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=y
 # CONFIG_ESP_NETIF_RECEIVE_REPORT_ERRORS is not set
 # CONFIG_ESP_NETIF_L2_TAP is not set
 # CONFIG_ESP_NETIF_BRIDGE_EN is not set
@@ -1155,23 +1121,21 @@ CONFIG_SPIRAM=y
 #
 # SPI RAM config
 #
-CONFIG_SPIRAM_MODE_QUAD=y
+# CONFIG_SPIRAM_MODE_QUAD is not set
-# CONFIG_SPIRAM_MODE_OCT is not set
+CONFIG_SPIRAM_MODE_OCT=y
 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
 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_PRE_CONFIGURE_MEMORY_PROTECTION=y
 # CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
 # CONFIG_SPIRAM_USE_MEMMAP is not set
 # CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
@@ -1191,11 +1155,6 @@ CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
 # CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH is not set
 # end of ESP Ringbuf
 
-#
-# ESP Security Specific
-#
-# end of ESP Security Specific
-
 #
 # ESP System Settings
 #
@@ -1444,21 +1403,10 @@ CONFIG_FATFS_TIMEOUT_MS=10000
 CONFIG_FATFS_PER_FILE_CACHE=y
 CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y
 # CONFIG_FATFS_USE_FASTSEEK is not set
-CONFIG_FATFS_USE_STRFUNC_NONE=y
-# CONFIG_FATFS_USE_STRFUNC_WITHOUT_CRLF_CONV is not set
-# CONFIG_FATFS_USE_STRFUNC_WITH_CRLF_CONV is not set
 CONFIG_FATFS_VFS_FSTAT_BLKSIZE=0
 # CONFIG_FATFS_IMMEDIATE_FSYNC is not set
 # CONFIG_FATFS_USE_LABEL is not set
 CONFIG_FATFS_LINK_LOCK=y
-# CONFIG_FATFS_USE_DYN_BUFFERS is not set
-
-#
-# File system free space calculation behavior
-#
-CONFIG_FATFS_DONT_TRUST_FREE_CLUSTER_CNT=0
-CONFIG_FATFS_DONT_TRUST_LAST_ALLOC=0
-# end of File system free space calculation behavior
 # end of FAT Filesystem support
 
 #
@@ -1480,7 +1428,6 @@ CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536
 # CONFIG_FREERTOS_USE_TICK_HOOK is not set
 CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
 # CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY is not set
-CONFIG_FREERTOS_USE_TIMERS=y
 CONFIG_FREERTOS_TIMER_SERVICE_TASK_NAME="Tmr Svc"
 # CONFIG_FREERTOS_TIMER_TASK_AFFINITY_CPU0 is not set
 # CONFIG_FREERTOS_TIMER_TASK_AFFINITY_CPU1 is not set
@@ -1507,7 +1454,6 @@ CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS=y
 CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
 CONFIG_FREERTOS_ISR_STACKSIZE=1536
 CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y
-# CONFIG_FREERTOS_FPU_IN_ISR is not set
 CONFIG_FREERTOS_TICK_SUPPORT_SYSTIMER=y
 CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL1=y
 # CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL3 is not set
@@ -1516,12 +1462,6 @@ CONFIG_FREERTOS_SYSTICK_USES_SYSTIMER=y
 # CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set
 # end of Port
 
-#
-# Extra
-#
-CONFIG_FREERTOS_TASK_CREATE_ALLOW_EXT_MEM=y
-# end of Extra
-
 CONFIG_FREERTOS_PORT=y
 CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
@@ -1560,11 +1500,7 @@ CONFIG_HEAP_TRACING_OFF=y
 # end of Heap memory debugging
 
 #
-# Log
+# Log output
-#
-
-#
-# Log Level
 #
 # CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
 # CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
@@ -1577,29 +1513,11 @@ CONFIG_LOG_DEFAULT_LEVEL=3
 # CONFIG_LOG_MAXIMUM_LEVEL_DEBUG is not set
 CONFIG_LOG_MAXIMUM_LEVEL_VERBOSE=y
 CONFIG_LOG_MAXIMUM_LEVEL=5
-
-#
-# Level Settings
-#
 # CONFIG_LOG_MASTER_LEVEL is not set
-CONFIG_LOG_DYNAMIC_LEVEL_CONTROL=y
-# CONFIG_LOG_TAG_LEVEL_IMPL_NONE is not set
-# CONFIG_LOG_TAG_LEVEL_IMPL_LINKED_LIST is not set
-CONFIG_LOG_TAG_LEVEL_IMPL_CACHE_AND_LINKED_LIST=y
-# CONFIG_LOG_TAG_LEVEL_CACHE_ARRAY is not set
-CONFIG_LOG_TAG_LEVEL_CACHE_BINARY_MIN_HEAP=y
-CONFIG_LOG_TAG_LEVEL_IMPL_CACHE_SIZE=31
-# end of Level Settings
-# end of Log Level
-
-#
-# Format
-#
 CONFIG_LOG_COLORS=y
 CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
 # CONFIG_LOG_TIMESTAMP_SOURCE_SYSTEM is not set
-# end of Format
+# end of Log output
-# end of Log
 
 #
 # LWIP
@@ -1638,8 +1556,6 @@ CONFIG_LWIP_ESP_MLDV6_REPORT=y
 CONFIG_LWIP_MLDV6_TMR_INTERVAL=40
 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
-# CONFIG_LWIP_DHCP_DOES_ACD_CHECK is not set
-# CONFIG_LWIP_DHCP_DOES_NOT_CHECK_OFFERED_IP is not set
 # CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set
 CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID=y
 # CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set
@@ -1654,7 +1570,6 @@ CONFIG_LWIP_DHCPS=y
 CONFIG_LWIP_DHCPS_LEASE_UNIT=60
 CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
 CONFIG_LWIP_DHCPS_STATIC_ENTRIES=y
-CONFIG_LWIP_DHCPS_ADD_DNS=y
 # end of DHCP server
 
 # CONFIG_LWIP_AUTOIP is not set
@@ -1713,12 +1628,12 @@ CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
 # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set
 # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1 is not set
 CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
-CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
-CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
 CONFIG_LWIP_IPV6_ND6_NUM_PREFIXES=5
 CONFIG_LWIP_IPV6_ND6_NUM_ROUTERS=3
 CONFIG_LWIP_IPV6_ND6_NUM_DESTINATIONS=10
 # CONFIG_LWIP_PPP_SUPPORT is not set
+CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
+CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
 # CONFIG_LWIP_SLIP_SUPPORT is not set
 
 #
@@ -1839,7 +1754,6 @@ CONFIG_MBEDTLS_HAVE_TIME=y
 # CONFIG_MBEDTLS_PLATFORM_TIME_ALT is not set
 # CONFIG_MBEDTLS_HAVE_TIME_DATE is not set
 CONFIG_MBEDTLS_ECDSA_DETERMINISTIC=y
-CONFIG_MBEDTLS_SHA1_C=y
 CONFIG_MBEDTLS_SHA512_C=y
 # CONFIG_MBEDTLS_SHA3_C is not set
 CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT=y
@@ -1895,8 +1809,6 @@ CONFIG_MBEDTLS_X509_CSR_PARSE_C=y
 # end of Certificates
 
 CONFIG_MBEDTLS_ECP_C=y
-CONFIG_MBEDTLS_PK_PARSE_EC_EXTENDED=y
-CONFIG_MBEDTLS_PK_PARSE_EC_COMPRESSED=y
 # CONFIG_MBEDTLS_DHM_C is not set
 CONFIG_MBEDTLS_ECDH_C=y
 CONFIG_MBEDTLS_ECDSA_C=y
@@ -1921,7 +1833,6 @@ CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y
 # CONFIG_MBEDTLS_THREADING_C is not set
 CONFIG_MBEDTLS_ERROR_STRINGS=y
 CONFIG_MBEDTLS_FS_IO=y
-# CONFIG_MBEDTLS_ALLOW_WEAK_CERTIFICATE_VERIFICATION is not set
 # end of mbedTLS
 
 #
@@ -1964,7 +1875,6 @@ CONFIG_STDATOMIC_S32C1I_SPIRAM_WORKAROUND=y
 # CONFIG_NVS_ENCRYPTION is not set
 # CONFIG_NVS_ASSERT_ERROR_CHECK is not set
 # CONFIG_NVS_LEGACY_DUP_KEYS_COMPATIBILITY is not set
-# CONFIG_NVS_ALLOCATE_CACHE_IN_SPIRAM is not set
 # end of NVS
 
 #
@@ -2033,10 +1943,10 @@ CONFIG_SPI_FLASH_HPM_AUTO=y
 CONFIG_SPI_FLASH_HPM_ON=y
 CONFIG_SPI_FLASH_HPM_DC_AUTO=y
 # CONFIG_SPI_FLASH_HPM_DC_DISABLE is not set
+CONFIG_SPI_FLASH_SUSPEND_QVL_SUPPORTED=y
 # CONFIG_SPI_FLASH_AUTO_SUSPEND is not set
 CONFIG_SPI_FLASH_SUSPEND_TSUS_VAL_US=50
 # CONFIG_SPI_FLASH_FORCE_ENABLE_XMC_C_SUSPEND is not set
-# CONFIG_SPI_FLASH_FORCE_ENABLE_C6_H2_SUSPEND is not set
 # end of Optional and Experimental Features (READ DOCS FIRST)
 # end of Main Flash configuration
 
@@ -2197,8 +2107,6 @@ CONFIG_VFS_MAX_COUNT=8
 #
 CONFIG_VFS_SEMIHOSTFS_MAX_MOUNT_POINTS=1
 # end of Host File System I/O (Semihosting)
-
-CONFIG_VFS_INITIALIZE_DEV_NULL=y
 # end of Virtual file system
 
 #
@@ -2386,9 +2294,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=y
+# CONFIG_FLASHMODE_QIO is not set
 # CONFIG_FLASHMODE_QOUT is not set
-# CONFIG_FLASHMODE_DIO is not set
+CONFIG_FLASHMODE_DIO=y
 # CONFIG_FLASHMODE_DOUT is not set
 CONFIG_MONITOR_BAUD=115200
 # CONFIG_OPTIMIZATION_LEVEL_DEBUG is not set
@@ -2521,7 +2429,6 @@ CONFIG_TIMER_TASK_PRIORITY=1
 CONFIG_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_TIMER_QUEUE_LENGTH=10
 # CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set
-CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
 # CONFIG_HAL_ASSERTION_SILIENT is not set
 # CONFIG_L2_TO_L3_COPY is not set
 CONFIG_ESP_GRATUITOUS_ARP=y