Very important fix

Merge pull request #400 from bobbycar-graz/update-mick-config
Update mick configs
2023-04-14 17:28:26 +02:00 · 2023-04-04 09:18:51 +02:00 · 2023-04-04 08:35:14 +02:00 · 2023-04-04 08:32:50 +02:00 · 2023-04-04 07:52:09 +02:00 · 2023-04-04 07:51:00 +02:00
91 changed files with 2051 additions and 691 deletions
--- a/.clang-format
+++ b/.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
--- a/.gitmodules
+++ b/.gitmodules
@ -36,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
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -25,6 +25,8 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 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
--- a/README.md
+++ b/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
--- a/components/FastLED-idf
+++ b/components/FastLED-idf
--- a/components/TFT_eSPI
+++ b/components/TFT_eSPI
--- a/components/arduino-esp32
+++ b/components/arduino-esp32
--- a/components/bobbycar-protocol
+++ b/components/bobbycar-protocol
--- a/components/esp-gui-lib
+++ b/components/esp-gui-lib
--- a/components/esp-nimble-cpp
+++ b/components/esp-nimble-cpp
--- a/components/espasyncota
+++ b/components/espasyncota
--- a/components/espconfiglib
+++ b/components/espconfiglib
--- a/components/espwifistack
+++ b/components/espwifistack
--- a/configs/config_comred_new.cmake
+++ b/configs/config_comred_new.cmake
@ -1,20 +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
--- a/configs/config_mick.cmake
+++ b/configs/config_mick.cmake
@ -1,21 +1,6 @@
 set(BOBBY_APP_NAME bobbyquad_mick)
 set(BOBBY_DEFAULT_USERNAME 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(BOBBYCAR_BUILDFLAGS
 # Pins
    -DPINS_GAS=34
--- a/configs/sdkconfig_comred_new
+++ b/configs/sdkconfig_comred_new
@ -5,7 +5,7 @@
 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
@ -53,7 +53,6 @@ CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_HIGH=2
 CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=20
 CONFIG_SOC_ADC_RTC_MIN_BITWIDTH=9
 CONFIG_SOC_ADC_RTC_MAX_BITWIDTH=12
-CONFIG_SOC_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
@ -62,27 +61,26 @@ 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_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
@ -97,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
@ -108,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
@ -147,7 +147,9 @@ 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
@ -174,12 +176,21 @@ 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_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
@ -255,8 +266,8 @@ CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16

 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

 #
@ -461,9 +472,9 @@ CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y
 # CONFIG_BT_NIMBLE_LOG_LEVEL_NONE is not set
 # CONFIG_BT_NIMBLE_LOG_LEVEL_ERROR is not set
 # CONFIG_BT_NIMBLE_LOG_LEVEL_WARNING is not set
-CONFIG_BT_NIMBLE_LOG_LEVEL_INFO=y
-# CONFIG_BT_NIMBLE_LOG_LEVEL_DEBUG is not set
-CONFIG_BT_NIMBLE_LOG_LEVEL=1
+# CONFIG_BT_NIMBLE_LOG_LEVEL_INFO is not set
+CONFIG_BT_NIMBLE_LOG_LEVEL_DEBUG=y
+CONFIG_BT_NIMBLE_LOG_LEVEL=0
 CONFIG_BT_NIMBLE_MAX_CONNECTIONS=3
 CONFIG_BT_NIMBLE_MAX_BONDS=3
 CONFIG_BT_NIMBLE_MAX_CCCDS=8
@ -519,6 +530,7 @@ 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
@ -665,6 +677,7 @@ 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
@ -676,6 +689,16 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # 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

 #
@ -781,6 +804,26 @@ CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y
 # Hardware Settings
 #

+#
+# 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
 #
@ -788,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
@ -827,12 +871,6 @@ 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
-
 #
 # Main XTAL Config
 #
@ -1026,10 +1064,11 @@ 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

 #
@ -1044,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
@ -1078,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
@ -1114,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
@ -1122,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
@ -1134,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

@ -1247,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
@ -1733,8 +1761,8 @@ CONFIG_TFT_ILI9341_DRIVER=y
 # 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_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
@ -1766,12 +1794,13 @@ CONFIG_TFT_RST=2
 #
 # CONFIG_TFT_LOAD_GLCD is not set
 CONFIG_TFT_LOAD_FONT2=y
-# CONFIG_TFT_LOAD_FONT4 is not set
+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

 #
@ -1784,9 +1813,17 @@ CONFIG_TFT_SMOOTH_FONT=y
 #
 # ESP-NimBLE-CPP configuration
 #
+# CONFIG_NIMBLE_CPP_LOG_LEVEL_NONE is not set
+# CONFIG_NIMBLE_CPP_LOG_LEVEL_ERROR is not set
+# CONFIG_NIMBLE_CPP_LOG_LEVEL_WARNING is not set
+CONFIG_NIMBLE_CPP_LOG_LEVEL_INFO=y
+# CONFIG_NIMBLE_CPP_LOG_LEVEL_DEBUG is not set
+CONFIG_NIMBLE_CPP_LOG_LEVEL=3
 # 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

--- a/configs/sdkconfig_mick
+++ b/configs/sdkconfig_mick
@ -5,7 +5,7 @@
 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
@ -53,7 +53,6 @@ CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_HIGH=2
 CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=20
 CONFIG_SOC_ADC_RTC_MIN_BITWIDTH=9
 CONFIG_SOC_ADC_RTC_MAX_BITWIDTH=12
-CONFIG_SOC_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
@ -62,27 +61,26 @@ 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_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
@ -97,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
@ -108,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
@ -147,7 +147,9 @@ 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
@ -174,12 +176,21 @@ 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_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
@ -255,8 +266,8 @@ CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16

 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

 #
@ -519,6 +530,7 @@ 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
@ -665,6 +677,7 @@ 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
@ -676,6 +689,16 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # 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

 #
@ -781,6 +804,26 @@ CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y
 # Hardware Settings
 #

+#
+# 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
 #
@ -788,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
@ -827,12 +871,6 @@ 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
-
 #
 # Main XTAL Config
 #
@ -1026,10 +1064,11 @@ 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

 #
@ -1044,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
@ -1078,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
@ -1114,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
@ -1122,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
@ -1134,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

@ -1247,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
@ -1733,8 +1761,8 @@ CONFIG_TFT_ILI9341_DRIVER=y
 # 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_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
@ -1766,12 +1794,13 @@ CONFIG_TFT_RST=2
 #
 # CONFIG_TFT_LOAD_GLCD is not set
 CONFIG_TFT_LOAD_FONT2=y
-# CONFIG_TFT_LOAD_FONT4 is not set
+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

 #
@ -1784,9 +1813,17 @@ CONFIG_TFT_SMOOTH_FONT=y
 #
 # 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

--- a/configs/sdkconfig_testdevice2
+++ b/configs/sdkconfig_testdevice2
@ -180,6 +180,7 @@ 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
@ -665,6 +666,7 @@ 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
@ -1773,6 +1775,7 @@ 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

 #
--- a/dependencies.lock
+++ b/dependencies.lock
@ -4,6 +4,6 @@ dependencies:
    source:
      type: idf
    version: 5.1.0
-manifest_hash: 61ebe3a040bdb7a8bb7b582261db12d83b6028789124b5f6ddacb4104628daa6
+manifest_hash: 45094f33b6a257bfcaa02efb329b001e383adbe7dc60bd5066b99a5e9f5ebc91
 target: esp32
 version: 1.0.0
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@ -1,4 +1,4 @@
-set(headers
+set(BOBBY_HEADERS
    accessorhelpers.h
    accessors/globalaccessors.h
    accessors/settingsaccessors.h
@ -26,6 +26,7 @@ set(headers
    actions/rebootaction.h
    actions/resetnvsaction.h
    actions/savesettingsaction.h
+    actions/setupactions.h
    actions/switchprofileaction.h
    actions/tempomatmodeapplycurrentpeedaction.h
    actions/updateswapfrontbackaction.h
@ -72,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
@ -159,6 +159,13 @@ 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
@ -233,6 +240,7 @@ set(headers
    serial_bobby.h
    settingspersister.h
    settingsutils.h
+    setup.h
    softpwmlimiter.h
    statistics.h
    statustexthelper.h
@ -259,7 +267,7 @@ set(headers
    wifiguiutils.h
 )

-set(sources
+set(BOBBY_SOURCES
    accessors/wifistaconfigaccessors.cpp
    actions/assertaction.cpp
    actions/bluetoothbeginaction.cpp
@ -282,6 +290,7 @@ set(sources
    actions/rebootaction.cpp
    actions/resetnvsaction.cpp
    actions/savesettingsaction.cpp
+    actions/setupactions.cpp
    actions/switchprofileaction.cpp
    actions/tempomatmodeapplycurrentpeedaction.cpp
    actions/updateswapfrontbackaction.cpp
@ -325,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
@ -410,6 +418,13 @@ 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
@ -485,6 +500,7 @@ set(sources
    serial_bobby.cpp
    settingspersister.cpp
    settingsutils.cpp
+    setup.cpp
    softpwmlimiter.cpp
    statistics.cpp
    statustexthelper.cpp
@ -519,8 +535,8 @@ set(dependencies

 idf_component_register(
    SRCS
-        ${headers}
-        ${sources}
+        ${BOBBY_HEADERS}
+        ${BOBBY_SOURCES}
    INCLUDE_DIRS
        .
    REQUIRES
@ -538,14 +554,31 @@ 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()
--- a/main/accessors/settingsaccessors.h
+++ b/main/accessors/settingsaccessors.h
@ -205,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; } };
--- a/main/actions/qraction.h
+++ b/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;
--- a/main/actions/resetnvsaction.cpp
+++ b/main/actions/resetnvsaction.cpp
@ -1,11 +0,0 @@
-#include "resetnvsaction.h"
-
-// system includes
-#include <esp_system.h>
-#include <nvs_flash.h>
-
-void ResetNVSAction::triggered()
-{
-    nvs_flash_erase();
-    esp_restart();
-}
--- a/main/actions/resetnvsaction.h
+++ b/main/actions/resetnvsaction.h
@ -1,10 +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;
+    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();
+        }
+    }
 };
--- a/main/actions/setupactions.cpp
+++ b/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
+}
--- a/main/actions/setupactions.h
+++ b/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;
+};
--- a/main/ble_bobby.cpp
+++ b/main/ble_bobby.cpp
@ -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))
@ -258,9 +268,9 @@ void RemoteControlCallbacks::onWrite(NimBLECharacteristic* pCharacteristic)
    }
 }

-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))
@ -282,7 +292,7 @@ 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");
--- a/main/bobbyblinker.cpp
+++ b/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;
+                }
            }
        }
    }
--- a/main/bobbyquickactions.cpp
+++ b/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));
--- a/main/buildserver.cpp
+++ b/main/buildserver.cpp
@ -155,7 +155,7 @@ namespace buildserver {

    std::string get_hash_url(std::string hash)
    {
-        return fmt::format(fmt::runtime(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;
    }

--- a/main/can.cpp
+++ b/main/can.cpp
@ -308,7 +308,7 @@ void sendCanCommands()
            ++can_total_error_cnt;
            can_sequential_bus_errors = status_info.bus_error_count;

-            if (can_total_error_cnt < 500)
+            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),
--- a/main/cloud.cpp
+++ b/main/cloud.cpp
@ -590,7 +590,7 @@ void updateCloud()
        lastCloudSend = now;
    }

-    if (!lastHeartbeat || now - *lastHeartbeat >= 1500ms)
+    if (!lastHeartbeat || now - *lastHeartbeat >= 1500ms && !configs.cloudSettings.cloudKey.value().empty())
    {
        cloudHeartbeat();
        lastHeartbeat = now;
@ -743,7 +743,7 @@ void cloudSend()

    const auto timeout = std::chrono::ceil<espcpputils::ticks>(espchrono::milliseconds32{configs.cloudSettings.cloudTransmitTimeout.value()}).count();

-    if (!hasAnnouncedItself && configs.cloudSettings.cloudEnabled.value())
+    if (!hasAnnouncedItself && configs.cloudSettings.cloudEnabled.value() && !configs.cloudSettings.cloudKey.value().empty())
    {
        std::string helloWorld = getLoginMessage();
        ESP_LOGW(TAG, "=====> %s", helloWorld.c_str());
--- a/main/displays/bobbygraphdisplay.h
+++ b/main/displays/bobbygraphdisplay.h
@ -38,7 +38,7 @@ void BobbyGraphDisplay<COUNT>::rawButtonReleased(uint8_t button)
 template<size_t COUNT>
 void BobbyGraphDisplay<COUNT>::buttonPressed(espgui::Button button)
 {
-    //Base::buttonPressed(button);
+    Base::buttonPressed(button);
    buttonPressedCommon(button);
 }

--- a/main/displays/buttoncalibratedisplay.cpp
+++ b/main/displays/buttoncalibratedisplay.cpp
@ -1,221 +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 "bobbyerrorhandler.h"
-#include "displays/statusdisplay.h"
-#include "newsettings.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{}.errorOccurred(std::move(result).error());
-            return;
-        }
-        else
-        {
-            ESP_LOGI(TAG, "Left button set to %d", m_leftButton);
-        }
-
-        if (auto result = configs.write_config(configs.dpadMappingRight, m_rightButton); !result)
-        {
-            BobbyErrorHandler{}.errorOccurred(std::move(result).error());
-            return;
-        }
-        else
-        {
-            ESP_LOGI(TAG, "Right button set to %d", m_rightButton);
-        }
-        if (auto result = configs.write_config(configs.dpadMappingUp, m_upButton); !result)
-        {
-            BobbyErrorHandler{}.errorOccurred(std::move(result).error());
-            return;
-        }
-        else
-        {
-            ESP_LOGI(TAG, "Up button set to %d", m_upButton);
-        }
-        if (auto result = configs.write_config(configs.dpadMappingDown, m_downButton); !result)
-        {
-            BobbyErrorHandler{}.errorOccurred(std::move(result).error());
-            return;
-        }
-        else
-        {
-            ESP_LOGI(TAG, "Down button set to %d", m_downButton);
-        }
-
-        if (espgui::displayStack.empty())
-        {
-            espgui::switchScreen<StatusDisplay>();
-        }
-        else
-            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);
-}
--- a/main/displays/buttoncalibratedisplay.h
+++ b/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;
-};
--- a/main/displays/gameoflifedisplay.cpp
+++ b/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;
 }
--- a/main/displays/lockscreen.cpp
+++ b/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
--- a/main/displays/menus/aboutmenu.cpp
+++ b/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>>();
--- a/main/displays/menus/batterymenu.cpp
+++ b/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>>>();
--- a/main/displays/menus/boardcomputerhardwaresettingsmenu.cpp
+++ b/main/displays/menus/boardcomputerhardwaresettingsmenu.cpp
@ -11,17 +11,15 @@

 // local includes
 #include "accessors/settingsaccessors.h"
+#include "actions/setupactions.h"
 #include "bobbycheckbox.h"
 #include "displays/bobbychangevaluedisplay.h"
-#include "displays/buttoncalibratedisplay.h"
 #include "displays/menus/extrabuttoncalibratemenu.h"
 #include "displays/menus/lockscreensettingsmenu.h"
-#include "displays/menus/settingsmenu.h"
 #include "displays/menus/setupquickactionsmenu.h"
 #include "displays/menus/timersmenu.h"
 #include "displays/potiscalibratedisplay.h"
 #include "icons/lock.h"
-#include "utils.h"

 #ifdef FEATURE_JOYSTICK
 #include "displays/joystickdebugdisplay.h"
@ -194,12 +192,12 @@ 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
@ -238,5 +236,5 @@ std::string BoardcomputerHardwareSettingsMenu::text() const

 void BoardcomputerHardwareSettingsMenu::back()
 {
-    switchScreen<SettingsMenu>();
+    popScreen();
 }
--- a/main/displays/menus/debugmenu.cpp
+++ b/main/displays/menus/debugmenu.cpp
@ -13,8 +13,10 @@
 #include "actions/loadsettingsaction.h"
 #include "actions/savesettingsaction.h"
 #include "actions/erasenvsaction.h"
+#include "actions/resetnvsaction.h"
 #include "icons/lock.h"
 #include "icons/battery.h"
+#include "icons/info.h"
 #include "debugcolorhelpers.h"
 #include "esptexthelpers.h"
 #include "accessors/settingsaccessors.h"
@ -57,8 +59,18 @@ constexpr char TEXT_TOGGLECLOUDDEBUG[] = "Cloud Debug";
 constexpr char TEXT_LOADSETTINGS[] = "Load settings (old)";
 constexpr char TEXT_SAVESETTINGS[] = "Save settings (old)";
 constexpr char TEXT_ERASENVS[] = "Erase NVS (old)";
+constexpr char TEXT_RESET_NVS_NEW[] = "Reset NVS (new)";
 constexpr char TEXT_DYNAMICMENU[] = "GUI experiments";
 constexpr char TEXT_BACK[] = "Back";
+
+class AccelerationText : public virtual espgui::TextInterface
+{
+public:
+    std::string text() const override
+    {
+        return fmt::format("Accel: {:.6f}", avgAccel);
+    }
+};
 } // namespace

 DebugMenu::DebugMenu()
@ -79,6 +91,7 @@ DebugMenu::DebugMenu()
 #ifdef FEATURE_CAN
    constructMenuItem<makeComponent<MenuItem, CanIcCrashText,                        StaticFont<2>, DisabledColor, DummyAction>>();
 #endif
+    constructMenuItem<makeComponent<MenuItem, AccelerationText,                      StaticFont<2>, DisabledColor, DummyAction>>();
    constructMenuItem<makeComponent<MenuItem, EmptyText,                             DummyAction>>();
    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_FRONTCOMMAND>,         PushScreenAction<FrontCommandDebugMenu>>>();
    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACKCOMMAND>,          PushScreenAction<BackCommandDebugMenu>>>();
@ -99,6 +112,8 @@ DebugMenu::DebugMenu()
    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_LOADSETTINGS>,         LoadSettingsAction>>();
    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SAVESETTINGS>,         SaveSettingsAction>>();
    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ERASENVS>,             EraseNvsAction>>();
+    constructMenuItem<makeComponent<MenuItem, EmptyText,                             DummyAction>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_RESET_NVS_NEW>,        ResetNVSAction<true>, StaticMenuItemIcon<&bobbyicons::info>>>();
    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DYNAMICMENU>,          PushScreenAction<DynamicDebugMenu>>>();
    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,                 PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
--- a/main/displays/menus/gitmenu.cpp
+++ b/main/displays/menus/gitmenu.cpp
@ -22,6 +22,8 @@ namespace {
    constexpr char TEXT_GIT_MESSAGE_TITLE[] = "Commit Message";
    constexpr char TEXT_GIT_MESSAGE[] = GIT_MESSAGE;
    constexpr char TEXT_GITHUB_URL[] = "Github URL";
+    constexpr char TEXT_IDF_VERSION[] = "ESP-IDF Version";
+    constexpr char TEXT_IDF_VERSION_VALUE[] = IDF_VER;
    constexpr char TEXT_BACK[] = "Back";

    class OpenPopupAction : public virtual espgui::ActionInterface
@ -49,6 +51,8 @@ GitMenu::GitMenu()
 {
    using namespace espgui;

+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_IDF_VERSION>,        StaticColor<TFT_GREY>, StaticFont<2>, DummyAction>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_IDF_VERSION_VALUE>,  DummyAction>>();
    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GIT_BRANCH_TITLE>,   StaticColor<TFT_GREY>, StaticFont<2>, DummyAction>>();
    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GIT_BRANCH>,         DummyAction>>();
    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GIT_COMMIT_TITLE>,   StaticColor<TFT_GREY>, StaticFont<2>, DummyAction>>();
--- a/main/displays/menus/graphsmenu.cpp
+++ b/main/displays/menus/graphsmenu.cpp
@ -15,6 +15,8 @@

 namespace {
 constexpr char TEXT_GRAPHS[] = "Graphs";
+constexpr char TEXT_RAW_GAS[] = "Raw Gas";
+constexpr char TEXT_RAW_BREMS[] = "Raw Brems";
 constexpr char TEXT_GAS[] = "Gas";
 constexpr char TEXT_BREMS[] = "Brems";
 constexpr char TEXT_POTIS[] = "Potis";
@ -32,6 +34,20 @@ constexpr char TEXT_MOTORCURRENTS[] = "Motor currents";
 constexpr char TEXT_RSSI[] = "RSSI";
 constexpr char TEXT_BACK[] = "Back";

+using RawGasGraphDisplay = espgui::makeComponent<
+        BobbyGraphDisplay<1>,
+        espgui::StaticText<TEXT_RAW_GAS>,
+        espgui::SingleGraphAccessor<RawGasStatistics>,
+        espgui::ConfirmActionInterface<espgui::PopScreenAction>,
+        espgui::BackActionInterface<espgui::PopScreenAction>
+>;
+using RawBremsGraphDisplay = espgui::makeComponent<
+        BobbyGraphDisplay<1>,
+        espgui::StaticText<TEXT_RAW_BREMS>,
+        espgui::SingleGraphAccessor<RawBremsStatistics>,
+        espgui::ConfirmActionInterface<espgui::PopScreenAction>,
+        espgui::BackActionInterface<espgui::PopScreenAction>
+>;
 using GasGraphDisplay = espgui::makeComponent<
    BobbyGraphDisplay<1>,
    espgui::StaticText<TEXT_GAS>,
@ -173,6 +189,8 @@ using RssiGraphDisplay = espgui::makeComponent<
 GraphsMenu::GraphsMenu()
 {
    using namespace espgui;
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_RAW_GAS>,               PushScreenAction<RawGasGraphDisplay>>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_RAW_BREMS>,             PushScreenAction<RawBremsGraphDisplay>>>();
    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GAS>,                   PushScreenAction<GasGraphDisplay>>>();
    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BREMS>,                 PushScreenAction<BremsGraphDisplay>>>();
    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_POTIS>,                 PushScreenAction<PotisGraphDisplay>>>();
--- a/main/displays/menus/greenpassmenu.cpp
+++ b/main/displays/menus/greenpassmenu.cpp
@ -81,7 +81,7 @@ GreenPassMenu::GreenPassMenu()
        }
        else
        {
-            constructMenuItem<makeComponentArgs<MenuItem, PushQrImportDisplayAction<GreenPassMenu>, StaticText<TEXT_ADDCERT>>>(std::move(nvs_key));
+            constructMenuItem<makeComponentArgs<MenuItem, PushQrImportDisplayAction, StaticText<TEXT_ADDCERT>>>(std::move(nvs_key));
        }
    }

--- a/main/displays/menus/ledstripmenu.cpp
+++ b/main/displays/menus/ledstripmenu.cpp
@ -48,6 +48,8 @@ constexpr char TEXT_ANIMATION_MULTIPLIER[] = "Animation Multiplier";
 constexpr char TEXT_LEDSTRIP_BRIGHTNESS[] = "Ledstrip Brightness";
 constexpr char TEXT_LEDSTRIP_ALLCUSTOMOFF[] = "All custom off";
 constexpr char TEXT_LEDSTRIP_CHANGE_OTA_ANIM[] = "Change Ota animation";
+constexpr char TEXT_LEDSTRIP_BRAKE_USE_ACCEL[] = "Brakelight use acceleration";
+constexpr char TEXT_LEDSTRIP_BRAKE_USE_POWER[] = "Brakelight use motor power";
 constexpr char TEXT_BACK[] = "Back";

 using LedsCountChangeScreen = espgui::makeComponent<
@ -179,6 +181,8 @@ LedstripMenu::LedstripMenu()
    if (!simplified) { constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_BIGOFFSET, BigOffsetAccessor>,           espgui::PushScreenAction<BigOffsetChangeScreen>>>(); }
    if (!simplified) { constructMenuItem<makeComponent<MenuItem, espgui::StaticText<TEXT_LEDSTRIP_BRIGHTNESS>,                             espgui::PushScreenAction<LedStripBrightnessChangeScreen>>>(); }
    if (!simplified) { constructMenuItem<makeComponent<MenuItem, LedStripMaxCurrentText, espgui::PushScreenAction<LedStripMaxAmpereChangeScreen>>>(); }
+    constructMenuItem<makeComponent<MenuItem, espgui::StaticText<TEXT_LEDSTRIP_BRAKE_USE_ACCEL>, BobbyCheckbox, LedstripBrakeLightUseAccelAccessor>>();
+    constructMenuItem<makeComponent<MenuItem, espgui::StaticText<TEXT_LEDSTRIP_BRAKE_USE_POWER>, BobbyCheckbox, LedstripBrakeLightUsePowerAccessor>>();
    constructMenuItem<makeComponent<MenuItem, espgui::StaticText<TEXT_BACK>,                                            espgui::PushScreenAction<MainMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
 }

--- a/main/displays/menus/ledstripselectanimationmenu.cpp
+++ b/main/displays/menus/ledstripselectanimationmenu.cpp
@ -1,72 +0,0 @@
-#include "ledstripselectanimationmenu.h"
-
-// Local includes
-#include "actions/dummyaction.h"
-#include "actions/ledstripanimationactions.h"
-#include "actions/popscreenaction.h"
-#include "icons/back.h"
-#include "ledstripdefines.h"
-#include "ledstripmenu.h"
-#include "newsettings.h"
-
-#ifdef FEATURE_LEDSTRIP
-namespace {
-constexpr char TEXT_SELECTANIMATION[] = "Select Animation";
-constexpr char TEXT_ANIMATION_DEFAULTRAINBOW[] = "Default Rainbow";
-constexpr char TEXT_ANIMATION_BETTERRAINBOW[] = "Better Rainbow";
-constexpr char TEXT_ANIMATION_SPEEDSYNCANIMATION[] = "Speed Sync";
-constexpr char TEXT_ANIMATION_CUSTOMCOLOR[] = "Custom Color";
-constexpr char TEXT_BACK[] = "Back";
-
-class CurrentSelectedAnimationText : public virtual espgui::TextInterface
-{
-public:
-    std::string text() const override;
-};
-
-} // namespace
-
-LedstripSelectAnimationMenu::LedstripSelectAnimationMenu()
-{
-    using namespace espgui;
-
-    constructMenuItem<makeComponent<MenuItem, CurrentSelectedAnimationText,                  DisabledColor, DummyAction>>();
-    constructMenuItem<makeComponent<MenuItem, EmptyText,                                     DummyAction>>();
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ANIMATION_DEFAULTRAINBOW>,     LedStripSetAnimationAction<LedstripAnimation::DefaultRainbow>>>();
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ANIMATION_BETTERRAINBOW>,      LedStripSetAnimationAction<LedstripAnimation::BetterRainbow>>>();
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ANIMATION_SPEEDSYNCANIMATION>, LedStripSetAnimationAction<LedstripAnimation::SpeedSync>>>();
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ANIMATION_CUSTOMCOLOR>,        LedStripSetAnimationAction<LedstripAnimation::CustomColor>>>();
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,                         PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>();
-}
-
-std::string LedstripSelectAnimationMenu::text() const
-{
-    return TEXT_SELECTANIMATION;
-}
-
-void LedstripSelectAnimationMenu::back()
-{
-    espgui::popScreen();
-}
-
-namespace {
-
-std::string CurrentSelectedAnimationText::text() const
-{
-    switch (configs.ledstrip.animationType.value)
-    {
-    case LedstripAnimation::DefaultRainbow:
-        return TEXT_ANIMATION_DEFAULTRAINBOW;
-    case LedstripAnimation::BetterRainbow:
-        return TEXT_ANIMATION_BETTERRAINBOW;
-    case LedstripAnimation::SpeedSync:
-        return TEXT_ANIMATION_SPEEDSYNCANIMATION;
-    case LedstripAnimation::CustomColor:
-        return TEXT_ANIMATION_CUSTOMCOLOR;
-    default:
-        return "Animation Unkown";
-    }
-}
-
-} // namespace
-#endif
--- a/main/displays/menus/recoverymenu.cpp
+++ b/main/displays/menus/recoverymenu.cpp
@ -50,7 +50,7 @@ RecoveryMenu::RecoveryMenu()
    configs.callForEveryFeature([&](ConfiguredFeatureFlag &feature){
        constructMenuItem<BasicFeatureFlagMenuItem>(feature);
    });
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_RESET_NVS>, ResetNVSAction, StaticMenuItemIcon<&bobbyicons::info>>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_RESET_NVS>, ResetNVSAction<false>, StaticMenuItemIcon<&bobbyicons::info>>>();
    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_REBOOT>, RebootAction, StaticMenuItemIcon<&bobbyicons::reboot>>>();
 }

--- a/main/displays/menus/statisticsmenu.cpp
+++ b/main/displays/menus/statisticsmenu.cpp
@ -48,7 +48,7 @@ public:
                     - converted.hours()
                     - converted.minutes()
                     - converted.seconds();
-        return fmt::format("Up: {:02d}:{:02d}:{:02d}&s&7.{:03d}",
+        return fmt::format("Up: {:02d}:{:02d}:{:02d}&s&7.{:01d}",
                           converted.hours().count(),
                           converted.minutes().count(),
                           converted.seconds().count(),
@ -93,7 +93,7 @@ public:
                     - converted.hours()
                     - converted.minutes()
                     - converted.seconds();
-        return fmt::format("Drive: {:02d}:{:02d}:{:02d}&s&7.{:03d}",
+        return fmt::format("Drive: {:02d}:{:02d}:{:02d}&s&7.{:02d}",
                           converted.hours().count(),
                           converted.minutes().count(),
                           converted.seconds().count(),
--- a/main/displays/pingpongdisplay.cpp
+++ b/main/displays/pingpongdisplay.cpp
@ -6,6 +6,9 @@
 #include <tftinstance.h>
 #include <screenmanager.h>

+// local includes
+#include <screens.h>
+
 PingPongDisplay::PingPongDisplay() :
    lpaddle_y(cpputils::randomNumber<uint8_t>(0, h - paddle_h, espcpputils::esp_random_device{})),
    rpaddle_y(cpputils::randomNumber<uint8_t>(0, h - paddle_h, espcpputils::esp_random_device{})),
@ -19,6 +22,8 @@ void PingPongDisplay::initScreen()
 {
    Base::initScreen();

+    disableScreenFlip(true);
+
    espgui::tft.fillScreen(TFT_BLACK);
    espgui::tft.setRotation(1);

@ -41,7 +46,7 @@ void PingPongDisplay::stop()
 {
    Base::stop();

-    espgui::tft.setRotation(0);
+    disableScreenFlip(false);
 }

 void PingPongDisplay::buttonPressed(espgui::Button button)
--- a/main/displays/potiscalibratedisplay.cpp
+++ b/main/displays/potiscalibratedisplay.cpp
@ -16,6 +16,7 @@ namespace {
 constexpr char TEXT_CALIBRATE[] = "Potis Calibrate";
 } // namespace

+/*
 std::string PotisCalibrateDisplay::text() const
 {
    return TEXT_CALIBRATE;
@ -320,3 +321,4 @@ void PotisCalibrateDisplay::copyToSettings()
    configs.write_config(configs.bremsMin, m_bremsMin);
    configs.write_config(configs.bremsMax, m_bremsMax);
 }
+*/
--- a/main/displays/potiscalibratedisplay.h
+++ b/main/displays/potiscalibratedisplay.h
@ -16,6 +16,7 @@
 #include "modeinterface.h"
 #include "modes/ignoreinputmode.h"

+/*
 class PotisCalibrateDisplay : public BobbyDisplayWithTitle
 {
    using Base = BobbyDisplayWithTitle;
@ -90,3 +91,4 @@ private:
    ;
    std::optional<float> m_gas, m_brems;
 };
+*/
--- a/main/displays/qrimportdisplay.cpp
+++ b/main/displays/qrimportdisplay.cpp
@ -0,0 +1,92 @@
+#include "qrimportdisplay.h"
+
+namespace {
+constexpr const char * const TAG = "qrimport";
+}
+
+void QrImportDisplay::start()
+{
+    using namespace espgui;
+    Base::start();
+
+    m_statuslabel.start();
+
+    qrimport::setup_request();
+
+    if (const auto result = qrimport::start_qr_request(); result)
+    {
+        ESP_LOGI(TAG, "started request, waiting for result");
+        m_waitingForResult = true;
+    }
+    else
+    {
+        ESP_LOGE(TAG, "could not start request: %.*s", result.error().size(), result.error().data());
+        m_result = tl::make_unexpected(std::move(result).error());
+    }
+}
+
+void QrImportDisplay::update()
+{
+    using namespace espgui;
+    Base::update();
+
+    if (!m_waitingForResult)
+        return;
+
+    if (qrimport::get_request_running())
+        return;
+
+    m_waitingForResult = false;
+
+    m_result = qrimport::check_request();
+    if (m_result)
+    {
+        ESP_LOGI(TAG, "%.*s => %.*s", m_nvs_key.size(), m_nvs_key.data(), m_result->size(), m_result->data());
+        if (const auto result = qrimport::set_qr_code(m_nvs_key, *m_result); !result)
+            m_result = tl::make_unexpected(fmt::format("saving qr failed: {}", esp_err_to_name(result.error())));
+    }
+    else
+        ESP_LOGW(TAG, "failed %.*s => %.*s", m_nvs_key.size(), m_nvs_key.data(), m_result.error().size(), m_result.error().data());
+}
+
+void QrImportDisplay::redraw()
+{
+    using namespace espgui;
+    Base::redraw();
+
+    if (m_waitingForResult)
+    {
+        tft.setTextColor(TFT_YELLOW, TFT_BLACK);
+        m_statuslabel.redraw("In progress");
+    }
+    else if (!m_result && !m_result.error().empty())
+    {
+        tft.setTextColor(TFT_RED, TFT_BLACK);
+        BobbyErrorHandler{}.errorOccurred(fmt::format("Error: {}", m_result.error()));
+        m_result.error().clear();
+    }
+    else
+    {
+        tft.setTextColor(TFT_GREEN, TFT_BLACK);
+        m_statuslabel.redraw("OK");
+        popScreen();
+    }
+}
+
+void QrImportDisplay::buttonPressed(espgui::Button button)
+{
+    using namespace espgui;
+    Base::buttonPressed(button);
+
+    switch (button)
+    {
+        using espgui::Button;
+    case Button::Left:
+        if (!m_waitingForResult)
+            popScreen();
+        else
+            ESP_LOGW(TAG, "tried to leave while waiting for result");
+        break;
+    default:;
+    }
+}
--- a/main/displays/qrimportdisplay.h
+++ b/main/displays/qrimportdisplay.h
@ -1,12 +1,11 @@
 #pragma once
-constexpr const char * const TAG = "qrimport";

 // 3rd party includes
 #include <esp_log.h>
-#include <widgets/label.h>
+#include <fmt/core.h>
 #include <tftinstance.h>
 #include <tl/expected.hpp>
-#include <fmt/core.h>
+#include <widgets/label.h>

 // local includes
 #include "bobbydisplay.h"
@ -14,7 +13,6 @@ constexpr const char * const TAG = "qrimport";
 #include "qrimport.h"
 #include "screenmanager.h"

-template<typename TMenu>
 class QrImportDisplay : public BobbyDisplay
 {
    using Base = BobbyDisplay;
@ -23,92 +21,10 @@ public:
    explicit QrImportDisplay(const std::string &nvs_key) : m_nvs_key{nvs_key} {}
    explicit QrImportDisplay(std::string &&nvs_key) : m_nvs_key{std::move(nvs_key)} {}

-    void start() override
-    {
-        using namespace espgui;
-        Base::start();
-
-        m_statuslabel.start();
-
-        qrimport::setup_request();
-
-        if (const auto result = qrimport::start_qr_request(); result)
-        {
-            ESP_LOGI(TAG, "started request, waiting for result");
-            m_waitingForResult = true;
-        }
-        else
-        {
-            ESP_LOGE(TAG, "could not start request: %.*s", result.error().size(), result.error().data());
-            m_result = tl::make_unexpected(std::move(result).error());
-        }
-    }
-
-    void update() override
-    {
-        using namespace espgui;
-        Base::update();
-
-        if (!m_waitingForResult)
-            return;
-
-        if (qrimport::get_request_running())
-            return;
-
-        m_waitingForResult = false;
-
-        m_result = qrimport::check_request();
-        if (m_result)
-        {
-            ESP_LOGI(TAG, "%.*s => %.*s", m_nvs_key.size(), m_nvs_key.data(), m_result->size(), m_result->data());
-            if (const auto result = qrimport::set_qr_code(m_nvs_key, *m_result); !result)
-                m_result = tl::make_unexpected(fmt::format("saving qr failed: {}", esp_err_to_name(result.error())));
-        }
-        else
-            ESP_LOGW(TAG, "failed %.*s => %.*s", m_nvs_key.size(), m_nvs_key.data(), m_result.error().size(), m_result.error().data());
-    }
-
-    void redraw() override
-    {
-        using namespace espgui;
-        Base::redraw();
-
-        if (m_waitingForResult)
-        {
-            tft.setTextColor(TFT_YELLOW, TFT_BLACK);
-            m_statuslabel.redraw("In progress");
-        }
-        else if (!m_result && !m_result.error().empty())
-        {
-            tft.setTextColor(TFT_RED, TFT_BLACK);
-            BobbyErrorHandler{}.errorOccurred(fmt::format("Error: {}", m_result.error()));
-            m_result.error().clear();
-        }
-        else
-        {
-            tft.setTextColor(TFT_GREEN, TFT_BLACK);
-            m_statuslabel.redraw("OK");
-            popScreen();
-        }
-    }
-
-    void buttonPressed(espgui::Button button) override
-    {
-        using namespace espgui;
-        Base::buttonPressed(button);
-
-        switch (button)
-        {
-            using espgui::Button;
-            case Button::Left:
-                if (!m_waitingForResult)
-                    popScreen();
-                else
-                    ESP_LOGW(TAG, "tried to leave while waiting for result");
-                break;
-            default:;
-        }
-    }
+    void start() override;
+    void update() override;
+    void redraw() override;
+    void buttonPressed(espgui::Button button) override;

 private:
    bool m_waitingForResult{false};
--- a/main/displays/setup/ask_calibrate_other_buttons.cpp
+++ b/main/displays/setup/ask_calibrate_other_buttons.cpp
@ -0,0 +1,56 @@
+#include "ask_calibrate_other_buttons.h"
+
+// 3rdparty lib includes
+#include <screenmanager.h>
+
+// local includes
+#include "displays/menus/extrabuttoncalibratemenu.h"
+#include "displays/setup/final_information.h"
+#include "setup.h"
+#include "utils.h"
+
+namespace {
+constexpr char const askSetupOtherButtonsText[] = "Do you want to setup other\nbuttons?\n(Blinker, Profile Buttons, etc.)\n\nPress LEFT to skip other buttons.\nPress RIGHT to setup buttons.";
+} // namespace
+
+void SetupAskCalibrateOtherButtonsDisplay::initScreen()
+{
+    Base::initScreen();
+
+    drawLargeText(askSetupOtherButtonsText);
+}
+
+void SetupAskCalibrateOtherButtonsDisplay::start()
+{
+    if (m_next_screen)
+    {
+        espgui::switchScreen<SetupFinalInformationDisplay>();
+        return;
+    }
+
+    Base::start();
+
+    setup::lock();
+}
+
+void SetupAskCalibrateOtherButtonsDisplay::buttonPressed(espgui::Button button)
+{
+    switch (button)
+    {
+    case espgui::Left:
+        espgui::switchScreen<SetupFinalInformationDisplay>();
+        return;
+    case espgui::Right:
+        m_next_screen = true;
+        espgui::pushScreen<ExtraButtonCalibrateMenu>();
+        return;
+    default:;
+    }
+
+    Base::buttonPressed(button);
+}
+
+std::string SetupAskCalibrateOtherButtonsDisplay::text() const
+{
+    return "Other Buttons";
+}
--- a/main/displays/setup/ask_calibrate_other_buttons.h
+++ b/main/displays/setup/ask_calibrate_other_buttons.h
@ -0,0 +1,18 @@
+#pragma once
+
+// local includes
+#include "displays/bobbydisplaywithtitle.h"
+
+class SetupAskCalibrateOtherButtonsDisplay : public virtual BobbyDisplayWithTitle
+{
+    using Base = BobbyDisplayWithTitle;
+public:
+    void initScreen() override;
+    void start() override;
+
+    void buttonPressed(espgui::Button button) override;
+
+    [[nodiscard]] std::string text() const override;
+private:
+    bool m_next_screen{false};
+};
--- a/main/displays/setup/ask_setup_clouds.cpp
+++ b/main/displays/setup/ask_setup_clouds.cpp
@ -0,0 +1,53 @@
+#include "ask_setup_clouds.h"
+
+// 3rdparty lib includes
+#include <screenmanager.h>
+
+// local includes
+#include "displays/setup/ask_calibrate_other_buttons.h"
+#include "displays/setup/setup_cloud.h"
+#include "setup.h"
+#include "taskmanager.h"
+#include "utils.h"
+
+namespace {
+constexpr char const askCloudText[] = "Do you want to setup cloud?\nWith this, you will be able\nto send data to graphana,\nremote control things like Buttons\nand NVS and more!\n\nPress LEFT to skip cloud.\nPress RIGHT to setup cloud.";
+} // namespace
+
+void SetupAskSetupCloudsDisplay::initScreen()
+{
+    Base::initScreen();
+
+    drawLargeText(askCloudText);
+}
+
+void SetupAskSetupCloudsDisplay::start()
+{
+    Base::start();
+
+    setup::lock();
+}
+
+void SetupAskSetupCloudsDisplay::buttonPressed(espgui::Button button)
+{
+    switch (button)
+    {
+    case espgui::Left: // skip cloud setup
+        espgui::switchScreen<SetupAskCalibrateOtherButtonsDisplay>();
+        return;
+    case espgui::Right: // enter cloud setup
+        configs.write_config(configs.feature.cloud.isEnabled, true);
+        configs.write_config(configs.feature.udpcloud.isEnabled, true);
+
+        reload_tasks();
+        espgui::switchScreen<SetupCloudDisplay>();
+    default:;
+    }
+
+    Base::buttonPressed(button);
+}
+
+std::string SetupAskSetupCloudsDisplay::text() const
+{
+    return "Cloud Setup";
+}
--- a/main/displays/setup/ask_setup_clouds.h
+++ b/main/displays/setup/ask_setup_clouds.h
@ -0,0 +1,16 @@
+#pragma once
+
+// local includes
+#include "displays/bobbydisplaywithtitle.h"
+
+class SetupAskSetupCloudsDisplay : public virtual BobbyDisplayWithTitle
+{
+    using Base = BobbyDisplayWithTitle;
+public:
+    void initScreen() override;
+    void start() override;
+
+    void buttonPressed(espgui::Button button) override;
+
+    [[nodiscard]] std::string text() const override;
+};
--- a/main/displays/setup/basic_buttons.cpp
+++ b/main/displays/setup/basic_buttons.cpp
@ -0,0 +1,230 @@
+#include "basic_buttons.h"
+
+// system includes
+#include <esp_log.h>
+
+// 3rdparty lib includes
+#include <screenmanager.h>
+#include <tftinstance.h>
+
+// local includes
+#include "bobbyerrorhandler.h"
+#include "displays/setup/calibrate_potis.h"
+#include "setup.h"
+#include "utils.h"
+
+namespace {
+constexpr char const buttonText[] = "Please press the highlighted\n buttons!";
+constexpr const char * const TAG = "SETUP-BUTTONS";
+}
+
+void SetupBasicButtonsDisplay::initScreen()
+{
+    Base::initScreen();
+
+    drawLargeText(buttonText);
+    drawButtons(m_button_cal_status);
+}
+
+void SetupBasicButtonsDisplay::start()
+{
+    Base::start();
+
+    setup::lock();
+
+    m_lastButton = std::nullopt;
+    m_button_cal_status = LEFT;
+    m_button_cal_finished = false;
+}
+
+void SetupBasicButtonsDisplay::update()
+{
+    if (m_button_cal_finished)
+    {
+        m_button_cal_finished = false;
+        saveButtons();
+
+        if (m_early_return)
+        {
+            setup::unlock();
+            espgui::popScreen();
+        }
+        else
+        {
+            espgui::switchScreen<SetupCalibratePotisDisplay>();
+        }
+    }
+
+    Base::update();
+}
+
+void SetupBasicButtonsDisplay::redraw()
+{
+    Base::redraw();
+}
+
+void SetupBasicButtonsDisplay::rawButtonPressed(uint8_t button)
+{
+    if (m_button_cal_status == FINISHED)
+    {
+        if (button == m_rightButton)
+        {
+            m_button_cal_finished = true;
+        }
+    }
+    else if (!m_lastButton || *m_lastButton != button)
+        m_lastButton = button;
+    else
+    {
+        switch (m_button_cal_status)
+        {
+        case LEFT:
+            m_leftButton = button;
+            m_lastButton = std::nullopt;
+            m_button_cal_status = RIGHT;
+            break;
+        case RIGHT:
+            m_rightButton = button;
+            m_lastButton = std::nullopt;
+            m_button_cal_status = UP;
+            break;
+        case UP:
+            m_upButton = button;
+            m_lastButton = std::nullopt;
+            m_button_cal_status = DOWN;
+            break;
+        case DOWN:
+            m_downButton = button;
+            m_lastButton = std::nullopt;
+            m_button_cal_status = FINISHED;
+            break;
+        default:;
+        }
+    }
+
+    drawButtons(m_button_cal_status);
+
+    Base::rawButtonPressed(button);
+}
+
+void SetupBasicButtonsDisplay::rawButtonReleased(uint8_t button)
+{
+    // Base::rawButtonReleased(button);
+}
+
+void SetupBasicButtonsDisplay::buttonPressed(espgui::Button button)
+{
+    // Base::buttonPressed(button);
+}
+
+void SetupBasicButtonsDisplay::buttonReleased(espgui::Button button)
+{
+    // Base::buttonReleased(button);
+}
+
+std::string SetupBasicButtonsDisplay::text() const
+{
+    return "Calibrate Buttons";
+}
+
+void SetupBasicButtonsDisplay::saveButtons() const
+{
+    if (auto result = configs.write_config(configs.dpadMappingLeft, m_leftButton); !result)
+    {
+        BobbyErrorHandler{}.errorOccurred(std::move(result).error());
+        return;
+    }
+    else
+    {
+        ESP_LOGI(TAG, "Left button set to %d", m_leftButton);
+    }
+
+    if (auto result = configs.write_config(configs.dpadMappingRight, m_rightButton); !result)
+    {
+        BobbyErrorHandler{}.errorOccurred(std::move(result).error());
+        return;
+    }
+    else
+    {
+        ESP_LOGI(TAG, "Right button set to %d", m_rightButton);
+    }
+    if (auto result = configs.write_config(configs.dpadMappingUp, m_upButton); !result)
+    {
+        BobbyErrorHandler{}.errorOccurred(std::move(result).error());
+        return;
+    }
+    else
+    {
+        ESP_LOGI(TAG, "Up button set to %d", m_upButton);
+    }
+    if (auto result = configs.write_config(configs.dpadMappingDown, m_downButton); !result)
+    {
+        BobbyErrorHandler{}.errorOccurred(std::move(result).error());
+        return;
+    }
+    else
+    {
+        ESP_LOGI(TAG, "Down button set to %d", m_downButton);
+    }
+}
+
+void SetupBasicButtonsDisplay::drawButtons(const SetupBasicButtonsDisplay::CurrentButton button)
+{
+    using namespace espgui;
+
+    const int16_t x_mid = tft.width() / 2;
+    const int16_t y_mid = tft.height() / 2;
+
+    const auto offset = 40;
+    const auto radius = 15;
+    const auto subtract = 2;
+
+    const auto up_x = x_mid;
+    const auto up_y = y_mid - offset;
+
+    const auto down_x = x_mid;
+    const auto down_y = y_mid + offset;
+
+    const auto left_x = x_mid - offset;
+    const auto left_y = y_mid;
+
+    const auto right_x = x_mid + offset;
+    const auto right_y = y_mid;
+
+    tft.fillCircle(up_x,    up_y,    radius-subtract, TFT_BLACK);
+    tft.fillCircle(down_x,  down_y,  radius-subtract, TFT_BLACK);
+    tft.fillCircle(left_x,  left_y,  radius-subtract, TFT_BLACK);
+    tft.fillCircle(right_x, right_y, radius-subtract, TFT_BLACK);
+
+    tft.drawCircle(up_x,    up_y,    radius, TFT_WHITE);
+    tft.drawCircle(down_x,  down_y,  radius, TFT_WHITE);
+    tft.drawCircle(left_x,  left_y,  radius, TFT_WHITE);
+    tft.drawCircle(right_x, right_y, radius, TFT_WHITE);
+
+    if (m_button_cal_finished)
+    {
+        return;
+    }
+
+    switch(button)
+    {
+    case UP:
+        tft.fillCircle(up_x, up_y, radius-subtract, m_lastButton ? TFT_YELLOW : TFT_WHITE);
+        break;
+    case DOWN:
+        tft.fillCircle(down_x,  down_y,  radius-subtract, m_lastButton ? TFT_YELLOW : TFT_WHITE);
+        break;
+    case LEFT:
+        tft.fillCircle(left_x,  left_y,  radius-subtract, m_lastButton ? TFT_YELLOW : TFT_WHITE);
+        break;
+    case RIGHT:
+        tft.fillCircle(right_x, right_y, radius-subtract, m_lastButton ? TFT_YELLOW : TFT_WHITE);
+        break;
+    default:;
+    }
+
+    if (m_button_cal_status == FINISHED)
+    {
+        tft.fillCircle(right_x, right_y, radius-subtract, TFT_GREEN);
+    }
+}
--- a/main/displays/setup/basic_buttons.h
+++ b/main/displays/setup/basic_buttons.h
@ -0,0 +1,51 @@
+#pragma once
+
+// system includes
+#include <optional>
+
+// local includes
+#include "displays/bobbydisplaywithtitle.h"
+
+class SetupBasicButtonsDisplay : public virtual BobbyDisplayWithTitle
+{
+    using Base = BobbyDisplayWithTitle;
+
+    enum CurrentButton : int8_t
+    {
+        UP,
+        DOWN,
+        LEFT,
+        RIGHT,
+        FINISHED
+    }; // button calibration
+public:
+    explicit SetupBasicButtonsDisplay(bool early_return = false) :
+        m_early_return{early_return}
+    {}
+
+    void initScreen() override;
+    void start() override;
+    void update() override;
+    void redraw() 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;
+
+    [[nodiscard]] std::string text() const override;
+private:
+    const bool m_early_return;
+
+    std::optional<uint8_t> m_lastButton;
+
+    CurrentButton m_button_cal_status;
+
+    uint8_t m_leftButton, m_rightButton, m_upButton, m_downButton;
+
+    bool m_button_cal_finished;
+
+    void saveButtons() const;
+
+    void drawButtons(CurrentButton button);
+};
--- a/main/displays/setup/calibrate_potis.cpp
+++ b/main/displays/setup/calibrate_potis.cpp
@ -0,0 +1,309 @@
+#include "calibrate_potis.h"
+
+// 3rdparty lib includes
+#include <cpputils.h>
+#include <screenmanager.h>
+#include <tftinstance.h>
+
+// local includes
+#include "displays/setup/ask_setup_clouds.h"
+#include "globals.h"
+#include "setup.h"
+
+using namespace espgui;
+
+void SetupCalibratePotisDisplay::initScreen()
+{
+    Base::initScreen();
+
+    tft.setTextFont(4);
+    tft.setTextColor(TFT_WHITE, TFT_BLACK);
+
+    tft.drawString("gas:", 25, 47);
+    tft.drawString("brems:", 25, 147);
+
+    for (auto &label : m_labels)
+        label.start();
+
+    for (auto &progressBar : m_progressBars)
+        progressBar.start();
+
+    m_renderedButton = -1;
+}
+
+void SetupCalibratePotisDisplay::start()
+{
+    Base::start();
+
+    setup::lock();
+
+    m_selectedButton = 0;
+    m_status = Status::Begin;
+    copyFromSettings();
+    m_gas = std::nullopt;
+    m_brems = std::nullopt;
+}
+void SetupCalibratePotisDisplay::update()
+{
+    Base::update();
+
+    if (raw_gas)
+        m_gas = cpputils::mapValueClamped<float>(*raw_gas, m_gasMin, m_gasMax, 0.f, 1000.f);
+    else
+        m_gas = std::nullopt;
+
+    if (raw_brems)
+        m_brems = cpputils::mapValueClamped<float>(*raw_brems, m_bremsMin, m_bremsMax, 0.f, 1000.f);
+    else
+        m_brems = std::nullopt;
+}
+
+void SetupCalibratePotisDisplay::redraw()
+{
+    Base::redraw();
+
+    m_labels[0].redraw(m_gas ? fmt::format("{:.02f}", *m_gas) : "?");
+    m_labels[1].redraw(raw_gas ? std::to_string(*raw_gas) : "?");
+    if (m_status == Status::GasMin)
+        espgui::tft.setTextColor(TFT_RED, TFT_BLACK);
+    m_labels[2].redraw(std::to_string(m_gasMin));
+    if (m_status == Status::GasMin)
+        espgui::tft.setTextColor(TFT_WHITE, TFT_BLACK);
+    if (m_status == Status::GasMax)
+        espgui::tft.setTextColor(TFT_RED, TFT_BLACK);
+    m_labels[3].redraw(std::to_string(m_gasMax));
+    if (m_status == Status::GasMax)
+        espgui::tft.setTextColor(TFT_WHITE, TFT_BLACK);
+
+    m_progressBars[0].redraw(m_gas ? *m_gas : 0);
+
+    m_labels[4].redraw(m_brems ? fmt::format("{:.02f}", *m_brems) : "?");
+    m_labels[5].redraw(raw_brems ? std::to_string(*raw_brems) : "?");
+    if (m_status == Status::BremsMin)
+        espgui::tft.setTextColor(TFT_RED, TFT_BLACK);
+    m_labels[6].redraw(std::to_string(m_bremsMin));
+    if (m_status == Status::BremsMin)
+        espgui::tft.setTextColor(TFT_WHITE, TFT_BLACK);
+    if (m_status == Status::BremsMax)
+        espgui::tft.setTextColor(TFT_RED, TFT_BLACK);
+    m_labels[7].redraw(std::to_string(m_bremsMax));
+    if (m_status == Status::BremsMax)
+        espgui::tft.setTextColor(TFT_WHITE, TFT_BLACK);
+
+    m_progressBars[1].redraw(m_brems ? *m_brems : 0);
+
+    m_labels[8].redraw([&](){
+        switch (m_status)
+        {
+        case Status::Begin: return "Start calibrating?";
+#ifdef FEATURE_JOYSTICK
+            case Status::Mitte: return "Release joystick";
+#endif
+        case Status::GasMin: return "Release gas";
+        case Status::GasMax: return "Press gas";
+        case Status::BremsMin: return "Release brems";
+        case Status::BremsMax: return "Press brems";
+        case Status::Confirm: return "Verify";
+        }
+        __builtin_unreachable();
+    }());
+
+    {
+        const auto failed = !m_gas || !m_brems || (m_status == Status::Confirm && (*m_gas > 100 || *m_brems > 100));
+        const auto color = failed ? TFT_DARKGREY : TFT_WHITE;
+        espgui::tft.setTextColor(color, TFT_BLACK);
+        m_labels[9].redraw([&](){
+            switch (m_status)
+            {
+            case Status::Begin: return "Yes";
+#ifdef FEATURE_JOYSTICK
+                case Status::Mitte:
+#endif
+            case Status::GasMin:
+            case Status::GasMax:
+            case Status::BremsMin:
+            case Status::BremsMax: return "Next";
+            case Status::Confirm: return "Save";
+            }
+            __builtin_unreachable();
+        }());
+
+        if (m_selectedButton != m_renderedButton && (m_selectedButton == 0 || m_renderedButton == 0))
+            espgui::tft.drawRect(3, 275, 100, 27, m_selectedButton == 0 ? color : TFT_BLACK);
+    }
+
+    espgui::tft.setTextColor(TFT_WHITE, TFT_BLACK);
+    m_labels[10].redraw([&](){
+        switch (m_status)
+        {
+        case Status::Begin: return "No";
+#ifdef FEATURE_JOYSTICK
+            case Status::Mitte:
+#endif
+        case Status::GasMin:
+        case Status::GasMax:
+        case Status::BremsMin:
+        case Status::BremsMax:
+        case Status::Confirm: return "Abort";
+        }
+        __builtin_unreachable();
+    }());
+
+    if (m_selectedButton != m_renderedButton && (m_selectedButton == 1 || m_renderedButton == 1))
+        espgui::tft.drawRect(123, 275, 100, 27, m_selectedButton == 1 ? TFT_WHITE : TFT_BLACK);
+
+    m_renderedButton = m_selectedButton;
+}
+
+void SetupCalibratePotisDisplay::stop()
+{
+    if (m_early_return)
+    {
+        setup::unlock();
+    }
+
+    Base::stop();
+}
+
+void SetupCalibratePotisDisplay::buttonPressed(espgui::Button button)
+{
+    Base::buttonPressed(button);
+
+    switch (button)
+    {
+        using espgui::Button;
+    case Button::Up:
+        m_selectedButton--;
+
+        if (m_selectedButton < 0)
+            m_selectedButton = 1;
+
+        break;
+    case Button::Down:
+        m_selectedButton++;
+
+        if (m_selectedButton > 1)
+            m_selectedButton = 0;
+
+        break;
+    case Button::Left:
+    back:
+        switch (m_status)
+        {
+        case Status::Begin:
+            if (m_early_return)
+                espgui::popScreen();
+            else
+                espgui::switchScreen<SetupAskSetupCloudsDisplay>();
+            break;
+#ifdef FEATURE_JOYSTICK
+            case Status::Mitte:
+#endif
+        case Status::GasMin:
+        case Status::GasMax:
+        case Status::BremsMin:
+        case Status::BremsMax:
+        case Status::Confirm:
+            m_selectedButton = 0;
+            m_status = Status::Begin;
+            copyFromSettings();
+        }
+
+        break;
+    case Button::Right:
+        switch (m_selectedButton)
+        {
+        case 0: // left button pressed
+            if (!raw_gas || !raw_brems || !m_gas || !m_brems)
+                return;
+
+            switch (m_status)
+            {
+#ifndef FEATURE_JOYSTICK
+            case Status::Begin:
+                m_status = Status::GasMin;
+                break;
+#else
+                case Status::Begin:
+                m_status = Status::Mitte;
+                break;
+
+            case Status::Mitte:
+                m_gasMitte = *raw_gas;
+                m_bremsMitte = *raw_brems;
+                m_status = Status::GasMin;
+                break;
+#endif
+            case Status::GasMin:
+                m_gasMin = *raw_gas;
+                m_status = Status::GasMax;
+                break;
+            case Status::GasMax:
+                m_gasMax = *raw_gas;
+                m_status = Status::BremsMin;
+                {
+                    const auto dead = (m_gasMax - m_gasMin)/20;
+                    m_gasMin += dead;
+                    m_gasMax -= dead;
+                }
+                break;
+            case Status::BremsMin:
+                m_bremsMin = *raw_brems;
+                m_status = Status::BremsMax;
+                break;
+            case Status::BremsMax:
+                m_bremsMax = *raw_brems;
+                m_status = Status::Confirm;
+                {
+                    const auto dead = (m_bremsMax - m_bremsMin)/20;
+                    m_bremsMin += dead;
+                    m_bremsMax -= dead;
+                }
+                break;
+            case Status::Confirm:
+                if (*m_gas > 100 || *m_brems > 100)
+                    return;
+
+                copyToSettings();
+
+                if (m_early_return)
+                    espgui::popScreen();
+                else
+                    espgui::switchScreen<SetupAskSetupCloudsDisplay>();
+            }
+            break;
+        case 1: // right button pressed
+            goto back;
+        }
+        break;
+    }
+};
+
+std::string SetupCalibratePotisDisplay::text() const
+{
+    return "Calibrate Potis";
+}
+
+void SetupCalibratePotisDisplay::copyFromSettings()
+{
+#ifdef FEATURE_JOYSTICK
+    m_gasMitte = configs.gasMitte.value();
+    m_bremsMitte = configs.bremsMitte.value();
+#endif
+    m_gasMin = configs.gasMin.value();
+    m_gasMax = configs.gasMax.value();
+    m_bremsMin = configs.bremsMin.value();
+    m_bremsMax = configs.bremsMax.value();
+}
+
+void SetupCalibratePotisDisplay::copyToSettings() const
+{
+#ifdef FEATURE_JOYSTICK
+    configs.write_config(configs.gasMitte, m_gasMitte);
+    configs.write_config(configs.bremsMitte, m_bremsMitte);
+#endif
+    configs.write_config(configs.gasMin, m_gasMin);
+    configs.write_config(configs.gasMax, m_gasMax);
+    configs.write_config(configs.bremsMin, m_bremsMin);
+    configs.write_config(configs.bremsMax, m_bremsMax);
+}
--- a/main/displays/setup/calibrate_potis.h
+++ b/main/displays/setup/calibrate_potis.h
@ -0,0 +1,86 @@
+#pragma once
+
+// system includes
+#include <array>
+#include <optional>
+
+// 3rdparty lib includes
+#include <widgets/label.h>
+#include <widgets/progressbar.h>
+
+// local includes
+#include "displays/bobbydisplaywithtitle.h"
+
+class SetupCalibratePotisDisplay : public virtual BobbyDisplayWithTitle
+{
+    using Base = BobbyDisplayWithTitle;
+public:
+    explicit SetupCalibratePotisDisplay(bool early_return = false) :
+            m_early_return{early_return}
+    {}
+
+    void initScreen() override;
+    void start() override;
+    void update() override;
+    void redraw() override;
+    void stop() override;
+
+    void buttonPressed(espgui::Button button) override;
+
+    [[nodiscard]] std::string text() const override;
+
+private:
+    void copyFromSettings();
+    void copyToSettings() const;
+
+    const bool m_early_return;
+
+    std::array<espgui::Label, 11> m_labels {{
+        espgui::Label{25, 72}, // 100, 23
+        espgui::Label{145, 72}, // 100, 23
+        espgui::Label{25, 97}, // 100, 23
+        espgui::Label{145, 97}, // 100, 23
+
+        espgui::Label{25, 172}, // 100, 23
+        espgui::Label{145, 172}, // 100, 23
+        espgui::Label{25, 197}, // 100, 23
+        espgui::Label{145, 197}, // 100, 23
+
+        espgui::Label{25, 247}, // 190, 23
+
+        espgui::Label{25, 277}, // 100, 23
+        espgui::Label{145, 277}, // 100, 23
+    }};
+
+    std::array<espgui::ProgressBar, 2> m_progressBars {{
+        espgui::ProgressBar{20, 129, 200, 10, 0, 1000},
+        espgui::ProgressBar{20, 229, 200, 10, 0, 1000}
+    }};
+
+    enum Status {
+        Begin,
+#ifdef FEATURE_JOYSTICK
+        Mitte,
+#endif
+        GasMin,
+        GasMax,
+        BremsMin,
+        BremsMax,
+        Confirm
+    };
+
+    int8_t m_selectedButton, m_renderedButton;
+
+    Status m_status;
+    int16_t
+            m_gasMin,
+            m_gasMax,
+            m_bremsMin,
+            m_bremsMax
+#ifdef FEATURE_JOYSTICK
+    ,m_gasMitte
+        ,m_bremsMitte
+#endif
+    ;
+    std::optional<float> m_gas, m_brems;
+};
--- a/main/displays/setup/final_information.cpp
+++ b/main/displays/setup/final_information.cpp
@ -0,0 +1,58 @@
+#include "final_information.h"
+
+// 3rdparty lib includes
+#include <screenmanager.h>
+
+// local includes
+#include "displays/menus/extrabuttoncalibratemenu.h"
+#include "displays/statusdisplay.h"
+#include "newsettings.h"
+#include "setup.h"
+#include "utils.h"
+
+using namespace std::chrono_literals;
+
+namespace {
+constexpr char const finalInformationText[] = "Setup is done!\nIf cloud is setup, go to\nhttps://service.bobbycar.cloud/\nand register this bobbycar!\nThis is also used\nto setup udp cloud.\nPress any button to exit.";
+} // namespace
+
+void SetupFinalInformationDisplay::initScreen()
+{
+    Base::initScreen();
+
+    drawLargeText(finalInformationText);
+}
+
+void SetupFinalInformationDisplay::start()
+{
+    Base::start();
+
+    setup::lock();
+}
+
+void SetupFinalInformationDisplay::stop()
+{
+    Base::stop();
+
+    setup::unlock();
+}
+
+void SetupFinalInformationDisplay::buttonPressed(espgui::Button button)
+{
+    configs.write_config(configs.boardcomputerHardware.setupFinished, true);
+    if (espgui::displayStack.empty())
+    {
+        espgui::switchScreen<StatusDisplay>();
+    }
+    else
+    {
+        espgui::popScreen();
+    }
+
+    Base::buttonPressed(button);
+}
+
+std::string SetupFinalInformationDisplay::text() const
+{
+    return "All done!";
+}
--- a/main/displays/setup/final_information.h
+++ b/main/displays/setup/final_information.h
@ -0,0 +1,20 @@
+#pragma once
+
+// 3rdparty lib includes
+#include <espchrono.h>
+
+// local includes
+#include "displays/bobbydisplaywithtitle.h"
+
+class SetupFinalInformationDisplay : public virtual BobbyDisplayWithTitle
+{
+    using Base = BobbyDisplayWithTitle;
+public:
+    void initScreen() override;
+    void start() override;
+    void stop() override;
+
+    void buttonPressed(espgui::Button button) override;
+
+    [[nodiscard]] std::string text() const override;
+};
--- a/main/displays/setup/information.cpp
+++ b/main/displays/setup/information.cpp
@ -0,0 +1,64 @@
+#include "information.h"
+
+// 3rdparty lib includes
+#include <screenmanager.h>
+
+// local includes
+#include "displays/setup/basic_buttons.h"
+#include "setup.h"
+#include "utils.h"
+
+using namespace std::chrono_literals;
+
+namespace {
+constexpr char const informationText[] = "Congratulations on your new\nbobbycar! This guide will help\nyou through initial setup,\ncalibrate everything and\nget you ready!";
+} // namespace
+
+void SetupInformationDisplay::initScreen()
+{
+    Base::initScreen();
+
+    m_init_text_progressbar.start();
+
+    drawLargeText(informationText);
+}
+
+void SetupInformationDisplay::start()
+{
+    Base::start();
+
+    setup::lock();
+
+    m_menu_opened_timestamp = espchrono::millis_clock::now();
+}
+
+void SetupInformationDisplay::update()
+{
+    if (espchrono::ago(m_menu_opened_timestamp) > 5s)
+    {
+        espgui::switchScreen<SetupBasicButtonsDisplay>();
+    }
+
+    Base::update();
+}
+
+void SetupInformationDisplay::redraw()
+{
+    m_init_text_progressbar.redraw(espchrono::ago(m_menu_opened_timestamp) / 50ms);
+
+    Base::redraw();
+}
+
+void SetupInformationDisplay::buttonPressed(espgui::Button button)
+{
+    if (espchrono::ago(m_menu_opened_timestamp) > 500ms)
+    {
+        espgui::switchScreen<SetupBasicButtonsDisplay>();
+    }
+}
+
+[[nodiscard]] std::string SetupInformationDisplay::text() const
+{
+    return "First Steps";
+}
+
--- a/main/displays/setup/information.h
+++ b/main/displays/setup/information.h
@ -0,0 +1,26 @@
+#pragma once
+
+// 3rdparty lib includes
+#include <espchrono.h>
+#include <tftinstance.h>
+#include <widgets/progressbar.h>
+
+// local includes
+#include "displays/bobbydisplaywithtitle.h"
+
+class SetupInformationDisplay : public virtual BobbyDisplayWithTitle
+{
+    using Base = BobbyDisplayWithTitle;
+public:
+    void initScreen() override;
+    void start() override;
+    void update() override;
+    void redraw() override;
+
+    void buttonPressed(espgui::Button button) override;
+
+    [[nodiscard]] std::string text() const override;
+private:
+    espchrono::millis_clock::time_point m_menu_opened_timestamp;
+    espgui::ProgressBar m_init_text_progressbar{10, espgui::tft.height()/2, espgui::tft.width()-20, 30, 0, 100};
+};
--- a/main/displays/setup/setup_cloud.cpp
+++ b/main/displays/setup/setup_cloud.cpp
@ -0,0 +1,103 @@
+#include "setup_cloud.h"
+
+// 3rdparty lib includes
+#include <actions/popscreenaction.h>
+#include <actions/pushscreenaction.h>
+#include <changevaluedisplay_string.h>
+
+// local includes
+#include "accessors/settingsaccessors.h"
+#include "bobbycheckbox.h"
+#include "displays/bobbychangevaluedisplay.h"
+#include "displays/setup/ask_calibrate_other_buttons.h"
+#include "setup.h"
+
+using namespace espgui;
+
+namespace {
+constexpr const char TEXT_ENABLE_CLOUD[] = "Enable Cloud";
+constexpr const char TEXT_CLOUD_USERNAME[] = "Cloud Username";
+constexpr const char TEXT_CLOUD_URL[] = "Cloud URL";
+constexpr const char TEXT_CLOUD_KEY[] = "Cloud Key";
+constexpr const char TEXT_DONE[] = "Done";
+
+using CloudUsernameChangeScreen = espgui::makeComponent<
+    BobbyChangeValueDisplay<std::string>,
+    espgui::StaticText<TEXT_CLOUD_USERNAME>,
+    UsernameAccessor,
+    espgui::ConfirmActionInterface<espgui::PopScreenAction>,
+    espgui::BackActionInterface<espgui::PopScreenAction>
+>;
+
+using CloudURLChangeScreen = espgui::makeComponent<
+    BobbyChangeValueDisplay<std::string>,
+    espgui::StaticText<TEXT_CLOUD_URL>,
+    CloudURLAccessor,
+    espgui::ConfirmActionInterface<espgui::PopScreenAction>,
+    espgui::BackActionInterface<espgui::PopScreenAction>
+>;
+
+using CloudKeyChangeScreen = espgui::makeComponent<
+    BobbyChangeValueDisplay<std::string>,
+    espgui::StaticText<TEXT_CLOUD_KEY>,
+    CloudKeyAccessor,
+    espgui::ConfirmActionInterface<espgui::PopScreenAction>,
+    espgui::BackActionInterface<espgui::PopScreenAction>
+>; // cloud setup
+
+template<bool early_return>
+class CloudSetupFinishedAction : public virtual ActionInterface
+{
+public:
+    void triggered() override
+    {
+        if (early_return)
+        {
+            espgui::popScreen();
+        }
+        else
+        {
+            espgui::switchScreen<SetupAskCalibrateOtherButtonsDisplay>();
+        }
+    }
+};
+} // namespace
+
+SetupCloudDisplay::SetupCloudDisplay(const bool early_return) : m_early_return{early_return}
+{
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ENABLE_CLOUD>, BobbyCheckbox, CloudEnabledAccessor>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CLOUD_USERNAME>, PushScreenAction<CloudUsernameChangeScreen>>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CLOUD_URL>, PushScreenAction<CloudURLChangeScreen>>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CLOUD_KEY>, PushScreenAction<CloudKeyChangeScreen>>>();
+
+    if (early_return)
+        constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DONE>, CloudSetupFinishedAction<true>>>();
+    else
+        constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DONE>, CloudSetupFinishedAction<false>>>();
+}
+
+void SetupCloudDisplay::start()
+{
+    Base::start();
+
+    setup::lock();
+}
+
+void SetupCloudDisplay::stop()
+{
+    if (m_early_return)
+    {
+        setup::unlock();
+    }
+
+    Base::stop();
+}
+
+void SetupCloudDisplay::back()
+{}
+
+std::string SetupCloudDisplay::text() const
+{
+    return "WebSocket Cloud";
+}
+
--- a/main/displays/setup/setup_cloud.h
+++ b/main/displays/setup/setup_cloud.h
@ -0,0 +1,20 @@
+#pragma once
+
+// local includes
+#include "displays/bobbymenudisplay.h"
+
+class SetupCloudDisplay : public virtual BobbyMenuDisplay
+{
+    using Base = BobbyMenuDisplay;
+public:
+    explicit SetupCloudDisplay(bool early_return = false);
+
+    void start() override;
+    void stop() override;
+
+    void back() override;
+
+    [[nodiscard]] std::string text() const override;
+private:
+    const bool m_early_return;
+};
--- a/main/displays/spirodisplay.cpp
+++ b/main/displays/spirodisplay.cpp
@ -7,6 +7,9 @@
 #include <screenmanager.h>
 #include <tftinstance.h>

+// local includes
+#include "screens.h"
+
 namespace {
 typedef unsigned char byte;
 } // namespace
@ -15,6 +18,7 @@ void SpiroDisplay::initScreen()
 {
    Base::initScreen();

+    disableScreenFlip(true);
    espgui::tft.setRotation(3);
 }

@ -79,7 +83,7 @@ void SpiroDisplay::stop()
 {
    Base::stop();

-    espgui::tft.setRotation(0);
+    disableScreenFlip(false);
 }

 void SpiroDisplay::buttonPressed(espgui::Button button)
--- a/main/displays/starfielddisplay.cpp
+++ b/main/displays/starfielddisplay.cpp
@ -7,8 +7,9 @@
 #include <screenmanager.h>

 // local includes
-#include "globals.h"
 #include "displays/menus/demosmenu.h"
+#include "globals.h"
+#include "screens.h"

 StarfieldDisplay::StarfieldDisplay() :
    za(cpputils::randomNumber<uint8_t>(espcpputils::esp_random_device{})),
@ -22,6 +23,8 @@ void StarfieldDisplay::initScreen()
 {
    Base::initScreen();

+    disableScreenFlip(true);
+
    espgui::tft.fillScreen(TFT_BLACK);
    espgui::tft.setRotation(1);

@ -75,8 +78,7 @@ void StarfieldDisplay::redraw()
 void StarfieldDisplay::stop()
 {
    Base::stop();
-
-    espgui::tft.setRotation(0);
+    disableScreenFlip(false);
 }

 void StarfieldDisplay::buttonPressed(espgui::Button button)
--- a/main/espnowfunctions.cpp
+++ b/main/espnowfunctions.cpp
@ -53,7 +53,7 @@ bool espnow_init_allowed()
 }

 namespace {
-extern "C" void onReceive(const uint8_t *mac_addr, const uint8_t *data, int data_len)
+extern "C" void onReceive(const esp_now_recv_info* info, const uint8_t *data, int data_len)
 {
    ESP_LOGD(TAG, "Received data");
    const std::string_view data_str{(const char *)data, size_t(data_len)};
--- a/main/esptexthelpers.h
+++ b/main/esptexthelpers.h
@ -1,18 +1,19 @@
 #pragma once

 // esp-idf includes
-#include <esp_heap_caps.h>
 #include <esp_chip_info.h>
+#include <esp_heap_caps.h>
 #include <esp_idf_version.h>

 // 3rdparty lib includes
-#include <fmt/core.h>
 #include <espstrutils.h>
+#include <fmt/core.h>

 // local includes
-#include "globals.h"
 #include "can.h"
+#include "globals.h"
 #include "textinterface.h"
+#include "utils.h"

 //template<const char *Ttext, typename TreturnType, TreturnType (EspClass::*Tmethod)()>
 //using EspStatusTextHelper = StatusTextHelper<Ttext, EspClass, &ESP, TreturnType, Tmethod>;
@ -54,6 +55,11 @@ class EspChipRevisionText : public virtual espgui::TextInterface { public: std::
    return fmt::format("{}{}", TEXT_ESPCHIPREVISION, chip_info.revision);
 }};

+constexpr char TEXT_ESPCHIPMODEL[] = "Chip Model: ";
+class EspChipModelText : public virtual espgui::TextInterface { public: std::string text() const override {
+        return fmt::format("{}{}", TEXT_ESPCHIPMODEL, toString(chip_info.model));
+    }};
+
 constexpr char TEXT_ESPMAXCPUFREQMHZ[] = "Cpu max freq MHz: ";
 class EspCpuMaxFreqMHzText : public virtual espgui::TextInterface { public: std::string text() const override {
    return fmt::format("{}{}", TEXT_ESPMAXCPUFREQMHZ, pm_config.max_freq_mhz);
--- a/main/globals.cpp
+++ b/main/globals.cpp
@ -15,8 +15,12 @@ float gametrakDist;
 float avgSpeed{};
 float avgSpeedKmh{};
 float sumCurrent{};
+float lastAvgSpeedKmh{};
+float avgAccel{};
 bool isLocked{};

+espchrono::millis_clock::time_point lastAvgSpeedKmhTs{};
+
 std::optional<int> sunrise;
 std::optional<int> sunset;
 std::optional<espchrono::DateTime> sunrise_dt;
--- a/main/globals.h
+++ b/main/globals.h
@ -53,8 +53,12 @@ extern esp_pm_config_esp32_t pm_config;

 extern float avgSpeed;
 extern float avgSpeedKmh;
+extern float lastAvgSpeedKmh;
+extern float avgAccel;
 extern float sumCurrent;

+extern espchrono::millis_clock::time_point lastAvgSpeedKmhTs;
+
 extern bool isLocked;

 #ifdef GLOBALS_PLUGIN
--- a/main/ledstrip.cpp
+++ b/main/ledstrip.cpp
@ -19,10 +19,53 @@ std::vector<CRGB> leds;
 uint8_t gHue = 0;
 float gLedPosition = 0; // yes, this is intendet as a float value! Do NOT change!

+bool brakeLightsStatus;
+
+espchrono::millis_clock::time_point brakeLightTimer;
+
 uint16_t blinkAnimation = LEDSTRIP_OVERWRITE_NONE;

 namespace {
-    bool initialized{false};
+bool initialized{false};
+
+bool brakeLights()
+{
+    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)
+    {
+        return true;
+    }
+
+    if (configs.ledstrip.brakeLights_useAccel.value() && (avgAccel < -0.001f && avgSpeedKmh > 2.f))
+    {
+        return true;
+    }
+
+    if (espchrono::ago(brakeLightTimer) < 200ms)
+    {
+        return true;
+    }
+
+    if (configs.ledstrip.brakeLights_usePower.value() && brakeLightsStatus)
+    {
+        if (const auto avgVoltage = controllers.getAvgVoltage(); avgVoltage)
+        {
+            const auto watt = sumCurrent * *avgVoltage;
+
+            return watt < -1;
+        }
+    }
+
+    return false;
+}
 } // namespace

 void initLedStrip()
@ -140,20 +183,17 @@ void updateLedStrip()
    {
        if (configs.ledstrip.enableBrakeLights.value())
        {
-            float avgPwm{};
-            for (const Controller &controller : controllers)
+            // avgAccel in m/s/s
+            if (brakeLights())
            {
-                avgPwm +=
-                    controller.command.left.pwm * (controller.invertLeft ? -1 : 1) +
-                    controller.command.right.pwm * (controller.invertRight ? -1 : 1);
-            }
-            avgPwm /= 4;
+                if (!(espchrono::ago(brakeLightTimer) < 200ms))
+                {
+                    brakeLightTimer = espchrono::millis_clock::now();
+                }

-            if (avgPwm < -1.f)
-            {
                auto color = avgSpeedKmh < -0.1f ? CRGB{255, 255, 255} : CRGB{255, 0, 0};

-                const auto center = (std::begin(leds) + (leds.size() / 2) + configs.ledstrip.centerOffset.value());
+                brakeLightsStatus = true;

                std::fill(std::begin(leds), std::end(leds), CRGB{0, 0, 0});
                if (configs.ledstrip.enableFullBlink.value())
@ -162,12 +202,15 @@ void updateLedStrip()
                }
                else if(!configs.ledstrip.enableAnimBlink.value())
                {
+                    const auto center = (std::begin(leds) + (leds.size() / 2) + configs.ledstrip.centerOffset.value());
+
                    std::fill(center - configs.ledstrip.bigOffset.value() - 2, center - configs.ledstrip.smallOffset.value() + 2, color);
                    std::fill(center + configs.ledstrip.smallOffset.value() - 2, center + configs.ledstrip.bigOffset.value() + 2, color);
                }
            }
            else
            {
+                brakeLightsStatus = false;
                showAnimation();
            }
        }
--- a/main/ledstrip.h
+++ b/main/ledstrip.h
@ -4,6 +4,7 @@
 #include <vector>

 // 3rdparty lib includes
+#include <espchrono.h>
 #include <FastLED.h>

 // local includes
@ -44,6 +45,10 @@ extern float gLedPosition; // yes, this is intendet as a float value! Do NOT cha

 extern uint16_t blinkAnimation;

+extern bool brakeLightsStatus;
+
+extern espchrono::millis_clock::time_point brakeLightTimer;
+
 void showDefaultLedstrip();
 void showAnimation();
 void showBetterRainbow();
--- a/main/main.cpp
+++ b/main/main.cpp
@ -31,14 +31,20 @@ using namespace std::chrono_literals;
 #else
 #include "modes/defaultmode.h"
 #endif
-#include "displays/buttoncalibratedisplay.h"
 #include "displays/lockscreen.h"
 #include "displays/menus/recoverymenu.h"
 #include "displays/potiscalibratedisplay.h"
+#include "displays/setup/information.h"
+#include "displays/setup/basic_buttons.h"
+#include "displays/setup/calibrate_potis.h"
 #include "displays/statusdisplay.h"
 #include "newsettings.h"
 #include "taskmanager.h"

+#define BOOT_PROGRESS(s) \
+    bootLabel.redraw(s); \
+    ESP_LOGI("BOOT", "%s", s);
+
 namespace {
 espchrono::millis_clock::time_point lastStatsPush;
 std::optional<espchrono::millis_clock::time_point> lastStatsUpdate;
@ -94,7 +100,7 @@ extern "C" void app_main()
        recovery = true;
    }

-    bootLabel.redraw("settings");
+    BOOT_PROGRESS("settings");

    if (const auto result = configs.init("bobbycar"); result != ESP_OK)
        ESP_LOGE(TAG, "config_init_settings() failed with %s", esp_err_to_name(result));
@ -117,7 +123,7 @@ extern "C" void app_main()
    {
        if (checkEnabledByName(task.name()))
        {
-            bootLabel.redraw(task.name());
+            BOOT_PROGRESS(task.name());
            task.setup(false);
        }
    }
@ -128,33 +134,43 @@ extern "C" void app_main()
    currentMode = &modes::defaultMode;
 #endif

-    bootLabel.redraw("switchScreen");
+    BOOT_PROGRESS("switchScreen");

-    if (configs.dpadMappingLeft.value() == INPUT_MAPPING_NONE ||
-        configs.dpadMappingRight.value() == INPUT_MAPPING_NONE ||
-        configs.dpadMappingUp.value() == INPUT_MAPPING_NONE ||
-        configs.dpadMappingDown.value() == INPUT_MAPPING_NONE)
+    if (const auto result = checkIfInCalibration(); result)
    {
-        espgui::switchScreen<ButtonCalibrateDisplay>(true);
+        switch(*result)
+        {
+        case SetupStep::INFORMATION:
+            BOOT_PROGRESS("Calibtration");
+            espgui::switchScreen<SetupInformationDisplay>();
+            break;
+        case SetupStep::BASIC_BUTTONS:
+            BOOT_PROGRESS("Calibtration");
+            espgui::switchScreen<SetupBasicButtonsDisplay>(true);
+            break;
+        case SetupStep::CALIBRATE_POTIS:
+            espgui::switchScreen<SetupCalibratePotisDisplay>(true);
+            break;
+        default:;
+        }
    }
    else if (configs.lockscreen.keepLockedAfterReboot.value() && configs.lockscreen.locked.value())
    {
+        BOOT_PROGRESS("Locked");
        espgui::switchScreen<StatusDisplay>();
        espgui::pushScreen<Lockscreen>();
    }
    else
    {
-        if (!gas || !brems || *gas > 200.f || *brems > 200.f)
-            espgui::switchScreen<PotisCalibrateDisplay>(true);
-        else
-        {
-            espgui::switchScreen<StatusDisplay>();
-        }
+        BOOT_PROGRESS("StatusDisplay")
+        espgui::switchScreen<StatusDisplay>();
    }

    esp_chip_info(&chip_info);
    esp_pm_get_configuration(&pm_config);

+    ESP_LOGI(TAG, "Entering main loop...");
+
    while (true)
    {
        const auto now = espchrono::millis_clock::now();
--- a/main/newsettings.h
+++ b/main/newsettings.h
@ -364,7 +364,8 @@ public:
            ConfigWrapperLegacy<int16_t> cloudSendRate  {1,                                      DoReset,   {},                         "cloudSendRate"       };
            ConfigWrapperLegacy<int16_t> udpSendRateMs  {65,                                     DoReset,   {},                         "udpSendRate"         };
        } timersSettings;
-        ConfigWrapperLegacy<bool>    flipScreen         {false,                                  DoReset,   {},                         "flipScreen"          };
+        ConfigWrapperLegacy<bool> flipScreen            {false,                                  NoReset,   {},                         "flipScreen"          };
+        ConfigWrapperLegacy<bool> setupFinished         {false,                                  DoReset,   {},                         "setupFinished"       };
    } boardcomputerHardware;

    struct {
@ -414,6 +415,8 @@ public:
        };
        ConfigWrapperLegacy<uint8_t> leds_per_meter     {144,                                    DoReset,   {},                         "ledsPerMeter"        };
        ConfigWrapperLegacy<bool> automaticLight        {false,                                  DoReset,   {},                         "nightLights"         };
+        ConfigWrapperLegacy<bool> brakeLights_useAccel  {false,                                  DoReset,   {},                         "brakeLightsA"    };
+        ConfigWrapperLegacy<bool> brakeLights_usePower  {false,                                  DoReset,   {},                         "brakeLightsP"    };
    } ledstrip;

    struct {
@ -487,6 +490,8 @@ public:
        ConfigWrapperLegacy<bool> bleFenceEnabled       {false,                                  DoReset,   {},                         "bleFenceEnabled"     };
    } bleSettings;

+    ConfigWrapperLegacy<bool> setupDone             {false,                                      DoReset,   {},                         "setupDone"           };
+
 #define NEW_SETTINGS(x) \
    x(baseMacAddressOverride) \
    x(hostname) \
@ -710,9 +715,10 @@ public:
    x(boardcomputerHardware.timersSettings.statsUpdateRate) \
    x(boardcomputerHardware.timersSettings.cloudCollectRate) \
    x(boardcomputerHardware.timersSettings.cloudSendRate) \
-    x(boardcomputerHardware.timersSettings.udpSendRateMs)   \
+    x(boardcomputerHardware.timersSettings.udpSendRateMs) \
    \
    x(boardcomputerHardware.flipScreen) \
+    x(boardcomputerHardware.setupFinished) \
    \
    x(cloudSettings.cloudEnabled) \
    x(cloudSettings.cloudTransmitTimeout) \
@ -745,6 +751,8 @@ public:
    x(ledstrip.maxMilliamps) \
    x(ledstrip.enableVisualizeBlink)\
    x(ledstrip.automaticLight) \
+    x(ledstrip.brakeLights_useAccel) \
+    x(ledstrip.brakeLights_usePower) \
    \
    x(ledstrip.custom_color[0]) \
    x(ledstrip.custom_color[1]) \
--- a/main/potis.cpp
+++ b/main/potis.cpp
@ -73,6 +73,18 @@ void readPotis()
 //              sum += analogRead(pin);
 //          return sum / sampleCount;
 //    };
+    constexpr auto sampleMultipleTimes = [](adc_channel_t channel){
+        int sum{};
+        const auto sampleCount = configs.sampleCount.value();
+        for (int i = 0; i < sampleCount; i++)
+        {
+            int value;
+            if (const auto result = adc_oneshot_read(adc1_handle, channel, &value); result != ESP_OK)
+                ESP_LOGE(TAG, "adc_oneshot_read_channel() failed with %s", esp_err_to_name(result));
+            sum += value;
+        }
+        return sum / sampleCount;
+    };

    raw_gas = std::nullopt;
    raw_brems = std::nullopt;
@ -100,19 +112,13 @@ void readPotis()
 #ifdef FEATURE_ADC_IN
    if (!raw_gas)
    {
-        int raw;
-        if (const auto result = adc_oneshot_read(adc1_handle, ADC_CHANNEL_GAS, &raw); result == ESP_OK)
-            raw_gas = raw;
-        else
-            ESP_LOGE(TAG, "adc_oneshot_read() failed with %s", esp_err_to_name(result));
+        raw_gas = sampleMultipleTimes(ADC_CHANNEL_GAS);
+        ESP_LOGD(TAG, "raw_gas: %d", *raw_gas);
    }
    if (!raw_brems)
    {
-        int raw;
-        if (const auto result = adc_oneshot_read(adc1_handle, ADC_CHANNEL_BREMS, &raw); result == ESP_OK)
-            raw_brems = raw;
-        else
-            ESP_LOGE(TAG, "adc_oneshot_read() failed with %s", esp_err_to_name(result));
+        raw_brems = sampleMultipleTimes(ADC_CHANNEL_BREMS);
+        ESP_LOGD(TAG, "raw_brems: %d", *raw_brems);
    }
 #endif

--- a/main/screens.cpp
+++ b/main/screens.cpp
@ -13,6 +13,10 @@ using namespace espgui;

 Label bootLabel{32, 250};

+namespace {
+bool disable_screen_flip{false};
+}
+
 void initScreen()
 {
    // vertical screen
@ -54,7 +58,8 @@ void updateDisplay()
        changeScreenCallback = {};
    }

-    updateRotation();
+    if (!disable_screen_flip)
+        updateRotation();

    if (const int8_t rawButton = rawButtonRequest.load(); rawButton != -1 && currentDisplay)
    {
@ -85,3 +90,8 @@ void redrawDisplay()
        currentDisplay->redraw();
    }
 }
+
+void disableScreenFlip(bool enable)
+{
+    disable_screen_flip = enable;
+}
--- a/main/screens.h
+++ b/main/screens.h
@ -9,3 +9,4 @@ void initScreen();
 void updateDisplay();
 void updateRotation();
 void redrawDisplay();
+void disableScreenFlip(bool enable);
--- a/main/setup.cpp
+++ b/main/setup.cpp
@ -0,0 +1,39 @@
+#include "setup.h"
+
+// local includes
+#include "globals.h"
+
+namespace setup {
+bool currently_locked;
+ModeInterface* oldMode;
+IgnoreInputMode setup_mode{0, bobbycar::protocol::ControlType::FieldOrientedControl, bobbycar::protocol::ControlMode::Torque};
+
+void lock()
+{
+    if (currently_locked)
+        return;
+
+    oldMode = currentMode;
+    currentMode = &setup_mode;
+}
+
+void unlock()
+{
+    if (!currently_locked)
+        return;
+
+    if (currentMode == &setup_mode)
+    {
+        // to avoid crash after deconstruction
+        setup_mode.stop();
+        lastMode = nullptr;
+
+        currentMode = oldMode;
+    }
+}
+
+bool isLocked()
+{
+    return currently_locked;
+}
+} // namespace setup
--- a/main/setup.h
+++ b/main/setup.h
@ -0,0 +1,23 @@
+#pragma once
+
+// local includes
+#include "bobbytypesafeenum.h"
+#include "modeinterface.h"
+#include "modes/ignoreinputmode.h"
+
+#define SetupStepValues(x) \
+    x(INFORMATION) \
+    x(BASIC_BUTTONS) \
+    x(CALIBRATE_POTIS)
+
+DECLARE_BOBBYTYPESAFE_ENUM(SetupStep, : uint8_t, SetupStepValues);
+
+namespace setup {
+extern bool currently_locked;
+extern ModeInterface* oldMode;
+extern IgnoreInputMode setup_mode;
+
+void lock();
+void unlock();
+bool isLocked();
+} // namespace setup
--- a/main/statistics.cpp
+++ b/main/statistics.cpp
@ -1,7 +1,7 @@
 #include "statistics.h"

 namespace statistics {
-ContainerType gas, brems, avgSpeed, avgSpeedKmh, sumCurrent, frontVoltage, backVoltage, frontLeftCurrent, frontRightCurrent, backLeftCurrent, backRightCurrent,
+ContainerType raw_gas, raw_brems, gas, brems, avgSpeed, avgSpeedKmh, sumCurrent, frontVoltage, backVoltage, frontLeftCurrent, frontRightCurrent, backLeftCurrent, backRightCurrent,
 #ifdef FEATURE_BMS
    bmsVoltage, bmsCurrent, bmsPower,
 #endif
@ -10,6 +10,10 @@ ContainerType gas, brems, avgSpeed, avgSpeedKmh, sumCurrent, frontVoltage, backV

 void pushStats()
 {
+    if (raw_gas)
+        statistics::raw_gas.push_back(*raw_gas);
+    if (raw_brems)
+        statistics::raw_brems.push_back(*raw_brems);
    if (gas)
        statistics::gas.push_back(*gas);
    if (brems)
--- a/main/statistics.h
+++ b/main/statistics.h
@ -11,7 +11,7 @@

 namespace statistics {
 using ContainerType = ring_buffer<float, 200>;
-extern ContainerType gas, brems, avgSpeed, avgSpeedKmh, sumCurrent, frontVoltage, backVoltage, frontLeftCurrent, frontRightCurrent, backLeftCurrent, backRightCurrent,
+extern ContainerType raw_gas, raw_brems, gas, brems, avgSpeed, avgSpeedKmh, sumCurrent, frontVoltage, backVoltage, frontLeftCurrent, frontRightCurrent, backLeftCurrent, backRightCurrent,
 #ifdef FEATURE_BMS
    bmsVoltage, bmsCurrent, bmsPower,
 #endif
@ -33,6 +33,8 @@ public:
    const statistics::ContainerType &getBuffer() const override { return T; }
 };

+using RawGasStatistics = BufferAccessorImpl<statistics::raw_gas>;
+using RawBremsStatistics = BufferAccessorImpl<statistics::raw_brems>;
 using GasStatistics = BufferAccessorImpl<statistics::gas>;
 using BremsStatistics = BufferAccessorImpl<statistics::brems>;
 using AvgSpeedStatistics = BufferAccessorImpl<statistics::avgSpeed>;
--- a/main/taskmanager.cpp
+++ b/main/taskmanager.cpp
@ -84,12 +84,12 @@ BobbySchedulerTask schedulerTasksArr[] {
    BobbySchedulerTask { "ledstrip",       initLedStrip,          updateLedStrip,          30ms, false },
    BobbySchedulerTask { "espnow",         espnow::initESPNow,    espnow::handle,          100ms, false },
    BobbySchedulerTask { "cloud",          initCloud,             updateCloud,             50ms, false },
-    BobbySchedulerTask { "udpcloud",       udpCloudInit,          udpCloudUpdate,          25ms, false },
+    BobbySchedulerTask { "udpcloud",       udpCloudInit,          udpCloudUpdate,          50ms, false },
    BobbySchedulerTask { "drivingmode",    initDrivingMode,       updateDrivingMode,       20ms, false },
    BobbySchedulerTask { "drivingstatistics", initStatistics,     calculateStatistics,     100ms, false },
    BobbySchedulerTask { "dnsannounce",    init_dns_announce,     handle_dns_announce,     100ms, false },
    BobbySchedulerTask { "updateDisp",     not_needed,            updateDisplay,           20ms, true },
-    BobbySchedulerTask { "redrawDisp",     not_needed,            redrawDisplay,           20ms, true },
+    BobbySchedulerTask { "redrawDisp",     not_needed,            redrawDisplay,           40ms, true },
    BobbySchedulerTask { "feedbackEmulator", feedbackemulator::init, feedbackemulator::update, 500ms, false},
 };
 } // namespace
@ -115,7 +115,7 @@ void sched_pushStats(bool printTasks)
        ESP_LOGI(TAG, "end listing tasks");
 }

-tl::expected<bool, std::string> checkInitializedByName(std::string name)
+tl::expected<bool, std::string> checkInitializedByName(const std::string& name)
 {
    for (auto &schedulerTask : schedulerTasks)
    {
@ -126,7 +126,7 @@ tl::expected<bool, std::string> checkInitializedByName(std::string name)
    return tl::make_unexpected("Task not found: " + std::string{name});
 }

-bool checkEnabledByName(std::string name) {
+bool checkEnabledByName(const std::string& name) {
    bool enabled = true;
    // iterate over all feature flags (runForEveryFeature())
    configs.callForEveryFeature([&](ConfiguredFeatureFlag &feature) {
@ -135,3 +135,14 @@ bool checkEnabledByName(std::string name) {
    });
    return enabled;
 }
+
+void reload_tasks()
+{
+    for (auto &task : schedulerTasks)
+    {
+        if (checkEnabledByName(task.name()) && !task.isInitialized())
+        {
+            task.setup();
+        }
+    }
+}
--- a/main/taskmanager.h
+++ b/main/taskmanager.h
@ -16,6 +16,8 @@ extern const BobbySchedulerTask &drivingModeTask;

 void sched_pushStats(bool printTasks);

-tl::expected<bool, std::string> checkInitializedByName(std::string name);
+tl::expected<bool, std::string> checkInitializedByName(const std::string& name);

-bool checkEnabledByName(std::string name);
+bool checkEnabledByName(const std::string& name);
+
+void reload_tasks();
--- a/main/udpcloud.cpp
+++ b/main/udpcloud.cpp
@ -17,6 +17,7 @@
 #include "drivingstatistics.h"
 #include "globals.h"
 #include "newsettings.h"
+#include "taskmanager.h"
 #include "udpsender.h"
 #include "utils.h"

@ -163,6 +164,7 @@ std::optional<std::string> buildUdpCloudJson()
    }

    doc["__t"] = configs.udpCloudSettings.udpToken.value();
+    doc["per"] = drivingModeTask.callCount();

    std::string buf;
    serializeJson(doc, buf);
@ -241,8 +243,6 @@ void sendUdpCloudPacket()
            ESP_LOGE(TAG, "send to cloud failed: %.*s (ip=%s)", result.error().size(), result.error().data(), wifi_stack::toString(udpCloudIp.u_addr.ip4).c_str());
        }

-        // ESP_LOGI(TAG, "%s", buf.c_str());
-
        visualSendUdpPacket = !visualSendUdpPacket;
    }
 }
--- a/main/utils.cpp
+++ b/main/utils.cpp
@ -3,6 +3,9 @@
 // system includes
 #include <utility>

+// 3rdparty lib includes
+#include <tftinstance.h>
+
 // local includes
 #include "globals.h"
 #include "newsettings.h"
@ -245,6 +248,28 @@ void updateAccumulators()
    sumCurrent = fixCurrent(sumCurrent);

    avgSpeedKmh = convertToKmh(avgSpeed);
+
+    // accel
+    EVERY_N_MILLIS(100)
+    {
+        const auto now = espchrono::millis_clock::now();
+        const auto delta = now - lastAvgSpeedKmhTs;
+        const auto deltaSpeedKmh = avgSpeedKmh - lastAvgSpeedKmh;
+
+        // ESP_LOGI("utils.cpp", "delta: %lli ms, deltaSpeedKmh: %f", delta.count() / 1000, deltaSpeedKmh);
+
+        const auto deltaMilliseconds = delta.count() / 1000.f;
+
+        const auto kmh_s = deltaSpeedKmh / deltaMilliseconds; // km/h / s
+        const auto m_s2 = kmh_s * 1000.f / 3600.f; // m/s^2
+
+        // ESP_LOGI("utils.cpp", "m_s2: %f", m_s2);
+
+        avgAccel = avgAccel * 0.3f + m_s2 * 0.7f;
+
+        lastAvgSpeedKmh = avgSpeedKmh;
+        lastAvgSpeedKmhTs = espchrono::millis_clock::now();
+    }
 }

 float wattToAmpere(float watt) {
@ -359,3 +384,81 @@ bool is_valid_timestamp(espchrono::utc_clock::time_point timestamp)
    using namespace date;
    return timestamp.time_since_epoch() > sys_seconds{sys_days{1_d/January/2000}}.time_since_epoch();
 }
+
+std::string toString(esp_chip_model_t esp_chip_model)
+{
+    switch (esp_chip_model)
+    {
+    case CHIP_ESP32:
+        return "ESP32";
+    case CHIP_ESP32S2:
+        return "ESP32S2";
+    case CHIP_ESP32S3:
+        return "ESP32S3";
+    case CHIP_ESP32C3:
+        return "ESP32C3";
+    case CHIP_ESP32H4:
+        return "ESP32H4";
+    case CHIP_ESP32C2:
+        return "ESP32C2";
+    case CHIP_ESP32C6:
+        return "ESP32C6";
+    default:
+        return "invalid";
+    }
+}
+
+std::optional<SetupStep> checkIfInCalibration()
+{
+    if (!configs.boardcomputerHardware.setupFinished.value())
+    {
+        return SetupStep::INFORMATION;
+    }
+    else if (
+        configs.dpadMappingLeft.value() == INPUT_MAPPING_NONE ||
+        configs.dpadMappingRight.value() == INPUT_MAPPING_NONE ||
+        configs.dpadMappingUp.value() == INPUT_MAPPING_NONE ||
+        configs.dpadMappingDown.value() == INPUT_MAPPING_NONE
+    )
+    {
+        return SetupStep::BASIC_BUTTONS;
+    }
+    else if (!gas || !brems || *gas > 200.f || *brems > 200.f)
+    {
+        return SetupStep::CALIBRATE_POTIS;
+    }
+    return std::nullopt;
+}
+
+void drawLargeText(const std::string&& text)
+{
+    using namespace espgui;
+
+    const auto topMargin = 50;
+    const uint8_t leftMargin = 8;
+    const auto rightMargin = leftMargin;
+    const auto bottomMargin = leftMargin;
+
+    int x = leftMargin + 5;
+    int y = topMargin + 5;
+
+    tft.setTextColor(TFT_WHITE);
+
+    for (char c : text)
+    {
+        if (c == '\n' || x > tft.width() - rightMargin - 10)
+        {
+            x = leftMargin + 5;
+            y += tft.fontHeight(2);
+        }
+
+        if (c != '\n')
+        {
+            const auto addedWidth = tft.drawChar(tft.decodeUTF8(c), x, y, 2);
+            x += addedWidth;
+        }
+
+        if (y >= tft.height() - bottomMargin)
+            break;
+    }
+}
--- a/main/utils.h
+++ b/main/utils.h
@ -46,6 +46,7 @@
 #ifdef DPAD_BOARDCOMPUTER_V2
 #include "dpad_boardcomputer_v2.h"
 #endif
+#include "setup.h"

 extern bool currentlyReverseBeeping;
 extern bool reverseBeepToggle;
@ -100,6 +101,10 @@ std::string get_wifi_security_string(wifi_auth_mode_t authMode);
 float float_map(float x, float in_min, float in_max, float out_min, float out_max);
 bool is_valid_timestamp(espchrono::utc_clock::time_point timestamp);

+std::string toString(esp_chip_model_t esp_chip_model);
+std::optional<SetupStep> checkIfInCalibration();
+void drawLargeText(const std::string&& text);
+
 namespace bobbydpad {
 #ifdef FEATURE_DPAD
 static constexpr const auto ButtonCount = dpad::BUTTON_COUNT;
Author	SHA1	Message	Date
Commander Red	062ea5c2e0	Very important fix	2023-04-14 17:28:26 +02:00
Michael Ehrenreich	1a7e83de83	Merge pull request #400 from bobbycar-graz/update-mick-config Update mick configs	2023-04-04 09:18:51 +02:00
Michael Ehrenreich	69b030268f	Update mick configs	2023-04-04 08:35:14 +02:00
Michael Ehrenreich	b3b45653b5	Merge pull request #399 from bobbycar-graz/fix-open-quickaction Skip empty configs on door open quickaction	2023-04-04 08:32:50 +02:00
Michael Ehrenreich	199a8f1e4e	Skip empty configs on door open quickaction	2023-04-04 07:52:09 +02:00
Michael Ehrenreich	d6c76f3c3f	Merge pull request #398 from bobbycar-graz/fix-build Also build components with C++23	2023-04-04 07:51:00 +02:00
Michael Ehrenreich	0909c055de	Also build components with C++23	2023-04-04 06:27:23 +02:00
CommanderRedYT	52b55b38cd	Merge pull request #391 from bobbycar-graz/add-idf-ver Added idf version to git menu	2022-12-24 16:08:40 +01:00
CommanderRedYT	65d7a7e9ec	Added idf version to git menu	2022-12-24 16:05:13 +01:00
CommanderRedYT	13a6ce3cc2	Merge pull request #390 from bobbycar-graz/update-for-nimble-tests Fixed ble	2022-12-24 16:02:52 +01:00
CommanderRedYT	6bc85875ee	Fixed ble	2022-12-24 15:55:35 +01:00
CommanderRedYT	4688326323	Revert init change	2022-12-24 15:30:05 +01:00
CommanderRedYT	1b7a523acd	Made some modifications	2022-12-24 15:29:45 +01:00
CommanderRedYT	c85e84e9a1	Updated submodules	2022-12-23 00:02:52 +01:00
CommanderRedYT	9e6ee2c957	Merge pull request #389 from bobbycar-graz/accel-brake-lights	2022-12-18 20:32:29 +01:00
CommanderRedYT	d29a74dbd4	Decreased limit	2022-12-18 19:33:37 +01:00
CommanderRedYT	b984360956	Added acceleration and power cause for brake lights	2022-12-18 19:32:41 +01:00
CommanderRedYT	fa819822f0	Removed unused file	2022-12-18 19:31:45 +01:00
CommanderRedYT	52ff7acd02	Added brake light optimizations	2022-12-18 02:31:41 +01:00
CommanderRedYT	b61dfcf53d	Added acceleration detection for brake lights	2022-12-18 00:18:50 +01:00
CommanderRedYT	f6b4966071	Merge pull request #388 from bobbycar-graz/optimizations	2022-12-17 23:25:26 +01:00
CommanderRedYT	a6fb1b7396	Added more stats	2022-10-30 02:47:13 +01:00
CommanderRedYT	fd40d8dbd8	Increase timings	2022-10-30 02:19:41 +02:00
CommanderRedYT	8cf766356c	Do not display so many can messages	2022-10-30 02:19:27 +02:00
CommanderRedYT	da8b91403d	Merge pull request #372 from bobbycar-graz/setup-screen-361	2022-10-26 19:19:17 +02:00
CommanderRedYT	4b4044626b	Poti screen	2022-10-26 19:03:55 +02:00
CommanderRedYT	71906ba511	Changed potis	2022-10-26 18:11:12 +02:00
CommanderRedYT	ef7e605eb7	Enable feedcode cloud	2022-10-26 18:11:05 +02:00
CommanderRedYT	32389f2bf9	Fixed font	2022-10-26 17:49:51 +02:00
CommanderRedYT	e647c4b372	Merge pull request #384 from bobbycar-graz/fix-tft-espi	2022-10-26 17:31:00 +02:00
CommanderRedYT	3c0b0cdbb1	Fixed everything	2022-10-26 17:30:02 +02:00
CommanderRedYT	43c2338dbd	Added raw poti graphs	2022-10-21 21:18:31 +02:00
CommanderRedYT	846a5d753a	Updated librarys	2022-10-21 16:15:38 +02:00
CommanderRedYT	f4110bb854	Minor modifications	2022-10-21 15:42:26 +02:00
CommanderRedYT	226636a82a	Remove old files	2022-10-13 22:01:25 +02:00
CommanderRedYT	a93f34e0ba	Refactor into multiple files	2022-10-13 22:00:16 +02:00
CommanderRedYT	f2350c8746	Made some opimizations	2022-10-13 16:48:32 +02:00
CommanderRedYT	1840030461	Fixed layout	2022-10-13 16:23:09 +02:00
CommanderRedYT	62a4b88acb	Added more setup scripts	2022-10-13 15:43:09 +02:00
CommanderRedYT	bc9a0c396c	Unfinished button calibration	2022-10-13 15:43:09 +02:00
CommanderRedYT	2bc1625fab	Old formatting	2022-10-13 15:43:08 +02:00
CommanderRedYT	9db3da4b27	Dev commit	2022-10-13 15:43:08 +02:00
CommanderRedYT	4e0fdd65c3	Remove commented out code	2022-10-13 15:43:08 +02:00
CommanderRedYT	129cc64d24	Partitially done	2022-10-13 15:43:08 +02:00
CommanderRedYT	f8b1454f9a	Added git status	2022-10-13 15:43:08 +02:00
CommanderRedYT	4f703c4d10	Fixed compiling commits that contains "quotes"	2022-10-13 15:43:08 +02:00
CommanderRedYT	95e04ef543	Changed nvs reset and some other things	2022-10-13 15:43:08 +02:00
CommanderRedYT	87751682b2	Made some modifications to qr functions	2022-10-13 15:43:08 +02:00
CommanderRedYT	7a3a081af4	Modified reset, added option to debug menu	2022-10-13 15:43:08 +02:00
CommanderRedYT	327932ac14	Merge pull request #381 from bobbycar-graz/clang-format	2022-10-08 16:32:46 +02:00
CommanderRedYT	17eff6127f	Added basic clang format file	2022-10-08 16:10:11 +02:00
CommanderRedYT	2ec6ddc150	Merge pull request #380 from bobbycar-graz/fix-boardcomputerhardwaresettingsmenu	2022-10-06 15:56:15 +02:00
CommanderRedYT	ba5d907e38	Switched to popScreen	2022-10-06 15:42:45 +02:00
CommanderRedYT	3de6827bc5	Merge pull request #379 from bobbycar-graz/fix-display-rotation	2022-10-06 13:51:03 +02:00
CommanderRedYT	846d90836d	Fixed screen rotation	2022-10-06 13:41:12 +02:00
CommanderRedYT	6e3324fe65	Merge pull request #378 from bobbycar-graz/enhancements	2022-10-06 11:37:02 +02:00
CommanderRedYT	79e51f7511	Added more debug text	2022-10-06 11:23:55 +02:00
CommanderRedYT	33f35f14b7	Merge pull request #359 from bobbycar-graz/new-ota-url	2022-10-06 11:23:33 +02:00
CommanderRedYT	b43e4e76ac	Changed to new ota url	2022-10-06 10:50:49 +02:00