Schon wieder irgendwas

.gitmodules

@@ -3,7 +3,7 @@
 	url = ../../0xFEEDC0DE64/espcpputils.git
 [submodule "esp-idf"]
 	path = esp-idf
-	url = ../../0xFEEDC0DE64/esp-idf.git
+	url = ../../bobbycar-graz/esp-idf.git
 [submodule "components/cpputils"]
 	path = components/cpputils
 	url = ../../0xFEEDC0DE64/cpputils.git
@@ -22,9 +22,6 @@
 [submodule "components/arduino-esp32"]
 	path = components/arduino-esp32
 	url = ../../0xFEEDC0DE64/arduino-esp32.git
-[submodule "components/expected"]
-	path = components/expected
-	url = ../../0xFEEDC0DE64/expected.git
 [submodule "components/bobbycar-protocol"]
 	path = components/bobbycar-protocol
 	url = ../../bobbycar-graz/bobbycar-protocol.git
@@ -70,6 +67,9 @@
 [submodule "esp_boost"]
 	path = esp_boost
 	url = ../../0xFEEDC0DE64/esp_boost.git
-[submodule "components/asio_web"]
+[submodule "components/esptftlib"]
-	path = components/asio_web
+	path = components/esptftlib
-	url = ../../0xFEEDC0DE64/asio_web.git
+	url = ../../0xFEEDC0DE64/esptftlib.git
+[submodule "components/espfontlib"]
+	path = components/espfontlib
+	url = ../../0xFEEDC0DE64/espfontlib.git

configs/sdkconfig_comred_new

@@ -1,6 +1,6 @@
 #
 # Automatically generated file. DO NOT EDIT.
-# Espressif IoT Development Framework (ESP-IDF) Project Configuration
+# Espressif IoT Development Framework (ESP-IDF) 5.2.0 Project Configuration
 #
 CONFIG_SOC_BROWNOUT_RESET_SUPPORTED="Not determined"
 CONFIG_SOC_TWAI_BRP_DIV_SUPPORTED="Not determined"
@@ -8,7 +8,9 @@ CONFIG_SOC_DPORT_WORKAROUND="Not determined"
 CONFIG_SOC_CAPS_ECO_VER_MAX=301
 CONFIG_SOC_ADC_SUPPORTED=y
 CONFIG_SOC_DAC_SUPPORTED=y
+CONFIG_SOC_UART_SUPPORTED=y
 CONFIG_SOC_MCPWM_SUPPORTED=y
+CONFIG_SOC_GPTIMER_SUPPORTED=y
 CONFIG_SOC_SDMMC_HOST_SUPPORTED=y
 CONFIG_SOC_BT_SUPPORTED=y
 CONFIG_SOC_PCNT_SUPPORTED=y
@@ -24,6 +26,7 @@ CONFIG_SOC_RTC_MEM_SUPPORTED=y
 CONFIG_SOC_I2S_SUPPORTED=y
 CONFIG_SOC_RMT_SUPPORTED=y
 CONFIG_SOC_SDM_SUPPORTED=y
+CONFIG_SOC_GPSPI_SUPPORTED=y
 CONFIG_SOC_LEDC_SUPPORTED=y
 CONFIG_SOC_I2C_SUPPORTED=y
 CONFIG_SOC_SUPPORT_COEXISTENCE=y
@@ -33,6 +36,9 @@ CONFIG_SOC_SHA_SUPPORTED=y
 CONFIG_SOC_FLASH_ENC_SUPPORTED=y
 CONFIG_SOC_SECURE_BOOT_SUPPORTED=y
 CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y
+CONFIG_SOC_BOD_SUPPORTED=y
+CONFIG_SOC_ULP_FSM_SUPPORTED=y
+CONFIG_SOC_CLK_TREE_SUPPORTED=y
 CONFIG_SOC_DPORT_WORKAROUND_DIS_INTERRUPT_LVL=5
 CONFIG_SOC_XTAL_SUPPORT_26M=y
 CONFIG_SOC_XTAL_SUPPORT_40M=y
@@ -49,12 +55,13 @@ CONFIG_SOC_ADC_DIGI_MIN_BITWIDTH=9
 CONFIG_SOC_ADC_DIGI_MAX_BITWIDTH=12
 CONFIG_SOC_ADC_DIGI_RESULT_BYTES=2
 CONFIG_SOC_ADC_DIGI_DATA_BYTES_PER_CONV=4
+CONFIG_SOC_ADC_DIGI_MONITOR_NUM=0
 CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_HIGH=2
 CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=20
 CONFIG_SOC_ADC_RTC_MIN_BITWIDTH=9
 CONFIG_SOC_ADC_RTC_MAX_BITWIDTH=12
 CONFIG_SOC_SHARED_IDCACHE_SUPPORTED=y
-CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=5
+CONFIG_SOC_IDCACHE_PER_CORE=y
 CONFIG_SOC_CPU_CORES_NUM=2
 CONFIG_SOC_CPU_INTR_NUM=32
 CONFIG_SOC_CPU_HAS_FPU=y
@@ -68,14 +75,15 @@ CONFIG_SOC_GPIO_PORT=1
 CONFIG_SOC_GPIO_PIN_COUNT=40
 CONFIG_SOC_GPIO_VALID_GPIO_MASK=0xFFFFFFFFFF
 CONFIG_SOC_GPIO_VALID_DIGITAL_IO_PAD_MASK=0xEF0FEA
-CONFIG_SOC_GPIO_SUPPORT_SLP_SWITCH=y
 CONFIG_SOC_I2C_NUM=2
 CONFIG_SOC_I2C_FIFO_LEN=32
+CONFIG_SOC_I2C_CMD_REG_NUM=16
 CONFIG_SOC_I2C_SUPPORT_SLAVE=y
 CONFIG_SOC_I2C_SUPPORT_APB=y
 CONFIG_SOC_I2S_NUM=2
 CONFIG_SOC_I2S_HW_VERSION_1=y
 CONFIG_SOC_I2S_SUPPORTS_APLL=y
+CONFIG_SOC_I2S_SUPPORTS_PLL_F160M=y
 CONFIG_SOC_I2S_SUPPORTS_PDM=y
 CONFIG_SOC_I2S_SUPPORTS_PDM_TX=y
 CONFIG_SOC_I2S_PDM_MAX_TX_LINES=1
@@ -96,7 +104,6 @@ CONFIG_SOC_LEDC_SUPPORT_REF_TICK=y
 CONFIG_SOC_LEDC_SUPPORT_HS_MODE=y
 CONFIG_SOC_LEDC_CHANNEL_NUM=8
 CONFIG_SOC_LEDC_TIMER_BIT_WIDTH=20
-CONFIG_SOC_LEDC_GAMMA_FADE_RANGE_MAX=1
 CONFIG_SOC_MCPWM_GROUPS=2
 CONFIG_SOC_MCPWM_TIMERS_PER_GROUP=3
 CONFIG_SOC_MCPWM_OPERATORS_PER_GROUP=3
@@ -107,7 +114,8 @@ CONFIG_SOC_MCPWM_GPIO_FAULTS_PER_GROUP=3
 CONFIG_SOC_MCPWM_CAPTURE_TIMERS_PER_GROUP=y
 CONFIG_SOC_MCPWM_CAPTURE_CHANNELS_PER_TIMER=3
 CONFIG_SOC_MCPWM_GPIO_SYNCHROS_PER_GROUP=3
-CONFIG_SOC_MCPWM_CLK_SUPPORT_PLL160M=y
+CONFIG_SOC_MMU_PERIPH_NUM=2
+CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=3
 CONFIG_SOC_MPU_MIN_REGION_SIZE=0x20000000
 CONFIG_SOC_MPU_REGIONS_MAX_NUM=8
 CONFIG_SOC_PCNT_GROUPS=1
@@ -128,11 +136,13 @@ CONFIG_SOC_RTCIO_HOLD_SUPPORTED=y
 CONFIG_SOC_RTCIO_WAKE_SUPPORTED=y
 CONFIG_SOC_SDM_GROUPS=1
 CONFIG_SOC_SDM_CHANNELS_PER_GROUP=8
+CONFIG_SOC_SDM_CLK_SUPPORT_APB=y
 CONFIG_SOC_SPI_HD_BOTH_INOUT_SUPPORTED=y
 CONFIG_SOC_SPI_AS_CS_SUPPORTED=y
 CONFIG_SOC_SPI_PERIPH_NUM=3
 CONFIG_SOC_SPI_DMA_CHAN_NUM=2
 CONFIG_SOC_SPI_MAX_CS_NUM=3
+CONFIG_SOC_SPI_SUPPORT_CLK_APB=y
 CONFIG_SOC_SPI_MAXIMUM_BUFFER_SIZE=64
 CONFIG_SOC_SPI_MAX_PRE_DIVIDER=8192
 CONFIG_SOC_MEMSPI_SRC_FREQ_80M_SUPPORTED=y
@@ -152,6 +162,7 @@ CONFIG_SOC_TWAI_BRP_MIN=2
 CONFIG_SOC_TWAI_CLK_SUPPORT_APB=y
 CONFIG_SOC_TWAI_SUPPORT_MULTI_ADDRESS_LAYOUT=y
 CONFIG_SOC_UART_NUM=3
+CONFIG_SOC_UART_HP_NUM=3
 CONFIG_SOC_UART_SUPPORT_APB_CLK=y
 CONFIG_SOC_UART_SUPPORT_REF_TICK=y
 CONFIG_SOC_UART_FIFO_LEN=128
@@ -159,10 +170,13 @@ CONFIG_SOC_UART_BITRATE_MAX=5000000
 CONFIG_SOC_SPIRAM_SUPPORTED=y
 CONFIG_SOC_SPI_MEM_SUPPORT_CONFIG_GPIO_BY_EFUSE=y
 CONFIG_SOC_SHA_SUPPORT_PARALLEL_ENG=y
+CONFIG_SOC_SHA_ENDIANNESS_BE=y
 CONFIG_SOC_SHA_SUPPORT_SHA1=y
 CONFIG_SOC_SHA_SUPPORT_SHA256=y
 CONFIG_SOC_SHA_SUPPORT_SHA384=y
 CONFIG_SOC_SHA_SUPPORT_SHA512=y
+CONFIG_SOC_MPI_MEM_BLOCKS_NUM=4
+CONFIG_SOC_MPI_OPERATIONS_NUM=y
 CONFIG_SOC_RSA_MAX_BIT_LEN=4096
 CONFIG_SOC_AES_SUPPORT_AES_128=y
 CONFIG_SOC_AES_SUPPORT_AES_192=y
@@ -171,11 +185,17 @@ CONFIG_SOC_SECURE_BOOT_V1=y
 CONFIG_SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS=y
 CONFIG_SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX=32
 CONFIG_SOC_PHY_DIG_REGS_MEM_SIZE=21
+CONFIG_SOC_PM_SUPPORT_EXT0_WAKEUP=y
+CONFIG_SOC_PM_SUPPORT_EXT1_WAKEUP=y
 CONFIG_SOC_PM_SUPPORT_EXT_WAKEUP=y
 CONFIG_SOC_PM_SUPPORT_TOUCH_SENSOR_WAKEUP=y
 CONFIG_SOC_PM_SUPPORT_RTC_PERIPH_PD=y
 CONFIG_SOC_PM_SUPPORT_RTC_FAST_MEM_PD=y
 CONFIG_SOC_PM_SUPPORT_RTC_SLOW_MEM_PD=y
+CONFIG_SOC_PM_SUPPORT_RC_FAST_PD=y
+CONFIG_SOC_PM_SUPPORT_VDDSDIO_PD=y
+CONFIG_SOC_PM_SUPPORT_MODEM_PD=y
+CONFIG_SOC_CONFIGURABLE_VDDSDIO_SUPPORTED=y
 CONFIG_SOC_CLK_APLL_SUPPORTED=y
 CONFIG_SOC_APLL_MULTIPLIER_OUT_MIN_HZ=350000000
 CONFIG_SOC_APLL_MULTIPLIER_OUT_MAX_HZ=500000000
@@ -184,18 +204,25 @@ CONFIG_SOC_APLL_MAX_HZ=125000000
 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
+CONFIG_SOC_CLK_XTAL32K_SUPPORTED=y
 CONFIG_SOC_SDMMC_USE_IOMUX=y
 CONFIG_SOC_SDMMC_NUM_SLOTS=2
 CONFIG_SOC_WIFI_WAPI_SUPPORT=y
 CONFIG_SOC_WIFI_CSI_SUPPORT=y
 CONFIG_SOC_WIFI_MESH_SUPPORT=y
+CONFIG_SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW=y
+CONFIG_SOC_WIFI_NAN_SUPPORT=y
 CONFIG_SOC_BLE_SUPPORTED=y
 CONFIG_SOC_BLE_MESH_SUPPORTED=y
 CONFIG_SOC_BT_CLASSIC_SUPPORTED=y
+CONFIG_SOC_BLUFI_SUPPORTED=y
+CONFIG_SOC_ULP_HAS_ADC=y
 CONFIG_IDF_CMAKE=y
+CONFIG_IDF_TOOLCHAIN="gcc"
 CONFIG_IDF_TARGET_ARCH_XTENSA=y
 CONFIG_IDF_TARGET_ARCH="xtensa"
 CONFIG_IDF_TARGET="esp32"
+CONFIG_IDF_INIT_VERSION="5.2.0"
 CONFIG_IDF_TARGET_ESP32=y
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
@@ -203,7 +230,7 @@ CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 # Build type
 #
 CONFIG_APP_BUILD_TYPE_APP_2NDBOOT=y
-# CONFIG_APP_BUILD_TYPE_ELF_RAM is not set
+# CONFIG_APP_BUILD_TYPE_RAM is not set
 CONFIG_APP_BUILD_GENERATE_BINARIES=y
 CONFIG_APP_BUILD_BOOTLOADER=y
 CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
@@ -216,6 +243,14 @@ CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
 #
 # Bootloader config
 #
+
+#
+# Bootloader manager
+#
+CONFIG_BOOTLOADER_COMPILE_TIME_DATE=y
+CONFIG_BOOTLOADER_PROJECT_VER=1
+# end of Bootloader manager
+
 CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x1000
 CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set
@@ -268,7 +303,9 @@ CONFIG_ESP_ROM_HAS_CRC_LE=y
 CONFIG_ESP_ROM_HAS_CRC_BE=y
 CONFIG_ESP_ROM_HAS_MZ_CRC32=y
 CONFIG_ESP_ROM_HAS_JPEG_DECODE=y
+CONFIG_ESP_ROM_HAS_UART_BUF_SWITCH=y
 CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y
+CONFIG_ESP_ROM_HAS_NEWLIB_NANO_FORMAT=y
 
 #
 # Serial flasher config
@@ -370,6 +407,12 @@ CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP_INFO=y
 CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP=3
 # end of Simple Async HTTP Request
 
+#
+# ESPAsyncOTA
+#
+# CONFIG_ESPASYNCOTA_DISABLE_HEAP_CAPS_LOG is not set
+# end of ESPAsyncOTA
+
 #
 # espchrono Configuration
 #
@@ -412,12 +455,13 @@ CONFIG_LOG_LOCAL_LEVEL_WIFI_STACK_INFO=y
 # CONFIG_LOG_LOCAL_LEVEL_WIFI_STACK_VERBOSE is not set
 CONFIG_LOG_LOCAL_LEVEL_WIFI_STACK=3
 # CONFIG_WIFI_DUAL_ANT is not set
+# CONFIG_WIFI_LOG_WORKAROUND is not set
 # end of ESP WiFi Stack settings
 
 #
 # Compiler options
 #
-# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set
+# CONFIG_COMPILER_OPTIMIZATION_DEBUG is not set
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 # CONFIG_COMPILER_OPTIMIZATION_PERF is not set
 # CONFIG_COMPILER_OPTIMIZATION_NONE is not set
@@ -435,7 +479,10 @@ CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
 # CONFIG_COMPILER_STACK_CHECK_MODE_STRONG is not set
 # CONFIG_COMPILER_STACK_CHECK_MODE_ALL is not set
 # CONFIG_COMPILER_WARN_WRITE_STRINGS is not set
+# CONFIG_COMPILER_DISABLE_GCC12_WARNINGS is not set
 # CONFIG_COMPILER_DUMP_RTL_FILES is not set
+CONFIG_COMPILER_RT_LIB_GCCLIB=y
+CONFIG_COMPILER_RT_LIB_NAME="gcc"
 # end of Compiler options
 
 #
@@ -506,11 +553,11 @@ CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT=12
 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_SIZE=256
 CONFIG_BT_NIMBLE_MSYS_2_BLOCK_COUNT=24
 CONFIG_BT_NIMBLE_MSYS_2_BLOCK_SIZE=320
-CONFIG_BT_NIMBLE_ACL_BUF_COUNT=20
+CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=20
-CONFIG_BT_NIMBLE_ACL_BUF_SIZE=255
+CONFIG_BT_NIMBLE_TRANSPORT_ACL_SIZE=255
-CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
+CONFIG_BT_NIMBLE_TRANSPORT_EVT_SIZE=70
-CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=30
+CONFIG_BT_NIMBLE_TRANSPORT_EVT_COUNT=30
-CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
+CONFIG_BT_NIMBLE_TRANSPORT_EVT_DISCARD_COUNT=8
 # end of Memory Settings
 
 CONFIG_BT_NIMBLE_GATT_MAX_PROCS=4
@@ -522,21 +569,52 @@ CONFIG_BT_NIMBLE_RPA_TIMEOUT=900
 # CONFIG_BT_NIMBLE_MESH is not set
 CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS=y
 CONFIG_BT_NIMBLE_HS_STOP_TIMEOUT_MS=2000
+# CONFIG_BT_NIMBLE_HOST_BASED_PRIVACY is not set
 # CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT is not set
-CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=y
-CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY=y
-CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY=y
-# CONFIG_BT_NIMBLE_EXT_ADV is not set
-CONFIG_BT_NIMBLE_MAX_PERIODIC_SYNCS=0
-# CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EN is not set
-CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_DIS=y
-# CONFIG_BT_NIMBLE_52_FEATURE_SUPPORT is not set
 CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EFF=0
 CONFIG_BT_NIMBLE_WHITELIST_SIZE=12
 # CONFIG_BT_NIMBLE_TEST_THROUGHPUT_TEST is not set
 # CONFIG_BT_NIMBLE_BLUFI_ENABLE is not set
 CONFIG_BT_NIMBLE_USE_ESP_TIMER=y
 CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE=y
+# CONFIG_BT_NIMBLE_BLE_GATT_BLOB_TRANSFER is not set
+
+#
+# GAP Service
+#
+
+#
+# GAP Appearance write permissions
+#
+# CONFIG_BT_NIMBLE_SVC_GAP_APPEAR_WRITE is not set
+# end of GAP Appearance write permissions
+
+CONFIG_BT_NIMBLE_SVC_GAP_APPEAR_WRITE_PERM=0
+CONFIG_BT_NIMBLE_SVC_GAP_APPEAR_WRITE_PERM_ENC=0
+CONFIG_BT_NIMBLE_SVC_GAP_APPEAR_WRITE_PERM_ATHN=0
+CONFIG_BT_NIMBLE_SVC_GAP_APPEAR_WRITE_PERM_ATHR=0
+CONFIG_BT_NIMBLE_SVC_GAP_CAR_CHAR_NOT_SUPP=y
+# CONFIG_BT_NIMBLE_SVC_GAP_CAR_NOT_SUPP is not set
+# CONFIG_BT_NIMBLE_SVC_GAP_CAR_SUPP is not set
+CONFIG_BT_NIMBLE_SVC_GAP_CENT_ADDR_RESOLUTION=-1
+
+#
+# GAP device name write permissions
+#
+# CONFIG_BT_NIMBLE_SVC_GAP_NAME_WRITE is not set
+# end of GAP device name write permissions
+
+CONFIG_BT_NIMBLE_SVC_GAP_NAME_WRITE_PERM=0
+CONFIG_BT_NIMBLE_SVC_GAP_NAME_WRITE_PERM_ENC=0
+CONFIG_BT_NIMBLE_SVC_GAP_NAME_WRITE_PERM_AUTHEN=0
+CONFIG_BT_NIMBLE_SVC_GAP_NAME_WRITE_PERM_AUTHOR=0
+CONFIG_BT_NIMBLE_SVC_GAP_PPCP_MAX_CONN_INTERVAL=0
+CONFIG_BT_NIMBLE_SVC_GAP_PPCP_MIN_CONN_INTERVAL=0
+CONFIG_BT_NIMBLE_SVC_GAP_PPCP_SLAVE_LATENCY=0
+CONFIG_BT_NIMBLE_SVC_GAP_PPCP_SUPERVISION_TMO=0
+# end of GAP Service
+
+# CONFIG_BT_NIMBLE_VS_SUPPORT is not set
 # end of NimBLE Options
 
 #
@@ -575,6 +653,7 @@ CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE=y
 # CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE is not set
 CONFIG_BTDM_SCAN_DUPL_TYPE=0
 CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=200
+CONFIG_BTDM_SCAN_DUPL_CACHE_REFRESH_PERIOD=0
 # CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN is not set
 CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
@@ -624,6 +703,7 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST is not set
 # CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID is not set
 # CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT is not set
+CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM=y
 # end of TWAI Configuration
 
 #
@@ -650,6 +730,7 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 #
 # GPTimer Configuration
 #
+CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM=y
 # CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM is not set
 # CONFIG_GPTIMER_ISR_IRAM_SAFE is not set
 # CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set
@@ -699,6 +780,12 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # CONFIG_DAC_ENABLE_DEBUG_LOG is not set
 CONFIG_DAC_DMA_AUTO_16BIT_ALIGN=y
 # end of DAC Configuration
+
+#
+# LEDC Configuration
+#
+# CONFIG_LEDC_CTRL_FUNC_IN_IRAM is not set
+# end of LEDC Configuration
 # end of Driver Configurations
 
 #
@@ -740,6 +827,12 @@ CONFIG_ADC_CALI_LUT_ENABLE=y
 CONFIG_ADC_DISABLE_DAC_OUTPUT=y
 # end of ADC and ADC Calibration
 
+#
+# Wireless Coexistence
+#
+CONFIG_ESP_COEX_SW_COEXIST_ENABLE=y
+# end of Wireless Coexistence
+
 #
 # Common ESP-related
 #
@@ -765,6 +858,7 @@ CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y
 #
 # GDB Stub
 #
+# CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME is not set
 # end of GDB Stub
 
 #
@@ -835,6 +929,7 @@ CONFIG_ESP_MAC_UNIVERSAL_MAC_ADDRESSES_FOUR=y
 # CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_TWO is not set
 CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y
 CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4
+# CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR is not set
 # end of MAC Config
 
 #
@@ -843,8 +938,9 @@ CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4
 CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
 CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
 # CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set
-# CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND is not set
 CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=2000
+# CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION is not set
+# CONFIG_ESP_SLEEP_DEBUG is not set
 # end of Sleep Config
 
 #
@@ -860,17 +956,9 @@ CONFIG_RTC_CLK_CAL_CYCLES=1024
 #
 # Peripheral Control
 #
-# CONFIG_PERIPH_CTRL_FUNC_IN_IRAM is not set
+CONFIG_PERIPH_CTRL_FUNC_IN_IRAM=y
 # end of Peripheral Control
 
-#
-# MMU Config
-#
-CONFIG_MMU_PAGE_SIZE_64KB=y
-CONFIG_MMU_PAGE_MODE="64KB"
-CONFIG_MMU_PAGE_SIZE=0x10000
-# end of MMU Config
-
 #
 # Main XTAL Config
 #
@@ -903,10 +991,17 @@ CONFIG_LCD_PANEL_IO_FORMAT_BUF_SIZE=32
 CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120
 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_RECEIVE_REPORT_ERRORS is not set
 # CONFIG_ESP_NETIF_L2_TAP is not set
 # CONFIG_ESP_NETIF_BRIDGE_EN is not set
 # end of ESP NETIF Adapter
 
+#
+# Partition API Configuration
+#
+# end of Partition API Configuration
+
 #
 # PHY
 #
@@ -917,6 +1012,10 @@ CONFIG_ESP_PHY_DEFAULT_INIT_IF_INVALID=y
 CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20
 CONFIG_ESP_PHY_MAX_TX_POWER=20
 CONFIG_ESP_PHY_REDUCE_TX_POWER=y
+CONFIG_ESP_PHY_RF_CAL_PARTIAL=y
+# CONFIG_ESP_PHY_RF_CAL_NONE is not set
+# CONFIG_ESP_PHY_RF_CAL_FULL is not set
+CONFIG_ESP_PHY_CALIBRATION_MODE=0
 # end of PHY
 
 #
@@ -935,7 +1034,6 @@ CONFIG_ESP_PHY_REDUCE_TX_POWER=y
 # ESP Ringbuf
 #
 # CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH is not set
-# CONFIG_RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH is not set
 # end of ESP Ringbuf
 
 #
@@ -950,6 +1048,12 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
 # Memory
 #
 # CONFIG_ESP32_USE_FIXED_STATIC_RAM_SIZE is not set
+
+#
+# Non-backward compatible options
+#
+# CONFIG_ESP_SYSTEM_ESP32_SRAM1_REGION_AS_IRAM is not set
+# end of Non-backward compatible options
 # end of Memory
 
 #
@@ -963,7 +1067,7 @@ CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0
 CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
 # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
 # CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set
-# CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME is not set
+CONFIG_ESP_SYSTEM_PANIC_REBOOT_DELAY_SECONDS=0
 
 #
 # Memory protection
@@ -1034,6 +1138,11 @@ CONFIG_ESP_TIME_FUNCS_USE_RTC_TIMER=y
 CONFIG_ESP_TIME_FUNCS_USE_ESP_TIMER=y
 CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584
 CONFIG_ESP_TIMER_INTERRUPT_LEVEL=1
+# CONFIG_ESP_TIMER_SHOW_EXPERIMENTAL is not set
+CONFIG_ESP_TIMER_TASK_AFFINITY=0x0
+CONFIG_ESP_TIMER_TASK_AFFINITY_CPU0=y
+CONFIG_ESP_TIMER_ISR_AFFINITY=0x1
+CONFIG_ESP_TIMER_ISR_AFFINITY_CPU0=y
 # CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD is not set
 CONFIG_ESP_TIMER_IMPL_TG0_LAC=y
 # end of High resolution timer (esp_timer)
@@ -1041,34 +1150,55 @@ CONFIG_ESP_TIMER_IMPL_TG0_LAC=y
 #
 # Wi-Fi
 #
-CONFIG_ESP32_WIFI_ENABLED=y
+CONFIG_ESP_WIFI_ENABLED=y
-CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=10
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
+# CONFIG_ESP_WIFI_STATIC_TX_BUFFER is not set
-# CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER=y
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
+CONFIG_ESP_WIFI_TX_BUFFER_TYPE=1
-CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=32
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
+# CONFIG_ESP_WIFI_CSI_ENABLED is not set
-# CONFIG_ESP32_WIFI_CSI_ENABLED is not set
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=6
-CONFIG_ESP32_WIFI_TX_BA_WIN=6
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=6
-CONFIG_ESP32_WIFI_RX_BA_WIN=6
+# CONFIG_ESP_WIFI_NVS_ENABLED is not set
-# CONFIG_ESP32_WIFI_NVS_ENABLED is not set
+CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0=y
-CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y
+# CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1 is not set
-# CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set
+CONFIG_ESP_WIFI_SOFTAP_BEACON_MAX_LEN=752
-CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
+CONFIG_ESP_WIFI_MGMT_SBUF_NUM=32
-CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
+CONFIG_ESP_WIFI_IRAM_OPT=y
-CONFIG_ESP32_WIFI_IRAM_OPT=y
+CONFIG_ESP_WIFI_RX_IRAM_OPT=y
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
+CONFIG_ESP_WIFI_ENABLE_WPA3_SAE=y
-CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y
+CONFIG_ESP_WIFI_ENABLE_SAE_PK=y
-CONFIG_ESP32_WIFI_ENABLE_WPA3_OWE_STA=y
+CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT=y
+CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA=y
 # CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set
 CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE=y
 # CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
 # CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set
 CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=6
+# CONFIG_ESP_WIFI_NAN_ENABLE is not set
+CONFIG_ESP_WIFI_MBEDTLS_CRYPTO=y
+CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y
+# CONFIG_ESP_WIFI_WAPI_PSK is not set
+# CONFIG_ESP_WIFI_SUITE_B_192 is not set
+# CONFIG_ESP_WIFI_11KV_SUPPORT is not set
+# CONFIG_ESP_WIFI_MBO_SUPPORT is not set
+# CONFIG_ESP_WIFI_DPP_SUPPORT is not set
+# CONFIG_ESP_WIFI_11R_SUPPORT is not set
+# CONFIG_ESP_WIFI_WPS_SOFTAP_REGISTRAR is not set
+
+#
+# WPS Configuration Options
+#
+# CONFIG_ESP_WIFI_WPS_STRICT is not set
+# CONFIG_ESP_WIFI_WPS_PASSPHRASE is not set
+# end of WPS Configuration Options
+
+# CONFIG_ESP_WIFI_DEBUG_PRINT is not set
+# CONFIG_ESP_WIFI_TESTING_OPTIONS is not set
 # end of Wi-Fi
 
 #
@@ -1115,6 +1245,7 @@ CONFIG_FATFS_FS_LOCK=0
 CONFIG_FATFS_TIMEOUT_MS=10000
 CONFIG_FATFS_PER_FILE_CACHE=y
 # CONFIG_FATFS_USE_FASTSEEK is not set
+CONFIG_FATFS_VFS_FSTAT_BLKSIZE=0
 # end of FAT Filesystem support
 
 #
@@ -1165,6 +1296,7 @@ CONFIG_FREERTOS_SYSTICK_USES_CCOUNT=y
 CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y
 # end of Port
 
+CONFIG_FREERTOS_PORT=y
 CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
 CONFIG_FREERTOS_DEBUG_OCDAWARE=y
@@ -1178,6 +1310,8 @@ CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y
 # CONFIG_HAL_ASSERTION_SILENT is not set
 # CONFIG_HAL_ASSERTION_ENABLE is not set
 CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
+CONFIG_HAL_SPI_MASTER_FUNC_IN_IRAM=y
+CONFIG_HAL_SPI_SLAVE_FUNC_IN_IRAM=y
 # end of Hardware Abstraction Layer (HAL) and Low Level (LL)
 
 #
@@ -1189,9 +1323,14 @@ CONFIG_HEAP_POISONING_DISABLED=y
 CONFIG_HEAP_TRACING_OFF=y
 # CONFIG_HEAP_TRACING_STANDALONE is not set
 # CONFIG_HEAP_TRACING_TOHOST is not set
+# CONFIG_HEAP_USE_HOOKS is not set
 # CONFIG_HEAP_ABORT_WHEN_ALLOCATION_FAILS is not set
+# CONFIG_HEAP_PLACE_FUNCTION_INTO_FLASH is not set
 # end of Heap memory debugging
 
+CONFIG_IEEE802154_CCA_THRESHOLD=-60
+CONFIG_IEEE802154_PENDING_TABLE_SIZE=20
+
 #
 # Log output
 #
@@ -1206,6 +1345,7 @@ CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT=y
 # CONFIG_LOG_MAXIMUM_LEVEL_DEBUG is not set
 # CONFIG_LOG_MAXIMUM_LEVEL_VERBOSE is not set
 CONFIG_LOG_MAXIMUM_LEVEL=3
+# CONFIG_LOG_MASTER_LEVEL is not set
 CONFIG_LOG_COLORS=y
 CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
 # CONFIG_LOG_TIMESTAMP_SOURCE_SYSTEM is not set
@@ -1217,6 +1357,7 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
 CONFIG_LWIP_LOCAL_HOSTNAME="bobbycar"
 # CONFIG_LWIP_NETIF_API is not set
 # CONFIG_LWIP_TCPIP_CORE_LOCKING is not set
+# CONFIG_LWIP_CHECK_THREAD_SAFETY is not set
 CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
 # CONFIG_LWIP_L2_TO_L3_COPY is not set
 # CONFIG_LWIP_IRAM_OPTIMIZATION is not set
@@ -1232,10 +1373,13 @@ CONFIG_LWIP_IP4_FRAG=y
 CONFIG_LWIP_IP6_FRAG=y
 # CONFIG_LWIP_IP4_REASSEMBLY is not set
 # CONFIG_LWIP_IP6_REASSEMBLY is not set
+CONFIG_LWIP_IP_REASS_MAX_PBUFS=10
 # CONFIG_LWIP_IP_FORWARD is not set
 # CONFIG_LWIP_STATS is not set
 CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
 CONFIG_LWIP_GARP_TMR_INTERVAL=60
+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_DISABLE_CLIENT_ID is not set
@@ -1243,16 +1387,19 @@ CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID=y
 # CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set
 CONFIG_LWIP_DHCP_OPTIONS_LEN=68
 CONFIG_LWIP_NUM_NETIF_CLIENT_DATA=0
+CONFIG_LWIP_DHCP_COARSE_TIMER_SECS=1
 
 #
 # DHCP server
 #
 CONFIG_LWIP_DHCPS=y
+CONFIG_LWIP_DHCPS_ENABLE_SUBNET_CHECK=y
 CONFIG_LWIP_DHCPS_LEASE_UNIT=60
 CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
 # end of DHCP server
 
 # CONFIG_LWIP_AUTOIP is not set
+CONFIG_LWIP_IPV4=y
 CONFIG_LWIP_IPV6=y
 CONFIG_LWIP_IPV6_AUTOCONFIG=y
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=3
@@ -1348,6 +1495,9 @@ CONFIG_LWIP_HOOK_IP6_ROUTE_NONE=y
 CONFIG_LWIP_HOOK_ND6_GET_GW_NONE=y
 # CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT is not set
 # CONFIG_LWIP_HOOK_ND6_GET_GW_CUSTOM is not set
+CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_NONE=y
+# CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_DEFAULT is not set
+# CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_CUSTOM is not set
 CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_NONE=y
 # CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT is not set
 # CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_CUSTOM is not set
@@ -1380,6 +1530,7 @@ CONFIG_MBEDTLS_ECDH_LEGACY_CONTEXT=y
 # CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK is not set
 # CONFIG_MBEDTLS_SSL_CONTEXT_SERIALIZATION is not set
 CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE=y
+CONFIG_MBEDTLS_PKCS7_C=y
 # end of mbedTLS v3.x related
 
 #
@@ -1476,6 +1627,7 @@ CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y
 CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
+CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y
 # CONFIG_MBEDTLS_POLY1305_C is not set
 # CONFIG_MBEDTLS_CHACHA20_C is not set
 # CONFIG_MBEDTLS_HKDF_C is not set
@@ -1526,6 +1678,17 @@ CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=y
 # OpenThread
 #
 # CONFIG_OPENTHREAD_ENABLED is not set
+
+#
+# Thread Operational Dataset
+#
+CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread-ESP"
+CONFIG_OPENTHREAD_NETWORK_CHANNEL=15
+CONFIG_OPENTHREAD_NETWORK_PANID=0x1234
+CONFIG_OPENTHREAD_NETWORK_EXTPANID="dead00beef00cafe"
+CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff"
+CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
+# end of Thread Operational Dataset
 # end of OpenThread
 
 #
@@ -1549,6 +1712,14 @@ CONFIG_PTHREAD_TASK_CORE_DEFAULT=-1
 CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
 # end of PThreads
 
+#
+# MMU Config
+#
+CONFIG_MMU_PAGE_SIZE_64KB=y
+CONFIG_MMU_PAGE_MODE="64KB"
+CONFIG_MMU_PAGE_SIZE=0x10000
+# end of MMU Config
+
 #
 # SPI Flash driver
 #
@@ -1578,6 +1749,11 @@ CONFIG_SPI_FLASH_BROWNOUT_RESET=y
 #
 # Auto-detect flash chips
 #
+CONFIG_SPI_FLASH_VENDOR_XMC_SUPPORTED=y
+CONFIG_SPI_FLASH_VENDOR_GD_SUPPORTED=y
+CONFIG_SPI_FLASH_VENDOR_ISSI_SUPPORTED=y
+CONFIG_SPI_FLASH_VENDOR_MXIC_SUPPORTED=y
+CONFIG_SPI_FLASH_VENDOR_WINBOND_SUPPORTED=y
 CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y
 CONFIG_SPI_FLASH_SUPPORT_MXIC_CHIP=y
 CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y
@@ -1656,6 +1832,11 @@ CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
 # CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL is not set
 # end of Unity unit testing library
 
+#
+# Root Hub configuration
+#
+# end of Root Hub configuration
+
 #
 # Virtual file system
 #
@@ -1679,25 +1860,10 @@ CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
 CONFIG_WIFI_PROV_BLE_SEC_CONN=y
 CONFIG_WIFI_PROV_BLE_FORCE_ENCRYPTION=y
 # CONFIG_WIFI_PROV_KEEP_BLE_ON_AFTER_PROV is not set
+CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
+# CONFIG_WIFI_PROV_STA_FAST_SCAN is not set
 # end of Wi-Fi Provisioning Manager
 
-#
-# Supplicant
-#
-CONFIG_WPA_MBEDTLS_CRYPTO=y
-CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
-# CONFIG_WPA_WAPI_PSK is not set
-# CONFIG_WPA_SUITE_B_192 is not set
-# CONFIG_WPA_DEBUG_PRINT is not set
-# CONFIG_WPA_TESTING_OPTIONS is not set
-# CONFIG_WPA_WPS_STRICT is not set
-# CONFIG_WPA_11KV_SUPPORT is not set
-# CONFIG_WPA_MBO_SUPPORT is not set
-# CONFIG_WPA_DPP_SUPPORT is not set
-# CONFIG_WPA_11R_SUPPORT is not set
-# CONFIG_WPA_WPS_SOFTAP_REGISTRAR is not set
-# end of Supplicant
-
 #
 # ESP-ASIO
 #
@@ -1706,6 +1872,13 @@ CONFIG_ASIO_USE_ESP_OPENSSL=y
 CONFIG_ASIO_SSL_BIO_SIZE=1024
 # end of ESP-ASIO
 
+#
+# esp-modem
+#
+CONFIG_ESP_MODEM_CMUX_DEFRAGMENT_PAYLOAD=y
+CONFIG_ESP_MODEM_CMUX_DELAY_AFTER_DLCI_SETUP=0
+# end of esp-modem
+
 #
 # ESP WebSocket client
 #
@@ -1718,15 +1891,18 @@ CONFIG_ASIO_SSL_BIO_SIZE=1024
 CONFIG_MDNS_MAX_INTERFACES=3
 CONFIG_MDNS_MAX_SERVICES=10
 CONFIG_MDNS_TASK_PRIORITY=1
+CONFIG_MDNS_ACTION_QUEUE_LEN=16
 CONFIG_MDNS_TASK_STACK_SIZE=4096
 # CONFIG_MDNS_TASK_AFFINITY_NO_AFFINITY is not set
 CONFIG_MDNS_TASK_AFFINITY_CPU0=y
 # CONFIG_MDNS_TASK_AFFINITY_CPU1 is not set
 CONFIG_MDNS_TASK_AFFINITY=0x0
 CONFIG_MDNS_SERVICE_ADD_TIMEOUT_MS=2000
-# CONFIG_MDNS_STRICT_MODE is not set
 CONFIG_MDNS_TIMER_PERIOD_MS=100
 # CONFIG_MDNS_NETWORKING_SOCKET is not set
+# CONFIG_MDNS_SKIP_SUPPRESSING_OWN_QUERIES is not set
+# CONFIG_MDNS_ENABLE_DEBUG_PRINTS is not set
+# CONFIG_MDNS_RESPOND_REVERSE_QUERIES is not set
 CONFIG_MDNS_MULTIPLE_INSTANCE=y
 
 #
@@ -1789,20 +1965,6 @@ CONFIG_TFT_RST=2
 # CONFIG_ENABLE_BL is not set
 # end of Control Pin configuration
 
-#
-# Fonts
-#
-# CONFIG_TFT_LOAD_GLCD is not set
-CONFIG_TFT_LOAD_FONT2=y
-CONFIG_TFT_LOAD_FONT4=y
-CONFIG_TFT_LOAD_FONT6=y
-CONFIG_TFT_LOAD_FONT7=y
-CONFIG_TFT_LOAD_FONT8=y
-CONFIG_TFT_LOAD_GFXFF=y
-CONFIG_TFT_SMOOTH_FONT=y
-# CONFIG_TFT_IS_AUTOBAHN is not set
-# end of Fonts
-
 #
 # Touch screen configuration
 #
@@ -1825,9 +1987,26 @@ CONFIG_NIMBLE_CPP_LOG_LEVEL=3
 # CONFIG_NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED is not set
 CONFIG_NIMBLE_CPP_ATT_VALUE_INIT_LENGTH=20
 # end of ESP-NimBLE-CPP configuration
+
+#
+# espfontlib
+#
+# CONFIG_TFT_LOAD_GLCD is not set
+CONFIG_TFT_LOAD_FONT2=y
+CONFIG_TFT_LOAD_FONT4=y
+CONFIG_TFT_LOAD_FONT6=y
+CONFIG_TFT_LOAD_FONT7=y
+CONFIG_TFT_LOAD_FONT8=y
+CONFIG_TFT_LOAD_GFXFF=y
+CONFIG_TFT_SMOOTH_FONT=y
+# CONFIG_TFT_IS_AUTOBAHN is not set
+# end of espfontlib
 # end of Component config
 
+# CONFIG_IDF_EXPERIMENTAL_FEATURES is not set
+
 # Deprecated options for backward compatibility
+# CONFIG_APP_BUILD_TYPE_ELF_RAM is not set
 # CONFIG_NO_BLOBS is not set
 # CONFIG_ESP32_NO_BLOBS is not set
 # CONFIG_ESP32_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set
@@ -1848,6 +2027,7 @@ CONFIG_FLASHMODE_DIO=y
 CONFIG_MONITOR_BAUD=115200
 # CONFIG_OPTIMIZATION_LEVEL_DEBUG is not set
 # CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
+# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set
 CONFIG_OPTIMIZATION_LEVEL_RELEASE=y
 CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
 CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y
@@ -1890,11 +2070,11 @@ CONFIG_NIMBLE_GAP_DEVICE_NAME_MAX_LEN=31
 CONFIG_NIMBLE_ATT_PREFERRED_MTU=256
 CONFIG_NIMBLE_SVC_GAP_APPEARANCE=0
 CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT=12
-CONFIG_NIMBLE_ACL_BUF_COUNT=20
+CONFIG_BT_NIMBLE_ACL_BUF_COUNT=20
-CONFIG_NIMBLE_ACL_BUF_SIZE=255
+CONFIG_BT_NIMBLE_ACL_BUF_SIZE=255
-CONFIG_NIMBLE_HCI_EVT_BUF_SIZE=70
+CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
-CONFIG_NIMBLE_HCI_EVT_HI_BUF_COUNT=30
+CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=30
-CONFIG_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
+CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
 CONFIG_NIMBLE_HS_FLOW_CTRL=y
 CONFIG_NIMBLE_HS_FLOW_CTRL_ITVL=1000
 CONFIG_NIMBLE_HS_FLOW_CTRL_THRESH=2
@@ -1926,6 +2106,9 @@ CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM=100
 CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 CONFIG_ADC2_DISABLE_DAC=y
 # CONFIG_MCPWM_ISR_IN_IRAM is not set
+CONFIG_SW_COEXIST_ENABLE=y
+CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y
+CONFIG_ESP_WIFI_SW_COEXIST_ENABLE=y
 # CONFIG_EVENT_LOOP_PROFILING is not set
 CONFIG_POST_EVENTS_FROM_ISR=y
 CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
@@ -1980,6 +2163,7 @@ CONFIG_CONSOLE_UART_BAUDRATE=115200
 CONFIG_INT_WDT=y
 CONFIG_INT_WDT_TIMEOUT_MS=300
 CONFIG_INT_WDT_CHECK_CPU1=y
+CONFIG_TASK_WDT=y
 CONFIG_ESP_TASK_WDT=y
 # CONFIG_TASK_WDT_PANIC is not set
 CONFIG_TASK_WDT_TIMEOUT_S=5
@@ -2010,7 +2194,41 @@ CONFIG_ESP32_BROWNOUT_DET_LVL=0
 # CONFIG_DISABLE_BASIC_ROM_CONSOLE is not set
 CONFIG_IPC_TASK_STACK_SIZE=1024
 CONFIG_TIMER_TASK_STACK_SIZE=3584
-CONFIG_SW_COEXIST_ENABLE=y
+CONFIG_ESP32_WIFI_ENABLED=y
+CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
+CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
+# CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
+CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
+# CONFIG_ESP32_WIFI_CSI_ENABLED is not set
+CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP32_WIFI_TX_BA_WIN=6
+CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP32_WIFI_RX_BA_WIN=6
+CONFIG_ESP32_WIFI_RX_BA_WIN=6
+# CONFIG_ESP32_WIFI_NVS_ENABLED is not set
+CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y
+# CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set
+CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
+CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
+CONFIG_ESP32_WIFI_IRAM_OPT=y
+CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
+CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y
+CONFIG_ESP32_WIFI_ENABLE_WPA3_OWE_STA=y
+CONFIG_WPA_MBEDTLS_CRYPTO=y
+CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
+# CONFIG_WPA_WAPI_PSK is not set
+# CONFIG_WPA_SUITE_B_192 is not set
+# CONFIG_WPA_11KV_SUPPORT is not set
+# CONFIG_WPA_MBO_SUPPORT is not set
+# CONFIG_WPA_DPP_SUPPORT is not set
+# CONFIG_WPA_11R_SUPPORT is not set
+# CONFIG_WPA_WPS_SOFTAP_REGISTRAR is not set
+# CONFIG_WPA_WPS_STRICT is not set
+# CONFIG_WPA_DEBUG_PRINT is not set
+# CONFIG_WPA_TESTING_OPTIONS is not set
 # CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
 # CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
 CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y

configs/sdkconfig_mick

@@ -1,6 +1,6 @@
 #
 # Automatically generated file. DO NOT EDIT.
-# Espressif IoT Development Framework (ESP-IDF) Project Configuration
+# Espressif IoT Development Framework (ESP-IDF) 5.2.0 Project Configuration
 #
 CONFIG_SOC_BROWNOUT_RESET_SUPPORTED="Not determined"
 CONFIG_SOC_TWAI_BRP_DIV_SUPPORTED="Not determined"
@@ -8,7 +8,9 @@ CONFIG_SOC_DPORT_WORKAROUND="Not determined"
 CONFIG_SOC_CAPS_ECO_VER_MAX=301
 CONFIG_SOC_ADC_SUPPORTED=y
 CONFIG_SOC_DAC_SUPPORTED=y
+CONFIG_SOC_UART_SUPPORTED=y
 CONFIG_SOC_MCPWM_SUPPORTED=y
+CONFIG_SOC_GPTIMER_SUPPORTED=y
 CONFIG_SOC_SDMMC_HOST_SUPPORTED=y
 CONFIG_SOC_BT_SUPPORTED=y
 CONFIG_SOC_PCNT_SUPPORTED=y
@@ -24,6 +26,7 @@ CONFIG_SOC_RTC_MEM_SUPPORTED=y
 CONFIG_SOC_I2S_SUPPORTED=y
 CONFIG_SOC_RMT_SUPPORTED=y
 CONFIG_SOC_SDM_SUPPORTED=y
+CONFIG_SOC_GPSPI_SUPPORTED=y
 CONFIG_SOC_LEDC_SUPPORTED=y
 CONFIG_SOC_I2C_SUPPORTED=y
 CONFIG_SOC_SUPPORT_COEXISTENCE=y
@@ -33,6 +36,9 @@ CONFIG_SOC_SHA_SUPPORTED=y
 CONFIG_SOC_FLASH_ENC_SUPPORTED=y
 CONFIG_SOC_SECURE_BOOT_SUPPORTED=y
 CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y
+CONFIG_SOC_BOD_SUPPORTED=y
+CONFIG_SOC_ULP_FSM_SUPPORTED=y
+CONFIG_SOC_CLK_TREE_SUPPORTED=y
 CONFIG_SOC_DPORT_WORKAROUND_DIS_INTERRUPT_LVL=5
 CONFIG_SOC_XTAL_SUPPORT_26M=y
 CONFIG_SOC_XTAL_SUPPORT_40M=y
@@ -49,12 +55,13 @@ CONFIG_SOC_ADC_DIGI_MIN_BITWIDTH=9
 CONFIG_SOC_ADC_DIGI_MAX_BITWIDTH=12
 CONFIG_SOC_ADC_DIGI_RESULT_BYTES=2
 CONFIG_SOC_ADC_DIGI_DATA_BYTES_PER_CONV=4
+CONFIG_SOC_ADC_DIGI_MONITOR_NUM=0
 CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_HIGH=2
 CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=20
 CONFIG_SOC_ADC_RTC_MIN_BITWIDTH=9
 CONFIG_SOC_ADC_RTC_MAX_BITWIDTH=12
 CONFIG_SOC_SHARED_IDCACHE_SUPPORTED=y
-CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=5
+CONFIG_SOC_IDCACHE_PER_CORE=y
 CONFIG_SOC_CPU_CORES_NUM=2
 CONFIG_SOC_CPU_INTR_NUM=32
 CONFIG_SOC_CPU_HAS_FPU=y
@@ -68,14 +75,15 @@ CONFIG_SOC_GPIO_PORT=1
 CONFIG_SOC_GPIO_PIN_COUNT=40
 CONFIG_SOC_GPIO_VALID_GPIO_MASK=0xFFFFFFFFFF
 CONFIG_SOC_GPIO_VALID_DIGITAL_IO_PAD_MASK=0xEF0FEA
-CONFIG_SOC_GPIO_SUPPORT_SLP_SWITCH=y
 CONFIG_SOC_I2C_NUM=2
 CONFIG_SOC_I2C_FIFO_LEN=32
+CONFIG_SOC_I2C_CMD_REG_NUM=16
 CONFIG_SOC_I2C_SUPPORT_SLAVE=y
 CONFIG_SOC_I2C_SUPPORT_APB=y
 CONFIG_SOC_I2S_NUM=2
 CONFIG_SOC_I2S_HW_VERSION_1=y
 CONFIG_SOC_I2S_SUPPORTS_APLL=y
+CONFIG_SOC_I2S_SUPPORTS_PLL_F160M=y
 CONFIG_SOC_I2S_SUPPORTS_PDM=y
 CONFIG_SOC_I2S_SUPPORTS_PDM_TX=y
 CONFIG_SOC_I2S_PDM_MAX_TX_LINES=1
@@ -96,7 +104,6 @@ CONFIG_SOC_LEDC_SUPPORT_REF_TICK=y
 CONFIG_SOC_LEDC_SUPPORT_HS_MODE=y
 CONFIG_SOC_LEDC_CHANNEL_NUM=8
 CONFIG_SOC_LEDC_TIMER_BIT_WIDTH=20
-CONFIG_SOC_LEDC_GAMMA_FADE_RANGE_MAX=1
 CONFIG_SOC_MCPWM_GROUPS=2
 CONFIG_SOC_MCPWM_TIMERS_PER_GROUP=3
 CONFIG_SOC_MCPWM_OPERATORS_PER_GROUP=3
@@ -107,7 +114,8 @@ CONFIG_SOC_MCPWM_GPIO_FAULTS_PER_GROUP=3
 CONFIG_SOC_MCPWM_CAPTURE_TIMERS_PER_GROUP=y
 CONFIG_SOC_MCPWM_CAPTURE_CHANNELS_PER_TIMER=3
 CONFIG_SOC_MCPWM_GPIO_SYNCHROS_PER_GROUP=3
-CONFIG_SOC_MCPWM_CLK_SUPPORT_PLL160M=y
+CONFIG_SOC_MMU_PERIPH_NUM=2
+CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=3
 CONFIG_SOC_MPU_MIN_REGION_SIZE=0x20000000
 CONFIG_SOC_MPU_REGIONS_MAX_NUM=8
 CONFIG_SOC_PCNT_GROUPS=1
@@ -128,11 +136,13 @@ CONFIG_SOC_RTCIO_HOLD_SUPPORTED=y
 CONFIG_SOC_RTCIO_WAKE_SUPPORTED=y
 CONFIG_SOC_SDM_GROUPS=1
 CONFIG_SOC_SDM_CHANNELS_PER_GROUP=8
+CONFIG_SOC_SDM_CLK_SUPPORT_APB=y
 CONFIG_SOC_SPI_HD_BOTH_INOUT_SUPPORTED=y
 CONFIG_SOC_SPI_AS_CS_SUPPORTED=y
 CONFIG_SOC_SPI_PERIPH_NUM=3
 CONFIG_SOC_SPI_DMA_CHAN_NUM=2
 CONFIG_SOC_SPI_MAX_CS_NUM=3
+CONFIG_SOC_SPI_SUPPORT_CLK_APB=y
 CONFIG_SOC_SPI_MAXIMUM_BUFFER_SIZE=64
 CONFIG_SOC_SPI_MAX_PRE_DIVIDER=8192
 CONFIG_SOC_MEMSPI_SRC_FREQ_80M_SUPPORTED=y
@@ -152,6 +162,7 @@ CONFIG_SOC_TWAI_BRP_MIN=2
 CONFIG_SOC_TWAI_CLK_SUPPORT_APB=y
 CONFIG_SOC_TWAI_SUPPORT_MULTI_ADDRESS_LAYOUT=y
 CONFIG_SOC_UART_NUM=3
+CONFIG_SOC_UART_HP_NUM=3
 CONFIG_SOC_UART_SUPPORT_APB_CLK=y
 CONFIG_SOC_UART_SUPPORT_REF_TICK=y
 CONFIG_SOC_UART_FIFO_LEN=128
@@ -159,10 +170,13 @@ CONFIG_SOC_UART_BITRATE_MAX=5000000
 CONFIG_SOC_SPIRAM_SUPPORTED=y
 CONFIG_SOC_SPI_MEM_SUPPORT_CONFIG_GPIO_BY_EFUSE=y
 CONFIG_SOC_SHA_SUPPORT_PARALLEL_ENG=y
+CONFIG_SOC_SHA_ENDIANNESS_BE=y
 CONFIG_SOC_SHA_SUPPORT_SHA1=y
 CONFIG_SOC_SHA_SUPPORT_SHA256=y
 CONFIG_SOC_SHA_SUPPORT_SHA384=y
 CONFIG_SOC_SHA_SUPPORT_SHA512=y
+CONFIG_SOC_MPI_MEM_BLOCKS_NUM=4
+CONFIG_SOC_MPI_OPERATIONS_NUM=y
 CONFIG_SOC_RSA_MAX_BIT_LEN=4096
 CONFIG_SOC_AES_SUPPORT_AES_128=y
 CONFIG_SOC_AES_SUPPORT_AES_192=y
@@ -171,11 +185,17 @@ CONFIG_SOC_SECURE_BOOT_V1=y
 CONFIG_SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS=y
 CONFIG_SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX=32
 CONFIG_SOC_PHY_DIG_REGS_MEM_SIZE=21
+CONFIG_SOC_PM_SUPPORT_EXT0_WAKEUP=y
+CONFIG_SOC_PM_SUPPORT_EXT1_WAKEUP=y
 CONFIG_SOC_PM_SUPPORT_EXT_WAKEUP=y
 CONFIG_SOC_PM_SUPPORT_TOUCH_SENSOR_WAKEUP=y
 CONFIG_SOC_PM_SUPPORT_RTC_PERIPH_PD=y
 CONFIG_SOC_PM_SUPPORT_RTC_FAST_MEM_PD=y
 CONFIG_SOC_PM_SUPPORT_RTC_SLOW_MEM_PD=y
+CONFIG_SOC_PM_SUPPORT_RC_FAST_PD=y
+CONFIG_SOC_PM_SUPPORT_VDDSDIO_PD=y
+CONFIG_SOC_PM_SUPPORT_MODEM_PD=y
+CONFIG_SOC_CONFIGURABLE_VDDSDIO_SUPPORTED=y
 CONFIG_SOC_CLK_APLL_SUPPORTED=y
 CONFIG_SOC_APLL_MULTIPLIER_OUT_MIN_HZ=350000000
 CONFIG_SOC_APLL_MULTIPLIER_OUT_MAX_HZ=500000000
@@ -184,18 +204,25 @@ CONFIG_SOC_APLL_MAX_HZ=125000000
 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
+CONFIG_SOC_CLK_XTAL32K_SUPPORTED=y
 CONFIG_SOC_SDMMC_USE_IOMUX=y
 CONFIG_SOC_SDMMC_NUM_SLOTS=2
 CONFIG_SOC_WIFI_WAPI_SUPPORT=y
 CONFIG_SOC_WIFI_CSI_SUPPORT=y
 CONFIG_SOC_WIFI_MESH_SUPPORT=y
+CONFIG_SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW=y
+CONFIG_SOC_WIFI_NAN_SUPPORT=y
 CONFIG_SOC_BLE_SUPPORTED=y
 CONFIG_SOC_BLE_MESH_SUPPORTED=y
 CONFIG_SOC_BT_CLASSIC_SUPPORTED=y
+CONFIG_SOC_BLUFI_SUPPORTED=y
+CONFIG_SOC_ULP_HAS_ADC=y
 CONFIG_IDF_CMAKE=y
+CONFIG_IDF_TOOLCHAIN="gcc"
 CONFIG_IDF_TARGET_ARCH_XTENSA=y
 CONFIG_IDF_TARGET_ARCH="xtensa"
 CONFIG_IDF_TARGET="esp32"
+CONFIG_IDF_INIT_VERSION="5.2.0"
 CONFIG_IDF_TARGET_ESP32=y
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
@@ -203,7 +230,7 @@ CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 # Build type
 #
 CONFIG_APP_BUILD_TYPE_APP_2NDBOOT=y
-# CONFIG_APP_BUILD_TYPE_ELF_RAM is not set
+# CONFIG_APP_BUILD_TYPE_RAM is not set
 CONFIG_APP_BUILD_GENERATE_BINARIES=y
 CONFIG_APP_BUILD_BOOTLOADER=y
 CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
@@ -216,6 +243,14 @@ CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
 #
 # Bootloader config
 #
+
+#
+# Bootloader manager
+#
+CONFIG_BOOTLOADER_COMPILE_TIME_DATE=y
+CONFIG_BOOTLOADER_PROJECT_VER=1
+# end of Bootloader manager
+
 CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x1000
 CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set
@@ -268,7 +303,9 @@ CONFIG_ESP_ROM_HAS_CRC_LE=y
 CONFIG_ESP_ROM_HAS_CRC_BE=y
 CONFIG_ESP_ROM_HAS_MZ_CRC32=y
 CONFIG_ESP_ROM_HAS_JPEG_DECODE=y
+CONFIG_ESP_ROM_HAS_UART_BUF_SWITCH=y
 CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y
+CONFIG_ESP_ROM_HAS_NEWLIB_NANO_FORMAT=y
 
 #
 # Serial flasher config
@@ -370,6 +407,12 @@ CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP_INFO=y
 CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP=3
 # end of Simple Async HTTP Request
 
+#
+# ESPAsyncOTA
+#
+# CONFIG_ESPASYNCOTA_DISABLE_HEAP_CAPS_LOG is not set
+# end of ESPAsyncOTA
+
 #
 # espchrono Configuration
 #
@@ -412,12 +455,13 @@ CONFIG_LOG_LOCAL_LEVEL_WIFI_STACK_INFO=y
 # CONFIG_LOG_LOCAL_LEVEL_WIFI_STACK_VERBOSE is not set
 CONFIG_LOG_LOCAL_LEVEL_WIFI_STACK=3
 # CONFIG_WIFI_DUAL_ANT is not set
+# CONFIG_WIFI_LOG_WORKAROUND is not set
 # end of ESP WiFi Stack settings
 
 #
 # Compiler options
 #
-# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set
+# CONFIG_COMPILER_OPTIMIZATION_DEBUG is not set
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 # CONFIG_COMPILER_OPTIMIZATION_PERF is not set
 # CONFIG_COMPILER_OPTIMIZATION_NONE is not set
@@ -435,7 +479,10 @@ CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
 # CONFIG_COMPILER_STACK_CHECK_MODE_STRONG is not set
 # CONFIG_COMPILER_STACK_CHECK_MODE_ALL is not set
 # CONFIG_COMPILER_WARN_WRITE_STRINGS is not set
+# CONFIG_COMPILER_DISABLE_GCC12_WARNINGS is not set
 # CONFIG_COMPILER_DUMP_RTL_FILES is not set
+CONFIG_COMPILER_RT_LIB_GCCLIB=y
+CONFIG_COMPILER_RT_LIB_NAME="gcc"
 # end of Compiler options
 
 #
@@ -506,11 +553,11 @@ CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT=12
 CONFIG_BT_NIMBLE_MSYS_1_BLOCK_SIZE=256
 CONFIG_BT_NIMBLE_MSYS_2_BLOCK_COUNT=24
 CONFIG_BT_NIMBLE_MSYS_2_BLOCK_SIZE=320
-CONFIG_BT_NIMBLE_ACL_BUF_COUNT=20
+CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=20
-CONFIG_BT_NIMBLE_ACL_BUF_SIZE=255
+CONFIG_BT_NIMBLE_TRANSPORT_ACL_SIZE=255
-CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
+CONFIG_BT_NIMBLE_TRANSPORT_EVT_SIZE=70
-CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=30
+CONFIG_BT_NIMBLE_TRANSPORT_EVT_COUNT=30
-CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
+CONFIG_BT_NIMBLE_TRANSPORT_EVT_DISCARD_COUNT=8
 # end of Memory Settings
 
 CONFIG_BT_NIMBLE_GATT_MAX_PROCS=4
@@ -522,21 +569,52 @@ CONFIG_BT_NIMBLE_RPA_TIMEOUT=900
 # CONFIG_BT_NIMBLE_MESH is not set
 CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS=y
 CONFIG_BT_NIMBLE_HS_STOP_TIMEOUT_MS=2000
+# CONFIG_BT_NIMBLE_HOST_BASED_PRIVACY is not set
 # CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT is not set
-CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=y
-CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY=y
-CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY=y
-# CONFIG_BT_NIMBLE_EXT_ADV is not set
-CONFIG_BT_NIMBLE_MAX_PERIODIC_SYNCS=0
-# CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EN is not set
-CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_DIS=y
-# CONFIG_BT_NIMBLE_52_FEATURE_SUPPORT is not set
 CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EFF=0
 CONFIG_BT_NIMBLE_WHITELIST_SIZE=12
 # CONFIG_BT_NIMBLE_TEST_THROUGHPUT_TEST is not set
 # CONFIG_BT_NIMBLE_BLUFI_ENABLE is not set
 CONFIG_BT_NIMBLE_USE_ESP_TIMER=y
 CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE=y
+# CONFIG_BT_NIMBLE_BLE_GATT_BLOB_TRANSFER is not set
+
+#
+# GAP Service
+#
+
+#
+# GAP Appearance write permissions
+#
+# CONFIG_BT_NIMBLE_SVC_GAP_APPEAR_WRITE is not set
+# end of GAP Appearance write permissions
+
+CONFIG_BT_NIMBLE_SVC_GAP_APPEAR_WRITE_PERM=0
+CONFIG_BT_NIMBLE_SVC_GAP_APPEAR_WRITE_PERM_ENC=0
+CONFIG_BT_NIMBLE_SVC_GAP_APPEAR_WRITE_PERM_ATHN=0
+CONFIG_BT_NIMBLE_SVC_GAP_APPEAR_WRITE_PERM_ATHR=0
+CONFIG_BT_NIMBLE_SVC_GAP_CAR_CHAR_NOT_SUPP=y
+# CONFIG_BT_NIMBLE_SVC_GAP_CAR_NOT_SUPP is not set
+# CONFIG_BT_NIMBLE_SVC_GAP_CAR_SUPP is not set
+CONFIG_BT_NIMBLE_SVC_GAP_CENT_ADDR_RESOLUTION=-1
+
+#
+# GAP device name write permissions
+#
+# CONFIG_BT_NIMBLE_SVC_GAP_NAME_WRITE is not set
+# end of GAP device name write permissions
+
+CONFIG_BT_NIMBLE_SVC_GAP_NAME_WRITE_PERM=0
+CONFIG_BT_NIMBLE_SVC_GAP_NAME_WRITE_PERM_ENC=0
+CONFIG_BT_NIMBLE_SVC_GAP_NAME_WRITE_PERM_AUTHEN=0
+CONFIG_BT_NIMBLE_SVC_GAP_NAME_WRITE_PERM_AUTHOR=0
+CONFIG_BT_NIMBLE_SVC_GAP_PPCP_MAX_CONN_INTERVAL=0
+CONFIG_BT_NIMBLE_SVC_GAP_PPCP_MIN_CONN_INTERVAL=0
+CONFIG_BT_NIMBLE_SVC_GAP_PPCP_SLAVE_LATENCY=0
+CONFIG_BT_NIMBLE_SVC_GAP_PPCP_SUPERVISION_TMO=0
+# end of GAP Service
+
+# CONFIG_BT_NIMBLE_VS_SUPPORT is not set
 # end of NimBLE Options
 
 #
@@ -575,6 +653,7 @@ CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE=y
 # CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE is not set
 CONFIG_BTDM_SCAN_DUPL_TYPE=0
 CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=200
+CONFIG_BTDM_SCAN_DUPL_CACHE_REFRESH_PERIOD=0
 # CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN is not set
 CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
@@ -624,6 +703,7 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST is not set
 # CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID is not set
 # CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT is not set
+CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM=y
 # end of TWAI Configuration
 
 #
@@ -650,6 +730,7 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 #
 # GPTimer Configuration
 #
+CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM=y
 # CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM is not set
 # CONFIG_GPTIMER_ISR_IRAM_SAFE is not set
 # CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set
@@ -699,6 +780,12 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # CONFIG_DAC_ENABLE_DEBUG_LOG is not set
 CONFIG_DAC_DMA_AUTO_16BIT_ALIGN=y
 # end of DAC Configuration
+
+#
+# LEDC Configuration
+#
+# CONFIG_LEDC_CTRL_FUNC_IN_IRAM is not set
+# end of LEDC Configuration
 # end of Driver Configurations
 
 #
@@ -740,6 +827,12 @@ CONFIG_ADC_CALI_LUT_ENABLE=y
 CONFIG_ADC_DISABLE_DAC_OUTPUT=y
 # end of ADC and ADC Calibration
 
+#
+# Wireless Coexistence
+#
+CONFIG_ESP_COEX_SW_COEXIST_ENABLE=y
+# end of Wireless Coexistence
+
 #
 # Common ESP-related
 #
@@ -765,6 +858,7 @@ CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y
 #
 # GDB Stub
 #
+# CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME is not set
 # end of GDB Stub
 
 #
@@ -835,6 +929,7 @@ CONFIG_ESP_MAC_UNIVERSAL_MAC_ADDRESSES_FOUR=y
 # CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_TWO is not set
 CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y
 CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4
+# CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR is not set
 # end of MAC Config
 
 #
@@ -843,8 +938,9 @@ CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4
 CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
 CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
 # CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set
-# CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND is not set
 CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=2000
+# CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION is not set
+# CONFIG_ESP_SLEEP_DEBUG is not set
 # end of Sleep Config
 
 #
@@ -860,17 +956,9 @@ CONFIG_RTC_CLK_CAL_CYCLES=1024
 #
 # Peripheral Control
 #
-# CONFIG_PERIPH_CTRL_FUNC_IN_IRAM is not set
+CONFIG_PERIPH_CTRL_FUNC_IN_IRAM=y
 # end of Peripheral Control
 
-#
-# MMU Config
-#
-CONFIG_MMU_PAGE_SIZE_64KB=y
-CONFIG_MMU_PAGE_MODE="64KB"
-CONFIG_MMU_PAGE_SIZE=0x10000
-# end of MMU Config
-
 #
 # Main XTAL Config
 #
@@ -903,10 +991,17 @@ CONFIG_LCD_PANEL_IO_FORMAT_BUF_SIZE=32
 CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120
 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_RECEIVE_REPORT_ERRORS is not set
 # CONFIG_ESP_NETIF_L2_TAP is not set
 # CONFIG_ESP_NETIF_BRIDGE_EN is not set
 # end of ESP NETIF Adapter
 
+#
+# Partition API Configuration
+#
+# end of Partition API Configuration
+
 #
 # PHY
 #
@@ -917,6 +1012,10 @@ CONFIG_ESP_PHY_DEFAULT_INIT_IF_INVALID=y
 CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20
 CONFIG_ESP_PHY_MAX_TX_POWER=20
 CONFIG_ESP_PHY_REDUCE_TX_POWER=y
+CONFIG_ESP_PHY_RF_CAL_PARTIAL=y
+# CONFIG_ESP_PHY_RF_CAL_NONE is not set
+# CONFIG_ESP_PHY_RF_CAL_FULL is not set
+CONFIG_ESP_PHY_CALIBRATION_MODE=0
 # end of PHY
 
 #
@@ -935,7 +1034,6 @@ CONFIG_ESP_PHY_REDUCE_TX_POWER=y
 # ESP Ringbuf
 #
 # CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH is not set
-# CONFIG_RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH is not set
 # end of ESP Ringbuf
 
 #
@@ -950,6 +1048,12 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
 # Memory
 #
 # CONFIG_ESP32_USE_FIXED_STATIC_RAM_SIZE is not set
+
+#
+# Non-backward compatible options
+#
+# CONFIG_ESP_SYSTEM_ESP32_SRAM1_REGION_AS_IRAM is not set
+# end of Non-backward compatible options
 # end of Memory
 
 #
@@ -963,7 +1067,7 @@ CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0
 CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
 # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
 # CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set
-# CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME is not set
+CONFIG_ESP_SYSTEM_PANIC_REBOOT_DELAY_SECONDS=0
 
 #
 # Memory protection
@@ -1034,6 +1138,11 @@ CONFIG_ESP_TIME_FUNCS_USE_RTC_TIMER=y
 CONFIG_ESP_TIME_FUNCS_USE_ESP_TIMER=y
 CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584
 CONFIG_ESP_TIMER_INTERRUPT_LEVEL=1
+# CONFIG_ESP_TIMER_SHOW_EXPERIMENTAL is not set
+CONFIG_ESP_TIMER_TASK_AFFINITY=0x0
+CONFIG_ESP_TIMER_TASK_AFFINITY_CPU0=y
+CONFIG_ESP_TIMER_ISR_AFFINITY=0x1
+CONFIG_ESP_TIMER_ISR_AFFINITY_CPU0=y
 # CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD is not set
 CONFIG_ESP_TIMER_IMPL_TG0_LAC=y
 # end of High resolution timer (esp_timer)
@@ -1041,34 +1150,55 @@ CONFIG_ESP_TIMER_IMPL_TG0_LAC=y
 #
 # Wi-Fi
 #
-CONFIG_ESP32_WIFI_ENABLED=y
+CONFIG_ESP_WIFI_ENABLED=y
-CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=10
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
+# CONFIG_ESP_WIFI_STATIC_TX_BUFFER is not set
-# CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER=y
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
+CONFIG_ESP_WIFI_TX_BUFFER_TYPE=1
-CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=32
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
+# CONFIG_ESP_WIFI_CSI_ENABLED is not set
-# CONFIG_ESP32_WIFI_CSI_ENABLED is not set
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP_WIFI_TX_BA_WIN=6
-CONFIG_ESP32_WIFI_TX_BA_WIN=6
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_RX_BA_WIN=6
-CONFIG_ESP32_WIFI_RX_BA_WIN=6
+# CONFIG_ESP_WIFI_NVS_ENABLED is not set
-# CONFIG_ESP32_WIFI_NVS_ENABLED is not set
+CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0=y
-CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y
+# CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1 is not set
-# CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set
+CONFIG_ESP_WIFI_SOFTAP_BEACON_MAX_LEN=752
-CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
+CONFIG_ESP_WIFI_MGMT_SBUF_NUM=32
-CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
+CONFIG_ESP_WIFI_IRAM_OPT=y
-CONFIG_ESP32_WIFI_IRAM_OPT=y
+CONFIG_ESP_WIFI_RX_IRAM_OPT=y
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
+CONFIG_ESP_WIFI_ENABLE_WPA3_SAE=y
-CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y
+CONFIG_ESP_WIFI_ENABLE_SAE_PK=y
-CONFIG_ESP32_WIFI_ENABLE_WPA3_OWE_STA=y
+CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT=y
+CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA=y
 # CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set
 CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE=y
 # CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
 # CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set
 CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=6
+# CONFIG_ESP_WIFI_NAN_ENABLE is not set
+CONFIG_ESP_WIFI_MBEDTLS_CRYPTO=y
+CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y
+# CONFIG_ESP_WIFI_WAPI_PSK is not set
+# CONFIG_ESP_WIFI_SUITE_B_192 is not set
+# CONFIG_ESP_WIFI_11KV_SUPPORT is not set
+# CONFIG_ESP_WIFI_MBO_SUPPORT is not set
+# CONFIG_ESP_WIFI_DPP_SUPPORT is not set
+# CONFIG_ESP_WIFI_11R_SUPPORT is not set
+# CONFIG_ESP_WIFI_WPS_SOFTAP_REGISTRAR is not set
+
+#
+# WPS Configuration Options
+#
+# CONFIG_ESP_WIFI_WPS_STRICT is not set
+# CONFIG_ESP_WIFI_WPS_PASSPHRASE is not set
+# end of WPS Configuration Options
+
+# CONFIG_ESP_WIFI_DEBUG_PRINT is not set
+# CONFIG_ESP_WIFI_TESTING_OPTIONS is not set
 # end of Wi-Fi
 
 #
@@ -1115,6 +1245,7 @@ CONFIG_FATFS_FS_LOCK=0
 CONFIG_FATFS_TIMEOUT_MS=10000
 CONFIG_FATFS_PER_FILE_CACHE=y
 # CONFIG_FATFS_USE_FASTSEEK is not set
+CONFIG_FATFS_VFS_FSTAT_BLKSIZE=0
 # end of FAT Filesystem support
 
 #
@@ -1165,6 +1296,7 @@ CONFIG_FREERTOS_SYSTICK_USES_CCOUNT=y
 CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y
 # end of Port
 
+CONFIG_FREERTOS_PORT=y
 CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
 CONFIG_FREERTOS_DEBUG_OCDAWARE=y
@@ -1178,6 +1310,8 @@ CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y
 # CONFIG_HAL_ASSERTION_SILENT is not set
 # CONFIG_HAL_ASSERTION_ENABLE is not set
 CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
+CONFIG_HAL_SPI_MASTER_FUNC_IN_IRAM=y
+CONFIG_HAL_SPI_SLAVE_FUNC_IN_IRAM=y
 # end of Hardware Abstraction Layer (HAL) and Low Level (LL)
 
 #
@@ -1189,9 +1323,14 @@ CONFIG_HEAP_POISONING_DISABLED=y
 CONFIG_HEAP_TRACING_OFF=y
 # CONFIG_HEAP_TRACING_STANDALONE is not set
 # CONFIG_HEAP_TRACING_TOHOST is not set
+# CONFIG_HEAP_USE_HOOKS is not set
 # CONFIG_HEAP_ABORT_WHEN_ALLOCATION_FAILS is not set
+# CONFIG_HEAP_PLACE_FUNCTION_INTO_FLASH is not set
 # end of Heap memory debugging
 
+CONFIG_IEEE802154_CCA_THRESHOLD=-60
+CONFIG_IEEE802154_PENDING_TABLE_SIZE=20
+
 #
 # Log output
 #
@@ -1206,6 +1345,7 @@ CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT=y
 # CONFIG_LOG_MAXIMUM_LEVEL_DEBUG is not set
 # CONFIG_LOG_MAXIMUM_LEVEL_VERBOSE is not set
 CONFIG_LOG_MAXIMUM_LEVEL=3
+# CONFIG_LOG_MASTER_LEVEL is not set
 CONFIG_LOG_COLORS=y
 CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
 # CONFIG_LOG_TIMESTAMP_SOURCE_SYSTEM is not set
@@ -1217,6 +1357,7 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
 CONFIG_LWIP_LOCAL_HOSTNAME="bobbycar"
 # CONFIG_LWIP_NETIF_API is not set
 # CONFIG_LWIP_TCPIP_CORE_LOCKING is not set
+# CONFIG_LWIP_CHECK_THREAD_SAFETY is not set
 CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
 # CONFIG_LWIP_L2_TO_L3_COPY is not set
 # CONFIG_LWIP_IRAM_OPTIMIZATION is not set
@@ -1232,10 +1373,13 @@ CONFIG_LWIP_IP4_FRAG=y
 CONFIG_LWIP_IP6_FRAG=y
 # CONFIG_LWIP_IP4_REASSEMBLY is not set
 # CONFIG_LWIP_IP6_REASSEMBLY is not set
+CONFIG_LWIP_IP_REASS_MAX_PBUFS=10
 # CONFIG_LWIP_IP_FORWARD is not set
 # CONFIG_LWIP_STATS is not set
 CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
 CONFIG_LWIP_GARP_TMR_INTERVAL=60
+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_DISABLE_CLIENT_ID is not set
@@ -1243,16 +1387,19 @@ CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID=y
 # CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set
 CONFIG_LWIP_DHCP_OPTIONS_LEN=68
 CONFIG_LWIP_NUM_NETIF_CLIENT_DATA=0
+CONFIG_LWIP_DHCP_COARSE_TIMER_SECS=1
 
 #
 # DHCP server
 #
 CONFIG_LWIP_DHCPS=y
+CONFIG_LWIP_DHCPS_ENABLE_SUBNET_CHECK=y
 CONFIG_LWIP_DHCPS_LEASE_UNIT=60
 CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
 # end of DHCP server
 
 # CONFIG_LWIP_AUTOIP is not set
+CONFIG_LWIP_IPV4=y
 CONFIG_LWIP_IPV6=y
 CONFIG_LWIP_IPV6_AUTOCONFIG=y
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=3
@@ -1348,6 +1495,9 @@ CONFIG_LWIP_HOOK_IP6_ROUTE_NONE=y
 CONFIG_LWIP_HOOK_ND6_GET_GW_NONE=y
 # CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT is not set
 # CONFIG_LWIP_HOOK_ND6_GET_GW_CUSTOM is not set
+CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_NONE=y
+# CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_DEFAULT is not set
+# CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_CUSTOM is not set
 CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_NONE=y
 # CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT is not set
 # CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_CUSTOM is not set
@@ -1380,6 +1530,7 @@ CONFIG_MBEDTLS_ECDH_LEGACY_CONTEXT=y
 # CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK is not set
 # CONFIG_MBEDTLS_SSL_CONTEXT_SERIALIZATION is not set
 CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE=y
+CONFIG_MBEDTLS_PKCS7_C=y
 # end of mbedTLS v3.x related
 
 #
@@ -1476,6 +1627,7 @@ CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y
 CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
+CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y
 # CONFIG_MBEDTLS_POLY1305_C is not set
 # CONFIG_MBEDTLS_CHACHA20_C is not set
 # CONFIG_MBEDTLS_HKDF_C is not set
@@ -1526,6 +1678,17 @@ CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=y
 # OpenThread
 #
 # CONFIG_OPENTHREAD_ENABLED is not set
+
+#
+# Thread Operational Dataset
+#
+CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread-ESP"
+CONFIG_OPENTHREAD_NETWORK_CHANNEL=15
+CONFIG_OPENTHREAD_NETWORK_PANID=0x1234
+CONFIG_OPENTHREAD_NETWORK_EXTPANID="dead00beef00cafe"
+CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff"
+CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
+# end of Thread Operational Dataset
 # end of OpenThread
 
 #
@@ -1549,6 +1712,14 @@ CONFIG_PTHREAD_TASK_CORE_DEFAULT=-1
 CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
 # end of PThreads
 
+#
+# MMU Config
+#
+CONFIG_MMU_PAGE_SIZE_64KB=y
+CONFIG_MMU_PAGE_MODE="64KB"
+CONFIG_MMU_PAGE_SIZE=0x10000
+# end of MMU Config
+
 #
 # SPI Flash driver
 #
@@ -1578,6 +1749,11 @@ CONFIG_SPI_FLASH_BROWNOUT_RESET=y
 #
 # Auto-detect flash chips
 #
+CONFIG_SPI_FLASH_VENDOR_XMC_SUPPORTED=y
+CONFIG_SPI_FLASH_VENDOR_GD_SUPPORTED=y
+CONFIG_SPI_FLASH_VENDOR_ISSI_SUPPORTED=y
+CONFIG_SPI_FLASH_VENDOR_MXIC_SUPPORTED=y
+CONFIG_SPI_FLASH_VENDOR_WINBOND_SUPPORTED=y
 CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y
 CONFIG_SPI_FLASH_SUPPORT_MXIC_CHIP=y
 CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y
@@ -1656,6 +1832,11 @@ CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
 # CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL is not set
 # end of Unity unit testing library
 
+#
+# Root Hub configuration
+#
+# end of Root Hub configuration
+
 #
 # Virtual file system
 #
@@ -1679,25 +1860,10 @@ CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
 CONFIG_WIFI_PROV_BLE_SEC_CONN=y
 CONFIG_WIFI_PROV_BLE_FORCE_ENCRYPTION=y
 # CONFIG_WIFI_PROV_KEEP_BLE_ON_AFTER_PROV is not set
+CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
+# CONFIG_WIFI_PROV_STA_FAST_SCAN is not set
 # end of Wi-Fi Provisioning Manager
 
-#
-# Supplicant
-#
-CONFIG_WPA_MBEDTLS_CRYPTO=y
-CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
-# CONFIG_WPA_WAPI_PSK is not set
-# CONFIG_WPA_SUITE_B_192 is not set
-# CONFIG_WPA_DEBUG_PRINT is not set
-# CONFIG_WPA_TESTING_OPTIONS is not set
-# CONFIG_WPA_WPS_STRICT is not set
-# CONFIG_WPA_11KV_SUPPORT is not set
-# CONFIG_WPA_MBO_SUPPORT is not set
-# CONFIG_WPA_DPP_SUPPORT is not set
-# CONFIG_WPA_11R_SUPPORT is not set
-# CONFIG_WPA_WPS_SOFTAP_REGISTRAR is not set
-# end of Supplicant
-
 #
 # ESP-ASIO
 #
@@ -1706,6 +1872,13 @@ CONFIG_ASIO_USE_ESP_OPENSSL=y
 CONFIG_ASIO_SSL_BIO_SIZE=1024
 # end of ESP-ASIO
 
+#
+# esp-modem
+#
+CONFIG_ESP_MODEM_CMUX_DEFRAGMENT_PAYLOAD=y
+CONFIG_ESP_MODEM_CMUX_DELAY_AFTER_DLCI_SETUP=0
+# end of esp-modem
+
 #
 # ESP WebSocket client
 #
@@ -1718,15 +1891,18 @@ CONFIG_ASIO_SSL_BIO_SIZE=1024
 CONFIG_MDNS_MAX_INTERFACES=3
 CONFIG_MDNS_MAX_SERVICES=10
 CONFIG_MDNS_TASK_PRIORITY=1
+CONFIG_MDNS_ACTION_QUEUE_LEN=16
 CONFIG_MDNS_TASK_STACK_SIZE=4096
 # CONFIG_MDNS_TASK_AFFINITY_NO_AFFINITY is not set
 CONFIG_MDNS_TASK_AFFINITY_CPU0=y
 # CONFIG_MDNS_TASK_AFFINITY_CPU1 is not set
 CONFIG_MDNS_TASK_AFFINITY=0x0
 CONFIG_MDNS_SERVICE_ADD_TIMEOUT_MS=2000
-# CONFIG_MDNS_STRICT_MODE is not set
 CONFIG_MDNS_TIMER_PERIOD_MS=100
 # CONFIG_MDNS_NETWORKING_SOCKET is not set
+# CONFIG_MDNS_SKIP_SUPPRESSING_OWN_QUERIES is not set
+# CONFIG_MDNS_ENABLE_DEBUG_PRINTS is not set
+# CONFIG_MDNS_RESPOND_REVERSE_QUERIES is not set
 CONFIG_MDNS_MULTIPLE_INSTANCE=y
 
 #
@@ -1789,20 +1965,6 @@ CONFIG_TFT_RST=2
 # CONFIG_ENABLE_BL is not set
 # end of Control Pin configuration
 
-#
-# Fonts
-#
-# CONFIG_TFT_LOAD_GLCD is not set
-CONFIG_TFT_LOAD_FONT2=y
-CONFIG_TFT_LOAD_FONT4=y
-CONFIG_TFT_LOAD_FONT6=y
-CONFIG_TFT_LOAD_FONT7=y
-CONFIG_TFT_LOAD_FONT8=y
-CONFIG_TFT_LOAD_GFXFF=y
-CONFIG_TFT_SMOOTH_FONT=y
-# CONFIG_TFT_IS_AUTOBAHN is not set
-# end of Fonts
-
 #
 # Touch screen configuration
 #
@@ -1825,9 +1987,26 @@ CONFIG_NIMBLE_CPP_LOG_LEVEL=0
 # CONFIG_NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED is not set
 CONFIG_NIMBLE_CPP_ATT_VALUE_INIT_LENGTH=20
 # end of ESP-NimBLE-CPP configuration
+
+#
+# espfontlib
+#
+# CONFIG_TFT_LOAD_GLCD is not set
+CONFIG_TFT_LOAD_FONT2=y
+CONFIG_TFT_LOAD_FONT4=y
+CONFIG_TFT_LOAD_FONT6=y
+CONFIG_TFT_LOAD_FONT7=y
+CONFIG_TFT_LOAD_FONT8=y
+CONFIG_TFT_LOAD_GFXFF=y
+CONFIG_TFT_SMOOTH_FONT=y
+# CONFIG_TFT_IS_AUTOBAHN is not set
+# end of espfontlib
 # end of Component config
 
+# CONFIG_IDF_EXPERIMENTAL_FEATURES is not set
+
 # Deprecated options for backward compatibility
+# CONFIG_APP_BUILD_TYPE_ELF_RAM is not set
 # CONFIG_NO_BLOBS is not set
 # CONFIG_ESP32_NO_BLOBS is not set
 # CONFIG_ESP32_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set
@@ -1848,6 +2027,7 @@ CONFIG_FLASHMODE_DIO=y
 CONFIG_MONITOR_BAUD=115200
 # CONFIG_OPTIMIZATION_LEVEL_DEBUG is not set
 # CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
+# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set
 CONFIG_OPTIMIZATION_LEVEL_RELEASE=y
 CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
 CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y
@@ -1890,11 +2070,11 @@ CONFIG_NIMBLE_GAP_DEVICE_NAME_MAX_LEN=31
 CONFIG_NIMBLE_ATT_PREFERRED_MTU=256
 CONFIG_NIMBLE_SVC_GAP_APPEARANCE=0
 CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT=12
-CONFIG_NIMBLE_ACL_BUF_COUNT=20
+CONFIG_BT_NIMBLE_ACL_BUF_COUNT=20
-CONFIG_NIMBLE_ACL_BUF_SIZE=255
+CONFIG_BT_NIMBLE_ACL_BUF_SIZE=255
-CONFIG_NIMBLE_HCI_EVT_BUF_SIZE=70
+CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
-CONFIG_NIMBLE_HCI_EVT_HI_BUF_COUNT=30
+CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=30
-CONFIG_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
+CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
 CONFIG_NIMBLE_HS_FLOW_CTRL=y
 CONFIG_NIMBLE_HS_FLOW_CTRL_ITVL=1000
 CONFIG_NIMBLE_HS_FLOW_CTRL_THRESH=2
@@ -1926,6 +2106,9 @@ CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM=100
 CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
 CONFIG_ADC2_DISABLE_DAC=y
 # CONFIG_MCPWM_ISR_IN_IRAM is not set
+CONFIG_SW_COEXIST_ENABLE=y
+CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y
+CONFIG_ESP_WIFI_SW_COEXIST_ENABLE=y
 # CONFIG_EVENT_LOOP_PROFILING is not set
 CONFIG_POST_EVENTS_FROM_ISR=y
 CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
@@ -1980,6 +2163,7 @@ CONFIG_CONSOLE_UART_BAUDRATE=115200
 CONFIG_INT_WDT=y
 CONFIG_INT_WDT_TIMEOUT_MS=300
 CONFIG_INT_WDT_CHECK_CPU1=y
+CONFIG_TASK_WDT=y
 CONFIG_ESP_TASK_WDT=y
 # CONFIG_TASK_WDT_PANIC is not set
 CONFIG_TASK_WDT_TIMEOUT_S=5
@@ -2010,7 +2194,41 @@ CONFIG_ESP32_BROWNOUT_DET_LVL=0
 # CONFIG_DISABLE_BASIC_ROM_CONSOLE is not set
 CONFIG_IPC_TASK_STACK_SIZE=1024
 CONFIG_TIMER_TASK_STACK_SIZE=3584
-CONFIG_SW_COEXIST_ENABLE=y
+CONFIG_ESP32_WIFI_ENABLED=y
+CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
+CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
+# CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
+CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
+# CONFIG_ESP32_WIFI_CSI_ENABLED is not set
+CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP32_WIFI_TX_BA_WIN=6
+CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP32_WIFI_RX_BA_WIN=6
+CONFIG_ESP32_WIFI_RX_BA_WIN=6
+# CONFIG_ESP32_WIFI_NVS_ENABLED is not set
+CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y
+# CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set
+CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
+CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
+CONFIG_ESP32_WIFI_IRAM_OPT=y
+CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
+CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y
+CONFIG_ESP32_WIFI_ENABLE_WPA3_OWE_STA=y
+CONFIG_WPA_MBEDTLS_CRYPTO=y
+CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
+# CONFIG_WPA_WAPI_PSK is not set
+# CONFIG_WPA_SUITE_B_192 is not set
+# CONFIG_WPA_11KV_SUPPORT is not set
+# CONFIG_WPA_MBO_SUPPORT is not set
+# CONFIG_WPA_DPP_SUPPORT is not set
+# CONFIG_WPA_11R_SUPPORT is not set
+# CONFIG_WPA_WPS_SOFTAP_REGISTRAR is not set
+# CONFIG_WPA_WPS_STRICT is not set
+# CONFIG_WPA_DEBUG_PRINT is not set
+# CONFIG_WPA_TESTING_OPTIONS is not set
 # CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
 # CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
 CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y

dependencies.lock

@@ -1,9 +1,15 @@
 dependencies:
+  espressif/esp-idf-cxx:
+    component_hash: df7921090d6601b268b99b5d54d2f53bb5ea25dbd58cc53961ef7784326621de
+    source:
+      service_url: https://api.components.espressif.com/
+      type: service
+    version: 1.0.1-beta
   idf:
     component_hash: null
     source:
       type: idf
-    version: 5.1.0
+    version: 5.2.0
-manifest_hash: 45094f33b6a257bfcaa02efb329b001e383adbe7dc60bd5066b99a5e9f5ebc91
+manifest_hash: 04b1e89bb78c4187b4d7bc0cf9461b7a3475762e58fec6f3bb49a885c56532c2
 target: esp32
 version: 1.0.0

main/CMakeLists.txt

@@ -23,7 +23,6 @@ set(BOBBY_HEADERS
     actions/loadsettingsaction.h
     actions/modesettingsaction.h
     actions/qraction.h
-    actions/rebootaction.h
     actions/resetnvsaction.h
     actions/savesettingsaction.h
     actions/setupactions.h
@@ -159,6 +158,7 @@ set(BOBBY_HEADERS
     displays/qrcodedebug.h
     displays/qrdisplay.h
     displays/qrimportdisplay.h
+    displays/rebootscreen.h
     displays/setup/ask_calibrate_other_buttons.h
     displays/setup/ask_setup_clouds.h
     displays/setup/basic_buttons.h
@@ -287,7 +287,6 @@ set(BOBBY_SOURCES
     actions/loadsettingsaction.cpp
     actions/modesettingsaction.cpp
     actions/qraction.cpp
-    actions/rebootaction.cpp
     actions/resetnvsaction.cpp
     actions/savesettingsaction.cpp
     actions/setupactions.cpp
@@ -418,6 +417,7 @@ set(BOBBY_SOURCES
     displays/qrcodedebug.cpp
     displays/qrdisplay.cpp
     displays/qrimportdisplay.cpp
+    displays/rebootscreen.cpp
     displays/setup/ask_calibrate_other_buttons.cpp
     displays/setup/ask_setup_clouds.cpp
     displays/setup/basic_buttons.cpp
@@ -530,7 +530,7 @@ set(dependencies
     freertos nvs_flash esp_http_server esp_https_ota mdns app_update esp_system esp_websocket_client driver esp_adc
     arduino-esp32 ArduinoJson esp-nimble-cpp FastLED-idf TFT_eSPI QRCode-esp32
     bobbycar-protocol cpputils cxx-ring-buffer date sunset
-    espasynchttpreq espasyncota espchrono espcpputils espconfiglib esp-gui-lib esphttpdutils espwifistack expected fmt
+    espasynchttpreq espasyncota espchrono espcpputils espconfiglib esp-gui-lib esphttpdutils espwifistack fmt
 )
 
 idf_component_register(

main/accessorhelpers.h

@@ -2,6 +2,7 @@
 
 // system includes
 #include <cstdint>
+#include <expected>
 
 // 3rdparty lib includes
 #include <accessorinterface.h>
@@ -19,7 +20,7 @@ struct RefAccessorSaveSettings : public virtual espgui::RefAccessor<T>
         espgui::RefAccessor<T>::setValue(value);
 
         if (!saveProfileSettings())
-            return tl::make_unexpected("saveProfileSettings() failed!");
+            return std::unexpected("saveProfileSettings() failed!");
 
         return {};
     };

main/accessors/settingsaccessors.h

@@ -1,5 +1,8 @@
 #pragma once
 
+// system includes
+#include <expected>
+
 // 3rdparty lib includes
 #include <accessorinterface.h>
 
@@ -29,7 +32,7 @@ struct NMotMaxKmhAccessor : public virtual espgui::AccessorInterface<int16_t>
     {
         profileSettings.limits.nMotMax = convertFromKmh(value);
         if (!saveProfileSettings())
-            return tl::make_unexpected("saveProfileSettings() failed!");
+            return std::unexpected("saveProfileSettings() failed!");
         return {};
     }
 };
@@ -77,7 +80,7 @@ struct WheelDiameterInchAccessor : public virtual espgui::AccessorInterface<floa
     {
 //        profileSettings.controllerHardware.wheelDiameter = convertFromInch(value);
 //        if (!saveProfileSettings())
-//            return tl::make_unexpected("saveProfileSettings() failed!");
+//            return std::unexpected("saveProfileSettings() failed!");
 //        return {};
         return configs.write_config(configs.controllerHardware.wheelDiameter, convertFromInch(value));
     }

main/actions/rebootaction.cpp

@@ -1,22 +0,0 @@
-#include "rebootaction.h"
-
-// esp-idf includes
-#include <esp_system.h>
-
-// 3rdparty lib includes
-#include <tftinstance.h>
-
-void RebootAction::triggered()
-{
-    espgui::tft.fillScreen(TFT_BLACK);
-    espgui::tft.setTextColor(TFT_YELLOW);
-
-    espgui::tft.drawString("Reboot", 5, 5, 4);
-
-    espgui::tft.fillRect(0, 34, espgui::tft.width(), 3, TFT_WHITE);
-
-    espgui::tft.setTextColor(TFT_WHITE);
-    espgui::tft.drawString("Rebooting now...", 0, 50, 4);
-
-    esp_restart();
-}

main/actions/rebootaction.h

@@ -1,10 +0,0 @@
-#pragma once
-
-// 3rdparty lib includes
-#include <actioninterface.h>
-
-class RebootAction : public virtual espgui::ActionInterface
-{
-public:
-    void triggered() override;
-};

main/actions/resetnvsaction.h

@@ -5,7 +5,7 @@
 
 // 3rdparty lib includes
 #include <actioninterface.h>
-#include <tftinstance.h>
+#include <tftcolors.h>
 
 // local includes
 #include "newsettings.h"
@@ -18,15 +18,15 @@ public:
     {
         if (reboot)
         {
-            espgui::tft.fillScreen(TFT_BLACK);
+            tft.fillScreen(espgui::TFT_BLACK);
-            espgui::tft.setTextColor(TFT_YELLOW);
+            tft.setTextColor(espgui::TFT_YELLOW);
 
-            espgui::tft.drawString("Reboot", 5, 5, 4);
+            tft.drawString("Reboot", 5, 5, 4);
 
-            espgui::tft.fillRect(0, 34, espgui::tft.width(), 3, TFT_WHITE);
+            tft.fillRect(0, 34, tft.width(), 3, espgui::TFT_WHITE);
 
-            espgui::tft.setTextColor(TFT_WHITE);
+            tft.setTextColor(espgui::TFT_WHITE);
-            espgui::tft.drawString("Rebooting now...", 0, 50, 4);
+            tft.drawString("Rebooting now...", 0, 50, 4);
 
             configs.reset();
 

main/bobbyerrorhandler.cpp

@@ -8,7 +8,9 @@
 
 void BobbyErrorHandler::errorOccurred(std::string &&error)
 {
-    auto newDisplay = std::make_unique<BobbyPopupDisplay>(std::move(error), std::move(espgui::currentDisplay));
+    espgui::changeScreenCallback = [error_ = std::move(error)](espgui::TftInterface &tft) mutable {
-    newDisplay->initOverlay();
+        auto newDisplay = std::make_unique<BobbyPopupDisplay>(std::move(error_), std::move(espgui::currentDisplay));
-    espgui::currentDisplay = std::move(newDisplay);
+        newDisplay->initOverlay(tft);
+        espgui::currentDisplay = std::move(newDisplay);
+    };
 }

main/cloud.cpp

@@ -2,6 +2,7 @@
 
 // system includes
 #include <optional>
+#include <expected>
 
 // esp-idf includes
 #include <esp_log.h>
@@ -13,7 +14,6 @@
 #include <menudisplay.h>
 #include <numberparsing.h>
 #include <screenmanager.h>
-#include <tftinstance.h>
 #include <tickchrono.h>
 #include <wrappers/websocket_client.h>
 
@@ -196,41 +196,41 @@ typename std::enable_if<
         !std::is_same_v<T, HandbremseMode> &&
         !std::is_same_v<T, BobbyQuickActions> &&
         !std::is_same_v<T, BatteryCellType>
-        , tl::expected<void, std::string>>::type
+        , std::expected<void, std::string>>::type
 set_config(ConfigWrapper<T> &config, std::string_view newValue)
 {
-    return tl::make_unexpected("Unsupported config type");
+    return std::unexpected("Unsupported config type");
 }
 
 template<typename T>
 typename std::enable_if<
         std::is_same_v<T, bool>
-        , tl::expected<void, std::string>>::type
+        , std::expected<void, std::string>>::type
 set_config(ConfigWrapper<T> &config, std::string_view newValue)
 {
     if (cpputils::is_in(newValue, "true", "false"))
         return configs.write_config(config, newValue == "true");
     else
-        return tl::make_unexpected(fmt::format("only true and false allowed, not {}", newValue));
+        return std::unexpected(fmt::format("only true and false allowed, not {}", newValue));
 }
 
 template<typename T>
 typename std::enable_if<
         !std::is_same_v<T, bool> &&
         std::is_integral_v<T>
-        , tl::expected<void, std::string>>::type
+        , std::expected<void, std::string>>::type
 set_config(ConfigWrapper<T> &config, std::string_view newValue)
 {
     if (auto parsed = cpputils::fromString<T>(newValue))
         return configs.write_config(config, *parsed);
     else
-        return tl::make_unexpected(fmt::format("could not parse {}", newValue));
+        return std::unexpected(fmt::format("could not parse {}", newValue));
 }
 
 template<typename T>
 typename std::enable_if<
         std::is_same_v<T, std::string>
-        , tl::expected<void, std::string>>::type
+        , std::expected<void, std::string>>::type
 set_config(ConfigWrapper<T> &config, std::string_view newValue)
 {
     return configs.write_config(config, std::string{newValue});
@@ -239,31 +239,31 @@ set_config(ConfigWrapper<T> &config, std::string_view newValue)
 template<typename T>
 typename std::enable_if<
         std::is_same_v<T, wifi_stack::ip_address_t>
-        , tl::expected<void, std::string>>::type
+        , std::expected<void, std::string>>::type
 set_config(ConfigWrapper<T> &config, std::string_view newValue)
 {
     if (const auto parsed = wifi_stack::fromString<wifi_stack::ip_address_t>(newValue); parsed)
         return configs.write_config(config, *parsed);
     else
-        return tl::make_unexpected(parsed.error());
+        return std::unexpected(parsed.error());
 }
 
 template<typename T>
 typename std::enable_if<
         std::is_same_v<T, wifi_stack::mac_t>
-        , tl::expected<void, std::string>>::type
+        , std::expected<void, std::string>>::type
 set_config(ConfigWrapper<T> &config, std::string_view newValue)
 {
     if (const auto parsed = wifi_stack::fromString<wifi_stack::mac_t>(newValue); parsed)
         return configs.write_config(config, *parsed);
     else
-        return tl::make_unexpected(parsed.error());
+        return std::unexpected(parsed.error());
 }
 
 template<typename T>
 typename std::enable_if<
         std::is_same_v<T, std::optional<wifi_stack::mac_t>>
-        , tl::expected<void, std::string>>::type
+        , std::expected<void, std::string>>::type
 set_config(ConfigWrapper<T> &config, std::string_view newValue)
 {
     if (newValue.empty())
@@ -271,7 +271,7 @@ set_config(ConfigWrapper<T> &config, std::string_view newValue)
     else if (const auto parsed = wifi_stack::fromString<wifi_stack::mac_t>(newValue); parsed)
         return configs.write_config(config, *parsed);
     else
-        return tl::make_unexpected(parsed.error());
+        return std::unexpected(parsed.error());
 }
 
 template<typename T>
@@ -284,13 +284,13 @@ typename std::enable_if<
         std::is_same_v<T, HandbremseMode> ||
         std::is_same_v<T, BobbyQuickActions> ||
         std::is_same_v<T, BatteryCellType>
-        , tl::expected<void, std::string>>::type
+        , std::expected<void, std::string>>::type
 set_config(ConfigWrapper<T> &config, std::string_view newValue)
 {
     if (auto parsed = cpputils::fromString<std::underlying_type_t<T>>(newValue))
         return configs.write_config(config, T(*parsed));
     else
-        return tl::make_unexpected(fmt::format("could not parse {}", newValue));
+        return std::unexpected(fmt::format("could not parse {}", newValue));
 }
 
 void send_config(uint32_t skipCount)
@@ -448,7 +448,7 @@ void send_information()
 
         if (const auto *display = currentDisplay->asMenuDisplay())
         {
-            displayObject["name"] = display->text();
+            displayObject["name"] = display->title();
         }
     }
     else

main/debuginputhandler.cpp

@@ -8,7 +8,6 @@
 #include <esp_log.h>
 
 // 3rdparty lib includes
-#include <tftinstance.h>
 #include <esp32-hal-gpio.h>
 #include <screenmanager.h>
 #include <changevaluedisplay.h>
@@ -117,7 +116,7 @@ void handleNormalChar(char c)
         {
         case 'i':
         case 'I':
-            espgui::tft.init();
+            tft.init();
             break;
         case 'p':
         case 'P':

main/displays/batterygraphdisplay.cpp

@@ -3,7 +3,7 @@ constexpr const char * const TAG = "BatteryGraphDisplay";
 
 // 3rdparty lib includes
 #include <screenmanager.h>
-#include <tftinstance.h>
+#include <tftcolors.h>
 
 // local includes
 #include "battery.h"
@@ -18,13 +18,13 @@ namespace {
     constexpr const uint8_t TOP_OFFSET = 40;
 } // namespace
 
-void BatteryGraphDisplay::initScreen()
+void BatteryGraphDisplay::initScreen(espgui::TftInterface &tft)
 {
-    Base::initScreen();
+    Base::initScreen(tft);
-    drawBatteryCurve();
+    drawBatteryCurve(tft);
 }
 
-std::string BatteryGraphDisplay::text() const
+std::string BatteryGraphDisplay::title() const
 {
     if (const auto avgVoltage = controllers.getAvgVoltage(); avgVoltage)
     {
@@ -33,10 +33,10 @@ std::string BatteryGraphDisplay::text() const
     return TEXT_BATTERY_GRAPH;
 }
 
-void BatteryGraphDisplay::redraw()
+void BatteryGraphDisplay::redraw(espgui::TftInterface &tft)
 {
     using namespace espgui;
-    Base::redraw();
+    Base::redraw(tft);
 
     if (const auto avgVoltage = controllers.getAvgVoltage(); avgVoltage)
     {
@@ -50,10 +50,10 @@ void BatteryGraphDisplay::redraw()
         const uint16_t lastXOffset = onePercent * (100 - getBatteryPercentage(m_lastBatVoltage, cellType));
 
         // clear the old one and draw the new one
-        tft.fillRect(lastXOffset + 2, TOP_OFFSET, onePercent, tft.height() - TOP_OFFSET, TFT_BLACK);
+        tft.fillRect(lastXOffset + 2, TOP_OFFSET, onePercent, tft.height() - TOP_OFFSET, espgui::TFT_BLACK);
-        tft.fillRect(xOffset + 2, TOP_OFFSET, onePercent, tft.height() - TOP_OFFSET, TFT_WHITE);
+        tft.fillRect(xOffset + 2, TOP_OFFSET, onePercent, tft.height() - TOP_OFFSET, espgui::TFT_WHITE);
         m_lastBatVoltage = *avgVoltage;
-        drawBatteryCurve();
+        drawBatteryCurve(tft);
     }
     // tft.drawLine() code
 }
@@ -73,11 +73,11 @@ void BatteryGraphDisplay::buttonPressed(espgui::Button button)
     }
 }
 
-void BatteryGraphDisplay::drawBatteryCurve()
+void BatteryGraphDisplay::drawBatteryCurve(espgui::TftInterface &tft)
 {
     const auto points = count_curve_points(configs.battery.cellType.value());
-    const auto max_height = espgui::tft.height() - 1;
+    const auto max_height = tft.height() - 1;
-    const auto max_width = espgui::tft.width() - 4;
+    const auto max_width = tft.width() - 4;
     const uint16_t part = max_width / points;
     const auto min_voltage = getMinBatCellVoltage(configs.battery.cellType.value());
     const auto max_voltage = getMaxBatCellVoltage(configs.battery.cellType.value());
@@ -89,7 +89,7 @@ void BatteryGraphDisplay::drawBatteryCurve()
             const int y1 = float_map(point->minVoltage / 100.f, min_voltage, max_voltage, max_height, TOP_OFFSET);
             const int x2 = 2 + part * (points - i);
             const int y2 = float_map(point->maxVoltage / 100.f, min_voltage, max_voltage, max_height, TOP_OFFSET);
-            espgui::tft.drawLine(x1, y1, x2, y2, TFT_WHITE);
+            tft.drawLine(x1, y1, x2, y2, espgui::TFT_WHITE);
         }
     }
 }

main/displays/batterygraphdisplay.h

@@ -7,13 +7,13 @@ class BatteryGraphDisplay : public BobbyDisplayWithTitle {
     using Base = BobbyDisplayWithTitle;
 
 public:
-    std::string text() const override;
+    std::string title() const override;
-    void initScreen() override;
+    void initScreen(espgui::TftInterface &tft) override;
-    void redraw() override;
+    void redraw(espgui::TftInterface &tft) override;
 
     void buttonPressed(espgui::Button button) override;
 
-    static void drawBatteryCurve();
+    static void drawBatteryCurve(espgui::TftInterface &tft);
 
 private:
     float m_lastBatVoltage{0};

main/displays/batteryinfodisplay.cpp

@@ -2,7 +2,7 @@
 
 // 3rdparty lib includes
 #include <screenmanager.h>
-#include <tftinstance.h>
+#include <tftcolors.h>
 
 // local includes
 #include "battery.h"
@@ -14,20 +14,20 @@
 
 // display with big battery and ten bars (0-100%)
 
-void BatteryInfoDisplay::initScreen()
+void BatteryInfoDisplay::initScreen(espgui::TftInterface &tft)
 {
     using namespace espgui;
-    Base::initScreen();
+    Base::initScreen(tft);
 
-    tft.drawRoundRect(m_offset, m_offset, tft.width() - (m_offset * 2), tft.height() - (m_offset * 2), 10, TFT_WHITE);
+    tft.drawRoundRect(m_offset, m_offset, tft.width() - (m_offset * 2), tft.height() - (m_offset * 2), 10, espgui::TFT_WHITE);
-    tft.drawRoundRect((tft.width() / 2) - (m_offset / 2), m_offset / 2, m_offset, m_offset / 2, 3, TFT_WHITE);
+    tft.drawRoundRect((tft.width() / 2) - (m_offset / 2), m_offset / 2, m_offset, m_offset / 2, 3, espgui::TFT_WHITE);
     m_lastBarCount = 0;
 }
 
-void BatteryInfoDisplay::redraw()
+void BatteryInfoDisplay::redraw(espgui::TftInterface &tft)
 {
     using namespace espgui;
-    Base::redraw();
+    Base::redraw(tft);
 
     // calculate height of space available for all bars
     const auto min_x = m_offset + 3; // leave 2 pixels + 1 pixel for border
@@ -51,7 +51,7 @@ void BatteryInfoDisplay::redraw()
             for (auto i = 0; i < 10; ++i)
             {
                 const auto y = bottomY - (i * segment_height) - segment_height;
-                tft.fillRoundRect(min_x, y, width, segment_height - 2, 10, segment_count > i ? TFT_GREEN : TFT_DARKGREY);
+                tft.fillRoundRect(min_x, y, width, segment_height - 2, 10, segment_count > i ? espgui::TFT_GREEN : espgui::TFT_DARKGREY);
             }
         }
     }

main/displays/batteryinfodisplay.h

@@ -8,8 +8,8 @@ class BatteryInfoDisplay : public BobbyDisplay
     using Base = BobbyDisplay;
 
 public:
-    void initScreen() override;
+    void initScreen(espgui::TftInterface &tft) override;
-    void redraw() override;
+    void redraw(espgui::TftInterface &tft) override;
 
     void buttonPressed(espgui::Button button) override;
 private:

main/displays/bmsdisplay.cpp

@@ -5,13 +5,12 @@
 #include "displays/speedinfodisplay.h"
 #include "displays/statusdisplay.h"
 #include "screenmanager.h"
-#include "tftinstance.h"
 
 using namespace espgui;
 
-void BmsDisplay::initScreen()
+void BmsDisplay::initScreen(espgui::TftInterface &tft)
 {
-    Base::initScreen();
+    Base::initScreen(tft);
 
     tft.fillScreen(TFT_BLACK);
     tft.setTextColor(TFT_WHITE, TFT_BLACK);
@@ -43,9 +42,9 @@ void BmsDisplay::initScreen()
     m_cycleLabel.start();
 }
 
-void BmsDisplay::redraw()
+void BmsDisplay::redraw(espgui::TftInterface &tft)
 {
-    Base::redraw();
+    Base::redraw(tft);
 
     if (bluetoothSerial.hasClient())
         tft.setTextColor(TFT_GREEN, TFT_BLACK);

main/displays/bmsdisplay.h

@@ -18,8 +18,8 @@ class BmsDisplay :
     using Base = BobbyDisplay;
 
 public:
-    void initScreen() override;
+    void initScreen(espgui::TftInterface &tft) override;
-    void redraw() override;
+    void redraw(espgui::TftInterface &tft) override;
 
     void buttonPressed(espgui::Button button) override;
 

main/displays/calibratevoltagedisplay.cpp

@@ -134,7 +134,7 @@ CalibrateVoltageDisplay::CalibrateVoltageDisplay()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_VOLTAGECALIBRATION_RESET>,        ResetCalibrationAction>>();
 }
 
-std::string CalibrateVoltageDisplay::text() const
+std::string CalibrateVoltageDisplay::title() const
 {
     return TEXT_BATTERY_CALIBRATE;
 }

main/displays/calibratevoltagedisplay.h

@@ -8,7 +8,7 @@ class CalibrateVoltageDisplay : public BobbyMenuDisplay
 public:
     CalibrateVoltageDisplay();
 
-    std::string text() const override;
+    std::string title() const override;
 
     void back() override;
 };

main/displays/confiscationdisplay.cpp

@@ -1,10 +1,10 @@
 #include "confiscationdisplay.h"
 
 // 3rdparty lib includes
-#include <tftinstance.h>
 #include <screenmanager.h>
 #include <esprandom.h>
 #include <randomutils.h>
+#include <fontrenderer.h>
 
 // local includes
 #include "globals.h"
@@ -29,39 +29,39 @@ void ConfiscationDisplay::start()
     m_nextRestart = espchrono::millis_clock::now() + std::chrono::seconds{cpputils::randomNumber(3, 7, espcpputils::esp_random_device{})};
 }
 
-void ConfiscationDisplay::initScreen()
+void ConfiscationDisplay::initScreen(espgui::TftInterface &tft)
 {
-    Base::initScreen();
+    Base::initScreen(tft);
 
-    espgui::tft.setSwapBytes(true);
+    espgui::FontRenderer fontRenderer{tft};
-    espgui::tft.pushImage(10, 70, bobbyicons::shortcircuit.WIDTH, bobbyicons::shortcircuit.HEIGHT, bobbyicons::shortcircuit.buffer);
-    espgui::tft.setSwapBytes(false);
 
-    m_progressBar.start();
+    tft.pushImage(10, 70, bobbyicons::shortcircuit.WIDTH, bobbyicons::shortcircuit.HEIGHT, bobbyicons::shortcircuit.buffer);
 
-    m_label.start();
+    m_progressBar.start(tft);
 
-    espgui::tft.setTextColor(TFT_WHITE, TFT_BLACK);
+    m_label.start(tft);
-    espgui::tft.setTextFont(2);
+
+    fontRenderer.setTextColor(TFT_WHITE, TFT_BLACK);
+    fontRenderer.setTextFont(2);
 
     auto y = 235;
     constexpr auto lineheight = 15;
-    espgui::tft.drawString("Bei erneuter, widerrechtlicher", 10, y+=lineheight);
+    tft.drawString(tft, fontRenderer, "Bei erneuter, widerrechtlicher", 10, y+=lineheight);
-    espgui::tft.drawString("Beschlagnahmung wird die Selbst-", 10, y+=lineheight);
+    tft.drawString(tft, fontRenderer, "Beschlagnahmung wird die Selbst-", 10, y+=lineheight);
-    espgui::tft.drawString("Vernichtung durch Kurzschluss", 10, y+=lineheight);
+    tft.drawString(tft, fontRenderer, "Vernichtung durch Kurzschluss", 10, y+=lineheight);
-    espgui::tft.drawString(fmt::format("der Batterie eingeleitet (ca {:.2f}MJ)", calculateMegaJoules()), 10, y+=lineheight);
+    tft.drawString(tft, fontRenderer, fmt::format("der Batterie eingeleitet (ca {:.2f}MJ)", calculateMegaJoules()), 10, y+=lineheight);
 }
 
-void ConfiscationDisplay::redraw()
+void ConfiscationDisplay::redraw(espgui::TftInterface &tft)
 {
-    Base::redraw();
+    Base::redraw(tft);
 
-    m_progressBar.redraw(m_progress);
+    m_progressBar.redraw(tft, m_progress);
 
-    espgui::tft.setTextColor(TFT_YELLOW, TFT_BLACK);
+    tft.setTextColor(TFT_YELLOW, TFT_BLACK);
 
-    espgui::tft.setTextFont(2);
+    tft.setTextFont(2);
-    m_label.redraw([](){
+    m_label.redraw(tft, fontRenderer, [](){
         if (const auto period = espchrono::millis_clock::now().time_since_epoch() % 6000ms; period < 2000ms)
             return "Halten Sie 10m Abstand.";
         else if (period < 4000ms)
@@ -110,7 +110,7 @@ void ConfiscationDisplay::buttonPressed(espgui::Button button)
     }
 }
 
-std::string ConfiscationDisplay::text() const
+std::string ConfiscationDisplay::title() const
 {
     return "Explosions-Modus";
 }

main/displays/confiscationdisplay.h

@@ -16,14 +16,14 @@ class ConfiscationDisplay : public BobbyDisplayWithTitle
 public:
     void start() override;
 
-    void initScreen() override;
+    void initScreen(espgui::TftInterface &tft) override;
-    void redraw() override;
+    void redraw(espgui::TftInterface &tft) override;
     void update() override;
     void stop() override;
 
     void buttonPressed(espgui::Button button) override;
 
-    std::string text() const override;
+    std::string title() const override;
 
 private:
     espgui::ProgressBar m_progressBar{10, 210, 200, 10, 0, 500};

main/displays/gameoflifedisplay.cpp

@@ -3,8 +3,9 @@
 // 3rdparty lib includes
 #include <randomutils.h>
 #include <esprandom.h>
-#include <tftinstance.h>
 #include <screenmanager.h>
+#include <tftinterface.h>
+#include <tftcolors.h>
 
 // local includes
 #include "screens.h"
@@ -17,28 +18,28 @@ void GameOfLifeDisplay::start()
     m_newgrid = std::make_unique<std::bitset<GRIDX*GRIDY>>();
 }
 
-void GameOfLifeDisplay::initScreen()
+void GameOfLifeDisplay::initScreen(espgui::TftInterface &tft)
 {
-    Base::initScreen();
+    Base::initScreen(tft);
 
     disableScreenFlip(true);
 
-    espgui::tft.setRotation(3);
+    tft.setRotation(3);
-    espgui::tft.fillScreen(TFT_BLACK);
+    tft.fillScreen(espgui::TFT_BLACK);
 }
 
-void GameOfLifeDisplay::redraw()
+void GameOfLifeDisplay::redraw(espgui::TftInterface &tft)
 {
-    Base::redraw();
+    Base::redraw(tft);
 
     if (gen == 0)
     {
-        espgui::tft.fillScreen(TFT_BLACK);
+        tft.fillScreen(espgui::TFT_BLACK);
         initGrid();
     }
 
     computeCA();
-    drawGrid();
+    drawGrid(tft);
 
     *m_grid = *m_newgrid;
 
@@ -70,9 +71,9 @@ void GameOfLifeDisplay::buttonPressed(espgui::Button button)
     }
 }
 
-void GameOfLifeDisplay::drawGrid()
+void GameOfLifeDisplay::drawGrid(espgui::TftInterface &tft)
 {
-    uint16_t color = TFT_WHITE;
+    uint16_t color = espgui::TFT_WHITE;
     for (int16_t x = 1; x < GRIDX - 1; x++) {
         for (int16_t y = 1; y < GRIDY - 1; y++) {
             if (((*m_grid)[index(x,y)]) != ((*m_newgrid)[index(x,y)])) {
@@ -80,7 +81,7 @@ void GameOfLifeDisplay::drawGrid()
                     color = 0xFFFF; //random(0xFFFF);
                 else
                     color = 0;
-                espgui::tft.fillRect(CELLXY * x, CELLXY * y, CELLXY, CELLXY, color);
+                tft.fillRect(CELLXY * x, CELLXY * y, CELLXY, CELLXY, color);
             }
         }
     }

main/displays/gameoflifedisplay.h

@@ -13,8 +13,8 @@ class GameOfLifeDisplay : public BobbyDisplay
 
 public:
     void start() override;
-    void initScreen() override;
+    void initScreen(espgui::TftInterface &tft) override;
-    void redraw() override;
+    void redraw(espgui::TftInterface &tft) override;
     void stop() override;
 
     void buttonPressed(espgui::Button button) override;
@@ -22,7 +22,7 @@ public:
 private:
 
     //Draws the grid on the display
-    void drawGrid();
+    void drawGrid(espgui::TftInterface &tft);
 
     //Initialise Grid
     void initGrid();

main/displays/gametrakcalibratedisplay.h

@@ -21,8 +21,8 @@ class GametrakCalibrateDisplay : public BobbyDisplay, public ConfirmActionInterf
     using Base = BobbyDisplay;
 
 public:
-    void initScreen() override;
+    void initScreen(espgui::TftInterface &tft) override;
-    void redraw() override;
+    void redraw(espgui::TftInterface &tft) override;
 
 private:
     std::array<Label, 6> m_labels {{
@@ -41,9 +41,9 @@ private:
     }};
 };
 
-void GametrakCalibrateDisplay::initScreen()
+void GametrakCalibrateDisplay::initScreen(espgui::TftInterface &tft)
 {
-    Base::initScreen();
+    Base::initScreen(tft);
 
     tft.fillScreen(TFT_BLACK);
     tft.setTextFont(4);
@@ -62,9 +62,9 @@ void GametrakCalibrateDisplay::initScreen()
         progressBar.start();
 }
 
-void GametrakCalibrateDisplay::redraw()
+void GametrakCalibrateDisplay::redraw(espgui::TftInterface &tft)
 {
-    Base::redraw();
+    Base::redraw(tft);
 
     m_labels[0].redraw(fmt::format("{:.02f}", gametrakX));
     m_labels[1].redraw(std::to_string(raw_gametrakX));

main/displays/joystickdebugdisplay.cpp

@@ -2,7 +2,6 @@
 #include "joystickdebugdisplay.h"
 
 // 3rdparty lib includes
-#include <tftinstance.h>
 #include <screenmanager.h>
 
 // local includes
@@ -27,7 +26,7 @@ void JoystickDebugDisplay::start()
     copyFromSettings();
 }
 
-std::string JoystickDebugDisplay::text() const
+std::string JoystickDebugDisplay::title() const
 {
     return TEXT_JOYSTICK;
 }
@@ -49,9 +48,9 @@ void JoystickDebugDisplay::update()
         m_y = map_analog_stick(m_bremsMitte, m_bremsMin, m_bremsMax, configs.deadband.value(), *raw_brems);
 }
 
-void JoystickDebugDisplay::redraw()
+void JoystickDebugDisplay::redraw(espgui::TftInterface &tft)
 {
-    Base::redraw();
+    Base::redraw(tft);
 
     if (m_x && m_y)
     {

main/displays/joystickdebugdisplay.h

@@ -16,7 +16,7 @@ class JoystickDebugDisplay : public BobbyDisplayWithTitle
 public:
     JoystickDebugDisplay();
 
-    std::string text() const override;
+    std::string title() const override;
     void start() override;
     void update() override;
     void redraw() override;

main/displays/ledstripcolorsdisplay.cpp

@@ -8,9 +8,9 @@
 #include <cpputils.h>
 #include <menuitem.h>
 #include <actioninterface.h>
-#include <tftinstance.h>
 #include <screenmanager.h>
 #include <actions/dummyaction.h>
+#include <fontrenderer.h>
 
 // local includes
 #include "utils.h"
@@ -49,41 +49,39 @@ const std::array<uint16_t, 8> tft_colors = {
 };
 } // namespace
 
-std::string LedstripColorsDisplay::text() const
+std::string LedstripColorsDisplay::title() const
 {
     return TEXT_LEDSTRIPCOLORMENU;
 }
 
-void LedstripColorsDisplay::initScreen()
+void LedstripColorsDisplay::initScreen(espgui::TftInterface &tft)
 {
-    Base::initScreen();
+    Base::initScreen(tft);
 
-    espgui::tft.setSwapBytes(true);
+    tft.pushImage(70, 60, bobbyicons::bobbycar.WIDTH, bobbyicons::bobbycar.HEIGHT, bobbyicons::bobbycar.buffer);
-    espgui::tft.pushImage(70, 60, bobbyicons::bobbycar.WIDTH, bobbyicons::bobbycar.HEIGHT, bobbyicons::bobbycar.buffer);
-    espgui::tft.setSwapBytes(false);
 }
 
-void LedstripColorsDisplay::redraw()
+void LedstripColorsDisplay::redraw(espgui::TftInterface &tft)
 {
-    Base::redraw();
+    Base::redraw(tft);
 
-    auto y_pos = ((espgui::tft.width() - 40) / 8 + 4) + 240;
+    auto y_pos = ((tft.width() - 40) / 8 + 4) + 240;
     if (last_state != state_select_color)
     {
-        espgui::tft.fillRect(0,y_pos - 1, espgui::tft.width(), 20, TFT_BLACK);
+        tft.fillRect(0,y_pos - 1, tft.width(), 20, TFT_BLACK);
         last_state = state_select_color;
     }
 
-    espgui::tft.setTextFont(2);
+    espgui::FontRenderer fontRenderer{tft};
-    espgui::tft.setTextColor(TFT_WHITE);
+    fontRenderer.drawString(state_select_color ?
-
+                                "Please select a color!" :
-    espgui::tft.drawString(state_select_color ?
+                                "Please select a side!", 50, y_pos,
-                       "Please select a color!" :
+                            espgui::TFT_WHITE, espgui::TFT_BLACK,
-                       "Please select a side!", 50, y_pos);
+                            2);
 
     if (!already_drew_circle)
     {
-        drawSide(static_cast<Bobbycar_Side>(selected_side), TFT_GOLD);
+        drawSide(tft, static_cast<Bobbycar_Side>(selected_side), TFT_GOLD);
         already_drew_circle = true;
     }
 }
@@ -103,7 +101,7 @@ void LedstripColorsDisplay::buttonPressed(espgui::Button button)
         else
         {
             state_select_color = false;
-            espgui::tft.fillRect(0, 228, espgui::tft.width(), ((espgui::tft.width() - 40) / 8) + 4, TFT_BLACK);
+            tft.fillRect(0, 228, tft.width(), ((tft.width() - 40) / 8) + 4, TFT_BLACK);
         }
 
         break;
@@ -111,7 +109,7 @@ void LedstripColorsDisplay::buttonPressed(espgui::Button button)
         if(!state_select_color)
         {
             state_select_color = true;
-            drawColors();
+            drawColors(tft);
         }
         else
         {
@@ -119,7 +117,7 @@ void LedstripColorsDisplay::buttonPressed(espgui::Button button)
             // Uncomment to close select color menu on color select
             /*
         state_select_color = false;
-        espgui::tft.fillRect(0, 228, espgui::tft.width(), ((espgui::tft.width() - 40) / 8) + 4, TFT_BLACK);
+        tft.fillRect(0, 228, tft.width(), ((tft.width() - 40) / 8) + 4, TFT_BLACK);
         */
         }
         break;
@@ -144,13 +142,13 @@ void LedstripColorsDisplay::buttonPressed(espgui::Button button)
         /* TODO commander: move into redraw method */
         if (state_select_color)
         {
-            drawColors();
+            drawColors(tft);
         }
         else
         {
-            espgui::tft.fillRect(0, 228, espgui::tft.width(), ((espgui::tft.width() - 40) / 8) + 4, TFT_BLACK);
+            tft.fillRect(0, 228, tft.width(), ((tft.width() - 40) / 8) + 4, TFT_BLACK);
             clearSides();
-            drawSide(static_cast<Bobbycar_Side>(selected_side), TFT_GOLD);
+            drawSide(tft, static_cast<Bobbycar_Side>(selected_side), TFT_GOLD);
         }
 
         break;
@@ -175,11 +173,11 @@ void LedstripColorsDisplay::buttonPressed(espgui::Button button)
         /* TODO commander: move into redraw method */
         if (state_select_color)
         {
-            drawColors();
+            drawColors(tft);
         }
         else
         {
-            espgui::tft.fillRect(0, 228, espgui::tft.width(), ((espgui::tft.width() - 40) / 8) + 4, TFT_BLACK);
+            tft.fillRect(0, 228, tft.width(), ((tft.width() - 40) / 8) + 4, TFT_BLACK);
             clearSides();
             drawSide(static_cast<Bobbycar_Side>(selected_side), TFT_GOLD);
         }
@@ -188,19 +186,19 @@ void LedstripColorsDisplay::buttonPressed(espgui::Button button)
     }
 }
 
-void LedstripColorsDisplay::drawColors()
+void LedstripColorsDisplay::drawColors(espgui::TftInterface &tft)
 {
-    uint16_t width = (espgui::tft.width() - 40);
+    uint16_t width = (tft.width() - 40);
     auto cube_width = width / 8;
 
-    espgui::tft.fillRect(0, 228, espgui::tft.width(), cube_width + 4, TFT_BLACK);
+    tft.fillRect(0, 228, tft.width(), cube_width + 4, TFT_BLACK);
-    espgui::tft.fillRect(21, 231, width - 1, cube_width - 1, TFT_WHITE);
+    tft.fillRect(21, 231, width - 1, cube_width - 1, TFT_WHITE);
 
-    espgui::tft.fillRect(20 + (selected_color * cube_width - 1), 228, cube_width + 4, cube_width + 4, TFT_YELLOW);
+    tft.fillRect(20 + (selected_color * cube_width - 1), 228, cube_width + 4, cube_width + 4, TFT_YELLOW);
     for (int index = 0; index < 8; index++)
     {
         auto offset = index * (cube_width);
-        espgui::tft.fillRect(22 + offset, 232, cube_width - 4, cube_width - 4, tft_colors[index]);
+        tft.fillRect(22 + offset, 232, cube_width - 4, cube_width - 4, tft_colors[index]);
     }
 }
 
@@ -212,9 +210,9 @@ void LedstripColorsDisplay::clearSides()
     }
 }
 
-void LedstripColorsDisplay::drawSide(Bobbycar_Side side, unsigned int color)
+void LedstripColorsDisplay::drawSide(espgui::TftInterface &tft, Bobbycar_Side side, unsigned int color)
 {
-    const auto middle = espgui::tft.width() / 2;
+    const auto middle = tft.width() / 2;
     const auto width = bobbyicons::bobbycar.WIDTH;
     const auto height = bobbyicons::bobbycar.HEIGHT;
     const auto left = middle - (width / 2);
@@ -224,33 +222,33 @@ void LedstripColorsDisplay::drawSide(Bobbycar_Side side, unsigned int color)
 
     switch (side) {
         case Bobbycar_Side::FRONT:
-            espgui::tft.fillRect(left, above, width, 5, color);
+            tft.fillRect(left, above, width, 5, color);
             break;
         case Bobbycar_Side::FRONT_LEFT:
-            espgui::tft.fillRect(left - 10, above + 10, 5, height / 2, color);
+            tft.fillRect(left - 10, above + 10, 5, height / 2, color);
-            espgui::tft.fillRect(left, above, width / 2, 5, color);
+            tft.fillRect(left, above, width / 2, 5, color);
             break;
         case Bobbycar_Side::LEFT:
-            espgui::tft.fillRect(left - 10, above + 10, 5, height, color);
+            tft.fillRect(left - 10, above + 10, 5, height, color);
             break;
         case Bobbycar_Side::BACK_LEFT:
-            espgui::tft.fillRect(left - 10, above + 10 + (height / 2), 5, height / 2, color);
+            tft.fillRect(left - 10, above + 10 + (height / 2), 5, height / 2, color);
-            espgui::tft.fillRect(left, bellow + 5, width / 2, 5, color);
+            tft.fillRect(left, bellow + 5, width / 2, 5, color);
             break;
         case Bobbycar_Side::BACK:
-            espgui::tft.fillRect(left, bellow + 5, width, 5, color);
+            tft.fillRect(left, bellow + 5, width, 5, color);
             break;
         case Bobbycar_Side::BACK_RIGHT:
-            espgui::tft.fillRect(right + 5, above + 10 + (height / 2), 5, height / 2, color);
+            tft.fillRect(right + 5, above + 10 + (height / 2), 5, height / 2, color);
-            espgui::tft.fillRect(middle, bellow + 5, width / 2, 5, color);
+            tft.fillRect(middle, bellow + 5, width / 2, 5, color);
             break;
         case Bobbycar_Side::RIGHT:
-            espgui::tft.fillRect(right + 5, above + 10, 5, height, color);
+            tft.fillRect(right + 5, above + 10, 5, height, color);
             break;
         case Bobbycar_Side::FRONT_RIGHT:
-            espgui::tft.fillRect(right + 5, above + 10, 5, height / 2, color);
+            tft.fillRect(right + 5, above + 10, 5, height / 2, color);
-            espgui::tft.fillRect(middle, above, width / 2, 5, color);
+            tft.fillRect(middle, above, width / 2, 5, color);
             break;
     }
-    // espgui::tft.fillCircle(espgui::tft.width() / 2, 140, 100, TFT_BLACK);
+    // tft.fillCircle(tft.width() / 2, 140, 100, TFT_BLACK);
 }

main/displays/ledstripcolorsdisplay.h

@@ -15,14 +15,14 @@ class LedstripColorsDisplay : public BobbyDisplayWithTitle
     using Base = BobbyDisplayWithTitle;
 
 public:
-    std::string text() const override;
+    std::string title() const override;
-    void initScreen() override;
+    void initScreen(espgui::TftInterface &tft) override;
-    void redraw() override;
+    void redraw(espgui::TftInterface &tft) override;
 
     void buttonPressed(espgui::Button button) override;
 
-    void drawColors();
+    void drawColors(espgui::TftInterface &tft);
-    void drawSide(Bobbycar_Side side, unsigned int color);
+    void drawSide(espgui::TftInterface &tft, Bobbycar_Side side, unsigned int color);
     void clearSides();
 
 private:

main/displays/lockscreen.cpp

@@ -4,8 +4,8 @@
 #include <algorithm>
 
 // 3rdparty lib includes
-#include <tftinstance.h>
 #include <screenmanager.h>
+#include <fontrenderer.h>
 
 // local includes
 #include "globals.h"
@@ -53,39 +53,34 @@ void Lockscreen::start()
     }
 }
 
-void Lockscreen::initScreen()
+void Lockscreen::initScreen(espgui::TftInterface &tft)
 {
-    Base::initScreen();
+    Base::initScreen(tft);
 
-    espgui::tft.fillScreen(TFT_BLACK);
+    espgui::FontRenderer fontRenderer{tft};
-    espgui::tft.setTextFont(4);
-    espgui::tft.setTextColor(TFT_YELLOW);
 
-    espgui::tft.drawString("Lock vehicle", 5, 5);
+    tft.fillScreen(TFT_BLACK);
 
-    espgui::tft.fillRect(0, 34, espgui::tft.width(), 3, TFT_WHITE);
+    fontRenderer.drawString("Lock vehicle", 5, 5, 4, espgui::TFT_YELLOW, espgui::TFT_BLACK);
 
-    espgui::tft.setTextColor(TFT_WHITE);
+    tft.fillRect(0, 34, tft.width(), 3, espgui::TFT_WHITE);
-    espgui::tft.drawString("Enter code to unlock:", 0, 50);
 
-    espgui::tft.setTextColor(TFT_WHITE, TFT_BLACK);
+    fontRenderer.drawString("Enter code to unlock:", 0, 50, 4, espgui::TFT_WHITE, espgui::TFT_BLACK);
 
     for(int i = 0; i <= 3; i++)
     {
-        drawRect(i, 3, TFT_WHITE);
+        drawRect(tft, i, 3, espgui::TFT_WHITE);
-        drawRect(i, 4, TFT_WHITE);
+        drawRect(tft, i, 4, espgui::TFT_WHITE);
     }
 
     for (auto &label : m_labels)
-        label.start();
+        label.start(tft);
 
-    espgui::tft.setTextFont(7);
+    drawRect(tft, m_currentIndex, 1, espgui::TFT_YELLOW);
-
+    drawRect(tft, m_currentIndex, 2, espgui::TFT_YELLOW);
-    drawRect(m_currentIndex, 1, TFT_YELLOW);
-    drawRect(m_currentIndex, 2, TFT_YELLOW);
 
     for(int i = 0; i <= m_currentIndex; i++)
-        m_labels[i].redraw(std::to_string(m_numbers[i]));
+        m_labels[i].redraw(tft, fontRenderer, std::to_string(m_numbers[i]), espgui::TFT_WHITE, espgui::TFT_BLACK, 7);
 }
 
 void Lockscreen::update()
@@ -93,14 +88,14 @@ void Lockscreen::update()
     Base::update();
 }
 
-void Lockscreen::redraw()
+void Lockscreen::redraw(espgui::TftInterface &tft)
 {
-    Base::redraw();
+    Base::redraw(tft);
 
     if (m_pressed || m_back_pressed)
     {
-        drawRect(m_currentIndex, 1, TFT_BLACK);
+        drawRect(tft, m_currentIndex, 1, TFT_BLACK);
-        drawRect(m_currentIndex, 2, TFT_BLACK);
+        drawRect(tft, m_currentIndex, 2, TFT_BLACK);
 
         if (!m_back_pressed && ++m_currentIndex>=4)
         {
@@ -124,18 +119,19 @@ LOCKSCREEN_PLUGIN_FIXES_2
 
             m_numbers = {0,0,0,0};
             m_currentIndex = 0;
-            std::for_each(std::begin(m_labels) + 1, std::end(m_labels), [](auto &label){ label.redraw("0"); });
+            std::for_each(std::begin(m_labels) + 1, std::end(m_labels),
+                          [&tft](auto &label){ label.redraw(tft, "0"); });
         }
         else if (m_back_pressed && m_currentIndex < 3)
         {
-            drawRect(m_currentIndex+1, 1, TFT_BLACK);
+            drawRect(tft, m_currentIndex+1, 1, TFT_BLACK);
-            drawRect(m_currentIndex+1, 2, TFT_BLACK);
+            drawRect(tft, m_currentIndex+1, 2, TFT_BLACK);
         }
 
-        m_labels[m_currentIndex].redraw(std::to_string(m_numbers[m_currentIndex]));
+        m_labels[m_currentIndex].redraw(tft, std::to_string(m_numbers[m_currentIndex]));
 
-        drawRect(m_currentIndex, 1, TFT_YELLOW);
+        drawRect(tft, m_currentIndex, 1, TFT_YELLOW);
-        drawRect(m_currentIndex, 2, TFT_YELLOW);
+        drawRect(tft, m_currentIndex, 2, TFT_YELLOW);
 
         m_pressed = false;
         m_back_pressed = false;
@@ -205,7 +201,7 @@ void Lockscreen::buttonPressed(espgui::Button button)
     }
 }
 
-void Lockscreen::drawRect(int index, int offset, uint32_t color) const
+void Lockscreen::drawRect(espgui::TftInterface &tft, int index, int offset, uint32_t color) const
 {
-    espgui::tft.drawRect(m_labels[index].x()-offset, m_labels[index].y()-offset, boxWidth+(offset*2), boxHeight+(offset*2), color);
+    tft.drawRect(m_labels[index].x()-offset, m_labels[index].y()-offset, boxWidth+(offset*2), boxHeight+(offset*2), color);
 }

main/displays/lockscreen.h

@@ -24,15 +24,15 @@ class Lockscreen : public BobbyDisplay
 
 public:
     void start() override;
-    void initScreen() override;
+    void initScreen(espgui::TftInterface &tft) override;
     void update() override;
-    void redraw() override;
+    void redraw(espgui::TftInterface &tft) override;
     void stop() override;
 
     void buttonPressed(espgui::Button button) override;
 
 private:
-    void drawRect(int index, int offset, uint32_t color) const;
+    void drawRect(espgui::TftInterface &tft, int index, int offset, uint32_t color) const;
 
     std::array<espgui::Label, 4> m_labels {{
         espgui::Label{spacing, 100}, // boxWidth, boxHeight

main/displays/menudisplaywithtime.cpp

@@ -1,8 +1,8 @@
 #include "menudisplaywithtime.h"
 
 // 3rdparty lib includes
-#include <tftinstance.h>
 #include <fmt/core.h>
+#include <fontrenderer.h>
 
 // local includes
 #include "utils.h"
@@ -10,17 +10,16 @@
 using namespace espgui;
 
 namespace bobbygui {
-void MenuDisplayWithTime::start()
+void MenuDisplayWithTime::initScreen(espgui::TftInterface &tft)
 {
-    Base::start();
+    Base::initScreen(tft);
-    m_label_currentTime.start();
+    m_label_currentTime.start(tft);
 }
 
-void MenuDisplayWithTime::redraw()
+void MenuDisplayWithTime::redraw(espgui::TftInterface &tft)
 {
-    Base::redraw();
+    Base::redraw(tft);
-    tft.setTextFont(use_big_font() ? 4 : 2);
+    m_label_currentTime.redraw(tft, fmt::format("&7Time: {}", local_clock_string()), espgui::TFT_WHITE, espgui::TFT_BLACK, use_big_font() ? 4 : 2);
-    m_label_currentTime.redraw(fmt::format("&7Time: {}", local_clock_string()));
 }
 
 } // namespace

main/displays/menudisplaywithtime.h

@@ -10,8 +10,8 @@ class MenuDisplayWithTime :
     using Base = BobbyMenuDisplay;
 
 public:
-    void start() override;
+    void initScreen(espgui::TftInterface &tft) override;
-    void redraw() override;
+    void redraw(espgui::TftInterface &tft) override;
     espgui::Label m_label_currentTime{145, 6};
 
 private:

main/displays/menus/aboutmenu.cpp

@@ -58,7 +58,7 @@ AboutMenu::AboutMenu()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,        PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
-std::string AboutMenu::text() const
+std::string AboutMenu::title() const
 {
     return TEXT_ABOUT;
 }

main/displays/menus/aboutmenu.h

@@ -8,7 +8,7 @@ class AboutMenu : public BobbyMenuDisplay
 public:
     AboutMenu();
 
-    std::string text() const override;
+    std::string title() const override;
 
     void back() override;
 };

main/displays/menus/batterydebugmenu.cpp

@@ -84,7 +84,7 @@ BatteryDebugMenu::BatteryDebugMenu()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,                                                    PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
-std::string BatteryDebugMenu::text() const
+std::string BatteryDebugMenu::title() const
 {
     return TEXT_BATTERYDEBUG;
 }

main/displays/menus/batterydebugmenu.h

@@ -8,7 +8,7 @@ class BatteryDebugMenu : public BobbyMenuDisplay
 public:
     BatteryDebugMenu();
 
-    std::string text() const override;
+    std::string title() const override;
 
     void back() override;
 };

main/displays/menus/batterymenu.cpp

@@ -9,8 +9,7 @@
 #include <changevaluedisplay.h>
 #include <textwithvaluehelper.h>
 #include <fmt/core.h>
-
+#include <tftcolors.h>
-#include <tftinstance.h>
 
 // Local includes
 #include "utils.h"
@@ -54,7 +53,7 @@ class WhStatisticsText : public virtual espgui::TextInterface { public: std::str
 
 using BatteryCellSeriesChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<uint8_t>,
-    espgui::StaticText<TEXT_CELL_SERIES>,
+    espgui::StaticTitle<TEXT_CELL_SERIES>,
     BatterySeriesCellsAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -62,7 +61,7 @@ using BatteryCellSeriesChangeScreen = espgui::makeComponent<
 
 using BatteryCellParallelChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<uint8_t>,
-    espgui::StaticText<TEXT_CELL_PARALLEL>,
+    espgui::StaticTitle<TEXT_CELL_PARALLEL>,
     BatteryParallelCellsAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -70,7 +69,7 @@ using BatteryCellParallelChangeScreen = espgui::makeComponent<
 
 using BatteryWHperKMChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<uint16_t>,
-    espgui::StaticText<TEXT_BATTERY_WHKM>,
+    espgui::StaticTitle<TEXT_BATTERY_WHKM>,
     BatteryWHperKMAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -93,16 +92,16 @@ BatteryMenu::BatteryMenu()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,                                                    PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
-std::string BatteryMenu::text() const
+std::string BatteryMenu::title() const
 {
     return TEXT_BATTERY;
 }
 
-void BatteryMenu::initScreen()
+void BatteryMenu::initScreen(espgui::TftInterface &tft)
 {
-    Base::initScreen();
+    Base::initScreen(tft);
-    m_batPercentBootLabel.start();
+    m_batPercentBootLabel.start(tft);
-    m_batPercentNowLabel.start();
+    m_batPercentNowLabel.start(tft);
 }
 
 void BatteryMenu::start()
@@ -111,9 +110,9 @@ void BatteryMenu::start()
     m_doubleProgressBarBatPercentage.start();
 }
 
-void BatteryMenu::redraw()
+void BatteryMenu::redraw(espgui::TftInterface &tft)
 {
-    Base::redraw();
+    Base::redraw(tft);
 
     if (const auto avgVoltage = controllers.getAvgVoltage(); avgVoltage)
     {
@@ -123,11 +122,11 @@ void BatteryMenu::redraw()
             m_doubleProgressBarBatPercentage.redraw(batPercent, *battery::bootBatPercentage);
 
             tft.setTextFont(2);
-            tft.setTextColor(TFT_DARKGREY, TFT_BLACK);
+            tft.setTextColor(espgui::TFT_DARKGREY, espgui::TFT_BLACK);
             m_batPercentNowLabel.redraw(fmt::format("{:.2f} %", batPercent));
             m_batPercentBootLabel.redraw(fmt::format("{:.2f} %", *battery::bootBatPercentage));
             tft.setTextFont(4);
-            tft.setTextColor(TFT_WHITE, TFT_BLACK);
+            tft.setTextColor(espgui::TFT_WHITE, espgui::TFT_BLACK);
         }
     }
 }

main/displays/menus/batterymenu.h

@@ -12,11 +12,11 @@ class BatteryMenu : public BobbyMenuDisplay
 public:
     BatteryMenu();
 
-    std::string text() const override;
+    std::string title() const override;
 
-    void initScreen() override;
+    void initScreen(espgui::TftInterface &tft) override;
     void start() override;
-    void redraw() override;
+    void redraw(espgui::TftInterface &tft) override;
     void back() override;
 
 private:

main/displays/menus/blesettingsmenu.cpp

@@ -26,7 +26,7 @@ constexpr char TEXT_BACK[] = "Back";
 
 using ApSsidChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<std::string>,
-    espgui::StaticText<TEXT_NAME>,
+    espgui::StaticTitle<TEXT_NAME>,
     BluetoothNameAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -44,7 +44,7 @@ BleSettingsMenu::BleSettingsMenu()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,       PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
-std::string BleSettingsMenu::text() const
+std::string BleSettingsMenu::title() const
 {
     return TEXT_BLESETTINGS;
 }

main/displays/menus/blesettingsmenu.h

@@ -8,7 +8,7 @@ class BleSettingsMenu : public BobbyMenuDisplay
 public:
     BleSettingsMenu();
 
-    std::string text() const override;
+    std::string title() const override;
 
     void back() override;
 };

main/displays/menus/boardcomputerhardwaresettingsmenu.cpp

@@ -76,35 +76,35 @@ public:
 
 using SampleCountChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_SAMPLECOUNT>,
+    espgui::StaticTitle<TEXT_SAMPLECOUNT>,
     SampleCountAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using GasMinChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_GASMIN>,
+    espgui::StaticTitle<TEXT_GASMIN>,
     GasMinAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using GasMaxChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_GASMAX>,
+    espgui::StaticTitle<TEXT_GASMAX>,
     GasMaxAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using BremsMinChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_BREMSMIN>,
+    espgui::StaticTitle<TEXT_BREMSMIN>,
     BremsMinAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using BremsMaxChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_BREMSMAX>,
+    espgui::StaticTitle<TEXT_BREMSMAX>,
     BremsMaxAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -114,14 +114,14 @@ using BremsMaxChangeScreen = espgui::makeComponent<
 #if defined(FEATURE_DPAD) || defined(FEATURE_DPAD_3WIRESW) || defined(FEATURE_DPAD_5WIRESW) || defined(FEATURE_DPAD_5WIRESW_2OUT) || defined (FEATURE_DPAD_6WIRESW) || defined (DPAD_BOARDCOMPUTER_V2)
 using DPadDebounceChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<uint8_t>,
-    espgui::StaticText<TEXT_DPADDEBOUNCE>,
+    espgui::StaticTitle<TEXT_DPADDEBOUNCE>,
     DPadDebounceAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using ButtonDelayChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<uint16_t>,
-    espgui::StaticText<TEXT_BUTTONDELAY>,
+    espgui::StaticTitle<TEXT_BUTTONDELAY>,
     ButtonDelayAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -144,42 +144,42 @@ public:
 
 using GametrakXMinChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_SETGAMETRAKXMIN>,
+    espgui::StaticTitle<TEXT_SETGAMETRAKXMIN>,
     GametrakXMinAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using GametrakXMaxChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_SETGAMETRAKXMAX>,
+    espgui::StaticTitle<TEXT_SETGAMETRAKXMAX>,
     GametrakXMaxAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using GametrakYMinChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_SETGAMETRAKYMIN>,
+    espgui::StaticTitle<TEXT_SETGAMETRAKYMIN>,
     GametrakYMinAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using GametrakYMaxChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_SETGAMETRAKYMAX>,
+    espgui::StaticTitle<TEXT_SETGAMETRAKYMAX>,
     GametrakYMaxAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using GametrakDistMinChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_SETGAMETRAKDISTMIN>,
+    espgui::StaticTitle<TEXT_SETGAMETRAKDISTMIN>,
     GametrakDistMinAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using GametrakDistMaxChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_SETGAMETRAKDISTMAX>,
+    espgui::StaticTitle<TEXT_SETGAMETRAKDISTMAX>,
     GametrakDistMaxAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -229,7 +229,7 @@ BoardcomputerHardwareSettingsMenu::BoardcomputerHardwareSettingsMenu()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,                                        PopScreenAction, StaticMenuItemIcon<&icons::back>>>();
 }
 
-std::string BoardcomputerHardwareSettingsMenu::text() const
+std::string BoardcomputerHardwareSettingsMenu::title() const
 {
     return TEXT_BOARDCOMPUTERHARDWARESETTINGS;
 }

main/displays/menus/boardcomputerhardwaresettingsmenu.h

@@ -8,7 +8,7 @@ class BoardcomputerHardwareSettingsMenu : public BobbyMenuDisplay
 public:
     BoardcomputerHardwareSettingsMenu();
 
-    std::string text() const override;
+    std::string title() const override;
 
     void back() override;
 };

main/displays/menus/buzzermenu.cpp

@@ -31,7 +31,7 @@ constexpr char TEXT_BACK[] = "Back";
 struct FrontFreqAccessor : public espgui::RefAccessor<uint8_t> { uint8_t &getRef() const override { return controllers.front.command.buzzer.freq; } };
 using FrontFreqChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<uint8_t>,
-    espgui::StaticText<TEXT_FRONTFREQ>,
+    espgui::StaticTitle<TEXT_FRONTFREQ>,
     FrontFreqAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -40,7 +40,7 @@ using FrontFreqChangeScreen = espgui::makeComponent<
 struct FrontPatternAccessor : public espgui::RefAccessor<uint8_t> { uint8_t &getRef() const override { return controllers.front.command.buzzer.pattern; } };
 using FrontPatternChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<uint8_t>,
-    espgui::StaticText<TEXT_FRONTPATTERN>,
+    espgui::StaticTitle<TEXT_FRONTPATTERN>,
     FrontPatternAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -49,7 +49,7 @@ using FrontPatternChangeScreen = espgui::makeComponent<
 struct BackFreqAccessor : public espgui::RefAccessor<uint8_t> { uint8_t &getRef() const override { return controllers.back.command.buzzer.freq; } };
 using BackFreqChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<uint8_t>,
-    espgui::StaticText<TEXT_BACKFREQ>,
+    espgui::StaticTitle<TEXT_BACKFREQ>,
     BackFreqAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -58,7 +58,7 @@ using BackFreqChangeScreen = espgui::makeComponent<
 struct BackPatternAccessor : public espgui::RefAccessor<uint8_t> { uint8_t &getRef() const override { return controllers.back.command.buzzer.pattern; } };
 using BackPatternChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<uint8_t>,
-    espgui::StaticText<TEXT_BACKPATTERN>,
+    espgui::StaticTitle<TEXT_BACKPATTERN>,
     BackPatternAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -66,28 +66,28 @@ using BackPatternChangeScreen = espgui::makeComponent<
 
 using ReverseBeepFreq0ChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<uint8_t>,
-    espgui::StaticText<TEXT_REVERSEBEEPFREQ0>,
+    espgui::StaticTitle<TEXT_REVERSEBEEPFREQ0>,
     ReverseBeepFreq0Accessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using ReverseBeepFreq1ChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<uint8_t>,
-    espgui::StaticText<TEXT_REVERSEBEEPFREQ1>,
+    espgui::StaticTitle<TEXT_REVERSEBEEPFREQ1>,
     ReverseBeepFreq1Accessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using ReverseBeepDuration0ChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_REVERSEBEEPDURATION0>,
+    espgui::StaticTitle<TEXT_REVERSEBEEPDURATION0>,
     ReverseBeepDuration0Accessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using ReverseBeepDuration1ChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_REVERSEBEEPDURATION1>,
+    espgui::StaticTitle<TEXT_REVERSEBEEPDURATION1>,
     ReverseBeepDuration1Accessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -110,7 +110,7 @@ BuzzerMenu::BuzzerMenu()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,                 PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
-std::string BuzzerMenu::text() const
+std::string BuzzerMenu::title() const
 {
     return TEXT_BUZZER;
 }

main/displays/menus/buzzermenu.h

@@ -8,7 +8,7 @@ class BuzzerMenu : public BobbyMenuDisplay
 public:
     BuzzerMenu();
 
-    std::string text() const override;
+    std::string title() const override;
 
     void back() override;
 };

main/displays/menus/candebugmenu.cpp

@@ -49,7 +49,7 @@ std::string toString(twai_state_t val)
 class CanStatusText : public virtual espgui::TextInterface
 {
 public:
-    explicit CanStatusText(const tl::expected<twai_status_info_t, esp_err_t> &last_can_status_info) :
+    explicit CanStatusText(const std::expected<twai_status_info_t, esp_err_t> &last_can_status_info) :
         m_last_can_status_info{last_can_status_info}
     {
     }
@@ -67,7 +67,7 @@ protected:
     virtual std::string canStatusText(const twai_status_info_t &can_status_info) const = 0;
 
 private:
-    const tl::expected<twai_status_info_t, esp_err_t> &m_last_can_status_info;
+    const std::expected<twai_status_info_t, esp_err_t> &m_last_can_status_info;
 };
 
 class CanStatusStateText : public CanStatusText
@@ -260,7 +260,7 @@ CanDebugMenu::CanDebugMenu()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
-std::string CanDebugMenu::text() const
+std::string CanDebugMenu::title() const
 {
     return TEXT_CANDEBUG;
 }
@@ -273,7 +273,7 @@ void CanDebugMenu::update()
     if (const auto result = twai_get_status_info(&status_info); result != ESP_OK)
     {
         ESP_LOGE(TAG, "twai_get_status_info() failed with %s", esp_err_to_name(result));
-        m_last_can_status_info = tl::make_unexpected(result);
+        m_last_can_status_info = std::unexpected(result);
     }
     else
     {

main/displays/menus/candebugmenu.h

@@ -1,16 +1,18 @@
 #pragma once
 
+#include "sdkconfig.h"
+
 // local includes
 #include "displays/bobbymenudisplay.h"
 
 #ifdef FEATURE_CAN
 
+// system includes
+#include <expected>
+
 // esp-idf includes
 #include <driver/twai.h>
 
-// 3rdparty lib includes
-#include <tl/expected.hpp>
-
 class CanDebugMenu : public BobbyMenuDisplay
 {
     using Base = BobbyMenuDisplay;
@@ -18,14 +20,14 @@ class CanDebugMenu : public BobbyMenuDisplay
 public:
     CanDebugMenu();
 
-    std::string text() const override;
+    std::string title() const override;
 
     void update() override;
 
     void back() override;
 
 private:
-    tl::expected<twai_status_info_t, esp_err_t> m_last_can_status_info;
+    std::expected<twai_status_info_t, esp_err_t> m_last_can_status_info;
 };
 
 #endif

main/displays/menus/cloudsettingsmenu.cpp

@@ -32,7 +32,7 @@ constexpr char TEXT_BACK[] = "Back";
 
 using CloudURLChangeScreen = espgui::makeComponent<
         BobbyChangeValueDisplay<std::string>,
-        espgui::StaticText<TEXT_CLOUDURL>,
+        espgui::StaticTitle<TEXT_CLOUDURL>,
         CloudURLAccessor,
         espgui::ConfirmActionInterface<espgui::PopScreenAction>,
         espgui::BackActionInterface<espgui::PopScreenAction>
@@ -40,7 +40,7 @@ using CloudURLChangeScreen = espgui::makeComponent<
 
 using CloudKeyChangeScreen = espgui::makeComponent<
         BobbyChangeValueDisplay<std::string>,
-        espgui::StaticText<TEXT_CLOUDKEY>,
+        espgui::StaticTitle<TEXT_CLOUDKEY>,
         CloudKeyAccessor,
         espgui::ConfirmActionInterface<espgui::PopScreenAction>,
         espgui::BackActionInterface<espgui::PopScreenAction>
@@ -48,7 +48,7 @@ using CloudKeyChangeScreen = espgui::makeComponent<
 
 using CloudTransmitTimeoutChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_CLOUDTRANSMITTIMEOUT>,
+    espgui::StaticTitle<TEXT_CLOUDTRANSMITTIMEOUT>,
     CloudTransmitTimeoutAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -65,7 +65,7 @@ public:
 
 using CloudCollectRateChangeDisplay = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_CLOUDCOLLECTRATE>,
+    espgui::StaticTitle<TEXT_CLOUDCOLLECTRATE>,
     CloudCollectRateAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -73,7 +73,7 @@ using CloudCollectRateChangeDisplay = espgui::makeComponent<
 
 using CloudSendRateChangeDisplay = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_CLOUDSENDRATE>,
+    espgui::StaticTitle<TEXT_CLOUDSENDRATE>,
     CloudSendRateAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -98,7 +98,7 @@ CloudSettingsMenu::CloudSettingsMenu()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,                 PushScreenAction<SettingsMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
-std::string CloudSettingsMenu::text() const
+std::string CloudSettingsMenu::title() const
 {
     return TEXT_CLOUDSETTINGS;
 }

main/displays/menus/cloudsettingsmenu.h

@@ -8,7 +8,7 @@ class CloudSettingsMenu : public BobbyMenuDisplay
 public:
     CloudSettingsMenu();
 
-    std::string text() const override;
+    std::string title() const override;
 
     void back() override;
 };

main/displays/menus/controllerhardwaresettingsmenu.cpp

@@ -39,14 +39,14 @@ constexpr char TEXT_BACK[] = "Back";
 
 using WheelDiameterMmChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_WHEELDIAMETERMM>,
+    espgui::StaticTitle<TEXT_WHEELDIAMETERMM>,
     WheelDiameterMmAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using WheelDiameterInchChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<float>,
-    espgui::StaticText<TEXT_WHEELDIAMETERINCH>,
+    espgui::StaticTitle<TEXT_WHEELDIAMETERINCH>,
     WheelDiameterInchAccessor,
     espgui::RatioNumberStep<float, std::ratio<1,10>>,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
@@ -54,7 +54,7 @@ using WheelDiameterInchChangeScreen = espgui::makeComponent<
 >;
 using NumMagnetPolesChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_NUMMAGNETPOLES>,
+    espgui::StaticTitle<TEXT_NUMMAGNETPOLES>,
     NumMagnetPolesAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -62,14 +62,14 @@ using NumMagnetPolesChangeScreen = espgui::makeComponent<
 #ifdef FEATURE_CAN
 using CanTransmitTimeoutChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_CANTRANSMITTIMEOUT>,
+    espgui::StaticTitle<TEXT_CANTRANSMITTIMEOUT>,
     CanTransmitTimeoutAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using CanReceiveTimeoutChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_CANRECEIVETIMEOUT>,
+    espgui::StaticTitle<TEXT_CANRECEIVETIMEOUT>,
     CanReceiveTimeoutAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -97,7 +97,7 @@ ControllerHardwareSettingsMenu::ControllerHardwareSettingsMenu()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,               PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
-std::string ControllerHardwareSettingsMenu::text() const
+std::string ControllerHardwareSettingsMenu::title() const
 {
     return TEXT_CONTROLLERHARDWARESETTINGS;
 }

main/displays/menus/controllerhardwaresettingsmenu.h

@@ -8,7 +8,7 @@ class ControllerHardwareSettingsMenu : public BobbyMenuDisplay
 public:
     ControllerHardwareSettingsMenu();
 
-    std::string text() const override;
+    std::string title() const override;
 
     void back() override;
 };

main/displays/menus/crashmenu.cpp

@@ -23,7 +23,7 @@ CrashMenu::CrashMenu()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,            PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
-std::string CrashMenu::text() const
+std::string CrashMenu::title() const
 {
     return TEXT_CRASHMENU;
 }

main/displays/menus/crashmenu.h

@@ -8,7 +8,7 @@ class CrashMenu : public BobbyMenuDisplay
 public:
     CrashMenu();
 
-    std::string text() const override;
+    std::string title() const override;
 
     void back() override;
 };

main/displays/menus/debugmenu.cpp

@@ -118,7 +118,7 @@ DebugMenu::DebugMenu()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,                 PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
-std::string DebugMenu::text() const
+std::string DebugMenu::title() const
 {
     return TEXT_DEBUG;
 }

main/displays/menus/debugmenu.h

@@ -8,7 +8,7 @@ class DebugMenu : public BobbyMenuDisplay
 public:
     DebugMenu();
 
-    std::string text() const override;
+    std::string title() const override;
 
     void back() override;
 };

main/displays/menus/defaultmodesettingsmenu.cpp

@@ -46,70 +46,70 @@ constexpr char TEXT_BACK[] = "Back";
 
 using DefaultModeModelModeChangeDisplay = espgui::makeComponent<
     BobbyChangeValueDisplay<UnifiedModelMode>,
-    espgui::StaticText<TEXT_MODELMODE>,
+    espgui::StaticTitle<TEXT_MODELMODE>,
     DefaultModeModelModeAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using DefaultModeSmoothingChangeDisplay = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_SMOOTHINGVAL>,
+    espgui::StaticTitle<TEXT_SMOOTHINGVAL>,
     DefaultModeSmoothingAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using DefaultModeFwSmoothingLowerLimitChangeDisplay = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_FWSMOOTHING_LIMIT>,
+    espgui::StaticTitle<TEXT_FWSMOOTHING_LIMIT>,
     DefaultModeEnableFieldWeakSmoothingLowerLimitAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using DefaultModeFrontPercentageChangeDisplay = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_FRONTPERCENTAGE>,
+    espgui::StaticTitle<TEXT_FRONTPERCENTAGE>,
     DefaultModeFrontPercentageAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using DefaultModeBackPercentageChangeDisplay = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_BACKPERCENTAGE>,
+    espgui::StaticTitle<TEXT_BACKPERCENTAGE>,
     DefaultModeBackPercentageAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using DefaultModeAddSchwelleChangeDisplay = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_ADDSCHWELLE>,
+    espgui::StaticTitle<TEXT_ADDSCHWELLE>,
     DefaultModeAddSchwelleAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using DefaultModeGas1WertChangeDisplay = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_ADDGASVAL>,
+    espgui::StaticTitle<TEXT_ADDGASVAL>,
     DefaultModeGas1WertAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using DefaultModeGas2WertChangeDisplay = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_SUBGASVAL>,
+    espgui::StaticTitle<TEXT_SUBGASVAL>,
     DefaultModeGas2WertAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using DefaultModeBrems1WertChangeDisplay = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_ADDBRAKEVAL>,
+    espgui::StaticTitle<TEXT_ADDBRAKEVAL>,
     DefaultModeBrems1WertAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
 >;
 using DefaultModeBrems2WertChangeDisplay = espgui::makeComponent<
     BobbyChangeValueDisplay<int16_t>,
-    espgui::StaticText<TEXT_SUBBRAKEVAL>,
+    espgui::StaticTitle<TEXT_SUBBRAKEVAL>,
     DefaultModeBrems2WertAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -141,7 +141,7 @@ DefaultModeSettingsMenu::DefaultModeSettingsMenu()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,                                                                    PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
-std::string DefaultModeSettingsMenu::text() const
+std::string DefaultModeSettingsMenu::title() const
 {
     return TEXT_DEFAULTMODESETTIGNS;
 }

main/displays/menus/defaultmodesettingsmenu.h

@@ -8,7 +8,7 @@ class DefaultModeSettingsMenu : public BobbyMenuDisplay
 public:
     DefaultModeSettingsMenu();
 
-    std::string text() const override;
+    std::string title() const override;
 
     void back() override;
 };

main/displays/menus/demosmenu.cpp

@@ -32,7 +32,7 @@ DemosMenu::DemosMenu()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,       PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
-std::string DemosMenu::text() const
+std::string DemosMenu::title() const
 {
     return TEXT_DEMOS;
 }

main/displays/menus/demosmenu.h

@@ -8,7 +8,7 @@ class DemosMenu : public BobbyMenuDisplay
 public:
     DemosMenu();
 
-    std::string text() const override;
+    std::string title() const override;
 
     void back() override;
 };

main/displays/menus/dynamicdebugmenu.cpp

@@ -3,6 +3,7 @@
 // system includes
 #include <string>
 #include <optional>
+#include <expected>
 
 // 3rdparty lib includes
 #include <espchrono.h>
@@ -68,7 +69,7 @@ private:
 class RandomIcon : public virtual MenuItemIconInterface
 {
 public:
-    const MenuItemIcon *icon() const override;
+    const MenuItemIcon *icon(bool selected) const override;
 
 private:
     mutable std::optional<espchrono::millis_clock::time_point> m_nextUpdate;
@@ -85,12 +86,12 @@ struct ToggleAccessor : public virtual AccessorInterface<bool>
 {
 public:
     bool getValue() const override { return toggle; };
-    tl::expected<void, std::string> setValue(bool value) override;
+    std::expected<void, std::string> setValue(bool value) override;
 };
 
 using ToggleChangeValueDisplay = espgui::makeComponent<
     BobbyChangeValueDisplay<bool>,
-    espgui::StaticText<TEXT_DEBUGTOGGLEMENU>,
+    espgui::StaticTitle<TEXT_DEBUGTOGGLEMENU>,
     ToggleAccessor,
     espgui::ConfirmActionInterface<espgui::PopScreenAction>,
     espgui::BackActionInterface<espgui::PopScreenAction>
@@ -184,7 +185,7 @@ int RandomFont::font() const
     return m_font;
 }
 
-const MenuItemIcon *RandomIcon::icon() const
+const MenuItemIcon *RandomIcon::icon(bool selected) const
 {
     const auto now = espchrono::millis_clock::now();
     if (!m_nextUpdate || now >= *m_nextUpdate)
@@ -199,10 +200,10 @@ const MenuItemIcon *RandomIcon::icon() const
     return m_icon;
 }
 
-tl::expected<void, std::string> ToggleAccessor::setValue(bool value)
+std::expected<void, std::string> ToggleAccessor::setValue(bool value)
 {
     if (toggleLocked)
-        return tl::make_unexpected("cannot be changed while is locked!");
+        return std::unexpected("cannot be changed while is locked!");
     toggle = value;
     return {};
 }

main/displays/menus/enablemenu.cpp

@@ -25,7 +25,7 @@ EnableMenu::EnableMenu()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,             PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
-std::string EnableMenu::text() const
+std::string EnableMenu::title() const
 {
     return TEXT_SETENABLED;
 }

main/displays/menus/enablemenu.h

@@ -8,7 +8,7 @@ class EnableMenu : public BobbyMenuDisplay
 public:
     EnableMenu();
 
-    std::string text() const override;
+    std::string title() const override;
 
     void back() override;
 };

main/displays/menus/espnowmenu.cpp

@@ -65,7 +65,7 @@ EspNowMenu::EspNowMenu()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PushScreenAction<SettingsMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
-std::string EspNowMenu::text() const
+std::string EspNowMenu::title() const
 {
     return TEXT_ESPNOW_MENU;
 }

main/displays/menus/espnowmenu.h

@@ -8,7 +8,7 @@ class EspNowMenu : public BobbyMenuDisplay
 public:
     EspNowMenu();
 
-    std::string text() const override;
+    std::string title() const override;
 
     void back() override;
 };

main/displays/menus/espnowsettingsmenu.cpp

@@ -27,7 +27,7 @@ EspNowSettingsMenu::EspNowSettingsMenu()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
-std::string EspNowSettingsMenu::text() const
+std::string EspNowSettingsMenu::title() const
 {
     return TEXT_ESPNOW_SETTINGS;
 }

main/displays/menus/espnowsettingsmenu.h

@@ -8,7 +8,7 @@ class EspNowSettingsMenu : public BobbyMenuDisplay
 public:
     EspNowSettingsMenu();
 
-    std::string text() const override;
+    std::string title() const override;
 
     void back() override;
 };

main/displays/menus/extrabuttoncalibratemenu.cpp

@@ -242,7 +242,7 @@ void ExtraButtonCalibrateMenu::buttonPressed(espgui::Button button)
     }
 }
 
-std::string ExtraButtonCalibrateMenu::text() const
+std::string ExtraButtonCalibrateMenu::title() const
 {
     return TEXT_EXTRABUTTONCALIBRATEMENU;
 }

main/displays/menus/extrabuttoncalibratemenu.h

@@ -30,7 +30,7 @@ class ExtraButtonCalibrateMenu :
     using Base = BobbyMenuDisplay;
 public:
     ExtraButtonCalibrateMenu();
-    std::string text() const override;
+    std::string title() const override;
     void back() override;
 
     void start() override;

main/displays/menus/featureflagsmenu.cpp

@@ -113,7 +113,7 @@ void FeatureFlagsMenu::start()
     isDirty = false;
 }
 
-std::string FeatureFlagsMenu::text() const
+std::string FeatureFlagsMenu::title() const
 {
     return TEXT_FEATUREFLAGS;
 }

main/displays/menus/featureflagsmenu.h

@@ -10,7 +10,7 @@ public:
     FeatureFlagsMenu();
     void start() override;
 
-    std::string text() const override;
+    std::string title() const override;
 
     void back() override;
 };

main/displays/menus/feedbackdebugmenu.h

@@ -10,6 +10,7 @@
 #include "debugtexthelpers.h"
 #include "debugcolorhelpers.h"
 #include "displays/menus/debugmenu.h"
+#include <tftcolors.h>
 
 template<const char *Ttext, typename Ttexts, template<int> class ColorInterface>
 class FeedbackDebugMenu :
@@ -21,11 +22,11 @@ public:
     FeedbackDebugMenu()
     {
         using namespace espgui;
-        //constructMenuItem<makeComponent<MenuItem, typename Ttexts::BatVoltageText,       ColorInterface<TFT_DARKGREY>, DummyAction>>();
+        //constructMenuItem<makeComponent<MenuItem, typename Ttexts::BatVoltageText,       ColorInterface<espgui::TFT_DARKGREY>, DummyAction>>();
-        constructMenuItem<makeComponent<MenuItem, typename Ttexts::BatVoltageFixedText,  ColorInterface<TFT_DARKGREY>, DummyAction>>();
+        constructMenuItem<makeComponent<MenuItem, typename Ttexts::BatVoltageFixedText,  ColorInterface<espgui::TFT_DARKGREY>, DummyAction>>();
-        //constructMenuItem<makeComponent<MenuItem, typename Ttexts::BoardTempText,        ColorInterface<TFT_DARKGREY>, DummyAction>>();
+        //constructMenuItem<makeComponent<MenuItem, typename Ttexts::BoardTempText,        ColorInterface<espgui::TFT_DARKGREY>, DummyAction>>();
-        constructMenuItem<makeComponent<MenuItem, typename Ttexts::BoardTempFixedText,   ColorInterface<TFT_DARKGREY>, DummyAction>>();
+        constructMenuItem<makeComponent<MenuItem, typename Ttexts::BoardTempFixedText,   ColorInterface<espgui::TFT_DARKGREY>, DummyAction>>();
-        constructMenuItem<makeComponent<MenuItem, typename Ttexts::TimeoutCntSerialText, StaticFont<2>, ColorInterface<TFT_DARKGREY>, DummyAction>>();
+        constructMenuItem<makeComponent<MenuItem, typename Ttexts::TimeoutCntSerialText, StaticFont<2>, ColorInterface<espgui::TFT_DARKGREY>, DummyAction>>();
         constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,                 PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
     }