Very important fix

Update mick configs

.clang-format

@@ -0,0 +1,66 @@
+# Generated from CLion C/C++ Code Style settings
+BasedOnStyle: LLVM
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: None
+AlignOperands: Align
+AllowAllArgumentsOnNextLine: false
+AllowAllConstructorInitializersOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Always
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Always
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterReturnType: None
+AlwaysBreakTemplateDeclarations: Yes
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: true
+  AfterControlStatement: Always
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: false
+  AfterUnion: true
+  BeforeCatch: false
+  BeforeElse: true
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: true
+BreakBeforeBinaryOperators: None
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: BeforeColon
+ColumnLimit: 0
+CompactNamespaces: false
+ContinuationIndentWidth: 8
+IndentCaseLabels: false
+IndentPPDirectives: None
+IndentWidth: 4
+KeepEmptyLinesAtTheStartOfBlocks: true
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PointerAlignment: Right
+ReflowComments: false
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 0
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+TabWidth: 4
+UseTab: Never

.github/workflows/workflow.yml

@@ -154,7 +154,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [feedc0de, comred, comred_new, peter, mick, nofeatures, seatbot, gernot]
+        node: [feedc0de, feedc0de_new, comred_new, peter, mick, nofeatures, seatbot]
     name: ${{ matrix.node }}
     needs:
       - checkout

.gitmodules

@@ -19,9 +19,6 @@
 [submodule "components/ArduinoJson"]
 	path = components/ArduinoJson
 	url = ../../0xFEEDC0DE64/ArduinoJson.git
-[submodule "components/TFT_eSPI"]
-	path = components/TFT_eSPI
-	url = ../../0xFEEDC0DE64/TFT_eSPI.git
 [submodule "components/arduino-esp32"]
 	path = components/arduino-esp32
 	url = ../../0xFEEDC0DE64/arduino-esp32.git
@@ -39,7 +36,7 @@
 	url = ../../0xFEEDC0DE64/espwifistack.git
 [submodule "components/esp-nimble-cpp"]
 	path = components/esp-nimble-cpp
-	url = ../../0xFEEDC0DE64/esp-nimble-cpp.git
+	url = ../../bobbycar-graz/esp-nimble-cpp.git
 [submodule "components/espasyncota"]
 	path = components/espasyncota
 	url = ../../0xFEEDC0DE64/espasyncota.git
@@ -67,3 +64,12 @@
 [submodule "esp-protocols"]
 	path = esp-protocols
 	url = ../../0xFEEDC0DE64/esp-protocols.git
+[submodule "components/TFT_eSPI"]
+	path = components/TFT_eSPI
+	url = ../../0xFEEDC0DE64/TFT_eSPI.git
+[submodule "esp_boost"]
+	path = esp_boost
+	url = ../../0xFEEDC0DE64/esp_boost.git
+[submodule "components/asio_web"]
+	path = components/asio_web
+	url = ../../0xFEEDC0DE64/asio_web.git

CMakeLists.txt

@@ -22,10 +22,13 @@ include(config.cmake)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+idf_build_set_property(CXX_COMPILE_OPTIONS -std=gnu++23 APPEND)
+
 set(EXTRA_COMPONENT_DIRS
+    esp_boost
     esp-protocols/components
 )
 

README.md

@@ -6,7 +6,7 @@
 | :---                |                                                                                                                   ---: |
 | Actions (CI) | [![CI](https://github.com/bobbycar-graz/bobbycar-boardcomputer-firmware/actions/workflows/workflow.yml/badge.svg)](https://github.com/bobbycar-graz/bobbycar-boardcomputer-firmware/actions/workflows/workflow.yml) |
 | Sonar | [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=bobbycar-graz_bobbycar-boardcomputer-firmware&metric=bugs)](https://sonarcloud.io/summary/new_code?id=bobbycar-graz_bobbycar-boardcomputer-firmware)<br />[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=bobbycar-graz_bobbycar-boardcomputer-firmware&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=bobbycar-graz_bobbycar-boardcomputer-firmware)<br />[![Duplicated Lines (%)](https://sonarcloud.io/api/project_badges/measure?project=bobbycar-graz_bobbycar-boardcomputer-firmware&metric=duplicated_lines_density)](https://sonarcloud.io/summary/new_code?id=bobbycar-graz_bobbycar-boardcomputer-firmware)<br />[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=bobbycar-graz_bobbycar-boardcomputer-firmware&metric=ncloc)](https://sonarcloud.io/summary/new_code?id=bobbycar-graz_bobbycar-boardcomputer-firmware)<br />[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=bobbycar-graz_bobbycar-boardcomputer-firmware&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=bobbycar-graz_bobbycar-boardcomputer-firmware)<br />[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=bobbycar-graz_bobbycar-boardcomputer-firmware&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=bobbycar-graz_bobbycar-boardcomputer-firmware)<br />[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=bobbycar-graz_bobbycar-boardcomputer-firmware&metric=reliability_rating)](https://sonarcloud.io/summary/new_code?id=bobbycar-graz_bobbycar-boardcomputer-firmware)<br />[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=bobbycar-graz_bobbycar-boardcomputer-firmware&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=bobbycar-graz_bobbycar-boardcomputer-firmware)<br />[![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=bobbycar-graz_bobbycar-boardcomputer-firmware&metric=sqale_index)](https://sonarcloud.io/summary/new_code?id=bobbycar-graz_bobbycar-boardcomputer-firmware)<br />[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=bobbycar-graz_bobbycar-boardcomputer-firmware&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=bobbycar-graz_bobbycar-boardcomputer-firmware) |
-## How to clone ? (READ THIS OR YOU WILL FAIL)
+## How to clone ? (READ THIS OR YOU WILL FAIL!)
 
 ```bash
 git clone --recursive git@github.com:bobbycar-graz/bobbycar-boardcomputer-firmware.git

configs/config_allfeatures.cmake

@@ -1,4 +1,5 @@
 set(BOBBY_APP_NAME bobbyquad_allfeatures)
+set(BOBBY_DEFAULT_USERNAME allfeatures)
 
 add_definitions(
   -DUSER_SETUP_LOADED=1
@@ -17,8 +18,6 @@ add_definitions(
 
 set(BOBBYCAR_BUILDFLAGS
 # Pins
-    -DPINS_GAS=34
-    -DPINS_BREMS=35
 #    -DFEATURE_JOYSTICK
 #    -DPINS_RX1=4
 #    -DPINS_TX1=5

configs/config_aveexy.cmake

@@ -0,0 +1,90 @@
+set(BOBBY_APP_NAME bobbyquad_aveexy)
+set(BOBBY_DEFAULT_USERNAME aveexy)
+
+add_definitions(
+  -DUSER_SETUP_LOADED=1
+  -DLOAD_GLCD=1
+  -DLOAD_FONT2=1
+  -DLOAD_FONT4=1
+  -DLOAD_FONT7=1
+  -DILI9341_DRIVER=1
+  -DTFT_MOSI=13
+  -DTFT_SCLK=15
+  -DTFT_CS=14
+  -DTFT_DC=12
+  -DTFT_RST=2
+  -DSPI_FREQUENCY=40000000
+)
+
+set(BOBBYCAR_BUILDFLAGS
+# Pins
+    -DPINS_GAS=34
+    -DPINS_BREMS=35
+#    -DFEATURE_JOYSTICK
+#    -DPINS_RX1=4
+#    -DPINS_TX1=5
+#    -DPINS_RX2=22
+#    -DPINS_TX2=23
+#    -DPINS_MOSFET0=18
+#    -DPINS_MOSFET1=19
+#    -DPINS_MOSFET2=21
+#    -DPINS_GAMETRAKX=34
+#    -DPINS_GAMETRAKY=39
+#    -DPINS_GAMETRAKDIST=36
+    -DPINS_LEDBACKLIGHT=23
+    -DPINS_LEDSTRIP=33
+
+# Config flags
+    -DFEATURE_ADC_IN
+    -DFEATURE_CAN
+#    -DFEATURE_SERIAL
+#    -DFEATURE_MOSFETS
+#    -DFEATURE_BLUETOOTH
+#    -DFEATURE_BMS
+#    -DFEATURE_GAMETRAK
+#    -DFEATURE_POWERSUPPLY
+    -DFEATURE_LEDBACKLIGHT
+
+    -DLEDBACKLIGHT_INVERTED
+#    -DLEDSTRIP_WRONG_DIRECTION
+    -DHEAP_LRGST_CRASH_TEXT_FIX
+
+# Default values
+    -DDEFAULT_SWAPSCREENBYTES=false
+    -DDEFAULT_INVERTFRONTLEFT=false
+    -DDEFAULT_INVERTFRONTRIGHT=true
+    -DDEFAULT_INVERTBACKLEFT=false
+    -DDEFAULT_INVERTBACKRIGHT=true
+    -DDEFAULT_WHEELDIAMETER=200
+    -DDEFAULT_IMOTMAX=28
+    -DDEFAULT_IDCMAX=30
+    -DDEFAULT_NMOTMAX=2000
+    -DDEFAULT_FIELDWEAKMAX=17
+    -DDEFAULT_FIELDADVMAX=40
+
+# DPAD
+#    -DFEATURE_DPAD_5WIRESW
+#    -DPINS_DPAD_5WIRESW_OUT=4
+#    -DPINS_DPAD_5WIRESW_IN1=5
+#    -DPINS_DPAD_5WIRESW_IN2=27
+#    -DPINS_DPAD_5WIRESW_IN3=18
+#    -DPINS_DPAD_5WIRESW_IN4=19
+#    -DPINS_DPAD_EXTRASW_IN5=25
+#    -DFEATURE_DPAD_6WIRESW
+#    -DPINS_DPAD_6WIRESW_OUT=4
+#    -DPINS_DPAD_6WIRESW_IN1=5
+#    -DPINS_DPAD_6WIRESW_IN2=27
+#    -DPINS_DPAD_6WIRESW_IN3=18
+#    -DPINS_DPAD_6WIRESW_IN4=19
+#    -DPINS_DPAD_6WIRESW_IN5=26
+#    -DFEATURE_GSCHISSENE_DIODE
+    -DDPAD_BOARDCOMPUTER_V2
+    -DPINS_DPAD_BOARDCOMPUTER_V2_OUT1=19
+    -DPINS_DPAD_BOARDCOMPUTER_V2_OUT2=5
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN1=4
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN2=18
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN3=27
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN4=16
+#    -DDPAD_BOARDCOMPUTER_V2_DEBUG
+)
+

configs/config_comred.cmake

@@ -1,4 +1,5 @@
 set(BOBBY_APP_NAME bobbyquad_comred)
+set(BOBBY_DEFAULT_USERNAMENAME comred)
 
 add_definitions(
   -DUSER_SETUP_LOADED=1

configs/config_comred_new.cmake

@@ -1,19 +1,20 @@
 set(BOBBY_APP_NAME bobbyquad_comred_new)
+set(BOBBY_DEFAULT_USERNAME comred_new)
 
-add_definitions(
-  -DUSER_SETUP_LOADED=1
-  -DLOAD_GLCD=1
-  -DLOAD_FONT2=1
-  -DLOAD_FONT4=1
-  -DLOAD_FONT7=1
-  -DILI9341_DRIVER=1
-  -DTFT_MOSI=13
-  -DTFT_SCLK=15
-  -DTFT_CS=14
-  -DTFT_DC=12
-  -DTFT_RST=2
-  -DSPI_FREQUENCY=40000000
-)
+# add_definitions(
+#   -DUSER_SETUP_LOADED=1
+#   -DLOAD_GLCD=1
+#   -DLOAD_FONT2=1
+#   -DLOAD_FONT4=1
+#   -DLOAD_FONT7=1
+#   -DILI9341_DRIVER=1
+#   -DTFT_MOSI=13
+#   -DTFT_SCLK=15
+#   -DTFT_CS=14
+#   -DTFT_DC=12
+#   -DTFT_RST=2
+#   -DSPI_FREQUENCY=40000000
+# )
 
 set(BOBBYCAR_BUILDFLAGS
 # Pins

configs/config_feedc0de.cmake

@@ -1,24 +1,8 @@
 set(BOBBY_APP_NAME bobbyquad_feedc0de)
-
-add_definitions(
-  -DUSER_SETUP_LOADED=1
-  -DLOAD_GLCD=1
-  -DLOAD_FONT2=1
-  -DLOAD_FONT4=1
-  -DLOAD_FONT7=1
-  -DILI9341_DRIVER=1
-  -DTFT_MOSI=13
-  -DTFT_SCLK=15
-  -DTFT_CS=14
-  -DTFT_DC=12
-  -DTFT_RST=2
-  -DSPI_FREQUENCY=40000000
-)
+set(BOBBY_DEFAULT_USERNAME feedc0de)
 
 set(BOBBYCAR_BUILDFLAGS
 # Pins
-    -DPINS_GAS=34
-    -DPINS_BREMS=35
 #    -DFEATURE_JOYSTICK
 #    -DPINS_RX1=4
 #    -DPINS_TX1=5

configs/config_feedc0de_new.cmake

@@ -0,0 +1,56 @@
+set(BOBBY_APP_NAME bobbyquad_feedc0de)
+set(BOBBY_DEFAULT_USERNAME feedc0de)
+
+set(BOBBYCAR_BUILDFLAGS
+# Pins
+#    -DFEATURE_JOYSTICK
+#    -DPINS_RX1=4
+#    -DPINS_TX1=5
+#    -DPINS_RX2=22
+#    -DPINS_TX2=23
+    -DPINS_MOSFET0=4
+    -DPINS_MOSFET1=5
+    -DPINS_MOSFET2=25
+#    -DPINS_GAMETRAKX=34
+#    -DPINS_GAMETRAKY=39
+#    -DPINS_GAMETRAKDIST=36
+    -DPINS_LEDBACKLIGHT=23
+    -DPINS_LEDSTRIP=26
+
+# Config flags
+    -DFEATURE_ADC_IN
+    -DFEATURE_CAN
+#    -DFEATURE_SERIAL
+    -DFEATURE_MOSFETS
+#    -DFEATURE_BLUETOOTH
+#    -DFEATURE_BMS
+#    -DFEATURE_GAMETRAK
+    -DFEATURE_POWERSUPPLY
+    -DFEATURE_LEDBACKLIGHT
+
+#    -DLEDBACKLIGHT_INVERTED
+#    -DLEDSTRIP_WRONG_DIRECTION
+#    -DHEAP_LRGST_CRASH_TEXT_FIX
+
+# Default values
+    -DDEFAULT_SWAPSCREENBYTES=false
+    -DDEFAULT_INVERTFRONTLEFT=false
+    -DDEFAULT_INVERTFRONTRIGHT=true
+    -DDEFAULT_INVERTBACKLEFT=false
+    -DDEFAULT_INVERTBACKRIGHT=true
+    -DDEFAULT_WHEELDIAMETER=255
+    -DDEFAULT_IMOTMAX=40
+    -DDEFAULT_IDCMAX=42
+    -DDEFAULT_NMOTMAX=2000
+    -DDEFAULT_FIELDWEAKMAX=17
+    -DDEFAULT_FIELDADVMAX=40
+
+# DPAD
+    -DDPAD_BOARDCOMPUTER_V2
+    -DPINS_DPAD_BOARDCOMPUTER_V2_OUT1=19
+    -DPINS_DPAD_BOARDCOMPUTER_V2_OUT2=5
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN1=4
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN2=18
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN3=27
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN4=16
+)

configs/config_gernot.cmake

@@ -1,4 +1,5 @@
 set(BOBBY_APP_NAME bobbyquad_gernot)
+set(BOBBY_DEFAULT_USERNAME gernot)
 
 add_definitions(
   -DUSER_SETUP_LOADED=1

configs/config_greyhash.cmake

@@ -1,4 +1,5 @@
 set(BOBBY_APP_NAME bobbyquad_greyhash)
+set(BOBBY_DEFAULT_USERNAME greyhash)
 
 add_definitions(
   -DUSER_SETUP_LOADED=1

configs/config_mick.cmake

@@ -1,19 +1,5 @@
 set(BOBBY_APP_NAME bobbyquad_mick)
-
-add_definitions(
-  -DUSER_SETUP_LOADED=1
-  -DLOAD_GLCD=1
-  -DLOAD_FONT2=1
-  -DLOAD_FONT4=1
-  -DLOAD_FONT7=1
-  -DILI9341_DRIVER=1
-  -DTFT_MOSI=13
-  -DTFT_SCLK=15
-  -DTFT_CS=14
-  -DTFT_DC=12
-  -DTFT_RST=2
-  -DSPI_FREQUENCY=27000000
-)
+set(BOBBY_DEFAULT_USERNAME mick)
 
 set(BOBBYCAR_BUILDFLAGS
 # Pins

configs/config_nofeatures.cmake

@@ -1,4 +1,5 @@
 set(BOBBY_APP_NAME bobbyquad_nofeatures)
+set(BOBBY_DEFAULT_USERNAME nofeatures)
 
 add_definitions(
   -DUSER_SETUP_LOADED=1

configs/config_peter.cmake

@@ -1,4 +1,5 @@
 set(BOBBY_APP_NAME bobbyquad_peter)
+set(BOBBY_DEFAULT_USERNAME peter)
 
 add_definitions(
   -DUSER_SETUP_LOADED=1

configs/config_seatbot.cmake

@@ -1,4 +1,5 @@
 set(BOBBY_APP_NAME bobbyquad_seatbot)
+set(BOBBY_DEFAULT_USERNAME seatbot)
 
 add_definitions(
   -DUSER_SETUP_LOADED=1
@@ -45,7 +46,7 @@ set(BOBBYCAR_BUILDFLAGS
     -DFEATURE_LEDBACKLIGHT
 
     -DLEDBACKLIGHT_INVERTED
-#    -DLEDSTRIP_WRONG_DIRECTION
+    -DLEDSTRIP_WRONG_DIRECTION
     -DHEAP_LRGST_CRASH_TEXT_FIX
 
 # Default values

configs/config_testdevice.cmake

@@ -0,0 +1,90 @@
+set(BOBBY_APP_NAME testdevice)
+set(BOBBY_DEFAULT_USERNAME testdevice)
+
+add_definitions(
+  -DUSER_SETUP_LOADED=1
+  -DLOAD_GLCD=1
+  -DLOAD_FONT2=1
+  -DLOAD_FONT4=1
+  -DLOAD_FONT7=1
+  -DILI9341_DRIVER=1
+  -DTFT_MOSI=13
+  -DTFT_SCLK=15
+  -DTFT_CS=14
+  -DTFT_DC=12
+  -DTFT_RST=2
+  -DSPI_FREQUENCY=40000000
+)
+
+set(BOBBYCAR_BUILDFLAGS
+# Pins
+    -DPINS_GAS=34
+    -DPINS_BREMS=35
+#    -DFEATURE_JOYSTICK
+#    -DPINS_RX1=4
+#    -DPINS_TX1=5
+#    -DPINS_RX2=22
+#    -DPINS_TX2=23
+#    -DPINS_MOSFET0=18
+#    -DPINS_MOSFET1=19
+#    -DPINS_MOSFET2=21
+#    -DPINS_GAMETRAKX=34
+#    -DPINS_GAMETRAKY=39
+#    -DPINS_GAMETRAKDIST=36
+    -DPINS_LEDBACKLIGHT=23
+    -DPINS_LEDSTRIP=33
+
+# Config flags
+    -DFEATURE_ADC_IN
+    -DFEATURE_CAN
+#    -DFEATURE_SERIAL
+#    -DFEATURE_MOSFETS
+#    -DFEATURE_BLUETOOTH
+#    -DFEATURE_BMS
+#    -DFEATURE_GAMETRAK
+#    -DFEATURE_POWERSUPPLY
+    -DFEATURE_LEDBACKLIGHT
+
+    -DLEDBACKLIGHT_INVERTED
+#    -DLEDSTRIP_WRONG_DIRECTION
+    -DHEAP_LRGST_CRASH_TEXT_FIX
+
+# Default values
+    -DDEFAULT_SWAPSCREENBYTES=false
+    -DDEFAULT_INVERTFRONTLEFT=false
+    -DDEFAULT_INVERTFRONTRIGHT=true
+    -DDEFAULT_INVERTBACKLEFT=false
+    -DDEFAULT_INVERTBACKRIGHT=true
+    -DDEFAULT_WHEELDIAMETER=200
+    -DDEFAULT_IMOTMAX=28
+    -DDEFAULT_IDCMAX=30
+    -DDEFAULT_NMOTMAX=2000
+    -DDEFAULT_FIELDWEAKMAX=17
+    -DDEFAULT_FIELDADVMAX=40
+
+# DPAD
+#    -DFEATURE_DPAD_5WIRESW
+#    -DPINS_DPAD_5WIRESW_OUT=4
+#    -DPINS_DPAD_5WIRESW_IN1=5
+#    -DPINS_DPAD_5WIRESW_IN2=27
+#    -DPINS_DPAD_5WIRESW_IN3=18
+#    -DPINS_DPAD_5WIRESW_IN4=19
+#    -DPINS_DPAD_EXTRASW_IN5=25
+#    -DFEATURE_DPAD_6WIRESW
+#    -DPINS_DPAD_6WIRESW_OUT=4
+#    -DPINS_DPAD_6WIRESW_IN1=5
+#    -DPINS_DPAD_6WIRESW_IN2=27
+#    -DPINS_DPAD_6WIRESW_IN3=18
+#    -DPINS_DPAD_6WIRESW_IN4=19
+#    -DPINS_DPAD_6WIRESW_IN5=26
+#    -DFEATURE_GSCHISSENE_DIODE
+    -DDPAD_BOARDCOMPUTER_V2
+    -DPINS_DPAD_BOARDCOMPUTER_V2_OUT1=19
+    -DPINS_DPAD_BOARDCOMPUTER_V2_OUT2=5
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN1=4
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN2=18
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN3=27
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN4=16
+#    -DDPAD_BOARDCOMPUTER_V2_DEBUG
+)
+

configs/config_testdevice2.cmake

@@ -0,0 +1,90 @@
+set(BOBBY_APP_NAME testdevice2)
+set(BOBBY_DEFAULT_USERNAME testdevice2)
+
+add_definitions(
+  -DUSER_SETUP_LOADED=1
+  -DLOAD_GLCD=1
+  -DLOAD_FONT2=1
+  -DLOAD_FONT4=1
+  -DLOAD_FONT7=1
+  -DST7789_DRIVER=1
+  -DTFT_MOSI=13
+  -DTFT_SCLK=15
+  -DTFT_CS=14
+  -DTFT_DC=12
+  -DTFT_RST=2
+  -DSPI_FREQUENCY=40000000
+)
+
+set(BOBBYCAR_BUILDFLAGS
+# Pins
+    -DPINS_GAS=34
+    -DPINS_BREMS=35
+#    -DFEATURE_JOYSTICK
+#    -DPINS_RX1=4
+#    -DPINS_TX1=5
+#    -DPINS_RX2=22
+#    -DPINS_TX2=23
+#    -DPINS_MOSFET0=18
+#    -DPINS_MOSFET1=19
+#    -DPINS_MOSFET2=21
+#    -DPINS_GAMETRAKX=34
+#    -DPINS_GAMETRAKY=39
+#    -DPINS_GAMETRAKDIST=36
+    -DPINS_LEDBACKLIGHT=23
+    -DPINS_LEDSTRIP=33
+
+# Config flags
+    -DFEATURE_ADC_IN
+    -DFEATURE_CAN
+#    -DFEATURE_SERIAL
+#    -DFEATURE_MOSFETS
+#    -DFEATURE_BLUETOOTH
+#    -DFEATURE_BMS
+#    -DFEATURE_GAMETRAK
+#    -DFEATURE_POWERSUPPLY
+    -DFEATURE_LEDBACKLIGHT
+
+    -DLEDBACKLIGHT_INVERTED
+#    -DLEDSTRIP_WRONG_DIRECTION
+    -DHEAP_LRGST_CRASH_TEXT_FIX
+
+# Default values
+    -DDEFAULT_SWAPSCREENBYTES=false
+    -DDEFAULT_INVERTFRONTLEFT=false
+    -DDEFAULT_INVERTFRONTRIGHT=true
+    -DDEFAULT_INVERTBACKLEFT=false
+    -DDEFAULT_INVERTBACKRIGHT=true
+    -DDEFAULT_WHEELDIAMETER=200
+    -DDEFAULT_IMOTMAX=28
+    -DDEFAULT_IDCMAX=30
+    -DDEFAULT_NMOTMAX=2000
+    -DDEFAULT_FIELDWEAKMAX=17
+    -DDEFAULT_FIELDADVMAX=40
+
+# DPAD
+#    -DFEATURE_DPAD_5WIRESW
+#    -DPINS_DPAD_5WIRESW_OUT=4
+#    -DPINS_DPAD_5WIRESW_IN1=5
+#    -DPINS_DPAD_5WIRESW_IN2=27
+#    -DPINS_DPAD_5WIRESW_IN3=18
+#    -DPINS_DPAD_5WIRESW_IN4=19
+#    -DPINS_DPAD_EXTRASW_IN5=25
+#    -DFEATURE_DPAD_6WIRESW
+#    -DPINS_DPAD_6WIRESW_OUT=4
+#    -DPINS_DPAD_6WIRESW_IN1=5
+#    -DPINS_DPAD_6WIRESW_IN2=27
+#    -DPINS_DPAD_6WIRESW_IN3=18
+#    -DPINS_DPAD_6WIRESW_IN4=19
+#    -DPINS_DPAD_6WIRESW_IN5=26
+#    -DFEATURE_GSCHISSENE_DIODE
+    -DDPAD_BOARDCOMPUTER_V2
+    -DPINS_DPAD_BOARDCOMPUTER_V2_OUT1=19
+    -DPINS_DPAD_BOARDCOMPUTER_V2_OUT2=5
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN1=4
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN2=18
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN3=27
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN4=16
+#    -DDPAD_BOARDCOMPUTER_V2_DEBUG
+)
+

configs/sdkconfig_feedc0de

@@ -11,29 +11,35 @@ CONFIG_SOC_DAC_SUPPORTED=y
 CONFIG_SOC_MCPWM_SUPPORTED=y
 CONFIG_SOC_SDMMC_HOST_SUPPORTED=y
 CONFIG_SOC_BT_SUPPORTED=y
-CONFIG_SOC_CLASSIC_BT_SUPPORTED=y
 CONFIG_SOC_PCNT_SUPPORTED=y
 CONFIG_SOC_WIFI_SUPPORTED=y
 CONFIG_SOC_SDIO_SLAVE_SUPPORTED=y
 CONFIG_SOC_TWAI_SUPPORTED=y
 CONFIG_SOC_EMAC_SUPPORTED=y
-CONFIG_SOC_CPU_CORES_NUM=2
 CONFIG_SOC_ULP_SUPPORTED=y
 CONFIG_SOC_CCOMP_TIMER_SUPPORTED=y
 CONFIG_SOC_RTC_FAST_MEM_SUPPORTED=y
 CONFIG_SOC_RTC_SLOW_MEM_SUPPORTED=y
+CONFIG_SOC_RTC_MEM_SUPPORTED=y
 CONFIG_SOC_I2S_SUPPORTED=y
 CONFIG_SOC_RMT_SUPPORTED=y
-CONFIG_SOC_SIGMADELTA_SUPPORTED=y
+CONFIG_SOC_SDM_SUPPORTED=y
+CONFIG_SOC_LEDC_SUPPORTED=y
+CONFIG_SOC_I2C_SUPPORTED=y
 CONFIG_SOC_SUPPORT_COEXISTENCE=y
 CONFIG_SOC_AES_SUPPORTED=y
 CONFIG_SOC_MPI_SUPPORTED=y
 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_DPORT_WORKAROUND_DIS_INTERRUPT_LVL=5
+CONFIG_SOC_XTAL_SUPPORT_26M=y
+CONFIG_SOC_XTAL_SUPPORT_40M=y
+CONFIG_SOC_XTAL_SUPPORT_AUTO_DETECT=y
 CONFIG_SOC_ADC_RTC_CTRL_SUPPORTED=y
 CONFIG_SOC_ADC_DIG_CTRL_SUPPORTED=y
+CONFIG_SOC_ADC_DMA_SUPPORTED=y
 CONFIG_SOC_ADC_PERIPH_NUM=2
 CONFIG_SOC_ADC_MAX_CHANNEL_NUM=10
 CONFIG_SOC_ADC_ATTEN_NUM=4
@@ -41,16 +47,21 @@ CONFIG_SOC_ADC_DIGI_CONTROLLER_NUM=2
 CONFIG_SOC_ADC_PATT_LEN_MAX=16
 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_SAMPLE_FREQ_THRES_HIGH=2
-CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=2000
+CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=20
 CONFIG_SOC_ADC_RTC_MIN_BITWIDTH=9
 CONFIG_SOC_ADC_RTC_MAX_BITWIDTH=12
 CONFIG_SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256=y
 CONFIG_SOC_SHARED_IDCACHE_SUPPORTED=y
+CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=5
+CONFIG_SOC_CPU_CORES_NUM=2
+CONFIG_SOC_CPU_INTR_NUM=32
+CONFIG_SOC_CPU_HAS_FPU=y
 CONFIG_SOC_CPU_BREAKPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINT_SIZE=64
-CONFIG_SOC_CPU_HAS_FPU=y
 CONFIG_SOC_DAC_PERIPH_NUM=2
 CONFIG_SOC_DAC_RESOLUTION=8
 CONFIG_SOC_GPIO_PORT=1
@@ -115,12 +126,13 @@ CONFIG_SOC_RTCIO_PIN_COUNT=18
 CONFIG_SOC_RTCIO_INPUT_OUTPUT_SUPPORTED=y
 CONFIG_SOC_RTCIO_HOLD_SUPPORTED=y
 CONFIG_SOC_RTCIO_WAKE_SUPPORTED=y
-CONFIG_SOC_SIGMADELTA_NUM=1
-CONFIG_SOC_SIGMADELTA_CHANNEL_NUM=8
+CONFIG_SOC_SDM_GROUPS=1
+CONFIG_SOC_SDM_CHANNELS_PER_GROUP=8
 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_MAXIMUM_BUFFER_SIZE=64
 CONFIG_SOC_SPI_MAX_PRE_DIVIDER=8192
 CONFIG_SOC_MEMSPI_SRC_FREQ_80M_SUPPORTED=y
@@ -138,6 +150,7 @@ CONFIG_SOC_TOUCH_PAD_MEASURE_WAIT_MAX=0xFF
 CONFIG_SOC_TWAI_BRP_MIN=2
 CONFIG_SOC_TWAI_SUPPORT_MULTI_ADDRESS_LAYOUT=y
 CONFIG_SOC_UART_NUM=3
+CONFIG_SOC_UART_SUPPORT_APB_CLK=y
 CONFIG_SOC_UART_SUPPORT_REF_TICK=y
 CONFIG_SOC_UART_FIFO_LEN=128
 CONFIG_SOC_UART_BITRATE_MAX=5000000
@@ -163,7 +176,11 @@ CONFIG_SOC_PM_SUPPORT_RTC_FAST_MEM_PD=y
 CONFIG_SOC_PM_SUPPORT_RTC_SLOW_MEM_PD=y
 CONFIG_SOC_SDMMC_USE_IOMUX=y
 CONFIG_SOC_SDMMC_NUM_SLOTS=2
-CONFIG_SOC_BLE_DONT_UPDATE_OWN_RPA=y
+CONFIG_SOC_WIFI_WAPI_SUPPORT=y
+CONFIG_SOC_WIFI_CSI_SUPPORT=y
+CONFIG_SOC_WIFI_MESH_SUPPORT=y
+CONFIG_SOC_BLE_SUPPORTED=y
+CONFIG_SOC_BT_CLASSIC_SUPPORTED=y
 CONFIG_IDF_CMAKE=y
 CONFIG_IDF_TARGET_ARCH_XTENSA=y
 CONFIG_IDF_TARGET_ARCH="xtensa"
@@ -185,16 +202,6 @@ CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
 # CONFIG_APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS is not set
 # end of Build type
 
-#
-# Application manager
-#
-CONFIG_APP_COMPILE_TIME_DATE=y
-# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
-# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
-# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
-CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
-# end of Application manager
-
 #
 # Bootloader config
 #
@@ -236,10 +243,21 @@ CONFIG_SECURE_BOOT_V1_SUPPORTED=y
 # CONFIG_SECURE_FLASH_ENC_ENABLED is not set
 # end of Security features
 
+#
+# Application manager
+#
+# CONFIG_APP_COMPILE_TIME_DATE is not set
+# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
+# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
+# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
+CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
+# end of Application manager
+
 CONFIG_ESP_ROM_HAS_CRC_LE=y
 CONFIG_ESP_ROM_HAS_CRC_BE=y
 CONFIG_ESP_ROM_HAS_JPEG_DECODE=y
 CONFIG_ESP_ROM_SUPPORT_MULTIPLE_UART=y
+CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y
 
 #
 # Serial flasher config
@@ -265,7 +283,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
 # CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
 CONFIG_ESPTOOLPY_FLASHSIZE="16MB"
-CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+# CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
 CONFIG_ESPTOOLPY_BEFORE="default_reset"
@@ -425,12 +443,6 @@ CONFIG_APPTRACE_UART_TASK_PRIO=1
 CONFIG_APPTRACE_LOCK_ENABLE=y
 # end of Application Level Tracing
 
-#
-# ESP-ASIO
-#
-# CONFIG_ASIO_SSL_SUPPORT is not set
-# end of ESP-ASIO
-
 #
 # Bluetooth
 #
@@ -490,6 +502,7 @@ CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=30
 CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
 # end of Memory Settings
 
+CONFIG_BT_NIMBLE_GATT_MAX_PROCS=4
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL=y
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL_ITVL=1000
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL_THRESH=2
@@ -509,9 +522,9 @@ CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_DIS=y
 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_SLEEP_ENABLE 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
 # end of NimBLE Options
 
 #
@@ -567,11 +580,20 @@ CONFIG_BTDM_CTRL_HLI=y
 #
 
 #
-# ADC Configuration
+# Legacy ADC Configuration
 #
-# CONFIG_ADC_FORCE_XPD_FSM is not set
 CONFIG_ADC_DISABLE_DAC=y
-# end of ADC Configuration
+# CONFIG_ADC_SUPPRESS_DEPRECATE_WARN is not set
+
+#
+# Legacy ADC Calibration Configuration
+#
+CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CAL_LUT_ENABLE=y
+# CONFIG_ADC_CALI_SUPPRESS_DEPRECATE_WARN is not set
+# end of Legacy ADC Calibration Configuration
+# end of Legacy ADC Configuration
 
 #
 # SPI Configuration
@@ -586,10 +608,10 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # TWAI Configuration
 #
 # CONFIG_TWAI_ISR_IN_IRAM is not set
-# CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC is not set
-# 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_BUS_OFF_REC=y
+CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST=y
+CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y
+CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y
 # end of TWAI Configuration
 
 #
@@ -605,6 +627,14 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # CONFIG_GPIO_CTRL_FUNC_IN_IRAM is not set
 # end of GPIO Configuration
 
+#
+# Sigma Delta Modulator Configuration
+#
+# CONFIG_SDM_CTRL_FUNC_IN_IRAM is not set
+# CONFIG_SDM_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_SDM_ENABLE_DEBUG_LOG is not set
+# end of Sigma Delta Modulator Configuration
+
 #
 # GPTimer Configuration
 #
@@ -635,7 +665,17 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # MCPWM Configuration
 #
 # CONFIG_MCPWM_ISR_IRAM_SAFE is not set
+# CONFIG_MCPWM_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_MCPWM_ENABLE_DEBUG_LOG is not set
 # end of MCPWM Configuration
+
+#
+# I2S Configuration
+#
+# CONFIG_I2S_ISR_IRAM_SAFE is not set
+# CONFIG_I2S_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_I2S_ENABLE_DEBUG_LOG is not set
+# end of I2S Configuration
 # end of Driver Configurations
 
 #
@@ -661,12 +701,21 @@ CONFIG_ESP_TLS_USING_MBEDTLS=y
 # end of ESP-TLS
 
 #
-# ADC-Calibration
+# ADC and ADC Calibration
 #
-CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
-CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
-CONFIG_ADC_CAL_LUT_ENABLE=y
-# end of ADC-Calibration
+# CONFIG_ADC_ONESHOT_CTRL_FUNC_IN_IRAM is not set
+# CONFIG_ADC_CONTINUOUS_ISR_IRAM_SAFE is not set
+
+#
+# ADC Calibration Configurations
+#
+CONFIG_ADC_CALI_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CALI_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CALI_LUT_ENABLE=y
+# end of ADC Calibration Configurations
+
+CONFIG_ADC_DISABLE_DAC_OUTPUT=y
+# end of ADC and ADC Calibration
 
 #
 # Common ESP-related
@@ -731,7 +780,6 @@ CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y
 #
 # Hardware Settings
 #
-# CONFIG_SPIRAM is not set
 
 #
 # MAC Config
@@ -784,16 +832,25 @@ CONFIG_ESP32_REV_MIN_0=y
 # CONFIG_ESP32_REV_MIN_2 is not set
 # CONFIG_ESP32_REV_MIN_3 is not set
 CONFIG_ESP32_REV_MIN=0
-CONFIG_ESP32_XTAL_FREQ_40=y
-# CONFIG_ESP32_XTAL_FREQ_26 is not set
-# CONFIG_ESP32_XTAL_FREQ_AUTO is not set
-CONFIG_ESP32_XTAL_FREQ=40
+
+#
+# Main XTAL Config
+#
+# CONFIG_XTAL_FREQ_26 is not set
+CONFIG_XTAL_FREQ_40=y
+# CONFIG_XTAL_FREQ_AUTO is not set
+CONFIG_XTAL_FREQ=40
+# end of Main XTAL Config
 # end of Hardware Settings
 
 #
 # LCD and Touch Panel
 #
 
+#
+# LCD Touch Drivers are maintained in the IDF Component Registry
+#
+
 #
 # LCD Peripheral Configuration
 #
@@ -809,6 +866,7 @@ CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120
 CONFIG_ESP_NETIF_TCPIP_LWIP=y
 # CONFIG_ESP_NETIF_LOOPBACK is not set
 # CONFIG_ESP_NETIF_L2_TAP is not set
+# CONFIG_ESP_NETIF_BRIDGE_EN is not set
 # end of ESP NETIF Adapter
 
 #
@@ -829,6 +887,19 @@ CONFIG_ESP_PHY_REDUCE_TX_POWER=y
 # CONFIG_PM_ENABLE is not set
 # end of Power Management
 
+#
+# ESP PSRAM
+#
+# CONFIG_SPIRAM is not set
+# end of ESP PSRAM
+
+#
+# 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
+
 #
 # ESP System Settings
 #
@@ -879,7 +950,8 @@ CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
 CONFIG_ESP_INT_WDT=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
 CONFIG_ESP_INT_WDT_CHECK_CPU1=y
-CONFIG_ESP_TASK_WDT=y
+CONFIG_ESP_TASK_WDT_EN=y
+CONFIG_ESP_TASK_WDT_INIT=y
 # CONFIG_ESP_TASK_WDT_PANIC is not set
 CONFIG_ESP_TASK_WDT_TIMEOUT_S=5
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
@@ -952,6 +1024,7 @@ 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_ESP_WIFI_SLP_IRAM_OPT is not set
 # CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set
 # CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
@@ -1076,7 +1149,7 @@ CONFIG_FREERTOS_DEBUG_OCDAWARE=y
 #
 CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y
 # CONFIG_HAL_ASSERTION_DISABLE is not set
-# CONFIG_HAL_ASSERTION_SILIENT is not set
+# CONFIG_HAL_ASSERTION_SILENT is not set
 # CONFIG_HAL_ASSERTION_ENABLE is not set
 CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
 # end of Hardware Abstraction Layer (HAL) and Low Level (LL)
@@ -1143,6 +1216,7 @@ CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
 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
 
 #
 # DHCP server
@@ -1232,6 +1306,7 @@ CONFIG_LWIP_SNTP_MAX_SERVERS=1
 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 # end of SNTP
 
+CONFIG_LWIP_BRIDGEIF_MAX_PORTS=7
 CONFIG_LWIP_ESP_LWIP_ASSERT=y
 
 #
@@ -1382,35 +1457,11 @@ CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
 # CONFIG_MBEDTLS_SECURITY_RISKS is not set
 # end of mbedTLS
 
-#
-# mDNS
-#
-CONFIG_MDNS_MAX_INTERFACES=3
-CONFIG_MDNS_MAX_SERVICES=10
-CONFIG_MDNS_TASK_PRIORITY=1
-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_MULTIPLE_INSTANCE=y
-
-#
-# MDNS Predefined interfaces
-#
-CONFIG_MDNS_PREDEF_NETIF_STA=y
-CONFIG_MDNS_PREDEF_NETIF_AP=y
-# end of MDNS Predefined interfaces
-# end of mDNS
-
 #
 # ESP-MQTT Configurations
 #
 CONFIG_MQTT_PROTOCOL_311=y
+# CONFIG_MQTT_PROTOCOL_5 is not set
 CONFIG_MQTT_TRANSPORT_SSL=y
 CONFIG_MQTT_TRANSPORT_WEBSOCKET=y
 CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y
@@ -1450,6 +1501,14 @@ CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=y
 # CONFIG_OPENTHREAD_ENABLED is not set
 # end of OpenThread
 
+#
+# Protocomm
+#
+CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_0=y
+CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_1=y
+# CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_2 is not set
+# end of Protocomm
+
 #
 # PThreads
 #
@@ -1472,7 +1531,6 @@ CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
 CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set
-# CONFIG_SPI_FLASH_USE_LEGACY_IMPL is not set
 # CONFIG_SPI_FLASH_SHARE_SPI1_BUS is not set
 # CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set
 CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y
@@ -1593,6 +1651,7 @@ CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
 # CONFIG_WIFI_PROV_BLE_BONDING is not set
 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
 # end of Wi-Fi Provisioning Manager
 
 #
@@ -1612,6 +1671,117 @@ CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
 # CONFIG_WPA_WPS_SOFTAP_REGISTRAR is not set
 # end of Supplicant
 
+#
+# ESP-ASIO
+#
+CONFIG_ASIO_SSL_SUPPORT=y
+CONFIG_ASIO_USE_ESP_OPENSSL=y
+CONFIG_ASIO_SSL_BIO_SIZE=1024
+# end of ESP-ASIO
+
+#
+# ESP WebSocket client
+#
+# CONFIG_ESP_WS_CLIENT_ENABLE_DYNAMIC_BUFFER is not set
+# end of ESP WebSocket client
+
+#
+# mDNS
+#
+CONFIG_MDNS_MAX_INTERFACES=3
+CONFIG_MDNS_MAX_SERVICES=10
+CONFIG_MDNS_TASK_PRIORITY=1
+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_MULTIPLE_INSTANCE=y
+
+#
+# MDNS Predefined interfaces
+#
+CONFIG_MDNS_PREDEF_NETIF_STA=y
+CONFIG_MDNS_PREDEF_NETIF_AP=y
+# end of MDNS Predefined interfaces
+# end of mDNS
+
+#
+# TFT_eSPI
+#
+CONFIG_TFT_eSPI_ESPIDF=y
+CONFIG_TFT_ILI9341_DRIVER=y
+# CONFIG_TFT_ILI9341_2_DRIVER is not set
+# CONFIG_TFT_ST7735_DRIVER is not set
+# CONFIG_TFT_ILI9163_DRIVER is not set
+# CONFIG_TFT_S6D02A1_DRIVER is not set
+# CONFIG_TFT_HX8357D_DRIVER is not set
+# CONFIG_TFT_ILI9481_DRIVER is not set
+# CONFIG_TFT_ILI9486_DRIVER is not set
+# CONFIG_TFT_ILI9488_DRIVER is not set
+# CONFIG_TFT_ST7789_DRIVER is not set
+# CONFIG_TFT_ST7789_2_DRIVER is not set
+# CONFIG_TFT_R61581_DRIVER is not set
+# CONFIG_TFT_RM68140_DRIVER is not set
+# CONFIG_TFT_ST7796_DRIVER is not set
+# CONFIG_TFT_SSD1351_DRIVER is not set
+# CONFIG_TFT_SSD1963_480_DRIVER is not set
+# CONFIG_TFT_SSD1963_800_DRIVER is not set
+# CONFIG_TFT_SSD1963_800ALT_DRIVER is not set
+# CONFIG_TFT_ILI9225_DRIVER is not set
+# CONFIG_TFT_GC9A01_DRIVER is not set
+# CONFIG_TFT_RGB_ORDER is not set
+CONFIG_TFT_BGR_ORDER=y
+# CONFIG_TFT_M5STACK is not set
+CONFIG_TFT_INVERSION_DISABLE=y
+# CONFIG_TFT_INVERSION_ON is not set
+# CONFIG_TFT_INVERSION_OFF is not set
+# CONFIG_TFT_PARALLEL_8_BIT is not set
+
+#
+# Display SPI config
+#
+CONFIG_TFT_MISO=-1
+CONFIG_TFT_MOSI=13
+CONFIG_TFT_SCLK=15
+# CONFIG_TFT_SDA_READ is not set
+CONFIG_TFT_SPI_FREQUENCY=40000000
+CONFIG_TFT_SPI_READ_FREQ=20000000
+# end of Display SPI config
+
+#
+# Control Pin configuration
+#
+CONFIG_TFT_CS=14
+CONFIG_TFT_DC=12
+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 is not set
+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
+# end of Fonts
+
+#
+# Touch screen configuration
+#
+# CONFIG_ENABLE_TOUCH is not set
+# end of Touch screen configuration
+# end of TFT_eSPI
+
 #
 # ESP-NimBLE-CPP configuration
 #
@@ -1724,8 +1894,6 @@ CONFIG_ADC2_DISABLE_DAC=y
 CONFIG_POST_EVENTS_FROM_ISR=y
 CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
 CONFIG_OTA_ALLOW_HTTP=y
-# CONFIG_SPIRAM_SUPPORT is not set
-# CONFIG_ESP32_SPIRAM_SUPPORT is not set
 # CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set
 CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
 CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
@@ -1740,6 +1908,10 @@ CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
 # CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256 is not set
 # CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256 is not set
 CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
+# CONFIG_ESP32_XTAL_FREQ_26 is not set
+CONFIG_ESP32_XTAL_FREQ_40=y
+# CONFIG_ESP32_XTAL_FREQ_AUTO is not set
+CONFIG_ESP32_XTAL_FREQ=40
 CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
 CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION=y
 # CONFIG_ESP32_PHY_DEFAULT_INIT_IF_INVALID is not set
@@ -1748,6 +1920,8 @@ CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
 CONFIG_ESP32_PHY_MAX_TX_POWER=20
 CONFIG_REDUCE_PHY_TX_POWER=y
 CONFIG_ESP32_REDUCE_PHY_TX_POWER=y
+# CONFIG_SPIRAM_SUPPORT is not set
+# CONFIG_ESP32_SPIRAM_SUPPORT is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
@@ -1770,7 +1944,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
 CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
@@ -1808,6 +1982,7 @@ CONFIG_TIMER_TASK_PRIORITY=1
 CONFIG_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_TIMER_QUEUE_LENGTH=10
 # CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set
+# CONFIG_HAL_ASSERTION_SILIENT is not set
 # CONFIG_L2_TO_L3_COPY is not set
 CONFIG_ESP_GRATUITOUS_ARP=y
 CONFIG_GARP_TMR_INTERVAL=60

configs/sdkconfig_gernot

@@ -11,29 +11,35 @@ CONFIG_SOC_DAC_SUPPORTED=y
 CONFIG_SOC_MCPWM_SUPPORTED=y
 CONFIG_SOC_SDMMC_HOST_SUPPORTED=y
 CONFIG_SOC_BT_SUPPORTED=y
-CONFIG_SOC_CLASSIC_BT_SUPPORTED=y
 CONFIG_SOC_PCNT_SUPPORTED=y
 CONFIG_SOC_WIFI_SUPPORTED=y
 CONFIG_SOC_SDIO_SLAVE_SUPPORTED=y
 CONFIG_SOC_TWAI_SUPPORTED=y
 CONFIG_SOC_EMAC_SUPPORTED=y
-CONFIG_SOC_CPU_CORES_NUM=2
 CONFIG_SOC_ULP_SUPPORTED=y
 CONFIG_SOC_CCOMP_TIMER_SUPPORTED=y
 CONFIG_SOC_RTC_FAST_MEM_SUPPORTED=y
 CONFIG_SOC_RTC_SLOW_MEM_SUPPORTED=y
+CONFIG_SOC_RTC_MEM_SUPPORTED=y
 CONFIG_SOC_I2S_SUPPORTED=y
 CONFIG_SOC_RMT_SUPPORTED=y
-CONFIG_SOC_SIGMADELTA_SUPPORTED=y
+CONFIG_SOC_SDM_SUPPORTED=y
+CONFIG_SOC_LEDC_SUPPORTED=y
+CONFIG_SOC_I2C_SUPPORTED=y
 CONFIG_SOC_SUPPORT_COEXISTENCE=y
 CONFIG_SOC_AES_SUPPORTED=y
 CONFIG_SOC_MPI_SUPPORTED=y
 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_DPORT_WORKAROUND_DIS_INTERRUPT_LVL=5
+CONFIG_SOC_XTAL_SUPPORT_26M=y
+CONFIG_SOC_XTAL_SUPPORT_40M=y
+CONFIG_SOC_XTAL_SUPPORT_AUTO_DETECT=y
 CONFIG_SOC_ADC_RTC_CTRL_SUPPORTED=y
 CONFIG_SOC_ADC_DIG_CTRL_SUPPORTED=y
+CONFIG_SOC_ADC_DMA_SUPPORTED=y
 CONFIG_SOC_ADC_PERIPH_NUM=2
 CONFIG_SOC_ADC_MAX_CHANNEL_NUM=10
 CONFIG_SOC_ADC_ATTEN_NUM=4
@@ -41,16 +47,21 @@ CONFIG_SOC_ADC_DIGI_CONTROLLER_NUM=2
 CONFIG_SOC_ADC_PATT_LEN_MAX=16
 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_SAMPLE_FREQ_THRES_HIGH=2
-CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=2000
+CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=20
 CONFIG_SOC_ADC_RTC_MIN_BITWIDTH=9
 CONFIG_SOC_ADC_RTC_MAX_BITWIDTH=12
 CONFIG_SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256=y
 CONFIG_SOC_SHARED_IDCACHE_SUPPORTED=y
+CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=5
+CONFIG_SOC_CPU_CORES_NUM=2
+CONFIG_SOC_CPU_INTR_NUM=32
+CONFIG_SOC_CPU_HAS_FPU=y
 CONFIG_SOC_CPU_BREAKPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINT_SIZE=64
-CONFIG_SOC_CPU_HAS_FPU=y
 CONFIG_SOC_DAC_PERIPH_NUM=2
 CONFIG_SOC_DAC_RESOLUTION=8
 CONFIG_SOC_GPIO_PORT=1
@@ -115,12 +126,13 @@ CONFIG_SOC_RTCIO_PIN_COUNT=18
 CONFIG_SOC_RTCIO_INPUT_OUTPUT_SUPPORTED=y
 CONFIG_SOC_RTCIO_HOLD_SUPPORTED=y
 CONFIG_SOC_RTCIO_WAKE_SUPPORTED=y
-CONFIG_SOC_SIGMADELTA_NUM=1
-CONFIG_SOC_SIGMADELTA_CHANNEL_NUM=8
+CONFIG_SOC_SDM_GROUPS=1
+CONFIG_SOC_SDM_CHANNELS_PER_GROUP=8
 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_MAXIMUM_BUFFER_SIZE=64
 CONFIG_SOC_SPI_MAX_PRE_DIVIDER=8192
 CONFIG_SOC_MEMSPI_SRC_FREQ_80M_SUPPORTED=y
@@ -138,6 +150,7 @@ CONFIG_SOC_TOUCH_PAD_MEASURE_WAIT_MAX=0xFF
 CONFIG_SOC_TWAI_BRP_MIN=2
 CONFIG_SOC_TWAI_SUPPORT_MULTI_ADDRESS_LAYOUT=y
 CONFIG_SOC_UART_NUM=3
+CONFIG_SOC_UART_SUPPORT_APB_CLK=y
 CONFIG_SOC_UART_SUPPORT_REF_TICK=y
 CONFIG_SOC_UART_FIFO_LEN=128
 CONFIG_SOC_UART_BITRATE_MAX=5000000
@@ -163,7 +176,11 @@ CONFIG_SOC_PM_SUPPORT_RTC_FAST_MEM_PD=y
 CONFIG_SOC_PM_SUPPORT_RTC_SLOW_MEM_PD=y
 CONFIG_SOC_SDMMC_USE_IOMUX=y
 CONFIG_SOC_SDMMC_NUM_SLOTS=2
-CONFIG_SOC_BLE_DONT_UPDATE_OWN_RPA=y
+CONFIG_SOC_WIFI_WAPI_SUPPORT=y
+CONFIG_SOC_WIFI_CSI_SUPPORT=y
+CONFIG_SOC_WIFI_MESH_SUPPORT=y
+CONFIG_SOC_BLE_SUPPORTED=y
+CONFIG_SOC_BT_CLASSIC_SUPPORTED=y
 CONFIG_IDF_CMAKE=y
 CONFIG_IDF_TARGET_ARCH_XTENSA=y
 CONFIG_IDF_TARGET_ARCH="xtensa"
@@ -185,16 +202,6 @@ CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
 # CONFIG_APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS is not set
 # end of Build type
 
-#
-# Application manager
-#
-CONFIG_APP_COMPILE_TIME_DATE=y
-# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
-# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
-# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
-CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
-# end of Application manager
-
 #
 # Bootloader config
 #
@@ -236,10 +243,21 @@ CONFIG_SECURE_BOOT_V1_SUPPORTED=y
 # CONFIG_SECURE_FLASH_ENC_ENABLED is not set
 # end of Security features
 
+#
+# Application manager
+#
+CONFIG_APP_COMPILE_TIME_DATE=y
+# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
+# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
+# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
+CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
+# end of Application manager
+
 CONFIG_ESP_ROM_HAS_CRC_LE=y
 CONFIG_ESP_ROM_HAS_CRC_BE=y
 CONFIG_ESP_ROM_HAS_JPEG_DECODE=y
 CONFIG_ESP_ROM_SUPPORT_MULTIPLE_UART=y
+CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y
 
 #
 # Serial flasher config
@@ -265,7 +283,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
 # CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
 CONFIG_ESPTOOLPY_FLASHSIZE="16MB"
-CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+# CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
 CONFIG_ESPTOOLPY_BEFORE="default_reset"
@@ -425,12 +443,6 @@ CONFIG_APPTRACE_UART_TASK_PRIO=1
 CONFIG_APPTRACE_LOCK_ENABLE=y
 # end of Application Level Tracing
 
-#
-# ESP-ASIO
-#
-# CONFIG_ASIO_SSL_SUPPORT is not set
-# end of ESP-ASIO
-
 #
 # Bluetooth
 #
@@ -490,6 +502,7 @@ CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=30
 CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
 # end of Memory Settings
 
+CONFIG_BT_NIMBLE_GATT_MAX_PROCS=4
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL=y
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL_ITVL=1000
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL_THRESH=2
@@ -509,9 +522,9 @@ CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_DIS=y
 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_SLEEP_ENABLE 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
 # end of NimBLE Options
 
 #
@@ -567,11 +580,20 @@ CONFIG_BTDM_CTRL_HLI=y
 #
 
 #
-# ADC Configuration
+# Legacy ADC Configuration
 #
-# CONFIG_ADC_FORCE_XPD_FSM is not set
 CONFIG_ADC_DISABLE_DAC=y
-# end of ADC Configuration
+# CONFIG_ADC_SUPPRESS_DEPRECATE_WARN is not set
+
+#
+# Legacy ADC Calibration Configuration
+#
+CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CAL_LUT_ENABLE=y
+# CONFIG_ADC_CALI_SUPPRESS_DEPRECATE_WARN is not set
+# end of Legacy ADC Calibration Configuration
+# end of Legacy ADC Configuration
 
 #
 # SPI Configuration
@@ -605,6 +627,14 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # CONFIG_GPIO_CTRL_FUNC_IN_IRAM is not set
 # end of GPIO Configuration
 
+#
+# Sigma Delta Modulator Configuration
+#
+# CONFIG_SDM_CTRL_FUNC_IN_IRAM is not set
+# CONFIG_SDM_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_SDM_ENABLE_DEBUG_LOG is not set
+# end of Sigma Delta Modulator Configuration
+
 #
 # GPTimer Configuration
 #
@@ -635,7 +665,17 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # MCPWM Configuration
 #
 # CONFIG_MCPWM_ISR_IRAM_SAFE is not set
+# CONFIG_MCPWM_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_MCPWM_ENABLE_DEBUG_LOG is not set
 # end of MCPWM Configuration
+
+#
+# I2S Configuration
+#
+# CONFIG_I2S_ISR_IRAM_SAFE is not set
+# CONFIG_I2S_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_I2S_ENABLE_DEBUG_LOG is not set
+# end of I2S Configuration
 # end of Driver Configurations
 
 #
@@ -661,12 +701,21 @@ CONFIG_ESP_TLS_USING_MBEDTLS=y
 # end of ESP-TLS
 
 #
-# ADC-Calibration
+# ADC and ADC Calibration
 #
-CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
-CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
-CONFIG_ADC_CAL_LUT_ENABLE=y
-# end of ADC-Calibration
+# CONFIG_ADC_ONESHOT_CTRL_FUNC_IN_IRAM is not set
+# CONFIG_ADC_CONTINUOUS_ISR_IRAM_SAFE is not set
+
+#
+# ADC Calibration Configurations
+#
+CONFIG_ADC_CALI_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CALI_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CALI_LUT_ENABLE=y
+# end of ADC Calibration Configurations
+
+CONFIG_ADC_DISABLE_DAC_OUTPUT=y
+# end of ADC and ADC Calibration
 
 #
 # Common ESP-related
@@ -731,7 +780,6 @@ CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y
 #
 # Hardware Settings
 #
-# CONFIG_SPIRAM is not set
 
 #
 # MAC Config
@@ -784,16 +832,25 @@ CONFIG_ESP32_REV_MIN_0=y
 # CONFIG_ESP32_REV_MIN_2 is not set
 # CONFIG_ESP32_REV_MIN_3 is not set
 CONFIG_ESP32_REV_MIN=0
-CONFIG_ESP32_XTAL_FREQ_40=y
-# CONFIG_ESP32_XTAL_FREQ_26 is not set
-# CONFIG_ESP32_XTAL_FREQ_AUTO is not set
-CONFIG_ESP32_XTAL_FREQ=40
+
+#
+# Main XTAL Config
+#
+# CONFIG_XTAL_FREQ_26 is not set
+CONFIG_XTAL_FREQ_40=y
+# CONFIG_XTAL_FREQ_AUTO is not set
+CONFIG_XTAL_FREQ=40
+# end of Main XTAL Config
 # end of Hardware Settings
 
 #
 # LCD and Touch Panel
 #
 
+#
+# LCD Touch Drivers are maintained in the IDF Component Registry
+#
+
 #
 # LCD Peripheral Configuration
 #
@@ -809,6 +866,7 @@ CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120
 CONFIG_ESP_NETIF_TCPIP_LWIP=y
 # CONFIG_ESP_NETIF_LOOPBACK is not set
 # CONFIG_ESP_NETIF_L2_TAP is not set
+# CONFIG_ESP_NETIF_BRIDGE_EN is not set
 # end of ESP NETIF Adapter
 
 #
@@ -829,6 +887,19 @@ CONFIG_ESP_PHY_REDUCE_TX_POWER=y
 # CONFIG_PM_ENABLE is not set
 # end of Power Management
 
+#
+# ESP PSRAM
+#
+# CONFIG_SPIRAM is not set
+# end of ESP PSRAM
+
+#
+# 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
+
 #
 # ESP System Settings
 #
@@ -879,7 +950,8 @@ CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
 CONFIG_ESP_INT_WDT=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
 CONFIG_ESP_INT_WDT_CHECK_CPU1=y
-CONFIG_ESP_TASK_WDT=y
+CONFIG_ESP_TASK_WDT_EN=y
+CONFIG_ESP_TASK_WDT_INIT=y
 # CONFIG_ESP_TASK_WDT_PANIC is not set
 CONFIG_ESP_TASK_WDT_TIMEOUT_S=5
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
@@ -952,6 +1024,7 @@ 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_ESP_WIFI_SLP_IRAM_OPT is not set
 # CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set
 # CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
@@ -1075,7 +1148,7 @@ CONFIG_FREERTOS_DEBUG_OCDAWARE=y
 #
 CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y
 # CONFIG_HAL_ASSERTION_DISABLE is not set
-# CONFIG_HAL_ASSERTION_SILIENT is not set
+# CONFIG_HAL_ASSERTION_SILENT is not set
 # CONFIG_HAL_ASSERTION_ENABLE is not set
 CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
 # end of Hardware Abstraction Layer (HAL) and Low Level (LL)
@@ -1142,6 +1215,7 @@ CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
 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
 
 #
 # DHCP server
@@ -1231,6 +1305,7 @@ CONFIG_LWIP_SNTP_MAX_SERVERS=1
 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 # end of SNTP
 
+CONFIG_LWIP_BRIDGEIF_MAX_PORTS=7
 CONFIG_LWIP_ESP_LWIP_ASSERT=y
 
 #
@@ -1381,35 +1456,11 @@ CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
 # CONFIG_MBEDTLS_SECURITY_RISKS is not set
 # end of mbedTLS
 
-#
-# mDNS
-#
-CONFIG_MDNS_MAX_INTERFACES=3
-CONFIG_MDNS_MAX_SERVICES=10
-CONFIG_MDNS_TASK_PRIORITY=1
-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_MULTIPLE_INSTANCE=y
-
-#
-# MDNS Predefined interfaces
-#
-CONFIG_MDNS_PREDEF_NETIF_STA=y
-CONFIG_MDNS_PREDEF_NETIF_AP=y
-# end of MDNS Predefined interfaces
-# end of mDNS
-
 #
 # ESP-MQTT Configurations
 #
 CONFIG_MQTT_PROTOCOL_311=y
+# CONFIG_MQTT_PROTOCOL_5 is not set
 CONFIG_MQTT_TRANSPORT_SSL=y
 CONFIG_MQTT_TRANSPORT_WEBSOCKET=y
 CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y
@@ -1449,6 +1500,14 @@ CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=y
 # CONFIG_OPENTHREAD_ENABLED is not set
 # end of OpenThread
 
+#
+# Protocomm
+#
+CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_0=y
+CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_1=y
+# CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_2 is not set
+# end of Protocomm
+
 #
 # PThreads
 #
@@ -1471,7 +1530,6 @@ CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
 CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set
-# CONFIG_SPI_FLASH_USE_LEGACY_IMPL is not set
 # CONFIG_SPI_FLASH_SHARE_SPI1_BUS is not set
 # CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set
 CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y
@@ -1592,6 +1650,7 @@ CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
 # CONFIG_WIFI_PROV_BLE_BONDING is not set
 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
 # end of Wi-Fi Provisioning Manager
 
 #
@@ -1611,6 +1670,117 @@ CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
 # CONFIG_WPA_WPS_SOFTAP_REGISTRAR is not set
 # end of Supplicant
 
+#
+# ESP-ASIO
+#
+CONFIG_ASIO_SSL_SUPPORT=y
+CONFIG_ASIO_USE_ESP_OPENSSL=y
+CONFIG_ASIO_SSL_BIO_SIZE=1024
+# end of ESP-ASIO
+
+#
+# ESP WebSocket client
+#
+# CONFIG_ESP_WS_CLIENT_ENABLE_DYNAMIC_BUFFER is not set
+# end of ESP WebSocket client
+
+#
+# mDNS
+#
+CONFIG_MDNS_MAX_INTERFACES=3
+CONFIG_MDNS_MAX_SERVICES=10
+CONFIG_MDNS_TASK_PRIORITY=1
+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_MULTIPLE_INSTANCE=y
+
+#
+# MDNS Predefined interfaces
+#
+CONFIG_MDNS_PREDEF_NETIF_STA=y
+CONFIG_MDNS_PREDEF_NETIF_AP=y
+# end of MDNS Predefined interfaces
+# end of mDNS
+
+#
+# TFT_eSPI
+#
+CONFIG_TFT_eSPI_ESPIDF=y
+CONFIG_TFT_ILI9341_DRIVER=y
+# CONFIG_TFT_ILI9341_2_DRIVER is not set
+# CONFIG_TFT_ST7735_DRIVER is not set
+# CONFIG_TFT_ILI9163_DRIVER is not set
+# CONFIG_TFT_S6D02A1_DRIVER is not set
+# CONFIG_TFT_HX8357D_DRIVER is not set
+# CONFIG_TFT_ILI9481_DRIVER is not set
+# CONFIG_TFT_ILI9486_DRIVER is not set
+# CONFIG_TFT_ILI9488_DRIVER is not set
+# CONFIG_TFT_ST7789_DRIVER is not set
+# CONFIG_TFT_ST7789_2_DRIVER is not set
+# CONFIG_TFT_R61581_DRIVER is not set
+# CONFIG_TFT_RM68140_DRIVER is not set
+# CONFIG_TFT_ST7796_DRIVER is not set
+# CONFIG_TFT_SSD1351_DRIVER is not set
+# CONFIG_TFT_SSD1963_480_DRIVER is not set
+# CONFIG_TFT_SSD1963_800_DRIVER is not set
+# CONFIG_TFT_SSD1963_800ALT_DRIVER is not set
+# CONFIG_TFT_ILI9225_DRIVER is not set
+# CONFIG_TFT_GC9A01_DRIVER is not set
+CONFIG_TFT_RGB_ORDER=y
+# CONFIG_TFT_BGR_ORDER is not set
+# CONFIG_TFT_M5STACK is not set
+CONFIG_TFT_INVERSION_DISABLE=y
+# CONFIG_TFT_INVERSION_ON is not set
+# CONFIG_TFT_INVERSION_OFF is not set
+# CONFIG_TFT_PARALLEL_8_BIT is not set
+
+#
+# Display SPI config
+#
+CONFIG_TFT_MISO=-1
+CONFIG_TFT_MOSI=13
+CONFIG_TFT_SCLK=15
+# CONFIG_TFT_SDA_READ is not set
+CONFIG_TFT_SPI_FREQUENCY=40000000
+CONFIG_TFT_SPI_READ_FREQ=20000000
+# end of Display SPI config
+
+#
+# Control Pin configuration
+#
+CONFIG_TFT_CS=14
+CONFIG_TFT_DC=12
+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 is not set
+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
+# end of Fonts
+
+#
+# Touch screen configuration
+#
+# CONFIG_ENABLE_TOUCH is not set
+# end of Touch screen configuration
+# end of TFT_eSPI
+
 #
 # ESP-NimBLE-CPP configuration
 #
@@ -1723,8 +1893,6 @@ CONFIG_ADC2_DISABLE_DAC=y
 CONFIG_POST_EVENTS_FROM_ISR=y
 CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
 CONFIG_OTA_ALLOW_HTTP=y
-# CONFIG_SPIRAM_SUPPORT is not set
-# CONFIG_ESP32_SPIRAM_SUPPORT is not set
 # CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set
 CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
 CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
@@ -1739,6 +1907,10 @@ CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
 # CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256 is not set
 # CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256 is not set
 CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
+# CONFIG_ESP32_XTAL_FREQ_26 is not set
+CONFIG_ESP32_XTAL_FREQ_40=y
+# CONFIG_ESP32_XTAL_FREQ_AUTO is not set
+CONFIG_ESP32_XTAL_FREQ=40
 CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
 CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION=y
 CONFIG_ESP32_PHY_DEFAULT_INIT_IF_INVALID=y
@@ -1747,6 +1919,8 @@ CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
 CONFIG_ESP32_PHY_MAX_TX_POWER=20
 CONFIG_REDUCE_PHY_TX_POWER=y
 CONFIG_ESP32_REDUCE_PHY_TX_POWER=y
+# CONFIG_SPIRAM_SUPPORT is not set
+# CONFIG_ESP32_SPIRAM_SUPPORT is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
@@ -1769,7 +1943,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
 CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
@@ -1807,6 +1981,7 @@ CONFIG_TIMER_TASK_PRIORITY=1
 CONFIG_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_TIMER_QUEUE_LENGTH=10
 # CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set
+# CONFIG_HAL_ASSERTION_SILIENT is not set
 # CONFIG_L2_TO_L3_COPY is not set
 CONFIG_ESP_GRATUITOUS_ARP=y
 CONFIG_GARP_TMR_INTERVAL=60

configs/sdkconfig_mick

@@ -5,35 +5,41 @@
 CONFIG_SOC_BROWNOUT_RESET_SUPPORTED="Not determined"
 CONFIG_SOC_TWAI_BRP_DIV_SUPPORTED="Not determined"
 CONFIG_SOC_DPORT_WORKAROUND="Not determined"
-CONFIG_SOC_CAPS_ECO_VER_MAX=3
+CONFIG_SOC_CAPS_ECO_VER_MAX=301
 CONFIG_SOC_ADC_SUPPORTED=y
 CONFIG_SOC_DAC_SUPPORTED=y
 CONFIG_SOC_MCPWM_SUPPORTED=y
 CONFIG_SOC_SDMMC_HOST_SUPPORTED=y
 CONFIG_SOC_BT_SUPPORTED=y
-CONFIG_SOC_CLASSIC_BT_SUPPORTED=y
 CONFIG_SOC_PCNT_SUPPORTED=y
 CONFIG_SOC_WIFI_SUPPORTED=y
 CONFIG_SOC_SDIO_SLAVE_SUPPORTED=y
 CONFIG_SOC_TWAI_SUPPORTED=y
 CONFIG_SOC_EMAC_SUPPORTED=y
-CONFIG_SOC_CPU_CORES_NUM=2
 CONFIG_SOC_ULP_SUPPORTED=y
 CONFIG_SOC_CCOMP_TIMER_SUPPORTED=y
 CONFIG_SOC_RTC_FAST_MEM_SUPPORTED=y
 CONFIG_SOC_RTC_SLOW_MEM_SUPPORTED=y
+CONFIG_SOC_RTC_MEM_SUPPORTED=y
 CONFIG_SOC_I2S_SUPPORTED=y
 CONFIG_SOC_RMT_SUPPORTED=y
-CONFIG_SOC_SIGMADELTA_SUPPORTED=y
+CONFIG_SOC_SDM_SUPPORTED=y
+CONFIG_SOC_LEDC_SUPPORTED=y
+CONFIG_SOC_I2C_SUPPORTED=y
 CONFIG_SOC_SUPPORT_COEXISTENCE=y
 CONFIG_SOC_AES_SUPPORTED=y
 CONFIG_SOC_MPI_SUPPORTED=y
 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_DPORT_WORKAROUND_DIS_INTERRUPT_LVL=5
+CONFIG_SOC_XTAL_SUPPORT_26M=y
+CONFIG_SOC_XTAL_SUPPORT_40M=y
+CONFIG_SOC_XTAL_SUPPORT_AUTO_DETECT=y
 CONFIG_SOC_ADC_RTC_CTRL_SUPPORTED=y
 CONFIG_SOC_ADC_DIG_CTRL_SUPPORTED=y
+CONFIG_SOC_ADC_DMA_SUPPORTED=y
 CONFIG_SOC_ADC_PERIPH_NUM=2
 CONFIG_SOC_ADC_MAX_CHANNEL_NUM=10
 CONFIG_SOC_ADC_ATTEN_NUM=4
@@ -41,37 +47,40 @@ CONFIG_SOC_ADC_DIGI_CONTROLLER_NUM=2
 CONFIG_SOC_ADC_PATT_LEN_MAX=16
 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_SAMPLE_FREQ_THRES_HIGH=2
-CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=2000
+CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=20
 CONFIG_SOC_ADC_RTC_MIN_BITWIDTH=9
 CONFIG_SOC_ADC_RTC_MAX_BITWIDTH=12
-CONFIG_SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256=y
 CONFIG_SOC_SHARED_IDCACHE_SUPPORTED=y
+CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=5
+CONFIG_SOC_CPU_CORES_NUM=2
+CONFIG_SOC_CPU_INTR_NUM=32
+CONFIG_SOC_CPU_HAS_FPU=y
 CONFIG_SOC_CPU_BREAKPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINT_SIZE=64
-CONFIG_SOC_CPU_HAS_FPU=y
-CONFIG_SOC_DAC_PERIPH_NUM=2
+CONFIG_SOC_DAC_CHAN_NUM=2
 CONFIG_SOC_DAC_RESOLUTION=8
+CONFIG_SOC_DAC_DMA_16BIT_ALIGN=y
 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_SUPPORT_SLAVE=y
 CONFIG_SOC_I2C_SUPPORT_APB=y
-CONFIG_SOC_CLK_APLL_SUPPORTED=y
-CONFIG_SOC_APLL_MULTIPLIER_OUT_MIN_HZ=350000000
-CONFIG_SOC_APLL_MULTIPLIER_OUT_MAX_HZ=500000000
-CONFIG_SOC_APLL_MIN_HZ=5303031
-CONFIG_SOC_APLL_MAX_HZ=125000000
 CONFIG_SOC_I2S_NUM=2
 CONFIG_SOC_I2S_HW_VERSION_1=y
 CONFIG_SOC_I2S_SUPPORTS_APLL=y
 CONFIG_SOC_I2S_SUPPORTS_PDM=y
 CONFIG_SOC_I2S_SUPPORTS_PDM_TX=y
+CONFIG_SOC_I2S_PDM_MAX_TX_LINES=1
 CONFIG_SOC_I2S_SUPPORTS_PDM_RX=y
+CONFIG_SOC_I2S_PDM_MAX_RX_LINES=1
 CONFIG_SOC_I2S_SUPPORTS_ADC_DAC=y
 CONFIG_SOC_I2S_SUPPORTS_ADC=y
 CONFIG_SOC_I2S_SUPPORTS_DAC=y
@@ -86,7 +95,8 @@ CONFIG_SOC_LEDC_SUPPORT_APB_CLOCK=y
 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_WIDE_NUM=20
+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
@@ -97,6 +107,7 @@ 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_MPU_MIN_REGION_SIZE=0x20000000
 CONFIG_SOC_MPU_REGIONS_MAX_NUM=8
 CONFIG_SOC_PCNT_GROUPS=1
@@ -115,12 +126,13 @@ CONFIG_SOC_RTCIO_PIN_COUNT=18
 CONFIG_SOC_RTCIO_INPUT_OUTPUT_SUPPORTED=y
 CONFIG_SOC_RTCIO_HOLD_SUPPORTED=y
 CONFIG_SOC_RTCIO_WAKE_SUPPORTED=y
-CONFIG_SOC_SIGMADELTA_NUM=1
-CONFIG_SOC_SIGMADELTA_CHANNEL_NUM=8
+CONFIG_SOC_SDM_GROUPS=1
+CONFIG_SOC_SDM_CHANNELS_PER_GROUP=8
 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_MAXIMUM_BUFFER_SIZE=64
 CONFIG_SOC_SPI_MAX_PRE_DIVIDER=8192
 CONFIG_SOC_MEMSPI_SRC_FREQ_80M_SUPPORTED=y
@@ -135,9 +147,12 @@ CONFIG_SOC_TIMER_GROUP_SUPPORT_APB=y
 CONFIG_SOC_TOUCH_VERSION_1=y
 CONFIG_SOC_TOUCH_SENSOR_NUM=10
 CONFIG_SOC_TOUCH_PAD_MEASURE_WAIT_MAX=0xFF
+CONFIG_SOC_TWAI_CONTROLLER_NUM=1
 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_SUPPORT_APB_CLK=y
 CONFIG_SOC_UART_SUPPORT_REF_TICK=y
 CONFIG_SOC_UART_FIFO_LEN=128
 CONFIG_SOC_UART_BITRATE_MAX=5000000
@@ -161,9 +176,22 @@ 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_CLK_APLL_SUPPORTED=y
+CONFIG_SOC_APLL_MULTIPLIER_OUT_MIN_HZ=350000000
+CONFIG_SOC_APLL_MULTIPLIER_OUT_MAX_HZ=500000000
+CONFIG_SOC_APLL_MIN_HZ=5303031
+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_SDMMC_USE_IOMUX=y
 CONFIG_SOC_SDMMC_NUM_SLOTS=2
-CONFIG_SOC_BLE_DONT_UPDATE_OWN_RPA=y
+CONFIG_SOC_WIFI_WAPI_SUPPORT=y
+CONFIG_SOC_WIFI_CSI_SUPPORT=y
+CONFIG_SOC_WIFI_MESH_SUPPORT=y
+CONFIG_SOC_BLE_SUPPORTED=y
+CONFIG_SOC_BLE_MESH_SUPPORTED=y
+CONFIG_SOC_BT_CLASSIC_SUPPORTED=y
 CONFIG_IDF_CMAKE=y
 CONFIG_IDF_TARGET_ARCH_XTENSA=y
 CONFIG_IDF_TARGET_ARCH="xtensa"
@@ -185,16 +213,6 @@ CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
 # CONFIG_APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS is not set
 # end of Build type
 
-#
-# Application manager
-#
-CONFIG_APP_COMPILE_TIME_DATE=y
-# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
-# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
-# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
-CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
-# end of Application manager
-
 #
 # Bootloader config
 #
@@ -236,10 +254,21 @@ CONFIG_SECURE_BOOT_V1_SUPPORTED=y
 # CONFIG_SECURE_FLASH_ENC_ENABLED is not set
 # end of Security features
 
+#
+# Application manager
+#
+CONFIG_APP_COMPILE_TIME_DATE=y
+# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
+# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
+# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
+CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
+# end of Application manager
+
 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_SUPPORT_MULTIPLE_UART=y
+CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y
 
 #
 # Serial flasher config
@@ -265,7 +294,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
 # CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
 CONFIG_ESPTOOLPY_FLASHSIZE="16MB"
-CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+# CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
 CONFIG_ESPTOOLPY_BEFORE="default_reset"
@@ -425,12 +454,6 @@ CONFIG_APPTRACE_UART_TASK_PRIO=1
 CONFIG_APPTRACE_LOCK_ENABLE=y
 # end of Application Level Tracing
 
-#
-# ESP-ASIO
-#
-# CONFIG_ASIO_SSL_SUPPORT is not set
-# end of ESP-ASIO
-
 #
 # Bluetooth
 #
@@ -490,6 +513,7 @@ CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=30
 CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
 # end of Memory Settings
 
+CONFIG_BT_NIMBLE_GATT_MAX_PROCS=4
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL=y
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL_ITVL=1000
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL_THRESH=2
@@ -506,12 +530,13 @@ CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY=y
 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_SLEEP_ENABLE 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
 # end of NimBLE Options
 
 #
@@ -567,11 +592,20 @@ CONFIG_BTDM_CTRL_HLI=y
 #
 
 #
-# ADC Configuration
+# Legacy ADC Configuration
 #
-# CONFIG_ADC_FORCE_XPD_FSM is not set
 CONFIG_ADC_DISABLE_DAC=y
-# end of ADC Configuration
+# CONFIG_ADC_SUPPRESS_DEPRECATE_WARN is not set
+
+#
+# Legacy ADC Calibration Configuration
+#
+CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CAL_LUT_ENABLE=y
+# CONFIG_ADC_CALI_SUPPRESS_DEPRECATE_WARN is not set
+# end of Legacy ADC Calibration Configuration
+# end of Legacy ADC Configuration
 
 #
 # SPI Configuration
@@ -605,6 +639,14 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # CONFIG_GPIO_CTRL_FUNC_IN_IRAM is not set
 # end of GPIO Configuration
 
+#
+# Sigma Delta Modulator Configuration
+#
+# CONFIG_SDM_CTRL_FUNC_IN_IRAM is not set
+# CONFIG_SDM_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_SDM_ENABLE_DEBUG_LOG is not set
+# end of Sigma Delta Modulator Configuration
+
 #
 # GPTimer Configuration
 #
@@ -635,7 +677,28 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # MCPWM Configuration
 #
 # CONFIG_MCPWM_ISR_IRAM_SAFE is not set
+# CONFIG_MCPWM_CTRL_FUNC_IN_IRAM is not set
+# CONFIG_MCPWM_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_MCPWM_ENABLE_DEBUG_LOG is not set
 # end of MCPWM Configuration
+
+#
+# I2S Configuration
+#
+# CONFIG_I2S_ISR_IRAM_SAFE is not set
+# CONFIG_I2S_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_I2S_ENABLE_DEBUG_LOG is not set
+# end of I2S Configuration
+
+#
+# DAC Configuration
+#
+# CONFIG_DAC_CTRL_FUNC_IN_IRAM is not set
+# CONFIG_DAC_ISR_IRAM_SAFE is not set
+# CONFIG_DAC_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_DAC_ENABLE_DEBUG_LOG is not set
+CONFIG_DAC_DMA_AUTO_16BIT_ALIGN=y
+# end of DAC Configuration
 # end of Driver Configurations
 
 #
@@ -661,12 +724,21 @@ CONFIG_ESP_TLS_USING_MBEDTLS=y
 # end of ESP-TLS
 
 #
-# ADC-Calibration
+# ADC and ADC Calibration
 #
-CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
-CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
-CONFIG_ADC_CAL_LUT_ENABLE=y
-# end of ADC-Calibration
+# CONFIG_ADC_ONESHOT_CTRL_FUNC_IN_IRAM is not set
+# CONFIG_ADC_CONTINUOUS_ISR_IRAM_SAFE is not set
+
+#
+# ADC Calibration Configurations
+#
+CONFIG_ADC_CALI_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CALI_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CALI_LUT_ENABLE=y
+# end of ADC Calibration Configurations
+
+CONFIG_ADC_DISABLE_DAC_OUTPUT=y
+# end of ADC and ADC Calibration
 
 #
 # Common ESP-related
@@ -731,7 +803,26 @@ CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y
 #
 # Hardware Settings
 #
-# CONFIG_SPIRAM is not set
+
+#
+# Chip revision
+#
+CONFIG_ESP32_REV_MIN_0=y
+# CONFIG_ESP32_REV_MIN_1 is not set
+# CONFIG_ESP32_REV_MIN_1_1 is not set
+# CONFIG_ESP32_REV_MIN_2 is not set
+# CONFIG_ESP32_REV_MIN_3 is not set
+# CONFIG_ESP32_REV_MIN_3_1 is not set
+CONFIG_ESP32_REV_MIN=0
+CONFIG_ESP32_REV_MIN_FULL=0
+CONFIG_ESP_REV_MIN_FULL=0
+
+#
+# Maximum Supported ESP32 Revision (Rev v3.99)
+#
+CONFIG_ESP32_REV_MAX_FULL=399
+CONFIG_ESP_REV_MAX_FULL=399
+# end of Chip revision
 
 #
 # MAC Config
@@ -740,6 +831,7 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_STA=y
 CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y
 CONFIG_ESP_MAC_ADDR_UNIVERSE_BT=y
 CONFIG_ESP_MAC_ADDR_UNIVERSE_ETH=y
+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
@@ -779,21 +871,24 @@ CONFIG_MMU_PAGE_MODE="64KB"
 CONFIG_MMU_PAGE_SIZE=0x10000
 # end of MMU Config
 
-CONFIG_ESP32_REV_MIN_0=y
-# CONFIG_ESP32_REV_MIN_1 is not set
-# CONFIG_ESP32_REV_MIN_2 is not set
-# CONFIG_ESP32_REV_MIN_3 is not set
-CONFIG_ESP32_REV_MIN=0
-CONFIG_ESP32_XTAL_FREQ_40=y
-# CONFIG_ESP32_XTAL_FREQ_26 is not set
-# CONFIG_ESP32_XTAL_FREQ_AUTO is not set
-CONFIG_ESP32_XTAL_FREQ=40
+#
+# Main XTAL Config
+#
+# CONFIG_XTAL_FREQ_26 is not set
+CONFIG_XTAL_FREQ_40=y
+# CONFIG_XTAL_FREQ_AUTO is not set
+CONFIG_XTAL_FREQ=40
+# end of Main XTAL Config
 # end of Hardware Settings
 
 #
 # LCD and Touch Panel
 #
 
+#
+# LCD Touch Drivers are maintained in the IDF Component Registry
+#
+
 #
 # LCD Peripheral Configuration
 #
@@ -809,6 +904,7 @@ CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120
 CONFIG_ESP_NETIF_TCPIP_LWIP=y
 # CONFIG_ESP_NETIF_LOOPBACK is not set
 # CONFIG_ESP_NETIF_L2_TAP is not set
+# CONFIG_ESP_NETIF_BRIDGE_EN is not set
 # end of ESP NETIF Adapter
 
 #
@@ -829,6 +925,19 @@ CONFIG_ESP_PHY_REDUCE_TX_POWER=y
 # CONFIG_PM_ENABLE is not set
 # end of Power Management
 
+#
+# ESP PSRAM
+#
+# CONFIG_SPIRAM is not set
+# end of ESP PSRAM
+
+#
+# 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
+
 #
 # ESP System Settings
 #
@@ -879,7 +988,8 @@ CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
 CONFIG_ESP_INT_WDT=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
 CONFIG_ESP_INT_WDT_CHECK_CPU1=y
-CONFIG_ESP_TASK_WDT=y
+CONFIG_ESP_TASK_WDT_EN=y
+CONFIG_ESP_TASK_WDT_INIT=y
 # CONFIG_ESP_TASK_WDT_PANIC is not set
 CONFIG_ESP_TASK_WDT_TIMEOUT_S=5
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
@@ -952,11 +1062,13 @@ 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_ESP_WIFI_SLP_IRAM_OPT is not set
-# CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE 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
 # end of Wi-Fi
 
 #
@@ -971,18 +1083,11 @@ CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y
 # FAT Filesystem support
 #
 CONFIG_FATFS_VOLUME_COUNT=2
+CONFIG_FATFS_LFN_NONE=y
+# CONFIG_FATFS_LFN_HEAP is not set
+# CONFIG_FATFS_LFN_STACK is not set
 # CONFIG_FATFS_SECTOR_512 is not set
-# CONFIG_FATFS_SECTOR_1024 is not set
-# CONFIG_FATFS_SECTOR_2048 is not set
 CONFIG_FATFS_SECTOR_4096=y
-CONFIG_FATFS_SECTORS_PER_CLUSTER_1=y
-# CONFIG_FATFS_SECTORS_PER_CLUSTER_2 is not set
-# CONFIG_FATFS_SECTORS_PER_CLUSTER_4 is not set
-# CONFIG_FATFS_SECTORS_PER_CLUSTER_8 is not set
-# CONFIG_FATFS_SECTORS_PER_CLUSTER_16 is not set
-# CONFIG_FATFS_SECTORS_PER_CLUSTER_32 is not set
-# CONFIG_FATFS_SECTORS_PER_CLUSTER_64 is not set
-# CONFIG_FATFS_SECTORS_PER_CLUSTER_128 is not set
 # CONFIG_FATFS_CODEPAGE_DYNAMIC is not set
 CONFIG_FATFS_CODEPAGE_437=y
 # CONFIG_FATFS_CODEPAGE_720 is not set
@@ -1005,13 +1110,7 @@ CONFIG_FATFS_CODEPAGE_437=y
 # CONFIG_FATFS_CODEPAGE_936 is not set
 # CONFIG_FATFS_CODEPAGE_949 is not set
 # CONFIG_FATFS_CODEPAGE_950 is not set
-CONFIG_FATFS_AUTO_TYPE=y
-# CONFIG_FATFS_FAT12 is not set
-# CONFIG_FATFS_FAT16 is not set
 CONFIG_FATFS_CODEPAGE=437
-CONFIG_FATFS_LFN_NONE=y
-# CONFIG_FATFS_LFN_HEAP is not set
-# CONFIG_FATFS_LFN_STACK is not set
 CONFIG_FATFS_FS_LOCK=0
 CONFIG_FATFS_TIMEOUT_MS=10000
 CONFIG_FATFS_PER_FILE_CACHE=y
@@ -1041,6 +1140,7 @@ CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0
+CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=1
 # CONFIG_FREERTOS_USE_TRACE_FACILITY is not set
 # CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set
 # end of Kernel
@@ -1049,6 +1149,7 @@ CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0
 # Port
 #
 # CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set
+CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS=y
 # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
 CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
 CONFIG_FREERTOS_ISR_STACKSIZE=2048
@@ -1061,7 +1162,6 @@ CONFIG_FREERTOS_SYSTICK_USES_CCOUNT=y
 # CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH is not set
 # CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH is not set
 # CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set
-CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y
 CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y
 # end of Port
 
@@ -1075,7 +1175,7 @@ CONFIG_FREERTOS_DEBUG_OCDAWARE=y
 #
 CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y
 # CONFIG_HAL_ASSERTION_DISABLE is not set
-# CONFIG_HAL_ASSERTION_SILIENT is not set
+# CONFIG_HAL_ASSERTION_SILENT is not set
 # CONFIG_HAL_ASSERTION_ENABLE is not set
 CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
 # end of Hardware Abstraction Layer (HAL) and Low Level (LL)
@@ -1142,6 +1242,7 @@ CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
 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
 
 #
 # DHCP server
@@ -1173,6 +1274,7 @@ CONFIG_LWIP_TCP_SYNMAXRTX=12
 CONFIG_LWIP_TCP_MSS=1440
 CONFIG_LWIP_TCP_TMR_INTERVAL=250
 CONFIG_LWIP_TCP_MSL=60000
+CONFIG_LWIP_TCP_FIN_WAIT_TIMEOUT=20000
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744
 CONFIG_LWIP_TCP_WND_DEFAULT=5744
 CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
@@ -1231,6 +1333,7 @@ CONFIG_LWIP_SNTP_MAX_SERVERS=1
 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 # end of SNTP
 
+CONFIG_LWIP_BRIDGEIF_MAX_PORTS=7
 CONFIG_LWIP_ESP_LWIP_ASSERT=y
 
 #
@@ -1381,35 +1484,11 @@ CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
 # CONFIG_MBEDTLS_SECURITY_RISKS is not set
 # end of mbedTLS
 
-#
-# mDNS
-#
-CONFIG_MDNS_MAX_INTERFACES=3
-CONFIG_MDNS_MAX_SERVICES=10
-CONFIG_MDNS_TASK_PRIORITY=1
-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_MULTIPLE_INSTANCE=y
-
-#
-# MDNS Predefined interfaces
-#
-CONFIG_MDNS_PREDEF_NETIF_STA=y
-CONFIG_MDNS_PREDEF_NETIF_AP=y
-# end of MDNS Predefined interfaces
-# end of mDNS
-
 #
 # ESP-MQTT Configurations
 #
 CONFIG_MQTT_PROTOCOL_311=y
+# CONFIG_MQTT_PROTOCOL_5 is not set
 CONFIG_MQTT_TRANSPORT_SSL=y
 CONFIG_MQTT_TRANSPORT_WEBSOCKET=y
 CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y
@@ -1449,6 +1528,14 @@ CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=y
 # CONFIG_OPENTHREAD_ENABLED is not set
 # end of OpenThread
 
+#
+# Protocomm
+#
+CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_0=y
+CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_1=y
+# CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_2 is not set
+# end of Protocomm
+
 #
 # PThreads
 #
@@ -1471,7 +1558,6 @@ CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
 CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set
-# CONFIG_SPI_FLASH_USE_LEGACY_IMPL is not set
 # CONFIG_SPI_FLASH_SHARE_SPI1_BUS is not set
 # CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set
 CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y
@@ -1592,6 +1678,7 @@ CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
 # CONFIG_WIFI_PROV_BLE_BONDING is not set
 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
 # end of Wi-Fi Provisioning Manager
 
 #
@@ -1611,12 +1698,132 @@ CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
 # CONFIG_WPA_WPS_SOFTAP_REGISTRAR is not set
 # end of Supplicant
 
+#
+# ESP-ASIO
+#
+CONFIG_ASIO_SSL_SUPPORT=y
+CONFIG_ASIO_USE_ESP_OPENSSL=y
+CONFIG_ASIO_SSL_BIO_SIZE=1024
+# end of ESP-ASIO
+
+#
+# ESP WebSocket client
+#
+# CONFIG_ESP_WS_CLIENT_ENABLE_DYNAMIC_BUFFER is not set
+# end of ESP WebSocket client
+
+#
+# mDNS
+#
+CONFIG_MDNS_MAX_INTERFACES=3
+CONFIG_MDNS_MAX_SERVICES=10
+CONFIG_MDNS_TASK_PRIORITY=1
+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_MULTIPLE_INSTANCE=y
+
+#
+# MDNS Predefined interfaces
+#
+CONFIG_MDNS_PREDEF_NETIF_STA=y
+CONFIG_MDNS_PREDEF_NETIF_AP=y
+# end of MDNS Predefined interfaces
+# end of mDNS
+
+#
+# TFT_eSPI
+#
+CONFIG_TFT_eSPI_ESPIDF=y
+CONFIG_TFT_ILI9341_DRIVER=y
+# CONFIG_TFT_ILI9341_2_DRIVER is not set
+# CONFIG_TFT_ST7735_DRIVER is not set
+# CONFIG_TFT_ILI9163_DRIVER is not set
+# CONFIG_TFT_S6D02A1_DRIVER is not set
+# CONFIG_TFT_HX8357D_DRIVER is not set
+# CONFIG_TFT_ILI9481_DRIVER is not set
+# CONFIG_TFT_ILI9486_DRIVER is not set
+# CONFIG_TFT_ILI9488_DRIVER is not set
+# CONFIG_TFT_ST7789_DRIVER is not set
+# CONFIG_TFT_ST7789_2_DRIVER is not set
+# CONFIG_TFT_R61581_DRIVER is not set
+# CONFIG_TFT_RM68140_DRIVER is not set
+# CONFIG_TFT_ST7796_DRIVER is not set
+# CONFIG_TFT_SSD1351_DRIVER is not set
+# CONFIG_TFT_SSD1963_480_DRIVER is not set
+# CONFIG_TFT_SSD1963_800_DRIVER is not set
+# CONFIG_TFT_SSD1963_800ALT_DRIVER is not set
+# CONFIG_TFT_ILI9225_DRIVER is not set
+# CONFIG_TFT_GC9A01_DRIVER is not set
+# CONFIG_TFT_RGB_ORDER is not set
+CONFIG_TFT_BGR_ORDER=y
+# CONFIG_TFT_M5STACK is not set
+CONFIG_TFT_INVERSION_DISABLE=y
+# CONFIG_TFT_INVERSION_ON is not set
+# CONFIG_TFT_INVERSION_OFF is not set
+# CONFIG_TFT_PARALLEL_8_BIT is not set
+
+#
+# Display SPI config
+#
+CONFIG_TFT_MISO=-1
+CONFIG_TFT_MOSI=13
+CONFIG_TFT_SCLK=15
+# CONFIG_TFT_SDA_READ is not set
+CONFIG_TFT_SPI_FREQUENCY=40000000
+CONFIG_TFT_SPI_READ_FREQ=20000000
+# end of Display SPI config
+
+#
+# Control Pin configuration
+#
+CONFIG_TFT_CS=14
+CONFIG_TFT_DC=12
+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
+#
+# CONFIG_ENABLE_TOUCH is not set
+# end of Touch screen configuration
+# end of TFT_eSPI
+
 #
 # ESP-NimBLE-CPP configuration
 #
+CONFIG_NIMBLE_CPP_LOG_LEVEL_NONE=y
+# CONFIG_NIMBLE_CPP_LOG_LEVEL_ERROR is not set
+# CONFIG_NIMBLE_CPP_LOG_LEVEL_WARNING is not set
+# CONFIG_NIMBLE_CPP_LOG_LEVEL_INFO is not set
+# CONFIG_NIMBLE_CPP_LOG_LEVEL_DEBUG is not set
+CONFIG_NIMBLE_CPP_LOG_LEVEL=0
 # CONFIG_NIMBLE_CPP_ENABLE_RETURN_CODE_TEXT is not set
 # CONFIG_NIMBLE_CPP_ENABLE_GAP_EVENT_CODE_TEXT is not set
-# CONFIG_NIMBLE_CPP_ENABLE_ADVERTISMENT_TYPE_TEXT is not set
+# CONFIG_NIMBLE_CPP_ENABLE_ADVERTISEMENT_TYPE_TEXT is not set
+# CONFIG_NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED is not set
+CONFIG_NIMBLE_CPP_ATT_VALUE_INIT_LENGTH=20
 # end of ESP-NimBLE-CPP configuration
 # end of Component config
 
@@ -1723,8 +1930,6 @@ CONFIG_ADC2_DISABLE_DAC=y
 CONFIG_POST_EVENTS_FROM_ISR=y
 CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
 CONFIG_OTA_ALLOW_HTTP=y
-# CONFIG_SPIRAM_SUPPORT is not set
-# CONFIG_ESP32_SPIRAM_SUPPORT is not set
 # CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set
 CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
 CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
@@ -1739,6 +1944,10 @@ CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
 # CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256 is not set
 # CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256 is not set
 CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
+# CONFIG_ESP32_XTAL_FREQ_26 is not set
+CONFIG_ESP32_XTAL_FREQ_40=y
+# CONFIG_ESP32_XTAL_FREQ_AUTO is not set
+CONFIG_ESP32_XTAL_FREQ=40
 CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
 CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION=y
 CONFIG_ESP32_PHY_DEFAULT_INIT_IF_INVALID=y
@@ -1747,6 +1956,8 @@ CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
 CONFIG_ESP32_PHY_MAX_TX_POWER=20
 CONFIG_REDUCE_PHY_TX_POWER=y
 CONFIG_ESP32_REDUCE_PHY_TX_POWER=y
+# CONFIG_SPIRAM_SUPPORT is not set
+# CONFIG_ESP32_SPIRAM_SUPPORT is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
@@ -1769,7 +1980,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
 CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
@@ -1807,6 +2018,7 @@ CONFIG_TIMER_TASK_PRIORITY=1
 CONFIG_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_TIMER_QUEUE_LENGTH=10
 # CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set
+# CONFIG_HAL_ASSERTION_SILIENT is not set
 # CONFIG_L2_TO_L3_COPY is not set
 CONFIG_ESP_GRATUITOUS_ARP=y
 CONFIG_GARP_TMR_INTERVAL=60

configs/sdkconfig_nofeatures

@@ -11,29 +11,35 @@ CONFIG_SOC_DAC_SUPPORTED=y
 CONFIG_SOC_MCPWM_SUPPORTED=y
 CONFIG_SOC_SDMMC_HOST_SUPPORTED=y
 CONFIG_SOC_BT_SUPPORTED=y
-CONFIG_SOC_CLASSIC_BT_SUPPORTED=y
 CONFIG_SOC_PCNT_SUPPORTED=y
 CONFIG_SOC_WIFI_SUPPORTED=y
 CONFIG_SOC_SDIO_SLAVE_SUPPORTED=y
 CONFIG_SOC_TWAI_SUPPORTED=y
 CONFIG_SOC_EMAC_SUPPORTED=y
-CONFIG_SOC_CPU_CORES_NUM=2
 CONFIG_SOC_ULP_SUPPORTED=y
 CONFIG_SOC_CCOMP_TIMER_SUPPORTED=y
 CONFIG_SOC_RTC_FAST_MEM_SUPPORTED=y
 CONFIG_SOC_RTC_SLOW_MEM_SUPPORTED=y
+CONFIG_SOC_RTC_MEM_SUPPORTED=y
 CONFIG_SOC_I2S_SUPPORTED=y
 CONFIG_SOC_RMT_SUPPORTED=y
-CONFIG_SOC_SIGMADELTA_SUPPORTED=y
+CONFIG_SOC_SDM_SUPPORTED=y
+CONFIG_SOC_LEDC_SUPPORTED=y
+CONFIG_SOC_I2C_SUPPORTED=y
 CONFIG_SOC_SUPPORT_COEXISTENCE=y
 CONFIG_SOC_AES_SUPPORTED=y
 CONFIG_SOC_MPI_SUPPORTED=y
 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_DPORT_WORKAROUND_DIS_INTERRUPT_LVL=5
+CONFIG_SOC_XTAL_SUPPORT_26M=y
+CONFIG_SOC_XTAL_SUPPORT_40M=y
+CONFIG_SOC_XTAL_SUPPORT_AUTO_DETECT=y
 CONFIG_SOC_ADC_RTC_CTRL_SUPPORTED=y
 CONFIG_SOC_ADC_DIG_CTRL_SUPPORTED=y
+CONFIG_SOC_ADC_DMA_SUPPORTED=y
 CONFIG_SOC_ADC_PERIPH_NUM=2
 CONFIG_SOC_ADC_MAX_CHANNEL_NUM=10
 CONFIG_SOC_ADC_ATTEN_NUM=4
@@ -41,16 +47,21 @@ CONFIG_SOC_ADC_DIGI_CONTROLLER_NUM=2
 CONFIG_SOC_ADC_PATT_LEN_MAX=16
 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_SAMPLE_FREQ_THRES_HIGH=2
-CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=2000
+CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=20
 CONFIG_SOC_ADC_RTC_MIN_BITWIDTH=9
 CONFIG_SOC_ADC_RTC_MAX_BITWIDTH=12
 CONFIG_SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256=y
 CONFIG_SOC_SHARED_IDCACHE_SUPPORTED=y
+CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=5
+CONFIG_SOC_CPU_CORES_NUM=2
+CONFIG_SOC_CPU_INTR_NUM=32
+CONFIG_SOC_CPU_HAS_FPU=y
 CONFIG_SOC_CPU_BREAKPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINT_SIZE=64
-CONFIG_SOC_CPU_HAS_FPU=y
 CONFIG_SOC_DAC_PERIPH_NUM=2
 CONFIG_SOC_DAC_RESOLUTION=8
 CONFIG_SOC_GPIO_PORT=1
@@ -115,12 +126,13 @@ CONFIG_SOC_RTCIO_PIN_COUNT=18
 CONFIG_SOC_RTCIO_INPUT_OUTPUT_SUPPORTED=y
 CONFIG_SOC_RTCIO_HOLD_SUPPORTED=y
 CONFIG_SOC_RTCIO_WAKE_SUPPORTED=y
-CONFIG_SOC_SIGMADELTA_NUM=1
-CONFIG_SOC_SIGMADELTA_CHANNEL_NUM=8
+CONFIG_SOC_SDM_GROUPS=1
+CONFIG_SOC_SDM_CHANNELS_PER_GROUP=8
 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_MAXIMUM_BUFFER_SIZE=64
 CONFIG_SOC_SPI_MAX_PRE_DIVIDER=8192
 CONFIG_SOC_MEMSPI_SRC_FREQ_80M_SUPPORTED=y
@@ -138,6 +150,7 @@ CONFIG_SOC_TOUCH_PAD_MEASURE_WAIT_MAX=0xFF
 CONFIG_SOC_TWAI_BRP_MIN=2
 CONFIG_SOC_TWAI_SUPPORT_MULTI_ADDRESS_LAYOUT=y
 CONFIG_SOC_UART_NUM=3
+CONFIG_SOC_UART_SUPPORT_APB_CLK=y
 CONFIG_SOC_UART_SUPPORT_REF_TICK=y
 CONFIG_SOC_UART_FIFO_LEN=128
 CONFIG_SOC_UART_BITRATE_MAX=5000000
@@ -163,7 +176,11 @@ CONFIG_SOC_PM_SUPPORT_RTC_FAST_MEM_PD=y
 CONFIG_SOC_PM_SUPPORT_RTC_SLOW_MEM_PD=y
 CONFIG_SOC_SDMMC_USE_IOMUX=y
 CONFIG_SOC_SDMMC_NUM_SLOTS=2
-CONFIG_SOC_BLE_DONT_UPDATE_OWN_RPA=y
+CONFIG_SOC_WIFI_WAPI_SUPPORT=y
+CONFIG_SOC_WIFI_CSI_SUPPORT=y
+CONFIG_SOC_WIFI_MESH_SUPPORT=y
+CONFIG_SOC_BLE_SUPPORTED=y
+CONFIG_SOC_BT_CLASSIC_SUPPORTED=y
 CONFIG_IDF_CMAKE=y
 CONFIG_IDF_TARGET_ARCH_XTENSA=y
 CONFIG_IDF_TARGET_ARCH="xtensa"
@@ -185,16 +202,6 @@ CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
 # CONFIG_APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS is not set
 # end of Build type
 
-#
-# Application manager
-#
-CONFIG_APP_COMPILE_TIME_DATE=y
-# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
-# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
-# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
-CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
-# end of Application manager
-
 #
 # Bootloader config
 #
@@ -236,10 +243,21 @@ CONFIG_SECURE_BOOT_V1_SUPPORTED=y
 # CONFIG_SECURE_FLASH_ENC_ENABLED is not set
 # end of Security features
 
+#
+# Application manager
+#
+CONFIG_APP_COMPILE_TIME_DATE=y
+# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
+# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
+# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
+CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
+# end of Application manager
+
 CONFIG_ESP_ROM_HAS_CRC_LE=y
 CONFIG_ESP_ROM_HAS_CRC_BE=y
 CONFIG_ESP_ROM_HAS_JPEG_DECODE=y
 CONFIG_ESP_ROM_SUPPORT_MULTIPLE_UART=y
+CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y
 
 #
 # Serial flasher config
@@ -265,7 +283,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
 # CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
 CONFIG_ESPTOOLPY_FLASHSIZE="16MB"
-CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+# CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
 CONFIG_ESPTOOLPY_BEFORE="default_reset"
@@ -425,12 +443,6 @@ CONFIG_APPTRACE_UART_TASK_PRIO=1
 CONFIG_APPTRACE_LOCK_ENABLE=y
 # end of Application Level Tracing
 
-#
-# ESP-ASIO
-#
-# CONFIG_ASIO_SSL_SUPPORT is not set
-# end of ESP-ASIO
-
 #
 # Bluetooth
 #
@@ -490,6 +502,7 @@ CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=30
 CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
 # end of Memory Settings
 
+CONFIG_BT_NIMBLE_GATT_MAX_PROCS=4
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL=y
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL_ITVL=1000
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL_THRESH=2
@@ -509,9 +522,9 @@ CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_DIS=y
 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_SLEEP_ENABLE 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
 # end of NimBLE Options
 
 #
@@ -567,11 +580,20 @@ CONFIG_BTDM_CTRL_HLI=y
 #
 
 #
-# ADC Configuration
+# Legacy ADC Configuration
 #
-# CONFIG_ADC_FORCE_XPD_FSM is not set
 CONFIG_ADC_DISABLE_DAC=y
-# end of ADC Configuration
+# CONFIG_ADC_SUPPRESS_DEPRECATE_WARN is not set
+
+#
+# Legacy ADC Calibration Configuration
+#
+CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CAL_LUT_ENABLE=y
+# CONFIG_ADC_CALI_SUPPRESS_DEPRECATE_WARN is not set
+# end of Legacy ADC Calibration Configuration
+# end of Legacy ADC Configuration
 
 #
 # SPI Configuration
@@ -605,6 +627,14 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # CONFIG_GPIO_CTRL_FUNC_IN_IRAM is not set
 # end of GPIO Configuration
 
+#
+# Sigma Delta Modulator Configuration
+#
+# CONFIG_SDM_CTRL_FUNC_IN_IRAM is not set
+# CONFIG_SDM_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_SDM_ENABLE_DEBUG_LOG is not set
+# end of Sigma Delta Modulator Configuration
+
 #
 # GPTimer Configuration
 #
@@ -635,7 +665,17 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # MCPWM Configuration
 #
 # CONFIG_MCPWM_ISR_IRAM_SAFE is not set
+# CONFIG_MCPWM_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_MCPWM_ENABLE_DEBUG_LOG is not set
 # end of MCPWM Configuration
+
+#
+# I2S Configuration
+#
+# CONFIG_I2S_ISR_IRAM_SAFE is not set
+# CONFIG_I2S_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_I2S_ENABLE_DEBUG_LOG is not set
+# end of I2S Configuration
 # end of Driver Configurations
 
 #
@@ -661,12 +701,21 @@ CONFIG_ESP_TLS_USING_MBEDTLS=y
 # end of ESP-TLS
 
 #
-# ADC-Calibration
+# ADC and ADC Calibration
 #
-CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
-CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
-CONFIG_ADC_CAL_LUT_ENABLE=y
-# end of ADC-Calibration
+# CONFIG_ADC_ONESHOT_CTRL_FUNC_IN_IRAM is not set
+# CONFIG_ADC_CONTINUOUS_ISR_IRAM_SAFE is not set
+
+#
+# ADC Calibration Configurations
+#
+CONFIG_ADC_CALI_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CALI_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CALI_LUT_ENABLE=y
+# end of ADC Calibration Configurations
+
+CONFIG_ADC_DISABLE_DAC_OUTPUT=y
+# end of ADC and ADC Calibration
 
 #
 # Common ESP-related
@@ -731,7 +780,6 @@ CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y
 #
 # Hardware Settings
 #
-# CONFIG_SPIRAM is not set
 
 #
 # MAC Config
@@ -784,16 +832,25 @@ CONFIG_ESP32_REV_MIN_0=y
 # CONFIG_ESP32_REV_MIN_2 is not set
 # CONFIG_ESP32_REV_MIN_3 is not set
 CONFIG_ESP32_REV_MIN=0
-CONFIG_ESP32_XTAL_FREQ_40=y
-# CONFIG_ESP32_XTAL_FREQ_26 is not set
-# CONFIG_ESP32_XTAL_FREQ_AUTO is not set
-CONFIG_ESP32_XTAL_FREQ=40
+
+#
+# Main XTAL Config
+#
+# CONFIG_XTAL_FREQ_26 is not set
+CONFIG_XTAL_FREQ_40=y
+# CONFIG_XTAL_FREQ_AUTO is not set
+CONFIG_XTAL_FREQ=40
+# end of Main XTAL Config
 # end of Hardware Settings
 
 #
 # LCD and Touch Panel
 #
 
+#
+# LCD Touch Drivers are maintained in the IDF Component Registry
+#
+
 #
 # LCD Peripheral Configuration
 #
@@ -809,6 +866,7 @@ CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120
 CONFIG_ESP_NETIF_TCPIP_LWIP=y
 # CONFIG_ESP_NETIF_LOOPBACK is not set
 # CONFIG_ESP_NETIF_L2_TAP is not set
+# CONFIG_ESP_NETIF_BRIDGE_EN is not set
 # end of ESP NETIF Adapter
 
 #
@@ -829,6 +887,19 @@ CONFIG_ESP_PHY_REDUCE_TX_POWER=y
 # CONFIG_PM_ENABLE is not set
 # end of Power Management
 
+#
+# ESP PSRAM
+#
+# CONFIG_SPIRAM is not set
+# end of ESP PSRAM
+
+#
+# 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
+
 #
 # ESP System Settings
 #
@@ -879,7 +950,8 @@ CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
 CONFIG_ESP_INT_WDT=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
 CONFIG_ESP_INT_WDT_CHECK_CPU1=y
-CONFIG_ESP_TASK_WDT=y
+CONFIG_ESP_TASK_WDT_EN=y
+CONFIG_ESP_TASK_WDT_INIT=y
 # CONFIG_ESP_TASK_WDT_PANIC is not set
 CONFIG_ESP_TASK_WDT_TIMEOUT_S=5
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
@@ -952,6 +1024,7 @@ 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_ESP_WIFI_SLP_IRAM_OPT is not set
 # CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set
 # CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
@@ -1075,7 +1148,7 @@ CONFIG_FREERTOS_DEBUG_OCDAWARE=y
 #
 CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y
 # CONFIG_HAL_ASSERTION_DISABLE is not set
-# CONFIG_HAL_ASSERTION_SILIENT is not set
+# CONFIG_HAL_ASSERTION_SILENT is not set
 # CONFIG_HAL_ASSERTION_ENABLE is not set
 CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
 # end of Hardware Abstraction Layer (HAL) and Low Level (LL)
@@ -1142,6 +1215,7 @@ CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
 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
 
 #
 # DHCP server
@@ -1231,6 +1305,7 @@ CONFIG_LWIP_SNTP_MAX_SERVERS=1
 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 # end of SNTP
 
+CONFIG_LWIP_BRIDGEIF_MAX_PORTS=7
 CONFIG_LWIP_ESP_LWIP_ASSERT=y
 
 #
@@ -1381,35 +1456,11 @@ CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
 # CONFIG_MBEDTLS_SECURITY_RISKS is not set
 # end of mbedTLS
 
-#
-# mDNS
-#
-CONFIG_MDNS_MAX_INTERFACES=3
-CONFIG_MDNS_MAX_SERVICES=10
-CONFIG_MDNS_TASK_PRIORITY=1
-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_MULTIPLE_INSTANCE=y
-
-#
-# MDNS Predefined interfaces
-#
-CONFIG_MDNS_PREDEF_NETIF_STA=y
-CONFIG_MDNS_PREDEF_NETIF_AP=y
-# end of MDNS Predefined interfaces
-# end of mDNS
-
 #
 # ESP-MQTT Configurations
 #
 CONFIG_MQTT_PROTOCOL_311=y
+# CONFIG_MQTT_PROTOCOL_5 is not set
 CONFIG_MQTT_TRANSPORT_SSL=y
 CONFIG_MQTT_TRANSPORT_WEBSOCKET=y
 CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y
@@ -1449,6 +1500,14 @@ CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=y
 # CONFIG_OPENTHREAD_ENABLED is not set
 # end of OpenThread
 
+#
+# Protocomm
+#
+CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_0=y
+CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_1=y
+# CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_2 is not set
+# end of Protocomm
+
 #
 # PThreads
 #
@@ -1471,7 +1530,6 @@ CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
 CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set
-# CONFIG_SPI_FLASH_USE_LEGACY_IMPL is not set
 # CONFIG_SPI_FLASH_SHARE_SPI1_BUS is not set
 # CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set
 CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y
@@ -1592,6 +1650,7 @@ CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
 # CONFIG_WIFI_PROV_BLE_BONDING is not set
 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
 # end of Wi-Fi Provisioning Manager
 
 #
@@ -1611,6 +1670,117 @@ CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
 # CONFIG_WPA_WPS_SOFTAP_REGISTRAR is not set
 # end of Supplicant
 
+#
+# ESP-ASIO
+#
+CONFIG_ASIO_SSL_SUPPORT=y
+CONFIG_ASIO_USE_ESP_OPENSSL=y
+CONFIG_ASIO_SSL_BIO_SIZE=1024
+# end of ESP-ASIO
+
+#
+# ESP WebSocket client
+#
+# CONFIG_ESP_WS_CLIENT_ENABLE_DYNAMIC_BUFFER is not set
+# end of ESP WebSocket client
+
+#
+# mDNS
+#
+CONFIG_MDNS_MAX_INTERFACES=3
+CONFIG_MDNS_MAX_SERVICES=10
+CONFIG_MDNS_TASK_PRIORITY=1
+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_MULTIPLE_INSTANCE=y
+
+#
+# MDNS Predefined interfaces
+#
+CONFIG_MDNS_PREDEF_NETIF_STA=y
+CONFIG_MDNS_PREDEF_NETIF_AP=y
+# end of MDNS Predefined interfaces
+# end of mDNS
+
+#
+# TFT_eSPI
+#
+CONFIG_TFT_eSPI_ESPIDF=y
+CONFIG_TFT_ILI9341_DRIVER=y
+# CONFIG_TFT_ILI9341_2_DRIVER is not set
+# CONFIG_TFT_ST7735_DRIVER is not set
+# CONFIG_TFT_ILI9163_DRIVER is not set
+# CONFIG_TFT_S6D02A1_DRIVER is not set
+# CONFIG_TFT_HX8357D_DRIVER is not set
+# CONFIG_TFT_ILI9481_DRIVER is not set
+# CONFIG_TFT_ILI9486_DRIVER is not set
+# CONFIG_TFT_ILI9488_DRIVER is not set
+# CONFIG_TFT_ST7789_DRIVER is not set
+# CONFIG_TFT_ST7789_2_DRIVER is not set
+# CONFIG_TFT_R61581_DRIVER is not set
+# CONFIG_TFT_RM68140_DRIVER is not set
+# CONFIG_TFT_ST7796_DRIVER is not set
+# CONFIG_TFT_SSD1351_DRIVER is not set
+# CONFIG_TFT_SSD1963_480_DRIVER is not set
+# CONFIG_TFT_SSD1963_800_DRIVER is not set
+# CONFIG_TFT_SSD1963_800ALT_DRIVER is not set
+# CONFIG_TFT_ILI9225_DRIVER is not set
+# CONFIG_TFT_GC9A01_DRIVER is not set
+CONFIG_TFT_RGB_ORDER=y
+# CONFIG_TFT_BGR_ORDER is not set
+# CONFIG_TFT_M5STACK is not set
+CONFIG_TFT_INVERSION_DISABLE=y
+# CONFIG_TFT_INVERSION_ON is not set
+# CONFIG_TFT_INVERSION_OFF is not set
+# CONFIG_TFT_PARALLEL_8_BIT is not set
+
+#
+# Display SPI config
+#
+CONFIG_TFT_MISO=-1
+CONFIG_TFT_MOSI=13
+CONFIG_TFT_SCLK=15
+# CONFIG_TFT_SDA_READ is not set
+CONFIG_TFT_SPI_FREQUENCY=27000000
+CONFIG_TFT_SPI_READ_FREQ=20000000
+# end of Display SPI config
+
+#
+# Control Pin configuration
+#
+CONFIG_TFT_CS=14
+CONFIG_TFT_DC=12
+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 is not set
+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
+# end of Fonts
+
+#
+# Touch screen configuration
+#
+# CONFIG_ENABLE_TOUCH is not set
+# end of Touch screen configuration
+# end of TFT_eSPI
+
 #
 # ESP-NimBLE-CPP configuration
 #
@@ -1723,8 +1893,6 @@ CONFIG_ADC2_DISABLE_DAC=y
 CONFIG_POST_EVENTS_FROM_ISR=y
 CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
 CONFIG_OTA_ALLOW_HTTP=y
-# CONFIG_SPIRAM_SUPPORT is not set
-# CONFIG_ESP32_SPIRAM_SUPPORT is not set
 # CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set
 CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
 CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
@@ -1739,6 +1907,10 @@ CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
 # CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256 is not set
 # CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256 is not set
 CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
+# CONFIG_ESP32_XTAL_FREQ_26 is not set
+CONFIG_ESP32_XTAL_FREQ_40=y
+# CONFIG_ESP32_XTAL_FREQ_AUTO is not set
+CONFIG_ESP32_XTAL_FREQ=40
 CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
 CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION=y
 CONFIG_ESP32_PHY_DEFAULT_INIT_IF_INVALID=y
@@ -1747,6 +1919,8 @@ CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
 CONFIG_ESP32_PHY_MAX_TX_POWER=20
 CONFIG_REDUCE_PHY_TX_POWER=y
 CONFIG_ESP32_REDUCE_PHY_TX_POWER=y
+# CONFIG_SPIRAM_SUPPORT is not set
+# CONFIG_ESP32_SPIRAM_SUPPORT is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
@@ -1769,7 +1943,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
 CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
@@ -1807,6 +1981,7 @@ CONFIG_TIMER_TASK_PRIORITY=1
 CONFIG_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_TIMER_QUEUE_LENGTH=10
 # CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set
+# CONFIG_HAL_ASSERTION_SILIENT is not set
 # CONFIG_L2_TO_L3_COPY is not set
 CONFIG_ESP_GRATUITOUS_ARP=y
 CONFIG_GARP_TMR_INTERVAL=60

configs/sdkconfig_peter

@@ -11,29 +11,35 @@ CONFIG_SOC_DAC_SUPPORTED=y
 CONFIG_SOC_MCPWM_SUPPORTED=y
 CONFIG_SOC_SDMMC_HOST_SUPPORTED=y
 CONFIG_SOC_BT_SUPPORTED=y
-CONFIG_SOC_CLASSIC_BT_SUPPORTED=y
 CONFIG_SOC_PCNT_SUPPORTED=y
 CONFIG_SOC_WIFI_SUPPORTED=y
 CONFIG_SOC_SDIO_SLAVE_SUPPORTED=y
 CONFIG_SOC_TWAI_SUPPORTED=y
 CONFIG_SOC_EMAC_SUPPORTED=y
-CONFIG_SOC_CPU_CORES_NUM=2
 CONFIG_SOC_ULP_SUPPORTED=y
 CONFIG_SOC_CCOMP_TIMER_SUPPORTED=y
 CONFIG_SOC_RTC_FAST_MEM_SUPPORTED=y
 CONFIG_SOC_RTC_SLOW_MEM_SUPPORTED=y
+CONFIG_SOC_RTC_MEM_SUPPORTED=y
 CONFIG_SOC_I2S_SUPPORTED=y
 CONFIG_SOC_RMT_SUPPORTED=y
-CONFIG_SOC_SIGMADELTA_SUPPORTED=y
+CONFIG_SOC_SDM_SUPPORTED=y
+CONFIG_SOC_LEDC_SUPPORTED=y
+CONFIG_SOC_I2C_SUPPORTED=y
 CONFIG_SOC_SUPPORT_COEXISTENCE=y
 CONFIG_SOC_AES_SUPPORTED=y
 CONFIG_SOC_MPI_SUPPORTED=y
 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_DPORT_WORKAROUND_DIS_INTERRUPT_LVL=5
+CONFIG_SOC_XTAL_SUPPORT_26M=y
+CONFIG_SOC_XTAL_SUPPORT_40M=y
+CONFIG_SOC_XTAL_SUPPORT_AUTO_DETECT=y
 CONFIG_SOC_ADC_RTC_CTRL_SUPPORTED=y
 CONFIG_SOC_ADC_DIG_CTRL_SUPPORTED=y
+CONFIG_SOC_ADC_DMA_SUPPORTED=y
 CONFIG_SOC_ADC_PERIPH_NUM=2
 CONFIG_SOC_ADC_MAX_CHANNEL_NUM=10
 CONFIG_SOC_ADC_ATTEN_NUM=4
@@ -41,16 +47,21 @@ CONFIG_SOC_ADC_DIGI_CONTROLLER_NUM=2
 CONFIG_SOC_ADC_PATT_LEN_MAX=16
 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_SAMPLE_FREQ_THRES_HIGH=2
-CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=2000
+CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=20
 CONFIG_SOC_ADC_RTC_MIN_BITWIDTH=9
 CONFIG_SOC_ADC_RTC_MAX_BITWIDTH=12
 CONFIG_SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256=y
 CONFIG_SOC_SHARED_IDCACHE_SUPPORTED=y
+CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=5
+CONFIG_SOC_CPU_CORES_NUM=2
+CONFIG_SOC_CPU_INTR_NUM=32
+CONFIG_SOC_CPU_HAS_FPU=y
 CONFIG_SOC_CPU_BREAKPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINT_SIZE=64
-CONFIG_SOC_CPU_HAS_FPU=y
 CONFIG_SOC_DAC_PERIPH_NUM=2
 CONFIG_SOC_DAC_RESOLUTION=8
 CONFIG_SOC_GPIO_PORT=1
@@ -115,12 +126,13 @@ CONFIG_SOC_RTCIO_PIN_COUNT=18
 CONFIG_SOC_RTCIO_INPUT_OUTPUT_SUPPORTED=y
 CONFIG_SOC_RTCIO_HOLD_SUPPORTED=y
 CONFIG_SOC_RTCIO_WAKE_SUPPORTED=y
-CONFIG_SOC_SIGMADELTA_NUM=1
-CONFIG_SOC_SIGMADELTA_CHANNEL_NUM=8
+CONFIG_SOC_SDM_GROUPS=1
+CONFIG_SOC_SDM_CHANNELS_PER_GROUP=8
 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_MAXIMUM_BUFFER_SIZE=64
 CONFIG_SOC_SPI_MAX_PRE_DIVIDER=8192
 CONFIG_SOC_MEMSPI_SRC_FREQ_80M_SUPPORTED=y
@@ -138,6 +150,7 @@ CONFIG_SOC_TOUCH_PAD_MEASURE_WAIT_MAX=0xFF
 CONFIG_SOC_TWAI_BRP_MIN=2
 CONFIG_SOC_TWAI_SUPPORT_MULTI_ADDRESS_LAYOUT=y
 CONFIG_SOC_UART_NUM=3
+CONFIG_SOC_UART_SUPPORT_APB_CLK=y
 CONFIG_SOC_UART_SUPPORT_REF_TICK=y
 CONFIG_SOC_UART_FIFO_LEN=128
 CONFIG_SOC_UART_BITRATE_MAX=5000000
@@ -163,7 +176,11 @@ CONFIG_SOC_PM_SUPPORT_RTC_FAST_MEM_PD=y
 CONFIG_SOC_PM_SUPPORT_RTC_SLOW_MEM_PD=y
 CONFIG_SOC_SDMMC_USE_IOMUX=y
 CONFIG_SOC_SDMMC_NUM_SLOTS=2
-CONFIG_SOC_BLE_DONT_UPDATE_OWN_RPA=y
+CONFIG_SOC_WIFI_WAPI_SUPPORT=y
+CONFIG_SOC_WIFI_CSI_SUPPORT=y
+CONFIG_SOC_WIFI_MESH_SUPPORT=y
+CONFIG_SOC_BLE_SUPPORTED=y
+CONFIG_SOC_BT_CLASSIC_SUPPORTED=y
 CONFIG_IDF_CMAKE=y
 CONFIG_IDF_TARGET_ARCH_XTENSA=y
 CONFIG_IDF_TARGET_ARCH="xtensa"
@@ -185,16 +202,6 @@ CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
 # CONFIG_APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS is not set
 # end of Build type
 
-#
-# Application manager
-#
-CONFIG_APP_COMPILE_TIME_DATE=y
-# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
-# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
-# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
-CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
-# end of Application manager
-
 #
 # Bootloader config
 #
@@ -236,10 +243,21 @@ CONFIG_SECURE_BOOT_V1_SUPPORTED=y
 # CONFIG_SECURE_FLASH_ENC_ENABLED is not set
 # end of Security features
 
+#
+# Application manager
+#
+CONFIG_APP_COMPILE_TIME_DATE=y
+# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
+# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
+# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
+CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
+# end of Application manager
+
 CONFIG_ESP_ROM_HAS_CRC_LE=y
 CONFIG_ESP_ROM_HAS_CRC_BE=y
 CONFIG_ESP_ROM_HAS_JPEG_DECODE=y
 CONFIG_ESP_ROM_SUPPORT_MULTIPLE_UART=y
+CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y
 
 #
 # Serial flasher config
@@ -265,7 +283,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
 # CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
 CONFIG_ESPTOOLPY_FLASHSIZE="16MB"
-CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+# CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
 CONFIG_ESPTOOLPY_BEFORE="default_reset"
@@ -425,12 +443,6 @@ CONFIG_APPTRACE_UART_TASK_PRIO=1
 CONFIG_APPTRACE_LOCK_ENABLE=y
 # end of Application Level Tracing
 
-#
-# ESP-ASIO
-#
-# CONFIG_ASIO_SSL_SUPPORT is not set
-# end of ESP-ASIO
-
 #
 # Bluetooth
 #
@@ -490,6 +502,7 @@ CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=30
 CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
 # end of Memory Settings
 
+CONFIG_BT_NIMBLE_GATT_MAX_PROCS=4
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL=y
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL_ITVL=1000
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL_THRESH=2
@@ -509,9 +522,9 @@ CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_DIS=y
 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_SLEEP_ENABLE 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
 # end of NimBLE Options
 
 #
@@ -567,11 +580,20 @@ CONFIG_BTDM_CTRL_HLI=y
 #
 
 #
-# ADC Configuration
+# Legacy ADC Configuration
 #
-# CONFIG_ADC_FORCE_XPD_FSM is not set
 CONFIG_ADC_DISABLE_DAC=y
-# end of ADC Configuration
+# CONFIG_ADC_SUPPRESS_DEPRECATE_WARN is not set
+
+#
+# Legacy ADC Calibration Configuration
+#
+CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CAL_LUT_ENABLE=y
+# CONFIG_ADC_CALI_SUPPRESS_DEPRECATE_WARN is not set
+# end of Legacy ADC Calibration Configuration
+# end of Legacy ADC Configuration
 
 #
 # SPI Configuration
@@ -605,6 +627,14 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # CONFIG_GPIO_CTRL_FUNC_IN_IRAM is not set
 # end of GPIO Configuration
 
+#
+# Sigma Delta Modulator Configuration
+#
+# CONFIG_SDM_CTRL_FUNC_IN_IRAM is not set
+# CONFIG_SDM_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_SDM_ENABLE_DEBUG_LOG is not set
+# end of Sigma Delta Modulator Configuration
+
 #
 # GPTimer Configuration
 #
@@ -635,7 +665,17 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # MCPWM Configuration
 #
 # CONFIG_MCPWM_ISR_IRAM_SAFE is not set
+# CONFIG_MCPWM_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_MCPWM_ENABLE_DEBUG_LOG is not set
 # end of MCPWM Configuration
+
+#
+# I2S Configuration
+#
+# CONFIG_I2S_ISR_IRAM_SAFE is not set
+# CONFIG_I2S_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_I2S_ENABLE_DEBUG_LOG is not set
+# end of I2S Configuration
 # end of Driver Configurations
 
 #
@@ -661,12 +701,21 @@ CONFIG_ESP_TLS_USING_MBEDTLS=y
 # end of ESP-TLS
 
 #
-# ADC-Calibration
+# ADC and ADC Calibration
 #
-CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
-CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
-CONFIG_ADC_CAL_LUT_ENABLE=y
-# end of ADC-Calibration
+# CONFIG_ADC_ONESHOT_CTRL_FUNC_IN_IRAM is not set
+# CONFIG_ADC_CONTINUOUS_ISR_IRAM_SAFE is not set
+
+#
+# ADC Calibration Configurations
+#
+CONFIG_ADC_CALI_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CALI_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CALI_LUT_ENABLE=y
+# end of ADC Calibration Configurations
+
+CONFIG_ADC_DISABLE_DAC_OUTPUT=y
+# end of ADC and ADC Calibration
 
 #
 # Common ESP-related
@@ -731,7 +780,6 @@ CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y
 #
 # Hardware Settings
 #
-# CONFIG_SPIRAM is not set
 
 #
 # MAC Config
@@ -784,16 +832,25 @@ CONFIG_ESP32_REV_MIN_0=y
 # CONFIG_ESP32_REV_MIN_2 is not set
 # CONFIG_ESP32_REV_MIN_3 is not set
 CONFIG_ESP32_REV_MIN=0
-CONFIG_ESP32_XTAL_FREQ_40=y
-# CONFIG_ESP32_XTAL_FREQ_26 is not set
-# CONFIG_ESP32_XTAL_FREQ_AUTO is not set
-CONFIG_ESP32_XTAL_FREQ=40
+
+#
+# Main XTAL Config
+#
+# CONFIG_XTAL_FREQ_26 is not set
+CONFIG_XTAL_FREQ_40=y
+# CONFIG_XTAL_FREQ_AUTO is not set
+CONFIG_XTAL_FREQ=40
+# end of Main XTAL Config
 # end of Hardware Settings
 
 #
 # LCD and Touch Panel
 #
 
+#
+# LCD Touch Drivers are maintained in the IDF Component Registry
+#
+
 #
 # LCD Peripheral Configuration
 #
@@ -809,6 +866,7 @@ CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120
 CONFIG_ESP_NETIF_TCPIP_LWIP=y
 # CONFIG_ESP_NETIF_LOOPBACK is not set
 # CONFIG_ESP_NETIF_L2_TAP is not set
+# CONFIG_ESP_NETIF_BRIDGE_EN is not set
 # end of ESP NETIF Adapter
 
 #
@@ -829,6 +887,19 @@ CONFIG_ESP_PHY_REDUCE_TX_POWER=y
 # CONFIG_PM_ENABLE is not set
 # end of Power Management
 
+#
+# ESP PSRAM
+#
+# CONFIG_SPIRAM is not set
+# end of ESP PSRAM
+
+#
+# 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
+
 #
 # ESP System Settings
 #
@@ -879,7 +950,8 @@ CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
 CONFIG_ESP_INT_WDT=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
 CONFIG_ESP_INT_WDT_CHECK_CPU1=y
-CONFIG_ESP_TASK_WDT=y
+CONFIG_ESP_TASK_WDT_EN=y
+CONFIG_ESP_TASK_WDT_INIT=y
 # CONFIG_ESP_TASK_WDT_PANIC is not set
 CONFIG_ESP_TASK_WDT_TIMEOUT_S=5
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
@@ -952,6 +1024,7 @@ 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_ESP_WIFI_SLP_IRAM_OPT is not set
 # CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set
 # CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
@@ -1075,7 +1148,7 @@ CONFIG_FREERTOS_DEBUG_OCDAWARE=y
 #
 CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y
 # CONFIG_HAL_ASSERTION_DISABLE is not set
-# CONFIG_HAL_ASSERTION_SILIENT is not set
+# CONFIG_HAL_ASSERTION_SILENT is not set
 # CONFIG_HAL_ASSERTION_ENABLE is not set
 CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
 # end of Hardware Abstraction Layer (HAL) and Low Level (LL)
@@ -1142,6 +1215,7 @@ CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
 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
 
 #
 # DHCP server
@@ -1231,6 +1305,7 @@ CONFIG_LWIP_SNTP_MAX_SERVERS=1
 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 # end of SNTP
 
+CONFIG_LWIP_BRIDGEIF_MAX_PORTS=7
 CONFIG_LWIP_ESP_LWIP_ASSERT=y
 
 #
@@ -1381,35 +1456,11 @@ CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
 # CONFIG_MBEDTLS_SECURITY_RISKS is not set
 # end of mbedTLS
 
-#
-# mDNS
-#
-CONFIG_MDNS_MAX_INTERFACES=3
-CONFIG_MDNS_MAX_SERVICES=10
-CONFIG_MDNS_TASK_PRIORITY=1
-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_MULTIPLE_INSTANCE=y
-
-#
-# MDNS Predefined interfaces
-#
-CONFIG_MDNS_PREDEF_NETIF_STA=y
-CONFIG_MDNS_PREDEF_NETIF_AP=y
-# end of MDNS Predefined interfaces
-# end of mDNS
-
 #
 # ESP-MQTT Configurations
 #
 CONFIG_MQTT_PROTOCOL_311=y
+# CONFIG_MQTT_PROTOCOL_5 is not set
 CONFIG_MQTT_TRANSPORT_SSL=y
 CONFIG_MQTT_TRANSPORT_WEBSOCKET=y
 CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y
@@ -1449,6 +1500,14 @@ CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=y
 # CONFIG_OPENTHREAD_ENABLED is not set
 # end of OpenThread
 
+#
+# Protocomm
+#
+CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_0=y
+CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_1=y
+# CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_2 is not set
+# end of Protocomm
+
 #
 # PThreads
 #
@@ -1471,7 +1530,6 @@ CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
 CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set
-# CONFIG_SPI_FLASH_USE_LEGACY_IMPL is not set
 # CONFIG_SPI_FLASH_SHARE_SPI1_BUS is not set
 # CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set
 CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y
@@ -1592,6 +1650,7 @@ CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
 # CONFIG_WIFI_PROV_BLE_BONDING is not set
 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
 # end of Wi-Fi Provisioning Manager
 
 #
@@ -1611,6 +1670,117 @@ CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
 # CONFIG_WPA_WPS_SOFTAP_REGISTRAR is not set
 # end of Supplicant
 
+#
+# ESP-ASIO
+#
+CONFIG_ASIO_SSL_SUPPORT=y
+CONFIG_ASIO_USE_ESP_OPENSSL=y
+CONFIG_ASIO_SSL_BIO_SIZE=1024
+# end of ESP-ASIO
+
+#
+# ESP WebSocket client
+#
+# CONFIG_ESP_WS_CLIENT_ENABLE_DYNAMIC_BUFFER is not set
+# end of ESP WebSocket client
+
+#
+# mDNS
+#
+CONFIG_MDNS_MAX_INTERFACES=3
+CONFIG_MDNS_MAX_SERVICES=10
+CONFIG_MDNS_TASK_PRIORITY=1
+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_MULTIPLE_INSTANCE=y
+
+#
+# MDNS Predefined interfaces
+#
+CONFIG_MDNS_PREDEF_NETIF_STA=y
+CONFIG_MDNS_PREDEF_NETIF_AP=y
+# end of MDNS Predefined interfaces
+# end of mDNS
+
+#
+# TFT_eSPI
+#
+CONFIG_TFT_eSPI_ESPIDF=y
+CONFIG_TFT_ILI9341_DRIVER=y
+# CONFIG_TFT_ILI9341_2_DRIVER is not set
+# CONFIG_TFT_ST7735_DRIVER is not set
+# CONFIG_TFT_ILI9163_DRIVER is not set
+# CONFIG_TFT_S6D02A1_DRIVER is not set
+# CONFIG_TFT_HX8357D_DRIVER is not set
+# CONFIG_TFT_ILI9481_DRIVER is not set
+# CONFIG_TFT_ILI9486_DRIVER is not set
+# CONFIG_TFT_ILI9488_DRIVER is not set
+# CONFIG_TFT_ST7789_DRIVER is not set
+# CONFIG_TFT_ST7789_2_DRIVER is not set
+# CONFIG_TFT_R61581_DRIVER is not set
+# CONFIG_TFT_RM68140_DRIVER is not set
+# CONFIG_TFT_ST7796_DRIVER is not set
+# CONFIG_TFT_SSD1351_DRIVER is not set
+# CONFIG_TFT_SSD1963_480_DRIVER is not set
+# CONFIG_TFT_SSD1963_800_DRIVER is not set
+# CONFIG_TFT_SSD1963_800ALT_DRIVER is not set
+# CONFIG_TFT_ILI9225_DRIVER is not set
+# CONFIG_TFT_GC9A01_DRIVER is not set
+CONFIG_TFT_RGB_ORDER=y
+# CONFIG_TFT_BGR_ORDER is not set
+# CONFIG_TFT_M5STACK is not set
+CONFIG_TFT_INVERSION_DISABLE=y
+# CONFIG_TFT_INVERSION_ON is not set
+# CONFIG_TFT_INVERSION_OFF is not set
+# CONFIG_TFT_PARALLEL_8_BIT is not set
+
+#
+# Display SPI config
+#
+CONFIG_TFT_MISO=-1
+CONFIG_TFT_MOSI=13
+CONFIG_TFT_SCLK=15
+# CONFIG_TFT_SDA_READ is not set
+CONFIG_TFT_SPI_FREQUENCY=40000000
+CONFIG_TFT_SPI_READ_FREQ=20000000
+# end of Display SPI config
+
+#
+# Control Pin configuration
+#
+CONFIG_TFT_CS=14
+CONFIG_TFT_DC=12
+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 is not set
+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
+# end of Fonts
+
+#
+# Touch screen configuration
+#
+# CONFIG_ENABLE_TOUCH is not set
+# end of Touch screen configuration
+# end of TFT_eSPI
+
 #
 # ESP-NimBLE-CPP configuration
 #
@@ -1723,8 +1893,6 @@ CONFIG_ADC2_DISABLE_DAC=y
 CONFIG_POST_EVENTS_FROM_ISR=y
 CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
 CONFIG_OTA_ALLOW_HTTP=y
-# CONFIG_SPIRAM_SUPPORT is not set
-# CONFIG_ESP32_SPIRAM_SUPPORT is not set
 # CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set
 CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
 CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
@@ -1739,6 +1907,10 @@ CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
 # CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256 is not set
 # CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256 is not set
 CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
+# CONFIG_ESP32_XTAL_FREQ_26 is not set
+CONFIG_ESP32_XTAL_FREQ_40=y
+# CONFIG_ESP32_XTAL_FREQ_AUTO is not set
+CONFIG_ESP32_XTAL_FREQ=40
 CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
 CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION=y
 CONFIG_ESP32_PHY_DEFAULT_INIT_IF_INVALID=y
@@ -1747,6 +1919,8 @@ CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
 CONFIG_ESP32_PHY_MAX_TX_POWER=20
 CONFIG_REDUCE_PHY_TX_POWER=y
 CONFIG_ESP32_REDUCE_PHY_TX_POWER=y
+# CONFIG_SPIRAM_SUPPORT is not set
+# CONFIG_ESP32_SPIRAM_SUPPORT is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
@@ -1769,7 +1943,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
 CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
@@ -1807,6 +1981,7 @@ CONFIG_TIMER_TASK_PRIORITY=1
 CONFIG_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_TIMER_QUEUE_LENGTH=10
 # CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set
+# CONFIG_HAL_ASSERTION_SILIENT is not set
 # CONFIG_L2_TO_L3_COPY is not set
 CONFIG_ESP_GRATUITOUS_ARP=y
 CONFIG_GARP_TMR_INTERVAL=60

configs/sdkconfig_seatbot

@@ -11,29 +11,35 @@ CONFIG_SOC_DAC_SUPPORTED=y
 CONFIG_SOC_MCPWM_SUPPORTED=y
 CONFIG_SOC_SDMMC_HOST_SUPPORTED=y
 CONFIG_SOC_BT_SUPPORTED=y
-CONFIG_SOC_CLASSIC_BT_SUPPORTED=y
 CONFIG_SOC_PCNT_SUPPORTED=y
 CONFIG_SOC_WIFI_SUPPORTED=y
 CONFIG_SOC_SDIO_SLAVE_SUPPORTED=y
 CONFIG_SOC_TWAI_SUPPORTED=y
 CONFIG_SOC_EMAC_SUPPORTED=y
-CONFIG_SOC_CPU_CORES_NUM=2
 CONFIG_SOC_ULP_SUPPORTED=y
 CONFIG_SOC_CCOMP_TIMER_SUPPORTED=y
 CONFIG_SOC_RTC_FAST_MEM_SUPPORTED=y
 CONFIG_SOC_RTC_SLOW_MEM_SUPPORTED=y
+CONFIG_SOC_RTC_MEM_SUPPORTED=y
 CONFIG_SOC_I2S_SUPPORTED=y
 CONFIG_SOC_RMT_SUPPORTED=y
-CONFIG_SOC_SIGMADELTA_SUPPORTED=y
+CONFIG_SOC_SDM_SUPPORTED=y
+CONFIG_SOC_LEDC_SUPPORTED=y
+CONFIG_SOC_I2C_SUPPORTED=y
 CONFIG_SOC_SUPPORT_COEXISTENCE=y
 CONFIG_SOC_AES_SUPPORTED=y
 CONFIG_SOC_MPI_SUPPORTED=y
 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_DPORT_WORKAROUND_DIS_INTERRUPT_LVL=5
+CONFIG_SOC_XTAL_SUPPORT_26M=y
+CONFIG_SOC_XTAL_SUPPORT_40M=y
+CONFIG_SOC_XTAL_SUPPORT_AUTO_DETECT=y
 CONFIG_SOC_ADC_RTC_CTRL_SUPPORTED=y
 CONFIG_SOC_ADC_DIG_CTRL_SUPPORTED=y
+CONFIG_SOC_ADC_DMA_SUPPORTED=y
 CONFIG_SOC_ADC_PERIPH_NUM=2
 CONFIG_SOC_ADC_MAX_CHANNEL_NUM=10
 CONFIG_SOC_ADC_ATTEN_NUM=4
@@ -41,16 +47,21 @@ CONFIG_SOC_ADC_DIGI_CONTROLLER_NUM=2
 CONFIG_SOC_ADC_PATT_LEN_MAX=16
 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_SAMPLE_FREQ_THRES_HIGH=2
-CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=2000
+CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=20
 CONFIG_SOC_ADC_RTC_MIN_BITWIDTH=9
 CONFIG_SOC_ADC_RTC_MAX_BITWIDTH=12
 CONFIG_SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256=y
 CONFIG_SOC_SHARED_IDCACHE_SUPPORTED=y
+CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=5
+CONFIG_SOC_CPU_CORES_NUM=2
+CONFIG_SOC_CPU_INTR_NUM=32
+CONFIG_SOC_CPU_HAS_FPU=y
 CONFIG_SOC_CPU_BREAKPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINT_SIZE=64
-CONFIG_SOC_CPU_HAS_FPU=y
 CONFIG_SOC_DAC_PERIPH_NUM=2
 CONFIG_SOC_DAC_RESOLUTION=8
 CONFIG_SOC_GPIO_PORT=1
@@ -115,12 +126,13 @@ CONFIG_SOC_RTCIO_PIN_COUNT=18
 CONFIG_SOC_RTCIO_INPUT_OUTPUT_SUPPORTED=y
 CONFIG_SOC_RTCIO_HOLD_SUPPORTED=y
 CONFIG_SOC_RTCIO_WAKE_SUPPORTED=y
-CONFIG_SOC_SIGMADELTA_NUM=1
-CONFIG_SOC_SIGMADELTA_CHANNEL_NUM=8
+CONFIG_SOC_SDM_GROUPS=1
+CONFIG_SOC_SDM_CHANNELS_PER_GROUP=8
 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_MAXIMUM_BUFFER_SIZE=64
 CONFIG_SOC_SPI_MAX_PRE_DIVIDER=8192
 CONFIG_SOC_MEMSPI_SRC_FREQ_80M_SUPPORTED=y
@@ -138,6 +150,7 @@ CONFIG_SOC_TOUCH_PAD_MEASURE_WAIT_MAX=0xFF
 CONFIG_SOC_TWAI_BRP_MIN=2
 CONFIG_SOC_TWAI_SUPPORT_MULTI_ADDRESS_LAYOUT=y
 CONFIG_SOC_UART_NUM=3
+CONFIG_SOC_UART_SUPPORT_APB_CLK=y
 CONFIG_SOC_UART_SUPPORT_REF_TICK=y
 CONFIG_SOC_UART_FIFO_LEN=128
 CONFIG_SOC_UART_BITRATE_MAX=5000000
@@ -163,7 +176,11 @@ CONFIG_SOC_PM_SUPPORT_RTC_FAST_MEM_PD=y
 CONFIG_SOC_PM_SUPPORT_RTC_SLOW_MEM_PD=y
 CONFIG_SOC_SDMMC_USE_IOMUX=y
 CONFIG_SOC_SDMMC_NUM_SLOTS=2
-CONFIG_SOC_BLE_DONT_UPDATE_OWN_RPA=y
+CONFIG_SOC_WIFI_WAPI_SUPPORT=y
+CONFIG_SOC_WIFI_CSI_SUPPORT=y
+CONFIG_SOC_WIFI_MESH_SUPPORT=y
+CONFIG_SOC_BLE_SUPPORTED=y
+CONFIG_SOC_BT_CLASSIC_SUPPORTED=y
 CONFIG_IDF_CMAKE=y
 CONFIG_IDF_TARGET_ARCH_XTENSA=y
 CONFIG_IDF_TARGET_ARCH="xtensa"
@@ -185,16 +202,6 @@ CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
 # CONFIG_APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS is not set
 # end of Build type
 
-#
-# Application manager
-#
-CONFIG_APP_COMPILE_TIME_DATE=y
-# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
-# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
-# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
-CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
-# end of Application manager
-
 #
 # Bootloader config
 #
@@ -236,10 +243,21 @@ CONFIG_SECURE_BOOT_V1_SUPPORTED=y
 # CONFIG_SECURE_FLASH_ENC_ENABLED is not set
 # end of Security features
 
+#
+# Application manager
+#
+CONFIG_APP_COMPILE_TIME_DATE=y
+# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
+# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
+# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
+CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
+# end of Application manager
+
 CONFIG_ESP_ROM_HAS_CRC_LE=y
 CONFIG_ESP_ROM_HAS_CRC_BE=y
 CONFIG_ESP_ROM_HAS_JPEG_DECODE=y
 CONFIG_ESP_ROM_SUPPORT_MULTIPLE_UART=y
+CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y
 
 #
 # Serial flasher config
@@ -265,7 +283,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
 # CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
 CONFIG_ESPTOOLPY_FLASHSIZE="16MB"
-CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+# CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
 CONFIG_ESPTOOLPY_BEFORE="default_reset"
@@ -425,12 +443,6 @@ CONFIG_APPTRACE_UART_TASK_PRIO=1
 CONFIG_APPTRACE_LOCK_ENABLE=y
 # end of Application Level Tracing
 
-#
-# ESP-ASIO
-#
-# CONFIG_ASIO_SSL_SUPPORT is not set
-# end of ESP-ASIO
-
 #
 # Bluetooth
 #
@@ -490,6 +502,7 @@ CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=30
 CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
 # end of Memory Settings
 
+CONFIG_BT_NIMBLE_GATT_MAX_PROCS=4
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL=y
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL_ITVL=1000
 CONFIG_BT_NIMBLE_HS_FLOW_CTRL_THRESH=2
@@ -509,9 +522,9 @@ CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_DIS=y
 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_SLEEP_ENABLE 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
 # end of NimBLE Options
 
 #
@@ -567,11 +580,20 @@ CONFIG_BTDM_CTRL_HLI=y
 #
 
 #
-# ADC Configuration
+# Legacy ADC Configuration
 #
-# CONFIG_ADC_FORCE_XPD_FSM is not set
 CONFIG_ADC_DISABLE_DAC=y
-# end of ADC Configuration
+# CONFIG_ADC_SUPPRESS_DEPRECATE_WARN is not set
+
+#
+# Legacy ADC Calibration Configuration
+#
+CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CAL_LUT_ENABLE=y
+# CONFIG_ADC_CALI_SUPPRESS_DEPRECATE_WARN is not set
+# end of Legacy ADC Calibration Configuration
+# end of Legacy ADC Configuration
 
 #
 # SPI Configuration
@@ -605,6 +627,14 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # CONFIG_GPIO_CTRL_FUNC_IN_IRAM is not set
 # end of GPIO Configuration
 
+#
+# Sigma Delta Modulator Configuration
+#
+# CONFIG_SDM_CTRL_FUNC_IN_IRAM is not set
+# CONFIG_SDM_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_SDM_ENABLE_DEBUG_LOG is not set
+# end of Sigma Delta Modulator Configuration
+
 #
 # GPTimer Configuration
 #
@@ -635,7 +665,17 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # MCPWM Configuration
 #
 # CONFIG_MCPWM_ISR_IRAM_SAFE is not set
+# CONFIG_MCPWM_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_MCPWM_ENABLE_DEBUG_LOG is not set
 # end of MCPWM Configuration
+
+#
+# I2S Configuration
+#
+# CONFIG_I2S_ISR_IRAM_SAFE is not set
+# CONFIG_I2S_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_I2S_ENABLE_DEBUG_LOG is not set
+# end of I2S Configuration
 # end of Driver Configurations
 
 #
@@ -661,12 +701,21 @@ CONFIG_ESP_TLS_USING_MBEDTLS=y
 # end of ESP-TLS
 
 #
-# ADC-Calibration
+# ADC and ADC Calibration
 #
-CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
-CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
-CONFIG_ADC_CAL_LUT_ENABLE=y
-# end of ADC-Calibration
+# CONFIG_ADC_ONESHOT_CTRL_FUNC_IN_IRAM is not set
+# CONFIG_ADC_CONTINUOUS_ISR_IRAM_SAFE is not set
+
+#
+# ADC Calibration Configurations
+#
+CONFIG_ADC_CALI_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CALI_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CALI_LUT_ENABLE=y
+# end of ADC Calibration Configurations
+
+CONFIG_ADC_DISABLE_DAC_OUTPUT=y
+# end of ADC and ADC Calibration
 
 #
 # Common ESP-related
@@ -731,7 +780,6 @@ CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y
 #
 # Hardware Settings
 #
-# CONFIG_SPIRAM is not set
 
 #
 # MAC Config
@@ -784,16 +832,25 @@ CONFIG_ESP32_REV_MIN_0=y
 # CONFIG_ESP32_REV_MIN_2 is not set
 # CONFIG_ESP32_REV_MIN_3 is not set
 CONFIG_ESP32_REV_MIN=0
-CONFIG_ESP32_XTAL_FREQ_40=y
-# CONFIG_ESP32_XTAL_FREQ_26 is not set
-# CONFIG_ESP32_XTAL_FREQ_AUTO is not set
-CONFIG_ESP32_XTAL_FREQ=40
+
+#
+# Main XTAL Config
+#
+# CONFIG_XTAL_FREQ_26 is not set
+CONFIG_XTAL_FREQ_40=y
+# CONFIG_XTAL_FREQ_AUTO is not set
+CONFIG_XTAL_FREQ=40
+# end of Main XTAL Config
 # end of Hardware Settings
 
 #
 # LCD and Touch Panel
 #
 
+#
+# LCD Touch Drivers are maintained in the IDF Component Registry
+#
+
 #
 # LCD Peripheral Configuration
 #
@@ -809,6 +866,7 @@ CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120
 CONFIG_ESP_NETIF_TCPIP_LWIP=y
 # CONFIG_ESP_NETIF_LOOPBACK is not set
 # CONFIG_ESP_NETIF_L2_TAP is not set
+# CONFIG_ESP_NETIF_BRIDGE_EN is not set
 # end of ESP NETIF Adapter
 
 #
@@ -829,6 +887,19 @@ CONFIG_ESP_PHY_REDUCE_TX_POWER=y
 # CONFIG_PM_ENABLE is not set
 # end of Power Management
 
+#
+# ESP PSRAM
+#
+# CONFIG_SPIRAM is not set
+# end of ESP PSRAM
+
+#
+# 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
+
 #
 # ESP System Settings
 #
@@ -879,7 +950,8 @@ CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
 CONFIG_ESP_INT_WDT=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
 CONFIG_ESP_INT_WDT_CHECK_CPU1=y
-CONFIG_ESP_TASK_WDT=y
+CONFIG_ESP_TASK_WDT_EN=y
+CONFIG_ESP_TASK_WDT_INIT=y
 # CONFIG_ESP_TASK_WDT_PANIC is not set
 CONFIG_ESP_TASK_WDT_TIMEOUT_S=5
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
@@ -952,6 +1024,7 @@ 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_ESP_WIFI_SLP_IRAM_OPT is not set
 # CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set
 # CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
@@ -1075,7 +1148,7 @@ CONFIG_FREERTOS_DEBUG_OCDAWARE=y
 #
 CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y
 # CONFIG_HAL_ASSERTION_DISABLE is not set
-# CONFIG_HAL_ASSERTION_SILIENT is not set
+# CONFIG_HAL_ASSERTION_SILENT is not set
 # CONFIG_HAL_ASSERTION_ENABLE is not set
 CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
 # end of Hardware Abstraction Layer (HAL) and Low Level (LL)
@@ -1142,6 +1215,7 @@ CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
 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
 
 #
 # DHCP server
@@ -1231,6 +1305,7 @@ CONFIG_LWIP_SNTP_MAX_SERVERS=1
 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 # end of SNTP
 
+CONFIG_LWIP_BRIDGEIF_MAX_PORTS=7
 CONFIG_LWIP_ESP_LWIP_ASSERT=y
 
 #
@@ -1381,35 +1456,11 @@ CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
 # CONFIG_MBEDTLS_SECURITY_RISKS is not set
 # end of mbedTLS
 
-#
-# mDNS
-#
-CONFIG_MDNS_MAX_INTERFACES=3
-CONFIG_MDNS_MAX_SERVICES=10
-CONFIG_MDNS_TASK_PRIORITY=1
-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_MULTIPLE_INSTANCE=y
-
-#
-# MDNS Predefined interfaces
-#
-CONFIG_MDNS_PREDEF_NETIF_STA=y
-CONFIG_MDNS_PREDEF_NETIF_AP=y
-# end of MDNS Predefined interfaces
-# end of mDNS
-
 #
 # ESP-MQTT Configurations
 #
 CONFIG_MQTT_PROTOCOL_311=y
+# CONFIG_MQTT_PROTOCOL_5 is not set
 CONFIG_MQTT_TRANSPORT_SSL=y
 CONFIG_MQTT_TRANSPORT_WEBSOCKET=y
 CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y
@@ -1449,6 +1500,14 @@ CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=y
 # CONFIG_OPENTHREAD_ENABLED is not set
 # end of OpenThread
 
+#
+# Protocomm
+#
+CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_0=y
+CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_1=y
+# CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_2 is not set
+# end of Protocomm
+
 #
 # PThreads
 #
@@ -1471,7 +1530,6 @@ CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
 CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set
-# CONFIG_SPI_FLASH_USE_LEGACY_IMPL is not set
 # CONFIG_SPI_FLASH_SHARE_SPI1_BUS is not set
 # CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set
 CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y
@@ -1592,6 +1650,7 @@ CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
 # CONFIG_WIFI_PROV_BLE_BONDING is not set
 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
 # end of Wi-Fi Provisioning Manager
 
 #
@@ -1611,6 +1670,117 @@ CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
 # CONFIG_WPA_WPS_SOFTAP_REGISTRAR is not set
 # end of Supplicant
 
+#
+# ESP-ASIO
+#
+CONFIG_ASIO_SSL_SUPPORT=y
+CONFIG_ASIO_USE_ESP_OPENSSL=y
+CONFIG_ASIO_SSL_BIO_SIZE=1024
+# end of ESP-ASIO
+
+#
+# ESP WebSocket client
+#
+# CONFIG_ESP_WS_CLIENT_ENABLE_DYNAMIC_BUFFER is not set
+# end of ESP WebSocket client
+
+#
+# mDNS
+#
+CONFIG_MDNS_MAX_INTERFACES=3
+CONFIG_MDNS_MAX_SERVICES=10
+CONFIG_MDNS_TASK_PRIORITY=1
+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_MULTIPLE_INSTANCE=y
+
+#
+# MDNS Predefined interfaces
+#
+CONFIG_MDNS_PREDEF_NETIF_STA=y
+CONFIG_MDNS_PREDEF_NETIF_AP=y
+# end of MDNS Predefined interfaces
+# end of mDNS
+
+#
+# TFT_eSPI
+#
+CONFIG_TFT_eSPI_ESPIDF=y
+CONFIG_TFT_ILI9341_DRIVER=y
+# CONFIG_TFT_ILI9341_2_DRIVER is not set
+# CONFIG_TFT_ST7735_DRIVER is not set
+# CONFIG_TFT_ILI9163_DRIVER is not set
+# CONFIG_TFT_S6D02A1_DRIVER is not set
+# CONFIG_TFT_HX8357D_DRIVER is not set
+# CONFIG_TFT_ILI9481_DRIVER is not set
+# CONFIG_TFT_ILI9486_DRIVER is not set
+# CONFIG_TFT_ILI9488_DRIVER is not set
+# CONFIG_TFT_ST7789_DRIVER is not set
+# CONFIG_TFT_ST7789_2_DRIVER is not set
+# CONFIG_TFT_R61581_DRIVER is not set
+# CONFIG_TFT_RM68140_DRIVER is not set
+# CONFIG_TFT_ST7796_DRIVER is not set
+# CONFIG_TFT_SSD1351_DRIVER is not set
+# CONFIG_TFT_SSD1963_480_DRIVER is not set
+# CONFIG_TFT_SSD1963_800_DRIVER is not set
+# CONFIG_TFT_SSD1963_800ALT_DRIVER is not set
+# CONFIG_TFT_ILI9225_DRIVER is not set
+# CONFIG_TFT_GC9A01_DRIVER is not set
+CONFIG_TFT_RGB_ORDER=y
+# CONFIG_TFT_BGR_ORDER is not set
+# CONFIG_TFT_M5STACK is not set
+CONFIG_TFT_INVERSION_DISABLE=y
+# CONFIG_TFT_INVERSION_ON is not set
+# CONFIG_TFT_INVERSION_OFF is not set
+# CONFIG_TFT_PARALLEL_8_BIT is not set
+
+#
+# Display SPI config
+#
+CONFIG_TFT_MISO=-1
+CONFIG_TFT_MOSI=13
+CONFIG_TFT_SCLK=15
+# CONFIG_TFT_SDA_READ is not set
+CONFIG_TFT_SPI_FREQUENCY=40000000
+CONFIG_TFT_SPI_READ_FREQ=20000000
+# end of Display SPI config
+
+#
+# Control Pin configuration
+#
+CONFIG_TFT_CS=14
+CONFIG_TFT_DC=12
+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 is not set
+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
+# end of Fonts
+
+#
+# Touch screen configuration
+#
+# CONFIG_ENABLE_TOUCH is not set
+# end of Touch screen configuration
+# end of TFT_eSPI
+
 #
 # ESP-NimBLE-CPP configuration
 #
@@ -1723,8 +1893,6 @@ CONFIG_ADC2_DISABLE_DAC=y
 CONFIG_POST_EVENTS_FROM_ISR=y
 CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
 CONFIG_OTA_ALLOW_HTTP=y
-# CONFIG_SPIRAM_SUPPORT is not set
-# CONFIG_ESP32_SPIRAM_SUPPORT is not set
 # CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set
 CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
 CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
@@ -1739,6 +1907,10 @@ CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
 # CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256 is not set
 # CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256 is not set
 CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
+# CONFIG_ESP32_XTAL_FREQ_26 is not set
+CONFIG_ESP32_XTAL_FREQ_40=y
+# CONFIG_ESP32_XTAL_FREQ_AUTO is not set
+CONFIG_ESP32_XTAL_FREQ=40
 CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
 CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION=y
 CONFIG_ESP32_PHY_DEFAULT_INIT_IF_INVALID=y
@@ -1747,6 +1919,8 @@ CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
 CONFIG_ESP32_PHY_MAX_TX_POWER=20
 CONFIG_REDUCE_PHY_TX_POWER=y
 CONFIG_ESP32_REDUCE_PHY_TX_POWER=y
+# CONFIG_SPIRAM_SUPPORT is not set
+# CONFIG_ESP32_SPIRAM_SUPPORT is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
@@ -1769,7 +1943,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
 CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
@@ -1807,6 +1981,7 @@ CONFIG_TIMER_TASK_PRIORITY=1
 CONFIG_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_TIMER_QUEUE_LENGTH=10
 # CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set
+# CONFIG_HAL_ASSERTION_SILIENT is not set
 # CONFIG_L2_TO_L3_COPY is not set
 CONFIG_ESP_GRATUITOUS_ARP=y
 CONFIG_GARP_TMR_INTERVAL=60

dependencies.lock

@@ -3,7 +3,7 @@ dependencies:
     component_hash: null
     source:
       type: idf
-    version: 5.0.0
-manifest_hash: 7c3516d5e235caf076ae74598eb0fa0e7367ac4e40a46f5f1c262bd592a127e4
+    version: 5.1.0
+manifest_hash: 45094f33b6a257bfcaa02efb329b001e383adbe7dc60bd5066b99a5e9f5ebc91
 target: esp32
 version: 1.0.0

export.sh

@@ -53,4 +53,4 @@ export PATH=$PATH:$(pwd)/tools
 alias open-ide=open_ide
 alias switchconf=./switchconf.sh
 alias bobby-build="idf.py build"
-export PS1="\033[1;32m(bobby-sourced)\033[;0m$PS1"
+

main/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(headers
+set(BOBBY_HEADERS
     accessorhelpers.h
     accessors/globalaccessors.h
     accessors/settingsaccessors.h
@@ -24,7 +24,9 @@ set(headers
     actions/modesettingsaction.h
     actions/qraction.h
     actions/rebootaction.h
+    actions/resetnvsaction.h
     actions/savesettingsaction.h
+    actions/setupactions.h
     actions/switchprofileaction.h
     actions/tempomatmodeapplycurrentpeedaction.h
     actions/updateswapfrontbackaction.h
@@ -62,6 +64,7 @@ set(headers
     debuginputhandler.h
     debugtexthelpers.h
     displays/batterygraphdisplay.h
+    displays/batteryinfodisplay.h
     displays/bmsdisplay.h
     displays/bobbychangevaluedisplay.h
     displays/bobbydisplay.h
@@ -70,7 +73,6 @@ set(headers
     displays/bobbymenudisplay.h
     displays/bobbypopupdisplay.h
     displays/bobbysplitgraphdisplay.h
-    displays/buttoncalibratedisplay.h
     displays/calibratevoltagedisplay.h
     displays/confiscationdisplay.h
     displays/gameoflifedisplay.h
@@ -127,6 +129,7 @@ set(headers
     displays/menus/networksettingsmenu.h
     displays/menus/otamenu.h
     displays/menus/profilesmenu.h
+    displays/menus/recoverymenu.h
     displays/menus/remotecontrolmodesettingsmenu.h
     displays/menus/selectbuildserverbranch.h
     displays/menus/selectbuildservermenu.h
@@ -156,10 +159,19 @@ set(headers
     displays/qrcodedebug.h
     displays/qrdisplay.h
     displays/qrimportdisplay.h
+    displays/setup/ask_calibrate_other_buttons.h
+    displays/setup/ask_setup_clouds.h
+    displays/setup/basic_buttons.h
+    displays/setup/calibrate_potis.h
+    displays/setup/final_information.h
+    displays/setup/information.h
+    displays/setup/setup_cloud.h
+    displays/speedinfodisplay.h
     displays/spirodisplay.h
     displays/starfielddisplay.h
     displays/statusdisplay.h
     displays/updatedisplay.h
+    displays/xydebugdisplay.h
     dnsannounce.h
     dpad.h
     dpad3wire.h
@@ -170,6 +182,7 @@ set(headers
     drivingstatistics.h
     espnowfunctions.h
     esptexthelpers.h
+    feedbackemulator.h
     feedbackparser.h
     globals.h
     handbremse.h
@@ -215,6 +228,7 @@ set(headers
     modes/tempomatmode.h
     modes/wheelchairmode.h
     mosfets.h
+    motorpwmlimiter.h
     newsettings.h
     ota.h
     potis.h
@@ -226,6 +240,8 @@ set(headers
     serial_bobby.h
     settingspersister.h
     settingsutils.h
+    setup.h
+    softpwmlimiter.h
     statistics.h
     statustexthelper.h
     taskmanager.h
@@ -235,6 +251,7 @@ set(headers
     texthelpers/wifistatexthelpers.h
     time_bobbycar.h
     types.h
+    typeutils.h
     udpcloud.h
     unifiedmodelmode.h
     utils.h
@@ -250,7 +267,7 @@ set(headers
     wifiguiutils.h
 )
 
-set(sources
+set(BOBBY_SOURCES
     accessors/wifistaconfigaccessors.cpp
     actions/assertaction.cpp
     actions/bluetoothbeginaction.cpp
@@ -271,7 +288,9 @@ set(sources
     actions/modesettingsaction.cpp
     actions/qraction.cpp
     actions/rebootaction.cpp
+    actions/resetnvsaction.cpp
     actions/savesettingsaction.cpp
+    actions/setupactions.cpp
     actions/switchprofileaction.cpp
     actions/tempomatmodeapplycurrentpeedaction.cpp
     actions/updateswapfrontbackaction.cpp
@@ -306,6 +325,7 @@ set(sources
     debuginputhandler.cpp
     debugtexthelpers.cpp
     displays/batterygraphdisplay.cpp
+    displays/batteryinfodisplay.cpp
     displays/bmsdisplay.cpp
     displays/bobbychangevaluedisplay.cpp
     displays/bobbydisplay.cpp
@@ -314,7 +334,6 @@ set(sources
     displays/bobbymenudisplay.cpp
     displays/bobbypopupdisplay.cpp
     displays/bobbysplitgraphdisplay.cpp
-    displays/buttoncalibratedisplay.cpp
     displays/calibratevoltagedisplay.cpp
     displays/confiscationdisplay.cpp
     displays/gameoflifedisplay.cpp
@@ -369,6 +388,7 @@ set(sources
     displays/menus/networksettingsmenu.cpp
     displays/menus/otamenu.cpp
     displays/menus/profilesmenu.cpp
+    displays/menus/recoverymenu.cpp
     displays/menus/remotecontrolmodesettingsmenu.cpp
     displays/menus/selectbuildserverbranch.cpp
     displays/menus/selectbuildservermenu.cpp
@@ -398,10 +418,19 @@ set(sources
     displays/qrcodedebug.cpp
     displays/qrdisplay.cpp
     displays/qrimportdisplay.cpp
+    displays/setup/ask_calibrate_other_buttons.cpp
+    displays/setup/ask_setup_clouds.cpp
+    displays/setup/basic_buttons.cpp
+    displays/setup/calibrate_potis.cpp
+    displays/setup/final_information.cpp
+    displays/setup/information.cpp
+    displays/setup/setup_cloud.cpp
+    displays/speedinfodisplay.cpp
     displays/spirodisplay.cpp
     displays/starfielddisplay.cpp
     displays/statusdisplay.cpp
     displays/updatedisplay.cpp
+    displays/xydebugdisplay.cpp
     dnsannounce.cpp
     dpad.cpp
     dpad3wire.cpp
@@ -412,6 +441,7 @@ set(sources
     drivingstatistics.cpp
     espnowfunctions.cpp
     esptexthelpers.cpp
+    feedbackemulator.cpp
     feedbackparser.cpp
     globals.cpp
     handbremse.cpp
@@ -458,6 +488,7 @@ set(sources
     modes/tempomatmode.cpp
     modes/wheelchairmode.cpp
     mosfets.cpp
+    motorpwmlimiter.cpp
     newsettings.cpp
     ota.cpp
     potis.cpp
@@ -469,6 +500,8 @@ set(sources
     serial_bobby.cpp
     settingspersister.cpp
     settingsutils.cpp
+    setup.cpp
+    softpwmlimiter.cpp
     statistics.cpp
     statustexthelper.cpp
     taskmanager.cpp
@@ -494,7 +527,7 @@ set(sources
 )
 
 set(dependencies
-    freertos nvs_flash esp_http_server esp_https_ota mdns app_update esp_system esp_websocket_client driver
+    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
@@ -502,8 +535,8 @@ set(dependencies
 
 idf_component_register(
     SRCS
-        ${headers}
-        ${sources}
+        ${BOBBY_HEADERS}
+        ${BOBBY_SOURCES}
     INCLUDE_DIRS
         .
     REQUIRES
@@ -521,13 +554,35 @@ execute_process(
         COMMAND git rev-parse --abbrev-ref HEAD
         OUTPUT_VARIABLE GIT_BRANCH
 )
+execute_process(
+        COMMAND git status --short
+        OUTPUT_VARIABLE GIT_STATUS
+)
+
+if (NOT GIT_STATUS STREQUAL "")
+    set(GIT_STATUS "dirty")
+else()
+    set(GIT_STATUS "clean")
+endif()
 
 string(STRIP "${GIT_REV}" GIT_REV)
 string(SUBSTRING "${GIT_REV}" 1 7 GIT_SHORT_REV)
 string(STRIP "${GIT_MESSAGE}" GIT_MESSAGE)
+string(REPLACE "\n" " " GIT_MESSAGE "${GIT_MESSAGE}")
+string(REPLACE "\"" "\\\"" GIT_MESSAGE "${GIT_MESSAGE}")
 string(SUBSTRING "${GIT_MESSAGE}" 0 100 GIT_MESSAGE)
 string(STRIP "${GIT_BRANCH}" GIT_BRANCH)
 
+message(WARNING "Git revision: ${GIT_REV}")
+message(WARNING "Git short revision: ${GIT_SHORT_REV}")
+message(WARNING "Git message: ${GIT_MESSAGE}")
+message(WARNING "Git branch: ${GIT_BRANCH}")
+message(WARNING "Git status: ${GIT_STATUS}")
+
+if(NOT DEFINED BOBBY_DEFAULT_USERNAME)
+    message(FATAL_ERROR "Please define BOBBY_DEFAULT_USERNAME")
+endif()
+
 target_compile_options(${COMPONENT_TARGET}
     PRIVATE
         -fstack-reuse=all
@@ -541,5 +596,6 @@ target_compile_options(${COMPONENT_TARGET}
         -DGIT_SHORT_REV="${GIT_SHORT_REV}"
         -DGIT_MESSAGE="${GIT_MESSAGE}"
         -DGIT_BRANCH="${GIT_BRANCH}"
+        -DBOBBY_DEFAULT_USERNAME="${BOBBY_DEFAULT_USERNAME}"
         ${BOBBYCAR_BUILDFLAGS}
 )

main/accessors/settingsaccessors.h

@@ -39,10 +39,14 @@ struct PhaseAdvMaxAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &
 
 // Bluetooth Low Energy
 struct BleEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.bleSettings.bleEnabled; } };
+struct BleFenceEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.bleSettings.bleFenceEnabled; } };
 
 // Cloud
 struct CloudEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.cloudSettings.cloudEnabled; } };
 struct CloudTransmitTimeoutAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.cloudSettings.cloudTransmitTimeout; } };
+struct CloudSendStatisticsAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.cloudSettings.sendStatistic; } };
+struct CloudURLAccessor : public NewSettingsAccessor<std::string> { ConfigWrapper<std::string> &getConfig() const override { return configs.cloudUrl; } };
+struct CloudKeyAccessor : public NewSettingsAccessor<std::string> { ConfigWrapper<std::string> &getConfig() const override { return configs.cloudSettings.cloudKey; } };
 
 // Time
 //struct TimezoneOffsetAccessor : public NewSettingsAccessor<int32_t> { ConfigWrapper<int32_t> &getConfig() const override { return configs.timezoneOffset; } };
@@ -125,11 +129,13 @@ struct CloudSendRateAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapp
 
 struct UdpCloudSendIntervalAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.boardcomputerHardware.timersSettings.udpSendRateMs; } };
 struct UdpCloudEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.udpCloudSettings.udpCloudEnabled; } };
-struct CloudDebugEnableAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.udpCloudSettings.enableCloudDebug; } };
-struct UdpUseStdStringAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.udpCloudSettings.udpUseStdString; } };
+struct UdpCloudDebugEnableAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.udpCloudSettings.enableCloudDebug; } };
+struct UdpCloudHostAccessor : public NewSettingsAccessor<std::string> { ConfigWrapper<std::string> &getConfig() const override { return configs.udpCloudSettings.udpCloudHost; } };
+struct UdpCloudPortAccessor : public NewSettingsAccessor<uint16_t> { ConfigWrapper<uint16_t> &getConfig() const override { return configs.udpCloudSettings.udpCloudPort; } };
 
 // DefaultMode
 struct DefaultModeModelModeAccessor : public RefAccessorSaveSettings<UnifiedModelMode> { UnifiedModelMode &getRef() const override { return profileSettings.defaultMode.modelMode; } };
+struct DefaultModeAllowRemoteControlAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.defaultMode.allowRemoteControl; } };
 struct DefaultModeSquareGasAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.defaultMode.squareGas; } };
 struct DefaultModeSquareBremsAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.defaultMode.squareBrems; } };
 
@@ -199,6 +205,9 @@ struct LedstripEnableBlinkAnimationAccessor : public NewSettingsAccessor<bool> {
 struct LedstripOtaAnimationAccessor : public NewSettingsAccessor<OtaAnimationModes> { ConfigWrapper<OtaAnimationModes> &getConfig() const override { return configs.ledstrip.otaMode; } };
 struct LedstripEnableVisualizeBlinkAnimationAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.ledstrip.enableVisualizeBlink; } };
 struct LedstripAutomaticLightAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.ledstrip.automaticLight; } };
+struct LedstripBrakeLightUseAccelAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.ledstrip.brakeLights_useAccel; } };
+struct LedstripBrakeLightUsePowerAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.ledstrip.brakeLights_usePower; } };
+
 
 // Battery
 struct BatterySeriesCellsAccessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.battery.cellsSeries; } };
@@ -259,5 +268,9 @@ struct QuickActionExtra2Accessor : public NewSettingsAccessor<BobbyQuickActions>
 struct QuickActionExtra3Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionExtra3; } };
 struct QuickActionExtra4Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionExtra4; } };
 
+// boardcomputer-hardware
+struct FlipScreenAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.boardcomputerHardware.flipScreen; } };
+
 // Other
 struct AnhaengerIdAccessor : public NewSettingsAccessor<uint16_t> { ConfigWrapper<uint16_t> &getConfig() const override { return configs.anhaenger_id; } };
+struct UsernameAccessor : public NewSettingsAccessor<std::string> { ConfigWrapper<std::string> &getConfig() const override { return configs.otaUsername; } };

main/actions/ledstripanimationactions.h

@@ -16,7 +16,7 @@ public:
     void triggered() override
     {
         if (auto result = configs.write_config(configs.ledstrip.animationType, type); !result)
-            BobbyErrorHandler{}.errorOccured(std::move(result).error());
+            BobbyErrorHandler{}.errorOccurred(std::move(result).error());
     }
 };
 

main/actions/qraction.h

@@ -32,7 +32,6 @@ private:
     std::string m_msg;
 };
 
-template<typename TMenu>
 class PushQrImportDisplayAction : public virtual espgui::ActionInterface
 {
 public:
@@ -41,7 +40,7 @@ public:
 
     void triggered() override
     {
-        espgui::pushScreen<QrImportDisplay<TMenu>>(std::move(m_nvskey));
+        espgui::pushScreen<QrImportDisplay>(std::move(m_nvskey));
     }
 private:
     std::string m_nvskey;

main/actions/resetnvsaction.h

@@ -0,0 +1,40 @@
+#pragma once
+
+// system includes
+#include <esp_system.h>
+
+// 3rdparty lib includes
+#include <actioninterface.h>
+#include <tftinstance.h>
+
+// local includes
+#include "newsettings.h"
+
+template<bool reboot>
+class ResetNVSAction : public virtual espgui::ActionInterface
+{
+public:
+    void triggered() override
+    {
+        if (reboot)
+        {
+            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);
+
+            configs.reset();
+
+            esp_restart();
+        }
+        else
+        {
+            configs.reset();
+        }
+    }
+};

main/actions/setupactions.cpp

@@ -0,0 +1,26 @@
+#include "setupactions.h"
+
+// 3rdparty lib includes
+#include <screenmanager.h>
+
+// local includes
+#include "displays/setup/basic_buttons.h"
+#include "displays/setup/calibrate_potis.h"
+
+PushButtonCalibrateDisplayAction::PushButtonCalibrateDisplayAction(const bool early_return) :
+    m_early_return{early_return}
+{}
+
+void PushButtonCalibrateDisplayAction::triggered()
+{
+    espgui::pushScreen<SetupBasicButtonsDisplay>(m_early_return);
+}
+
+PushPotiCalibrateDisplayAction::PushPotiCalibrateDisplayAction(const bool early_return) :
+        m_early_return{early_return}
+{}
+
+void PushPotiCalibrateDisplayAction::triggered()
+{
+    // espgui::pushScreen<SetupCalibratePotisDisplay>(m_early_return); // commented out until implemented
+}

main/actions/setupactions.h

@@ -0,0 +1,24 @@
+#pragma once
+
+// 3rdparty lib includes
+#include <actioninterface.h>
+
+class PushButtonCalibrateDisplayAction : public virtual espgui::ActionInterface
+{
+public:
+    explicit PushButtonCalibrateDisplayAction(bool early_return);
+
+    void triggered() override;
+private:
+    const bool m_early_return;
+};
+
+class PushPotiCalibrateDisplayAction : public virtual espgui::ActionInterface
+{
+public:
+    explicit PushPotiCalibrateDisplayAction(bool early_return);
+
+    void triggered() override;
+private:
+    const bool m_early_return;
+};

main/ble_bobby.cpp

@@ -6,11 +6,11 @@
 // 3rdparty lib includes
 #include <ArduinoJson.h>
 #include <wifi_bobbycar.h>
-#include <futurecpp.h>
 
 // local includes
 #include "ledstrip.h"
 #include "globals.h"
+#include "modes/defaultmode.h"
 #include "modes/remotecontrolmode.h"
 #include "utils.h"
 #include "newsettings.h"
@@ -21,19 +21,19 @@ constexpr const char * const TAG = "BOBBYBLE";
 class RemoteControlCallbacks : public NimBLECharacteristicCallbacks
 {
 public:
-    void onWrite(NimBLECharacteristic* pCharacteristic) override;
+    void onWrite(NimBLECharacteristic* pCharacteristic, NimBLEConnInfo& connInfo) override;
 };
 
 class WirelessSettingsCallbacks : public NimBLECharacteristicCallbacks
 {
 public:
-    void onWrite(NimBLECharacteristic* pCharacteristic) override;
+    void onWrite(NimBLECharacteristic* pCharacteristic, NimBLEConnInfo& connInfo) override;
 };
 
 class WiFiListCallbacks : public NimBLECharacteristicCallbacks
 {
 public:
-    void onRead(NimBLECharacteristic* pCharacteristic) override;
+    void onRead(NimBLECharacteristic* pCharacteristic, NimBLEConnInfo& connInfo) override;
 };
 
 } // namespace
@@ -55,14 +55,20 @@ void createBle()
 {
     ESP_LOGI("BOBBY", "called");
 
-    BLEDevice::init(configs.bluetoothName.value());
+    NimBLEDevice::init(configs.bluetoothName.value());
 
     const auto serviceUuid{"0335e46c-f355-4ce6-8076-017de08cee98"};
 
-    pServer = BLEDevice::createServer();
+    ESP_LOGI(TAG, "Creating BLE server");
+
+    pServer = NimBLEDevice::createServer();
+
+    ESP_LOGI(TAG, "Creating BLE service");
 
     pService = pServer->createService(serviceUuid);
 
+    ESP_LOGI(TAG, "Creating BLE characteristics");
+
     livestatsCharacteristic = pService->createCharacteristic("a48321ea-329f-4eab-a401-30e247211524", NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY);
     remotecontrolCharacteristic = pService->createCharacteristic("4201def0-a264-43e6-946b-6b2d9612dfed", NIMBLE_PROPERTY::WRITE);
     remotecontrolCharacteristic->setCallbacks(&bleRemoteCallbacks);
@@ -72,19 +78,23 @@ void createBle()
     getwifilist = pService->createCharacteristic("4201def2-a264-43e6-946b-6b2d9612dfed", NIMBLE_PROPERTY::READ);
     getwifilist->setCallbacks(&bleWiFiListCallbacks);
 
+    ESP_LOGI(TAG, "Starting BLE service");
+
     pService->start();
 
-    BLEAdvertising *pAdvertising = BLEDevice::getAdvertising();
+    ESP_LOGI(TAG, "Starting BLE advertising");
+
+    NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
     pAdvertising->addServiceUUID(serviceUuid);
     pAdvertising->setScanResponse(true);
-    BLEDevice::startAdvertising();
+    NimBLEDevice::startAdvertising();
 }
 
 void destroyBle()
 {
     ESP_LOGI("BOBBY", "called");
 
-    BLEDevice::deinit(true);
+    NimBLEDevice::deinit(true);
 
     pServer = {};
     pService = {};
@@ -226,9 +236,9 @@ void handleBle()
 
 namespace {
 
-void RemoteControlCallbacks::onWrite(NimBLECharacteristic* pCharacteristic)
+void RemoteControlCallbacks::onWrite(NimBLECharacteristic* pCharacteristic, NimBLEConnInfo& connInfo)
 {
-    const auto &val = pCharacteristic->getValue();
+    const std::string& val = pCharacteristic->getValue();
 
     StaticJsonDocument<256> doc;
     if (const auto error = deserializeJson(doc, val))
@@ -247,18 +257,20 @@ void RemoteControlCallbacks::onWrite(NimBLECharacteristic* pCharacteristic)
 
     if (!simplified)
     {
-        modes::remoteControlMode.setCommand(RemoteCommand{
+        RemoteCommand cmd {
             .frontLeft = doc[isInverted ? "fr":"fl"].as<int16_t>(),
             .frontRight = doc[isInverted ? "fl":"fr"].as<int16_t>(),
             .backLeft = doc["bl"].as<int16_t>(),
             .backRight = doc["br"].as<int16_t>()
-        });
+        };
+        modes::defaultMode.setRemoteCommand(cmd);
+        modes::remoteControlMode.setRemoteCommand(cmd);
     }
 }
 
-void WirelessSettingsCallbacks::onWrite(NimBLECharacteristic* pCharacteristic)
+void WirelessSettingsCallbacks::onWrite(NimBLECharacteristic* pCharacteristic, NimBLEConnInfo& connInfo)
 {
-    const auto &val = pCharacteristic->getValue();
+    const std::string& val = pCharacteristic->getValue();
 
     StaticJsonDocument<256> doc;
     if (const auto error = deserializeJson(doc, val))
@@ -271,7 +283,7 @@ void WirelessSettingsCallbacks::onWrite(NimBLECharacteristic* pCharacteristic)
 
     if (write_type == "wifi") {
         const int index = doc["wifi_index"].as<int>();
-        ESP_LOGI(TAG, "[ble_config]: Set wifi%i: WiFi-SSID: %s, WiFi-Password: ***", doc["wifi_index"].as<int>(), doc["wifi_ssid"].as<const char*>());
+        ESP_LOGI(TAG, "Set wifi%i: WiFi-SSID: %s, WiFi-Password: ***", doc["wifi_index"].as<int>(), doc["wifi_ssid"].as<const char*>());
         configs.write_config(configs.wifi_configs[index].ssid, doc["wifi_ssid"].as<std::string>());
         configs.write_config(configs.wifi_configs[index].key, doc["wifi_pass"].as<std::string>());
     } else {
@@ -280,11 +292,11 @@ void WirelessSettingsCallbacks::onWrite(NimBLECharacteristic* pCharacteristic)
     }
 }
 
-void WiFiListCallbacks::onRead(NimBLECharacteristic *pCharacteristic)
+void WiFiListCallbacks::onRead(NimBLECharacteristic* pCharacteristic, NimBLEConnInfo& connInfo)
 {
     StaticJsonDocument<768> responseDoc;
     auto wifiArray = responseDoc.createNestedArray("wifis");
-    ESP_LOGI(TAG, "[ble_wifilist] Got request for listing wifi ssids.");
+    ESP_LOGI(TAG, "Got request for listing wifi ssids.");
     for (const auto &wifi : configs.wifi_configs)
     {
         wifiArray.add(wifi.ssid.value());

main/ble_bobby.h

@@ -13,3 +13,10 @@ extern BLECharacteristic *getwifilist;
 void initBle();
 
 void handleBle();
+
+struct RemoteCommand {
+    int16_t frontLeft{};
+    int16_t frontRight{};
+    int16_t backLeft{};
+    int16_t backRight{};
+};

main/bobbyblinker.cpp

@@ -60,23 +60,18 @@ namespace bobbyblinker {
         }
         if (configs.ledstrip.enableBrakeLights.value() && espchrono::ago(*brake_last_time_sent) > 500ms)
         {
-            float avgPwm{};
-            for (const Controller &controller: controllers) {
-                avgPwm +=
-                        controller.command.left.pwm * (controller.invertLeft ? -1 : 1) +
-                        controller.command.right.pwm * (controller.invertRight ? -1 : 1);
-            }
-            avgPwm /= 4;
-
-            if (avgPwm < -1.f)
+            if (brakeLightsStatus == brakeLightsOffSent)
             {
-                sendState("BRAKELIGHTSON");
-                brakeLightsOffSent = false;
-            }
-            else if (!brakeLightsOffSent && avgPwm > -1.f)
-            {
-                sendState("BRAKELIGHTSOFF");
-                brakeLightsOffSent = true;
+                if (brakeLightsStatus)
+                {
+                    sendState("BRAKELIGHTSON");
+                    brakeLightsOffSent = false;
+                }
+                else if (!brakeLightsOffSent)
+                {
+                    sendState("BRAKELIGHTSOFF");
+                    brakeLightsOffSent = true;
+                }
             }
         }
     }

main/bobbybuttons.cpp

@@ -6,9 +6,7 @@
 // local includes
 #include "newsettings.h"
 #include "settingsutils.h"
-#include "modes/defaultmode.h"
 #include "ledstripdefines.h"
-#include "ledstrip.h"
 
 #include "bobbyquickactions.h"
 
@@ -112,6 +110,7 @@ void buttonReleasedCommon(espgui::Button button)
 
 void BobbyButtons::rawButtonPressed(uint8_t button)
 {
+    ESP_LOGI(TAG, "%hhu", button);
     //Base::rawButtonPressed(button);
     if (const auto translated = translateRawButton(button))
         buttonPressed(*translated);
@@ -119,6 +118,7 @@ void BobbyButtons::rawButtonPressed(uint8_t button)
 
 void BobbyButtons::rawButtonReleased(uint8_t button)
 {
+    ESP_LOGI(TAG, "%hhu", button);
     //Base::rawButtonReleased(button);
     if (const auto translated = translateRawButton(button))
         buttonReleased(*translated);

main/bobbybuttons.h

@@ -21,7 +21,8 @@ enum BobbyButton
     Extra3,
     Extra4,
     Confirm = espgui::Button::Right,
-    Back = espgui::Button::Left
+    Back = espgui::Button::Left,
+    ButtonMax = Back
 };
 
 [[nodiscard]] std::optional<espgui::Button> translateRawButton(uint8_t button);

main/bobbyerrorhandler.cpp

@@ -6,7 +6,7 @@
 // local includes
 #include "displays/bobbypopupdisplay.h"
 
-void BobbyErrorHandler::errorOccured(std::string &&error)
+void BobbyErrorHandler::errorOccurred(std::string &&error)
 {
     auto newDisplay = std::make_unique<BobbyPopupDisplay>(std::move(error), std::move(espgui::currentDisplay));
     newDisplay->initOverlay();

main/bobbyerrorhandler.h

@@ -5,5 +5,5 @@
 
 struct BobbyErrorHandler : public virtual espgui::ErrorHandlerInterface
 {
-    void errorOccured(std::string &&error) override;
+    void errorOccurred(std::string &&error) override;
 };

main/bobbyquickactions.cpp

@@ -95,6 +95,9 @@ void open_garage()
         return;
     for (const auto &config : configs.wireless_door_configs)
     {
+        if (config.doorId.value().empty() || config.doorToken.value().empty())
+            continue;
+
         if (const auto error = espnow::send_espnow_message(fmt::format("BOBBYOPEN:{}:{}", config.doorId.value(), config.doorToken.value())); error != ESP_OK)
         {
             ESP_LOGE("BOBBY", "send_espnow_message() failed with: %s", esp_err_to_name(error));

main/bobbyquickactions.h

@@ -2,9 +2,9 @@
 
 // 3rdparty lib includes
 #include <buttonsinterface.h>
-#include <cpptypesafeenum.h>
 
 // local includes
+#include "bobbytypesafeenum.h"
 #include "bobbybuttons.h"
 
 #define BobbyQuickActionsValues(x) \
@@ -18,7 +18,7 @@
     x(HUPE) \
     x(COMPRESSOR_TOGGLE)
 
-DECLARE_TYPESAFE_ENUM(BobbyQuickActions, : uint8_t, BobbyQuickActionsValues)
+DECLARE_BOBBYTYPESAFE_ENUM(BobbyQuickActions, : uint8_t, BobbyQuickActionsValues)
 
 namespace quickactions {
 

main/bobbyschedulertask.h

@@ -3,11 +3,42 @@
 // 3rdparty lib includes
 #include <schedulertask.h>
 
+#include <esp_log.h>
+
 class BobbySchedulerTask : public espcpputils::SchedulerTask {
 public:
-    using SchedulerTask::SchedulerTask;
-    void setup() const { SchedulerTask::setup(); m_wasInitialized = true; }
+    // using SchedulerTask::SchedulerTask; -> we need to add one more parameter
+    BobbySchedulerTask(const char *name, void (&setupCallback)(), void (&loopCallback)(),
+                       espchrono::millis_clock::duration loopInterval, bool use_in_recovery = false,
+                       bool intervalImportant = false,
+                       std::string (*perfInfo)() = nullptr) :
+        espcpputils::SchedulerTask(name, setupCallback, loopCallback, loopInterval, intervalImportant, perfInfo),
+        m_use_in_recovery{use_in_recovery}
+    {
+    }
+    void setup(bool in_recovery = false)
+    {
+        m_in_recovery = in_recovery;
+        if (in_recovery && !m_use_in_recovery)
+        {
+            ESP_LOGI("BobbySchedulerTask", "Skipping setup of %s (%s)", name(), m_use_in_recovery ? "use in recovery" : "no use in recovery");
+            return;
+        }
+        SchedulerTask::setup();
+        m_wasInitialized = true;
+        ESP_LOGI("BobbySchedulerTask", "Task %s initialized", name());
+    }
+    void loop()
+    {
+        if (!m_in_recovery || m_use_in_recovery)
+        {
+            // ESP_LOGI("BobbySchedulerTask", "Loop %s", name());
+            SchedulerTask::loop();
+        }
+    }
     bool isInitialized() const { return m_wasInitialized; }
 private:
     mutable bool m_wasInitialized{false};
+    const bool m_use_in_recovery;
+    bool m_in_recovery{false};
 };

main/buildserver.cpp

@@ -155,7 +155,7 @@ namespace buildserver {
 
     std::string get_hash_url(std::string hash)
     {
-        return fmt::format(url_for_hashes, hash);
+        return fmt::format("{}{}.bin", url_for_hashes, hash);
     }
 
     std::string get_latest_url()
@@ -197,7 +197,7 @@ namespace buildserver {
         index = 0;
 
         url_for_latest = fmt::format("{}{}", configs.otaServerUrl.value(), doc["latest"].as<std::string>());
-        url_for_hashes = fmt::format("{}{}", configs.otaServerUrl.value(), doc["url"].as<std::string>());
+        url_for_hashes = fmt::format("{}{}", configs.otaServerUrl.value(), doc["new_url"].as<std::string>());
         parsing_finished = true;
     }
 

main/can.cpp

@@ -4,6 +4,7 @@
 // system includes
 #include <cstring>
 #include <optional>
+#include <utility>
 
 // esp-idf
 #include <driver/twai.h>
@@ -14,7 +15,6 @@
 #include <espchrono.h>
 #include <tickchrono.h>
 #include <screenmanager.h>
-#include <futurecpp.h>
 
 // local includes
 #include "bobbycar-can.h"
@@ -82,6 +82,11 @@ void initCan()
 
 void updateCan()
 {
+    if (configs.emulateFeedback.value())
+    {
+        return;
+    }
+
     for (int i = 0; i < 4; i++)
         if (!tryParseCanInput())
             break;
@@ -161,6 +166,18 @@ bool parseMotorControllerCanMessage(const twai_message_t &message, Controller &c
     case MotorController<isBack, true>::Feedback::Temp:
         controller.feedback.boardTemp = *((int16_t*)message.data);
         return true;
+    case MotorController<isBack, false>::Feedback::Id:
+        controller.feedback.left.id = *((int16_t*)message.data);
+        return true;
+    case MotorController<isBack, true>::Feedback::Id:
+        controller.feedback.right.id = *((int16_t*)message.data);
+        return true;
+    case MotorController<isBack, false>::Feedback::Iq:
+        controller.feedback.left.iq = *((int16_t*)message.data);
+        return true;
+    case MotorController<isBack, true>::Feedback::Iq:
+        controller.feedback.right.iq = *((int16_t*)message.data);
+        return true;
     }
 
     return false;
@@ -253,7 +270,7 @@ bool tryParseCanInput()
     if (parseBoardcomputerCanMessage(message))
         return true;
 
-    ESP_LOGW(TAG, "Unknown CAN info received .identifier = %u", message.identifier);
+    ESP_LOGW(TAG, "Unknown CAN info received .identifier = %lu", message.identifier);
 
     return true;
 }
@@ -265,6 +282,9 @@ void sendCanCommands()
     static uint32_t can_sequential_error_cnt = 0;
     static uint32_t can_sequential_bus_errors = 0;
 
+    if (!configs.controllerHardware.sendFrontCanCmd.value() && !configs.controllerHardware.sendBackCanCmd.value())
+        return;
+
     constexpr auto send = [](uint32_t addr, auto value){
         twai_message_t message;
         twai_status_info_t status_info;
@@ -281,22 +301,24 @@ void sendCanCommands()
         const auto status = twai_get_status_info(&status_info);
         const auto timestamp_after = espchrono::millis_clock::now();
 
-        if ((result == ESP_ERR_TIMEOUT || status_info.state == TWAI_STATE_BUS_OFF) || (status == ESP_OK && status_info.bus_error_count > can_sequential_bus_errors))
+        if ((result == ESP_ERR_TIMEOUT || status_info.state == TWAI_STATE_BUS_OFF) ||
+            (status == ESP_OK && status_info.bus_error_count > can_sequential_bus_errors))
         {
             ++can_sequential_error_cnt;
             ++can_total_error_cnt;
             can_sequential_bus_errors = status_info.bus_error_count;
 
-            ESP_LOGW(TAG, "twai_transmit() failed after %lldms with %s, seq err: %d, total err: %d",
-                     (timestamp_after - timestamp_before).count(),
-                     esp_err_to_name(result),
-                     can_sequential_error_cnt,
-                     can_total_error_cnt);
+            if (can_total_error_cnt < 500 && (configs.canUninstallOnReset.value() && can_total_error_cnt < 100))
+                ESP_LOGW(TAG, "twai_transmit() failed after %lldms with %s, seq err: %lu, total err: %lu",
+                         std::chrono::floor<std::chrono::milliseconds>(timestamp_after - timestamp_before).count(),
+                         esp_err_to_name(result),
+                         can_sequential_error_cnt,
+                         can_total_error_cnt);
         }
         else if (result != ESP_OK)
         {
-            ESP_LOGD(TAG, "ERROR: twai_transmit() failed after %lldms with %s",
-                     (timestamp_after - timestamp_before).count(),
+            ESP_LOGE(TAG, "twai_transmit() failed after %lldms with %s",
+                     std::chrono::floor<std::chrono::milliseconds>(timestamp_after - timestamp_before).count(),
                      esp_err_to_name(result));
         }
         else
@@ -310,28 +332,28 @@ void sendCanCommands()
             can_sequential_error_cnt = 0;
             if (configs.canResetOnError.value())
             {
-                ESP_LOGW(TAG, "WARNING: Something isn't right, trying to restart can ic...");
+                ESP_LOGW(TAG, "Something isn't right, trying to restart can ic...");
                 if (const auto err = twai_stop(); err != ESP_OK)
                 {
-                    ESP_LOGE(TAG, "ERROR: twai_stop() failed with %s", esp_err_to_name(err));
+                    ESP_LOGE(TAG, "twai_stop() failed with %s", esp_err_to_name(err));
                 }
 
                 if (configs.canUninstallOnReset.value())
                 {
                     if (const auto err = twai_driver_uninstall(); err != ESP_OK) {
-                        ESP_LOGE(TAG, "ERROR: twai_driver_uninstall() failed with %s", esp_err_to_name(err));
+                        ESP_LOGE(TAG, "twai_driver_uninstall() failed with %s", esp_err_to_name(err));
                     }
                     twai_general_config_t g_config = TWAI_GENERAL_CONFIG_DEFAULT(GPIO_NUM_21, GPIO_NUM_22,
                                                                                  TWAI_MODE_NORMAL);
                     twai_timing_config_t t_config = TWAI_TIMING_CONFIG_250KBITS();
                     twai_filter_config_t f_config = TWAI_FILTER_CONFIG_ACCEPT_ALL();
                     if (const auto err = twai_driver_install(&g_config, &t_config, &f_config); err != ESP_OK) {
-                        ESP_LOGE(TAG, "ERROR: twai_driver_install() failed with %s", esp_err_to_name(err));
+                        ESP_LOGE(TAG, "twai_driver_install() failed with %s", esp_err_to_name(err));
                     }
                 }
                 if (const auto err = twai_start(); err != ESP_OK)
                 {
-                    ESP_LOGE(TAG, "ERROR: twai_start() failed with %s", esp_err_to_name(err));
+                    ESP_LOGE(TAG, "twai_start() failed with %s", esp_err_to_name(err));
                 }
             }
         }
@@ -371,18 +393,33 @@ void sendCanCommands()
 
     static struct {
         struct {
-            uint8_t freq = 0;
-            uint8_t pattern = 0;
+            struct {
+                int16_t nCruiseMotTgt{};
+                bool cruiseCtrlEna{};
+            } left, right;
+            uint8_t freq{};
+            uint8_t pattern{};
         } front, back;
         std::underlying_type_t<Boardcomputer::Button> buttonLeds{};
     } lastValues;
 
     static int i{};
 
-    if ((front && front->command.buzzer.freq    != lastValues.front.freq ) ||
-        (front && front->command.buzzer.pattern != lastValues.front.pattern ) ||
-        (back && back->command.buzzer.freq     != lastValues.back.freq) ||
-        (back && back->command.buzzer.pattern  != lastValues.back.pattern))
+    // anti aufklatsch when tempomat
+         if ((front && front->command.left.nCruiseMotTgt  != lastValues.front.left.nCruiseMotTgt) ||
+             (front && front->command.right.nCruiseMotTgt != lastValues.front.right.nCruiseMotTgt) ||
+             (back && back->command.left.nCruiseMotTgt    != lastValues.back.left.nCruiseMotTgt) ||
+             (back && back->command.right.nCruiseMotTgt   != lastValues.back.right.nCruiseMotTgt))
+        i = 8;
+    else if ((front && front->command.left.cruiseCtrlEna  != lastValues.front.left.cruiseCtrlEna) ||
+             (front && front->command.right.cruiseCtrlEna != lastValues.front.right.cruiseCtrlEna) ||
+             (back && back->command.left.cruiseCtrlEna    != lastValues.back.left.cruiseCtrlEna) ||
+             (back && back->command.right.cruiseCtrlEna   != lastValues.back.right.cruiseCtrlEna))
+        i = 9;
+    else if ((front && front->command.buzzer.freq    != lastValues.front.freq ) ||
+             (front && front->command.buzzer.pattern != lastValues.front.pattern ) ||
+             (back && back->command.buzzer.freq      != lastValues.back.freq) ||
+             (back && back->command.buzzer.pattern   != lastValues.back.pattern))
         i = 10;
     else if (buttonLeds              != lastValues.buttonLeds)
         i = 12;
@@ -457,17 +494,17 @@ void sendCanCommands()
         if (back) send(MotorController<true, true>::Command::PhaseAdvMax, back->command.right.phaseAdvMax);
         break;
     case 8:
-        if (front) send(MotorController<false, false>::Command::CruiseCtrlEna, front->command.left.cruiseCtrlEna);
-        if (front) send(MotorController<false, true>::Command::CruiseCtrlEna, front->command.right.cruiseCtrlEna);
-        if (back) send(MotorController<true, false>::Command::CruiseCtrlEna, back->command.left.cruiseCtrlEna);
-        if (back) send(MotorController<true, true>::Command::CruiseCtrlEna, back->command.right.cruiseCtrlEna);
-        break;
-    case 9:
         if (front) send(MotorController<false, false>::Command::CruiseMotTgt, front->command.left.nCruiseMotTgt);
         if (front) send(MotorController<false, true>::Command::CruiseMotTgt, front->command.right.nCruiseMotTgt);
         if (back) send(MotorController<true, false>::Command::CruiseMotTgt, back->command.left.nCruiseMotTgt);
         if (back) send(MotorController<true, true>::Command::CruiseMotTgt, back->command.right.nCruiseMotTgt);
         break;
+    case 9:
+        if (front) send(MotorController<false, false>::Command::CruiseCtrlEna, front->command.left.cruiseCtrlEna);
+        if (front) send(MotorController<false, true>::Command::CruiseCtrlEna, front->command.right.cruiseCtrlEna);
+        if (back) send(MotorController<true, false>::Command::CruiseCtrlEna, back->command.left.cruiseCtrlEna);
+        if (back) send(MotorController<true, true>::Command::CruiseCtrlEna, back->command.right.cruiseCtrlEna);
+        break;
     case 10:
         if (front && send(MotorController<false, false>::Command::BuzzerFreq, front->command.buzzer.freq) == ESP_OK)
             lastValues.front.freq = front->command.buzzer.freq;

main/changevaluedisplay_bobbyquickactions.cpp

@@ -1,5 +1,8 @@
 #include "changevaluedisplay_bobbyquickactions.h"
 
+// system includes
+#include <utility>
+
 // esp-idf includes
 #include <esp_log.h>
 
@@ -7,7 +10,6 @@
 #include <actions/setvalueaction.h>
 #include <actions/backproxyaction.h>
 #include <icons/back.h>
-#include <futurecpp.h>
 
 // local includes
 #include "utils.h"

main/changevaluedisplay_controlmode.cpp

@@ -1,5 +1,8 @@
 #include "changevaluedisplay_controlmode.h"
 
+// system includes
+#include <utility>
+
 // esp-idf includes
 #include <esp_log.h>
 
@@ -7,7 +10,6 @@
 #include <actions/setvalueaction.h>
 #include <actions/backproxyaction.h>
 #include <icons/back.h>
-#include <futurecpp.h>
 
 // local includes
 #include "utils.h"

main/changevaluedisplay_controltype.cpp

@@ -1,5 +1,8 @@
 #include "changevaluedisplay_controltype.h"
 
+// system includes
+#include <utility>
+
 // esp-idf includes
 #include <esp_log.h>
 
@@ -7,7 +10,6 @@
 #include <actions/setvalueaction.h>
 #include <actions/backproxyaction.h>
 #include <icons/back.h>
-#include <futurecpp.h>
 
 // local includes
 #include "utils.h"

main/changevaluedisplay_handbremsmode.cpp

@@ -1,5 +1,8 @@
 #include "changevaluedisplay_handbremsmode.h"
 
+// system includes
+#include <utility>
+
 // esp-idf includes
 #include <esp_log.h>
 
@@ -7,7 +10,6 @@
 #include <actions/setvalueaction.h>
 #include <actions/backproxyaction.h>
 #include <icons/back.h>
-#include <futurecpp.h>
 
 // local includes
 #include "utils.h"

main/changevaluedisplay_larsmmode_mode.cpp

@@ -1,5 +1,8 @@
 #include "changevaluedisplay_larsmmode_mode.h"
 
+// system includes
+#include <utility>
+
 // esp-idf includes
 #include <esp_log.h>
 
@@ -7,7 +10,6 @@
 #include <actions/setvalueaction.h>
 #include <actions/backproxyaction.h>
 #include <icons/back.h>
-#include <futurecpp.h>
 
 // local includes
 #include "utils.h"

main/changevaluedisplay_unifiedmodelmode.cpp

@@ -1,5 +1,8 @@
 #include "changevaluedisplay_unifiedmodelmode.h"
 
+// system includes
+#include <utility>
+
 // esp-idf includes
 #include <esp_log.h>
 
@@ -7,7 +10,6 @@
 #include <actions/setvalueaction.h>
 #include <actions/backproxyaction.h>
 #include <icons/back.h>
-#include <futurecpp.h>
 
 // local includes
 #include "utils.h"

main/cloud.h

@@ -7,6 +7,9 @@
 #include <wrappers/websocket_client.h>
 #include <espchrono.h>
 
+// local includes
+#include "bobbytypesafeenum.h"
+
 extern espcpputils::websocket_client cloudClient;
 extern bool cloudStarted;
 extern espchrono::millis_clock::time_point lastCreateTry;
@@ -21,3 +24,5 @@ void initCloud();
 void updateCloud();
 void cloudCollect();
 void cloudSend();
+
+std::string getLoginMessage();

main/configutils_bobby.h

@@ -6,12 +6,13 @@
 
 // local includes
 #include "battery.h"
-#include "ledstrip.h"
-#include "handbremse.h"
 #include "bobbyquickactions.h"
+#include "cloud.h"
+#include "handbremse.h"
+#include "ledstrip.h"
 
-IMPLEMENT_NVS_GET_SET_ENUM(OtaAnimationModes)
+IMPLEMENT_NVS_GET_SET_ENUM(BatteryCellType)
+IMPLEMENT_NVS_GET_SET_ENUM(BobbyQuickActions)
 IMPLEMENT_NVS_GET_SET_ENUM(HandbremseMode)
 IMPLEMENT_NVS_GET_SET_ENUM(LedstripAnimation)
-IMPLEMENT_NVS_GET_SET_ENUM(BobbyQuickActions)
-IMPLEMENT_NVS_GET_SET_ENUM(BatteryCellType)
+IMPLEMENT_NVS_GET_SET_ENUM(OtaAnimationModes)

main/configwrapper_bobby.cpp

@@ -4,8 +4,8 @@
 #define CONFIGWRAPPER_TOSTRING_USINGS using ::toString;
 #include <configwrapper_priv.h>
 
-INSTANTIATE_CONFIGWRAPPER_TEMPLATES(OtaAnimationModes)
+INSTANTIATE_CONFIGWRAPPER_TEMPLATES(BatteryCellType)
+INSTANTIATE_CONFIGWRAPPER_TEMPLATES(BobbyQuickActions)
 INSTANTIATE_CONFIGWRAPPER_TEMPLATES(HandbremseMode)
 INSTANTIATE_CONFIGWRAPPER_TEMPLATES(LedstripAnimation)
-INSTANTIATE_CONFIGWRAPPER_TEMPLATES(BobbyQuickActions)
-INSTANTIATE_CONFIGWRAPPER_TEMPLATES(BatteryCellType)
+INSTANTIATE_CONFIGWRAPPER_TEMPLATES(OtaAnimationModes)

main/debugtexthelpers.h

@@ -77,6 +77,8 @@ private:
         struct DcPhaCFixedText : public virtual TextInterface { public: std::string text() const override { std::string line{"dcPhaC: "}; if (controller::get().feedbackValid) line += fmt::format("{:.2f}A", fixCurrent(MotorFeedbackGetter::get().dcPhaC)); return line; } };
         struct ChopsText : public virtual TextInterface { public: std::string text() const override { std::string line{"chops: "}; if (controller::get().feedbackValid) line += std::to_string(MotorFeedbackGetter::get().chops); return line; } };
         struct HallText : public virtual TextInterface { public: std::string text() const override { std::string line{"hall: "}; if (controller::get().feedbackValid) line += hallString(MotorFeedbackGetter::get()); return line; } };
+        struct IdText : public virtual TextInterface { public: std::string text() const override { std::string line{"id: "}; if (controller::get().feedbackValid) line += fmt::format("{:.2f}A", fixCurrent(MotorFeedbackGetter::get().id)); return line; } };
+        struct IqText : public virtual TextInterface { public: std::string text() const override { std::string line{"iq: "}; if (controller::get().feedbackValid) line += fmt::format("{:.2f}A", fixCurrent(MotorFeedbackGetter::get().iq)); return line; } };
     };
 
 public:

main/displays/batteryinfodisplay.cpp

@@ -0,0 +1,80 @@
+#include "batteryinfodisplay.h"
+
+// 3rdparty lib includes
+#include <screenmanager.h>
+#include <tftinstance.h>
+
+// local includes
+#include "battery.h"
+#include "displays/menus/mainmenu.h"
+#include "displays/metersdisplay.h"
+#include "displays/speedinfodisplay.h"
+#include "globals.h"
+#include "newsettings.h"
+
+// display with big battery and ten bars (0-100%)
+
+void BatteryInfoDisplay::initScreen()
+{
+    using namespace espgui;
+    Base::initScreen();
+
+    tft.drawRoundRect(m_offset, m_offset, tft.width() - (m_offset * 2), tft.height() - (m_offset * 2), 10, TFT_WHITE);
+    tft.drawRoundRect((tft.width() / 2) - (m_offset / 2), m_offset / 2, m_offset, m_offset / 2, 3, TFT_WHITE);
+    m_lastBarCount = 0;
+}
+
+void BatteryInfoDisplay::redraw()
+{
+    using namespace espgui;
+    Base::redraw();
+
+    // calculate height of space available for all bars
+    const auto min_x = m_offset + 3; // leave 2 pixels + 1 pixel for border
+    const auto max_x = tft.width() - m_offset - 3;
+    const auto topY = m_offset + 3;
+    const auto bottomY = tft.height() - m_offset - 3;
+    const auto height = bottomY - topY;
+    const auto width = max_x - min_x;
+    const uint16_t segment_height = (height / 10);
+
+    if (const auto avgVoltage = controllers.getAvgVoltage(); avgVoltage)
+    {
+        const auto cellType = configs.battery.cellType.value();
+        const uint16_t percentage = getBatteryPercentage(*avgVoltage, cellType);
+        const auto segment_count = std::max(percentage / 10, 1);
+
+        if (segment_count != m_lastBarCount)
+        {
+            m_lastBarCount = segment_count;
+            // draw battery
+            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.fillRect(0, 0, tft.width(), topY, TFT_CYAN);
+    // tft.fillRect(0, bottomY, tft.width(), tft.height()-bottomY, TFT_YELLOW);
+}
+
+void BatteryInfoDisplay::buttonPressed(espgui::Button button)
+{
+    Base::buttonPressed(button);
+
+    switch (button) {
+        using espgui::Button;
+        case Button::Right:
+            espgui::pushScreen<MainMenu>();
+            break;
+        case Button::Up:
+            espgui::switchScreen<MetersDisplay>();
+            break;
+        case Button::Down:
+            espgui::switchScreen<SpeedInfoDisplay>();
+            break;
+        default:;
+    }
+}

main/displays/batteryinfodisplay.h

@@ -0,0 +1,18 @@
+#pragma once
+
+// local includes
+#include "bobbydisplay.h"
+
+class BatteryInfoDisplay : public BobbyDisplay
+{
+    using Base = BobbyDisplay;
+
+public:
+    void initScreen() override;
+    void redraw() override;
+
+    void buttonPressed(espgui::Button button) override;
+private:
+    static constexpr const auto m_offset = 40;
+    uint16_t m_lastBarCount{0};
+};

main/displays/bmsdisplay.cpp

@@ -2,7 +2,7 @@
 
 #if defined(FEATURE_BLUETOOTH) && defined(FEATURE_BMS)
 #include "displays/menus/mainmenu.h"
-#include "displays/metersdisplay.h"
+#include "displays/speedinfodisplay.h"
 #include "displays/statusdisplay.h"
 #include "screenmanager.h"
 #include "tftinstance.h"
@@ -102,7 +102,7 @@ void BmsDisplay::buttonPressed(espgui::Button button)
     {
     using espgui::Button;
     case Button::Right: pushScreen<MainMenu>(); break;
-    case Button::Up: switchScreen<MetersDisplay>(); break;
+    case Button::Up: switchScreen<SpeedInfoDisplay>(); break;
     case Button::Down: switchScreen<StatusDisplay>(); break;
     default:;
     }

main/displays/bobbychangevaluedisplay.h

@@ -48,5 +48,6 @@ void BobbyChangeValueDisplay<Tvalue>::buttonPressed(espgui::Button button)
 template<typename Tvalue>
 void BobbyChangeValueDisplay<Tvalue>::buttonReleased(espgui::Button button)
 {
-    //Base::buttonReleased(button);
+    Base::buttonReleased(button);
+    buttonReleasedCommon(button);
 }

main/displays/bobbydisplaywithtitle.cpp

@@ -26,4 +26,5 @@ void BobbyDisplayWithTitle::buttonPressed(espgui::Button button)
 void BobbyDisplayWithTitle::buttonReleased(espgui::Button button)
 {
     //Base::buttonReleased(button);
+    buttonReleasedCommon(button);
 }

main/displays/bobbygraphdisplay.h

@@ -46,4 +46,5 @@ template<size_t COUNT>
 void BobbyGraphDisplay<COUNT>::buttonReleased(espgui::Button button)
 {
     //Base::buttonReleased(button);
+    buttonReleasedCommon(button);
 }

main/displays/bobbymenudisplay.cpp

@@ -26,6 +26,6 @@ void BobbyMenuDisplay::buttonPressed(espgui::Button button)
 
 void BobbyMenuDisplay::buttonReleased(espgui::Button button)
 {
-    //Base::buttonReleased(button);
+    Base::buttonReleased(button);
     buttonReleasedCommon(button);
 }

main/displays/bobbypopupdisplay.cpp

@@ -26,4 +26,5 @@ void BobbyPopupDisplay::buttonPressed(espgui::Button button)
 void BobbyPopupDisplay::buttonReleased(espgui::Button button)
 {
     //Base::buttonReleased(button);
+    buttonReleasedCommon(button);
 }

main/displays/bobbysplitgraphdisplay.h

@@ -46,5 +46,6 @@ template<std::size_t COUNT0, std::size_t COUNT1>
 void BobbySplitGraphDisplay<COUNT0, COUNT1>::buttonReleased(espgui::Button button)
 {
     //Base::buttonReleased(button);
+    buttonReleasedCommon(button);
 }
 

main/displays/buttoncalibratedisplay.cpp

@@ -1,199 +0,0 @@
-#include "buttoncalibratedisplay.h"
-
-// esp-idf includes
-#include <esp_log.h>
-
-// 3rdparty lib includes
-#include <tftinstance.h>
-#include <fmt/core.h>
-#include <screenmanager.h>
-
-// local includes
-#include "newsettings.h"
-#include "displays/menus/boardcomputerhardwaresettingsmenu.h"
-#include "bobbyerrorhandler.h"
-
-namespace {
-constexpr const char TAG[] = "BUTTON";
-} // namespace
-
-std::string ButtonCalibrateDisplay::text() const
-{
-    return "Button calibrate";
-}
-
-void ButtonCalibrateDisplay::start()
-{
-    Base::start();
-
-    m_oldMode = currentMode;
-    currentMode = &m_mode;
-    m_lastButton = std::nullopt;
-    m_status = WaitingLeft;
-
-    m_finished = false;
-}
-
-void ButtonCalibrateDisplay::initScreen()
-{
-    Base::initScreen();
-
-    m_labelInstruction.start();
-    m_labelLeft.start();
-    m_labelRight.start();
-    m_labelUp.start();
-    m_labelDown.start();
-    m_labelEnd.start();
-}
-
-void ButtonCalibrateDisplay::update()
-{
-    Base::update();
-
-    if (m_finished)
-    {
-        m_finished = false;
-
-        if (auto result = configs.write_config(configs.dpadMappingLeft, m_leftButton); !result)
-        {
-            BobbyErrorHandler{}.errorOccured(std::move(result).error());
-            return;
-        }
-        if (auto result = configs.write_config(configs.dpadMappingRight, m_rightButton); !result)
-        {
-            BobbyErrorHandler{}.errorOccured(std::move(result).error());
-            return;
-        }
-        if (auto result = configs.write_config(configs.dpadMappingUp, m_upButton); !result)
-        {
-            BobbyErrorHandler{}.errorOccured(std::move(result).error());
-            return;
-        }
-        if (auto result = configs.write_config(configs.dpadMappingDown, m_downButton); !result)
-        {
-            BobbyErrorHandler{}.errorOccured(std::move(result).error());
-            return;
-        }
-
-        espgui::popScreen();
-    }
-}
-
-void ButtonCalibrateDisplay::redraw()
-{
-    Base::redraw();
-
-    espgui::tft.setTextColor(TFT_WHITE, TFT_BLACK);
-
-    switch (m_status)
-    {
-    case WaitingLeft:
-        if (m_lastButton)
-            m_labelInstruction.redraw("Press LEFT again");
-        else
-            m_labelInstruction.redraw("Press LEFT");
-        break;
-    case WaitingRight:
-        if (m_lastButton)
-            m_labelInstruction.redraw("Press RIGHT again");
-        else
-            m_labelInstruction.redraw("Press RIGHT");
-        break;
-    case WaitingUp:
-        if (m_lastButton)
-            m_labelInstruction.redraw("Press UP again");
-        else
-            m_labelInstruction.redraw("Press UP");
-        break;
-    case WaitingDown:
-        if (m_lastButton)
-            m_labelInstruction.redraw("Press DOWN again");
-        else
-            m_labelInstruction.redraw("Press DOWN");
-        break;
-    case Finished:
-        m_labelInstruction.redraw("Finished");
-        break;
-    }
-
-    m_labelLeft.redraw(m_status > WaitingLeft ? fmt::format("Left: {}", m_leftButton) : std::string{});
-    m_labelRight.redraw(m_status > WaitingRight ? fmt::format("Right: {}", m_rightButton) : std::string{});
-    m_labelUp.redraw(m_status > WaitingUp ? fmt::format("Up: {}", m_upButton) : std::string{});
-    m_labelDown.redraw(m_status > WaitingDown ? fmt::format("Down: {}", m_downButton) : std::string{});
-
-    m_labelEnd.redraw(m_status == Finished ? "Press RIGHT to save" : "");
-}
-
-void ButtonCalibrateDisplay::stop()
-{
-    Base::stop();
-
-    if (currentMode == &m_mode)
-    {
-        // to avoid crash after deconstruction
-        m_mode.stop();
-        lastMode = nullptr;
-
-        currentMode = m_oldMode;
-    }
-}
-
-void ButtonCalibrateDisplay::rawButtonPressed(uint8_t button)
-{
-    //Base::rawButtonPressed(button);
-
-    if (m_status == Finished)
-    {
-        if (button == m_rightButton)
-        {
-            ESP_LOGI(TAG, "correct button");
-            m_finished = true;
-        }
-        else
-            ESP_LOGI(TAG, "wrong button");
-    }
-    else if (!m_lastButton || *m_lastButton != button)
-        m_lastButton = button;
-    else
-    {
-        switch (m_status)
-        {
-        case WaitingLeft:
-            m_leftButton = button;
-            m_lastButton = std::nullopt;
-            m_status = WaitingRight;
-            break;
-        case WaitingRight:
-            m_rightButton = button;
-            m_lastButton = std::nullopt;
-            m_status = WaitingUp;
-            break;
-        case WaitingUp:
-            m_upButton = button;
-            m_lastButton = std::nullopt;
-            m_status = WaitingDown;
-            break;
-        case WaitingDown:
-            m_downButton = button;
-            m_lastButton = std::nullopt;
-            m_status = Finished;
-            break;
-        case Finished:;
-        }
-    }
-}
-
-void ButtonCalibrateDisplay::rawButtonReleased(uint8_t button)
-{
-    //Base::rawButtonReleased(button);
-}
-
-void ButtonCalibrateDisplay::buttonPressed(espgui::Button button)
-{
-    //Base::buttonPressed(button);
-}
-
-void ButtonCalibrateDisplay::buttonReleased(espgui::Button button)
-{
-    //Base::buttonReleased(button);
-}

main/displays/buttoncalibratedisplay.h

@@ -1,53 +0,0 @@
-#pragma once
-
-// 3rdparty lib includes
-#include <displaywithtitle.h>
-#include <widgets/label.h>
-
-// local includes
-#include "globals.h"
-#include "modeinterface.h"
-#include "modes/ignoreinputmode.h"
-
-class ButtonCalibrateDisplay : public espgui::DisplayWithTitle
-{
-    using Base = espgui::DisplayWithTitle;
-
-public:
-    ButtonCalibrateDisplay() = default;
-    explicit ButtonCalibrateDisplay(bool bootup) : m_bootup{bootup} {}
-
-    std::string text() const override;
-    void start() override;
-    void initScreen() override;
-    void update() override;
-    void redraw() override;
-    void stop() override;
-
-    void rawButtonPressed(uint8_t button) override;
-    void rawButtonReleased(uint8_t button) override;
-    void buttonPressed(espgui::Button button) override;
-    void buttonReleased(espgui::Button button) override;
-
-private:
-    const bool m_bootup{false};
-    ModeInterface *m_oldMode;
-    IgnoreInputMode m_mode{0, bobbycar::protocol::ControlType::FieldOrientedControl, bobbycar::protocol::ControlMode::Torque};
-
-    std::optional<uint8_t> m_lastButton;
-
-    enum { WaitingLeft, WaitingRight, WaitingUp, WaitingDown, Finished } m_status;
-
-    espgui::Label m_labelInstruction{25, 72};
-
-    espgui::Label m_labelLeft{25, 100};
-    espgui::Label m_labelRight{25, 125};
-    espgui::Label m_labelUp{25, 150};
-    espgui::Label m_labelDown{25, 175};
-
-    espgui::Label m_labelEnd{25, 225};
-
-    uint8_t m_leftButton, m_rightButton, m_upButton, m_downButton;
-
-    bool m_finished;
-};

main/displays/gameoflifedisplay.cpp

@@ -6,6 +6,9 @@
 #include <tftinstance.h>
 #include <screenmanager.h>
 
+// local includes
+#include "screens.h"
+
 void GameOfLifeDisplay::start()
 {
     Base::start();
@@ -18,6 +21,8 @@ void GameOfLifeDisplay::initScreen()
 {
     Base::initScreen();
 
+    disableScreenFlip(true);
+
     espgui::tft.setRotation(3);
     espgui::tft.fillScreen(TFT_BLACK);
 }
@@ -45,7 +50,8 @@ void GameOfLifeDisplay::stop()
 {
     Base::stop();
 
-    espgui::tft.setRotation(0);
+    disableScreenFlip(false);
+
     m_grid = nullptr;
     m_newgrid = nullptr;
 }

main/displays/lockscreen.cpp

@@ -106,10 +106,7 @@ void Lockscreen::redraw()
         {
             if (isValid1stPin(m_numbers))
             {
-                if (!gas || !brems || *gas > 200.f || *brems > 200.f)
-                    espgui::switchScreen<PotisCalibrateDisplay>(true);
-                else
-                    espgui::popScreen();
+                espgui::popScreen();
 #ifdef LOCKSCREEN_PLUGIN
 #include LOCKSCREEN_PLUGIN
 LOCKSCREEN_PLUGIN_FIXES_1
@@ -118,10 +115,7 @@ LOCKSCREEN_PLUGIN_FIXES_1
             }
             else if(isValid2ndPin(m_numbers))
             {
-                if (!gas || !brems || *gas > 200.f || *brems > 200.f)
-                    espgui::switchScreen<PotisCalibrateDisplay>(true);
-                else
-                    espgui::popScreen();
+                espgui::popScreen();
 #ifdef LOCKSCREEN_PLUGIN_FIXES_2
 LOCKSCREEN_PLUGIN_FIXES_2
 #endif

main/displays/menus/aboutmenu.cpp

@@ -45,6 +45,7 @@ AboutMenu::AboutMenu()
     constructMenuItem<makeComponent<MenuItem, HeapLargest32Text,            StaticFont<2>, DisabledColor, DummyAction>>();
 #endif
     constructMenuItem<makeComponent<MenuItem, EspChipRevisionText,          StaticFont<2>, DisabledColor, DummyAction>>();
+    constructMenuItem<makeComponent<MenuItem, EspChipModelText,             StaticFont<2>, DisabledColor, DummyAction>>();
     constructMenuItem<makeComponent<MenuItem, EspCpuMinFreqMHzText,         StaticFont<2>, DisabledColor, DummyAction>>();
     constructMenuItem<makeComponent<MenuItem, EspCpuMaxFreqMHzText,         StaticFont<2>, DisabledColor, DummyAction>>();
     constructMenuItem<makeComponent<MenuItem, EspSdkVersionText,            StaticFont<2>, DisabledColor, DummyAction>>();

main/displays/menus/batterymenu.cpp

@@ -88,7 +88,6 @@ BatteryMenu::BatteryMenu()
     constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_BATTERY_WHKM, BatteryWHperKMAccessor>,           PushScreenAction<BatteryWHperKMChangeScreen>>>();
     constructMenuItem<PushScreenTypeSafeChangeMenuItem<BatteryCellType, TEXT_SELECT_CELL_TYPE>>(&configs.battery.cellType);
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SHOW_BATTERY_GRAPH>,                                      PushScreenAction<BatteryGraphDisplay>, StaticMenuItemIcon<&bobbyicons::graph>>>();
-    constructMenuItem<makeComponent<MenuItem, EmptyText,                                                                DummyAction>>();
     constructMenuItem<makeComponent<MenuItem, WhStatisticsText,                                                         DummyAction>>();
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERY_CALIBRATE>,                                       PushScreenAction<CalibrateVoltageDisplay>, StaticMenuItemIcon<&bobbyicons::settings>>>();
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,                                                    PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();

main/displays/menus/blesettingsmenu.cpp

@@ -19,6 +19,7 @@
 namespace {
 constexpr char TEXT_BLESETTINGS[] = "BLE settings";
 constexpr char TEXT_ENABLED[] = "Enabled";
+constexpr char TEXT_FENCE_ENABLED[] = "Fence enabled";
 constexpr char TEXT_NAME[] = "Name";
 constexpr char TEXT_NAME_FORMATTED[] = "Name: &s";
 constexpr char TEXT_BACK[] = "Back";
@@ -36,6 +37,7 @@ BleSettingsMenu::BleSettingsMenu()
 {
     using namespace espgui;
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ENABLED>, BobbyCheckbox, BleEnabledAccessor>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_FENCE_ENABLED>, BobbyCheckbox, BleFenceEnabledAccessor>>();
     constructMenuItem<makeComponent<MenuItem, BleServerPeerDevicesText,    DisabledColor, DummyAction>>();
     constructMenuItem<makeComponent<MenuItem, BleCharacSubscribedText,     DisabledColor, DummyAction>>();
     constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_NAME_FORMATTED, BluetoothNameAccessor>, PushScreenAction<ApSsidChangeScreen>>>();

main/displays/menus/boardcomputerhardwaresettingsmenu.cpp

@@ -10,17 +10,17 @@
 #include <textwithvaluehelper.h>
 
 // local includes
-#include "displays/bobbychangevaluedisplay.h"
-#include "utils.h"
-#include "icons/lock.h"
 #include "accessors/settingsaccessors.h"
-#include "displays/menus/lockscreensettingsmenu.h"
-#include "displays/potiscalibratedisplay.h"
-#include "displays/menus/timersmenu.h"
-#include "displays/menus/settingsmenu.h"
-#include "displays/buttoncalibratedisplay.h"
+#include "actions/setupactions.h"
+#include "bobbycheckbox.h"
+#include "displays/bobbychangevaluedisplay.h"
 #include "displays/menus/extrabuttoncalibratemenu.h"
+#include "displays/menus/lockscreensettingsmenu.h"
 #include "displays/menus/setupquickactionsmenu.h"
+#include "displays/menus/timersmenu.h"
+#include "displays/potiscalibratedisplay.h"
+#include "icons/lock.h"
+
 #ifdef FEATURE_JOYSTICK
 #include "displays/joystickdebugdisplay.h"
 #endif
@@ -35,6 +35,7 @@ constexpr char TEXT_POTISCALIBRATE[] = "Potis Calibrate";
 #ifdef FEATURE_JOYSTICK
 constexpr char TEXT_JOYSTICK[] = "Debug Joystick";
 #endif
+constexpr char TEXT_FLIPDISPLAY[] = "Flip Display";
 constexpr char TEXT_SAMPLECOUNT[] = "sampleCount";
 constexpr char TEXT_GASMIN[] = "gasMin";
 constexpr char TEXT_GASMAX[] = "gasMax";
@@ -191,15 +192,16 @@ using namespace espgui;
 BoardcomputerHardwareSettingsMenu::BoardcomputerHardwareSettingsMenu()
 {
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_LOCKSCREENSETTINGS>,                          PushScreenAction<LockscreenSettingsMenu>, StaticMenuItemIcon<&bobbyicons::lock>>>();
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BUTTONCALIBRATE>,                             PushScreenAction<ButtonCalibrateDisplay>>>();
+    constructMenuItem<makeComponentArgs<MenuItem, PushButtonCalibrateDisplayAction,                         StaticText<TEXT_BUTTONCALIBRATE>>>(true);
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_EXTRABUTTONCALIBRATE>,                        PushScreenAction<ExtraButtonCalibrateMenu>>>();
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_QUICKACTIONS>,                                PushScreenAction<SetupQuickActionsMenu>>>();
     constructMenuItem<makeComponent<MenuItem, GasText,                                                      DisabledColor, StaticFont<2>, DummyAction>>();
     constructMenuItem<makeComponent<MenuItem, BremsText,                                                    DisabledColor, StaticFont<2>, DummyAction>>();
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_POTISCALIBRATE>,                              PushScreenAction<PotisCalibrateDisplay>>>();
+    constructMenuItem<makeComponentArgs<MenuItem, PushPotiCalibrateDisplayAction,                           StaticText<TEXT_POTISCALIBRATE>>>(true);
 #ifdef FEATURE_JOYSTICK
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_JOYSTICK>,                                    PushScreenAction<JoystickDebugDisplay>>>();
 #endif
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_FLIPDISPLAY>,                                 BobbyCheckbox, FlipScreenAccessor>>();
     constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_SAMPLECOUNT, SampleCountAccessor>,   PushScreenAction<SampleCountChangeScreen>>>();
     constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_GASMIN, GasMinAccessor>,             PushScreenAction<GasMinChangeScreen>>>();
     constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_GASMAX, GasMaxAccessor>,             PushScreenAction<GasMaxChangeScreen>>>();
@@ -234,5 +236,5 @@ std::string BoardcomputerHardwareSettingsMenu::text() const
 
 void BoardcomputerHardwareSettingsMenu::back()
 {
-    switchScreen<SettingsMenu>();
+    popScreen();
 }