Schon wieder irgendwas

Update mick configs

.clang-format

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

.github/workflows/main.yml

@@ -1,106 +0,0 @@
-name: Build
-on:
-  push:
-  release:
-    types:
-      - created
-#  pull_request:
-#    types: [opened, synchronize, reopened]
-
-jobs:
-  build:
-    name: "config_name"
-    runs-on: ubuntu-latest
-    env:
-      SONAR_SCANNER_VERSION: 4.4.0.2170
-      SONAR_SERVER_URL: "https://sonarcloud.io"
-      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
-      SONAR_CACHE_DIR: sonar_cache
-    environment: deploy
-    strategy:
-      fail-fast: false
-      matrix:
-        node: [feedc0de, comred, peter, mick]
-    steps:
-    
-      - name: Checkout (without submodules)
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-
-      - name: Set up JDK 11 (for Sonar)
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-
-      - name: Download and set up sonar-scanner
-        env:
-          SONAR_SCANNER_DOWNLOAD_URL: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${{ env.SONAR_SCANNER_VERSION }}-linux.zip
-        run: |
-          mkdir -p $HOME/.sonar
-          curl -sSLo $HOME/.sonar/sonar-scanner.zip ${{ env.SONAR_SCANNER_DOWNLOAD_URL }}
-          unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
-          echo "$HOME/.sonar/sonar-scanner-${{ env.SONAR_SCANNER_VERSION }}-linux/bin" >> $GITHUB_PATH
-
-      - name: Download and set up build-wrapper (for Sonar)
-        env:
-          BUILD_WRAPPER_DOWNLOAD_URL: ${{ env.SONAR_SERVER_URL }}/static/cpp/build-wrapper-linux-x86.zip
-        run: |
-          curl -sSLo $HOME/.sonar/build-wrapper-linux-x86.zip ${{ env.BUILD_WRAPPER_DOWNLOAD_URL }}
-          unzip -o $HOME/.sonar/build-wrapper-linux-x86.zip -d $HOME/.sonar/
-          echo "$HOME/.sonar/build-wrapper-linux-x86" >> $GITHUB_PATH
-
-      - name: Checkout and install esp-idf
-        uses: 0xFEEDC0DE64/checkout_install_esp_idf@main
-
-      - name: Fast Submodule Checkout components/arduino-esp32
-        uses: 0xFEEDC0DE64/fast_submodule_checkout@main
-        with:
-          submodule: components/arduino-esp32
-
-      - name: Checkout remaining submodules
-        run: git submodule update --init --recursive $(git submodule | awk '{ if ($2 != "esp-idf" && $2 != "components/arduino-esp32") print $2 }')
-
-      - name: Setup ccache
-        uses: 0xFEEDC0DE64/setup_ccache@main
-        with:
-          key: ${{ runner.os }}-ccache-${{ matrix.node }}
-          
-          
-      - name: Build firmware
-        run: |
-          export CCACHE_MAXSIZE=400M CCACHE_BASEDIR="$(pwd)"
-          . export.sh
-          ./switchconf.sh ${{ matrix.node }}
-          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} idf.py --ccache build
-          ccache -s
-
-      - name: Cache sonar
-        uses: 0xFEEDC0DE64/cache-with-update@update-cache-on-cachehit
-        with:
-          path: ${{ env.SONAR_SERVER_URL }}
-          key: ${{ runner.os }}-sonar-${{ matrix.node }}
-
-      - name: Run sonar-scanner
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}" --define sonar.cfamily.cache.path="${{ env.SONAR_CACHE_DIR }}"
-          
-      - name: Set outputs
-        id: vars
-        run: |
-          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
-          echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-
-      - name: Upload Build Artifact
-        uses: actions/upload-artifact@v2.2.4
-        with:
-          name: bobbyquad_${{ matrix.node }}
-          path: |
-            build_${{ matrix.node }}/bobbyquad_${{ matrix.node }}.bin
-            build_${{ matrix.node }}/bobbyquad_${{ matrix.node }}.elf
-            build_${{ matrix.node }}/bootloader/bootloader.bin
-            build_${{ matrix.node }}/bootloader/bootloader.elf
-            build_${{ matrix.node }}/partition_table/partition-table.bin

.github/workflows/workflow.yml

@@ -0,0 +1,363 @@
+name: CI
+on:
+  workflow_dispatch:
+  push:
+  release:
+    types:
+      - created
+#  pull_request:
+#    types: [opened, synchronize, reopened]
+
+
+jobs:
+  checkout:
+    runs-on: ubuntu-latest
+    name: Checkout (with submodules)
+    steps:
+      - name: Cache repository
+        uses: actions/cache@v2
+        id: cache-repository
+        with:
+          path: repository
+          key: ${{ runner.os }}-repository-${{ github.sha }}
+
+      - name: Checkout (without submodules)
+        uses: actions/checkout@v2
+        with:
+          path: repository
+
+      - name: Fast Submodule Checkout esp-idf
+        uses: 0xFEEDC0DE64/fast_submodule_checkout@main
+        with:
+          submodule: esp-idf
+          repo: repository
+
+      - name: Fast Submodule Checkout components/arduino-esp32
+        uses: 0xFEEDC0DE64/fast_submodule_checkout@main
+        with:
+          submodule: components/arduino-esp32
+          repo: repository
+
+      - name: Checkout remaining submodules
+        run: git -C repository submodule update --init --recursive $(git -C repository submodule | awk '{ if ($2 != "esp-idf" && $2 != "components/arduino-esp32") print $2 }')
+
+  checkout-history:
+    runs-on: ubuntu-latest
+    name: Checkout (with history and submodules)
+    steps:
+      - name: Cache repository
+        uses: actions/cache@v2
+        id: cache-repository
+        with:
+          path: repository
+          key: ${{ runner.os }}-repository-history-${{ github.sha }}
+
+      - name: Checkout (without submodules)
+        uses: actions/checkout@v2
+        with:
+          path: repository
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+      - name: Fast Submodule Checkout esp-idf
+        uses: 0xFEEDC0DE64/fast_submodule_checkout@main
+        with:
+          submodule: esp-idf
+          repo: repository
+
+      - name: Fast Submodule Checkout components/arduino-esp32
+        uses: 0xFEEDC0DE64/fast_submodule_checkout@main
+        with:
+          submodule: components/arduino-esp32
+          repo: repository
+
+      - name: Checkout remaining submodules
+        run: git -C repository submodule update --init --recursive $(git -C repository submodule | awk '{ if ($2 != "esp-idf" && $2 != "components/arduino-esp32") print $2 }')
+
+  install-idf:
+    runs-on: ubuntu-latest
+    name: Install esp-idf
+    needs:
+      - checkout
+    steps:
+      - name: Cache repository
+        uses: actions/cache@v2
+        id: cache-repository
+        with:
+          path: repository
+          key: ${{ runner.os }}-repository-${{ github.sha }}
+
+      - name: Verify that "Cache repostory" had a hit
+        if: ${{ steps.cache-repository.outputs.cache-hit != 'true' }}
+        run: exit 1
+
+      - name: Get esp-idf release name
+        id: get-esp-idf-release
+        uses: 0xFEEDC0DE64/get_latest_tag@main
+        with:
+          repo: repository/esp-idf
+
+      - name: Cache .espressif
+        id: cache-espressif
+        uses: actions/cache@v2
+        with:
+          path: ~/.espressif
+          key: ${{ runner.os }}-espressif-${{ steps.get-esp-idf-release.outputs.tag_name }}
+
+      - name: Install .espressif dependencies
+        if: ${{ steps.cache-espressif.outputs.cache-hit != 'true' }}
+        run: repository/esp-idf/install.sh
+
+  install-sonar-scanner:
+    runs-on: ubuntu-latest
+    env:
+      SONAR_SCANNER_VERSION: 4.4.0.2170
+    name: Install sonar-scanner
+    steps:
+      - name: Cache sonar-scanner
+        uses: actions/cache@v2
+        id: cache-sonar-scanner
+        with:
+          path: sonar-scanner
+          key: ${{ runner.os }}-sonar-scanner-${{ env.SONAR_SCANNER_VERSION }}
+
+      - name: Download and set up sonar-scanner
+        env:
+          SONAR_SCANNER_DOWNLOAD_URL: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${{ env.SONAR_SCANNER_VERSION }}-linux.zip
+        if: ${{ steps.cache-sonar-scanner.outputs.cache-hit != 'true' }}
+        run: |
+          curl -sSLo sonar-scanner.zip ${{ env.SONAR_SCANNER_DOWNLOAD_URL }}
+          unzip -o sonar-scanner.zip -d sonar-scanner/
+          echo "$(pwd)/sonar-scanner/sonar-scanner-${{ env.SONAR_SCANNER_VERSION }}-linux/bin" >> $GITHUB_PATH
+
+  install-sonar-build-wrapper:
+    runs-on: ubuntu-latest
+    name: Install sonar-build-wrapper
+    steps:
+      - name: Cache sonar-build-wrapper
+        uses: actions/cache@v2
+        id: cache-sonar-build-wrapper
+        with:
+          path: sonar-build-wrapper
+          key: ${{ runner.os }}-sonar-build-wrapper
+
+      - name: Download and set up build-wrapper (for Sonar)
+        env:
+          BUILD_WRAPPER_DOWNLOAD_URL: https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip
+        if: ${{ steps.cache-sonar-build-wrapper.outputs.cache-hit != 'true' }}
+        run: |
+          curl -sSLo build-wrapper-linux-x86.zip ${{ env.BUILD_WRAPPER_DOWNLOAD_URL }}
+          unzip -o build-wrapper-linux-x86.zip -d sonar-build-wrapper/
+          echo "$(pwd)/sonar-build-wrapper/build-wrapper-linux-x86" >> $GITHUB_PATH
+
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [feedc0de, feedc0de_new, comred_new, peter, mick, nofeatures, seatbot]
+    name: ${{ matrix.node }}
+    needs:
+      - checkout
+      - install-idf
+    steps:
+      - name: Cache repository
+        uses: actions/cache@v2
+        id: cache-repository
+        with:
+          path: repository
+          key: ${{ runner.os }}-repository-${{ github.sha }}
+
+      - name: Verify that "Cache repostory" had a hit
+        if: ${{ steps.cache-repository.outputs.cache-hit != 'true' }}
+        run: exit 1
+
+      - name: Get esp-idf release name
+        id: get-esp-idf-release
+        uses: 0xFEEDC0DE64/get_latest_tag@main
+        with:
+          repo: repository/esp-idf
+
+      - name: Cache .espressif
+        id: cache-espressif
+        uses: actions/cache@v2
+        with:
+          path: ~/.espressif
+          key: ${{ runner.os }}-espressif-${{ steps.get-esp-idf-release.outputs.tag_name }}
+
+      - name: Verify that "Cache .espressif" had a hit
+        if: ${{ steps.cache-espressif.outputs.cache-hit != 'true' }}
+        run: |
+          echo "Cache .espressif did not hit? Did the prepare step run successfully?"
+          exit 1
+
+      - name: Setup ccache
+        uses: 0xFEEDC0DE64/setup_ccache@main
+        with:
+          key: ${{ runner.os }}-ccache-${{ matrix.node }}
+
+      - name: Unpack ignore folder
+        env:
+          GPG_KEY: ${{ secrets.GPG_KEY }}
+        if: ${{ matrix.node == 'comred' || matrix.node == 'peter' || matrix.node == 'mick' || matrix.node == 'comred_new' }}
+        run: |
+          echo Unpacking ignore folder...
+          cd repository
+          tools/bobby-decrypt
+
+      - name: Build firmware
+        run: |
+          cd repository
+          export CCACHE_MAXSIZE=1024M CCACHE_BASEDIR="$(pwd)"
+          ./esp-idf/install.sh
+          . export.sh
+          ./switchconf.sh ${{ matrix.node }}
+          idf.py --ccache build
+          ccache -s
+
+      - name: Set outputs
+        id: vars
+        run: |
+          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+          echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+
+      - name: Upload Build Artifact
+        uses: actions/upload-artifact@v2.2.4
+        with:
+          name: bobbyquad_${{ matrix.node }}
+          path: |
+            repository/build_${{ matrix.node }}/bobbyquad_${{ matrix.node }}.bin
+            repository/build_${{ matrix.node }}/bobbyquad_${{ matrix.node }}.elf
+
+  build-and-analyze:
+    runs-on: ubuntu-latest
+    env:
+      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory
+      SONAR_SCANNER_VERSION: 4.4.0.2170
+      SONAR_CACHE_DIR: sonar_cache
+    name: allfeatures
+    needs:
+      - checkout-history
+      - install-idf
+      - install-sonar-build-wrapper
+      - install-sonar-scanner
+    steps:
+      - name: Cache repository
+        uses: actions/cache@v2
+        id: cache-repository
+        with:
+          path: repository
+          key: ${{ runner.os }}-repository-history-${{ github.sha }}
+
+      - name: Verify that "Cache repostory" had a hit
+        if: ${{ steps.cache-repository.outputs.cache-hit != 'true' }}
+        run: exit 1
+
+      - name: Get esp-idf release name
+        id: get-esp-idf-release
+        uses: 0xFEEDC0DE64/get_latest_tag@main
+        with:
+          repo: repository/esp-idf
+
+      - name: Cache .espressif
+        id: cache-espressif
+        uses: actions/cache@v2
+        with:
+          path: ~/.espressif
+          key: ${{ runner.os }}-espressif-${{ steps.get-esp-idf-release.outputs.tag_name }}
+
+      - name: Verify that "Cache .espressif" had a hit
+        if: ${{ steps.cache-espressif.outputs.cache-hit != 'true' }}
+        run: |
+          echo "Cache .espressif did not hit? Did the prepare step run successfully?"
+          exit 1
+
+      - name: Cache sonar-scanner
+        uses: actions/cache@v2
+        id: cache-sonar-scanner
+        with:
+          path: sonar-scanner
+          key: ${{ runner.os }}-sonar-scanner-${{ env.SONAR_SCANNER_VERSION }}
+
+      - name: Verify that "Cache sonar-scanner" had a hit
+        if: ${{ steps.cache-sonar-scanner.outputs.cache-hit != 'true' }}
+        run: |
+          echo "Cache sonar-scanner did not hit? Did the prepare step run successfully?"
+          exit 1
+
+      - name: Cache sonar-build-wrapper
+        uses: actions/cache@v2
+        id: cache-sonar-build-wrapper
+        with:
+          path: sonar-build-wrapper
+          key: ${{ runner.os }}-sonar-build-wrapper
+
+      - name: Verify that "Cache sonar-build-wrapper" had a hit
+        if: ${{ steps.cache-sonar-build-wrapper.outputs.cache-hit != 'true' }}
+        run: |
+          echo "Cache sonar-build-wrapper did not hit? Did the prepare step run successfully?"
+          exit 1
+
+      - name: Cache sonar-build-wrapper-output
+        uses: actions/cache@v2
+        id: cache-sonar-build-wrapper-output
+        with:
+          path: repository
+          key: ${{ runner.os }}-sonar-build-wrapper-output-${{ github.sha }}
+
+      - name: Set up JDK 11 (for Sonar)
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+
+      - name: Setup sonar-build-wrapper
+        run: echo "$(pwd)/sonar-build-wrapper/build-wrapper-linux-x86" >> $GITHUB_PATH
+
+      - name: Setup ccache
+        uses: 0xFEEDC0DE64/setup_ccache@main
+        with:
+          key: ${{ runner.os }}-ccache-allfeatures
+
+      - name: Build firmware
+        run: |
+          cd repository
+          export CCACHE_MAXSIZE=1024M CCACHE_BASEDIR="$(pwd)"
+          ./esp-idf/install.sh
+          . export.sh
+          ./switchconf.sh allfeatures
+          build-wrapper-linux-x86-64 --out-dir "${{ env.BUILD_WRAPPER_OUT_DIR }}" idf.py --ccache build
+          ccache -s
+
+      - name: Set outputs
+        id: vars
+        run: |
+          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+          echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+
+      - name: Upload Build Artifact
+        uses: actions/upload-artifact@v2.2.4
+        with:
+          name: bobbyquad_allfeatures
+          path: |
+            repository/build_allfeatures/bobbyquad_allfeatures.bin
+            repository/build_allfeatures/bobbyquad_allfeatures.elf
+
+      - name: Setup sonar-scanner
+        run: echo "$(pwd)/sonar-scanner/sonar-scanner-${{ env.SONAR_SCANNER_VERSION }}-linux/bin" >> $GITHUB_PATH
+
+      - name: Cache sonar-scanner-cache
+        uses: 0xFEEDC0DE64/cache-with-update@update-cache-on-cachehit
+        with:
+          path: ${{ env.SONAR_CACHE_DIR }}
+          key: ${{ runner.os }}-sonar-scanner-cache-${{ env.SONAR_SCANNER_VERSION }}
+
+      - name: Run sonar-scanner
+        continue-on-error: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: |
+          cd repository
+          sonar-scanner \
+              --define sonar.host.url="https://sonarcloud.io" \
+              --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}" \
+              --define sonar.cfamily.cache.path="../${{ env.SONAR_CACHE_DIR }}"

.gitignore

@@ -12,3 +12,4 @@ desktop.ini
 /.ccache
 /main/certs/*
 /.vscode/*
+/ignore.tar.gz

.gitmodules

@@ -3,7 +3,7 @@
 	url = ../../0xFEEDC0DE64/espcpputils.git
 [submodule "esp-idf"]
 	path = esp-idf
-	url = ../../0xFEEDC0DE64/esp-idf.git
+	url = ../../bobbycar-graz/esp-idf.git
 [submodule "components/cpputils"]
 	path = components/cpputils
 	url = ../../0xFEEDC0DE64/cpputils.git
@@ -19,15 +19,9 @@
 [submodule "components/ArduinoJson"]
 	path = components/ArduinoJson
 	url = ../../0xFEEDC0DE64/ArduinoJson.git
-[submodule "components/TFT_eSPI"]
-	path = components/TFT_eSPI
-	url = ../../0xFEEDC0DE64/TFT_eSPI.git
 [submodule "components/arduino-esp32"]
 	path = components/arduino-esp32
 	url = ../../0xFEEDC0DE64/arduino-esp32.git
-[submodule "components/expected"]
-	path = components/expected
-	url = ../../0xFEEDC0DE64/expected.git
 [submodule "components/bobbycar-protocol"]
 	path = components/bobbycar-protocol
 	url = ../../bobbycar-graz/bobbycar-protocol.git
@@ -39,7 +33,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
@@ -60,4 +54,22 @@
 	url = ../../0xFEEDC0DE64/espconfiglib.git
 [submodule "components/QRCode-esp32"]
 	path = components/QRCode-esp32
-	url = ../QRCode-esp32.git
+	url = ../../bobbycar-graz/QRCode-esp32.git
+[submodule "components/sunset"]
+	path = components/sunset
+	url = ../../bobbycar-graz/sunset.git
+[submodule "esp-protocols"]
+	path = esp-protocols
+	url = ../../0xFEEDC0DE64/esp-protocols.git
+[submodule "components/TFT_eSPI"]
+	path = components/TFT_eSPI
+	url = ../../0xFEEDC0DE64/TFT_eSPI.git
+[submodule "esp_boost"]
+	path = esp_boost
+	url = ../../0xFEEDC0DE64/esp_boost.git
+[submodule "components/esptftlib"]
+	path = components/esptftlib
+	url = ../../0xFEEDC0DE64/esptftlib.git
+[submodule "components/espfontlib"]
+	path = components/espfontlib
+	url = ../../0xFEEDC0DE64/espfontlib.git

CMakeLists.txt

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

README.md

@@ -4,7 +4,7 @@
 
 | Service | Status |
 | :---                |                                                                                                                   ---: |
-| Actions | ![Build Status](https://github.com/bobbycar-graz/bobbycar-boardcomputer-firmware/actions/workflows/main.yml/badge.svg) |
+| 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)
 

config_comred.cmake

@@ -1,129 +0,0 @@
-set(BOBBY_APP_NAME bobbyquad_comred)
-
-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
-  -DFEATURE_ADC_IN
-  -DPINS_GAS=34
-  -DPINS_BREMS=35
-  -DDEFAULT_SWAPSCREENBYTES=false
-  -DFEATURE_CAN
-#  -DFEATURE_SERIAL
-#  -DPINS_RX1=4
-#  -DPINS_TX1=5
-#  -DPINS_RX2=22
-#  -DPINS_TX2=23
-  -DDEFAULT_INVERTFRONTLEFT=false
-  -DDEFAULT_INVERTFRONTRIGHT=true
-  -DDEFAULT_INVERTBACKLEFT=false
-  -DDEFAULT_INVERTBACKRIGHT=true
-  -DDEFAULT_WHEELDIAMETER=200
-#  -DFEATURE_MOSFETS
-#  -DPINS_MOSFET0=18
-#  -DPINS_MOSFET1=19
-#  -DPINS_MOSFET2=21
-  -DDEFAULT_IMOTMAX=28
-  -DDEFAULT_IDCMAX=30
-  -DDEFAULT_NMOTMAX=2000
-  -DDEFAULT_FIELDWEAKMAX=7
-  -DDEFAULT_FIELDADVMAX=40
-  -DDEVICE_PREFIX=comr_bobbyquad
-  -DAP_PASSWORD=Passwort_123
-  -DFEATURE_WEBSERVER
-  -DFEATURE_OTA
-  -DOTA_USERNAME="comred"
-#  -DFEATURE_DPAD_5WIRESW
-#  -DPINS_DPAD_5WIRESW_OUT=4
-#  -DPINS_DPAD_5WIRESW_IN1=5
-#  -DPINS_DPAD_5WIRESW_IN2=27
-#  -DPINS_DPAD_5WIRESW_IN3=18
-#  -DPINS_DPAD_5WIRESW_IN4=19
-#  -DPINS_DPAD_EXTRASW_IN5=25
-  -DFEATURE_DPAD_6WIRESW
-  -DPINS_DPAD_6WIRESW_OUT=4
-  -DPINS_DPAD_6WIRESW_IN1=5
-  -DPINS_DPAD_6WIRESW_IN2=27
-  -DPINS_DPAD_6WIRESW_IN3=18
-  -DPINS_DPAD_6WIRESW_IN4=19
-  -DPINS_DPAD_6WIRESW_IN5=26
-
-#  -DDPAD_5WIRESW_UP=1
-#  -DDPAD_5WIRESW_DOWN=5
-#  -DDPAD_5WIRESW_CONFIRM=2
-#  -DDPAD_5WIRESW_BACK=6
-#  -DDPAD_5WIRESW_PROFILE0=4
-#  -DDPAD_5WIRESW_PROFILE1=0
-#  -DDPAD_5WIRESW_PROFILE2=7
-#  -DDPAD_5WIRESW_PROFILE3=3
-#  -DDPAD_5WIRESW_DEBUG
-
-   -DDPAD_6WIRESW_UP=1
-   -DDPAD_6WIRESW_DOWN=5
-   -DDPAD_6WIRESW_CONFIRM=2
-   -DDPAD_6WIRESW_BACK=6
-   -DDPAD_6WIRESW_PROFILE0=4
-   -DDPAD_6WIRESW_PROFILE1=0
-   -DDPAD_6WIRESW_PROFILE2=7
-   -DDPAD_6WIRESW_PROFILE3=3
-   -DDPAD_6WIRESW_BLINK_LEFT=8
-   -DDPAD_6WIRESW_BLINK_RIGHT=9
-#   -DDPAD_6WIRESW_DEBUG
-   -DFEATURE_GSCHISSENE_DIODE
-
-  -DDEFAULT_GASMIN=842
-  -DDEFAULT_GASMAX=2480
-  -DDEFAULT_BREMSMIN=826
-  -DDEFAULT_BREMSMAX=2502
-  -DFEATURE_BLE
-#  -DFEATURE_BLUETOOTH
-#  -DFEATURE_BMS
-#  -DFEATURE_GAMETRAK
-#  -DPINS_GAMETRAKX=34
-#  -DPINS_GAMETRAKY=39
-#  -DPINS_GAMETRAKDIST=36
-#  -DDEFAULT_GAMETRAKXMIN=0
-#  -DDEFAULT_GAMETRAKXMAX=4095
-#  -DDEFAULT_GAMETRAKYMIN=0
-#  -DDEFAULT_GAMETRAKYMAX=4095
-#  -DDEFAULT_GAMETRAKDISTMIN=0
-#  -DDEFAULT_GAMETRAKDISTMAX=4095
-#  -DFEATURE_POWERSUPPLY
-#   -DFEATURE_CLOUD
-   -DFEATURE_UDPCLOUD
-  -DFEATURE_LEDBACKLIGHT
-  -DPINS_LEDBACKLIGHT=23
-  -DLEDBACKLIGHT_INVERTED
-  -DFEATURE_GARAGE
-#  -DFEATURE_NTP
-  -DFEATURE_WIRELESS_CONFIG
-  -DFEATURE_LEDSTRIP
-  -DPINS_LEDSTRIP=33
-  -DLEDSTRIP_LENGTH=288
-  -DHEAP_LRGST_CRASH_TEXT_FIX
-#  -DLEDSTRIP_WRONG_DIRECTION
-  -DLEDSTRIP_ANIMATION_DEFAULT=1
-  -DLEDS_PER_METER=144
-  -DOLD_NVS
-  -DFEATURE_DNS_NS
-  -DSWITCH_BLINK
-#  -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_FUNKTIONIERT
-  -DFEATURE_ESPNOW
-)
-
-if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
-    include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
-    message(WARNING "Including lockscreen_plugin")
-endif()

config_feedc0de.cmake

@@ -1,105 +0,0 @@
-set(BOBBY_APP_NAME bobbyquad_feedc0de)
-
-add_definitions(
-  -DUSER_SETUP_LOADED=1
-  -DLOAD_GLCD=1
-  -DLOAD_FONT2=1
-  -DLOAD_FONT4=1
-  -DLOAD_FONT7=1
-  -DILI9341_DRIVER=1
-  -DTFT_MOSI=13
-  -DTFT_SCLK=15
-  -DTFT_CS=14
-  -DTFT_DC=12
-  -DTFT_RST=2
-  -DSPI_FREQUENCY=40000000
-)
-
-set(BOBBYCAR_BUILDFLAGS
-  -DFEATURE_ADC_IN
-  -DPINS_GAS=34
-  -DPINS_BREMS=35
-  -DDEFAULT_SWAPSCREENBYTES=false
-  -DFEATURE_CAN
-#  -DFEATURE_SERIAL
-#  -DPINS_RX1=4
-#  -DPINS_TX1=5
-#  -DPINS_RX2=22
-#  -DPINS_TX2=23
-  -DDEFAULT_INVERTFRONTLEFT=false
-  -DDEFAULT_INVERTFRONTRIGHT=true
-  -DDEFAULT_INVERTBACKLEFT=false
-  -DDEFAULT_INVERTBACKRIGHT=true
-  -DDEFAULT_WHEELDIAMETER=255
-  -DFEATURE_MOSFETS
-  -DPINS_MOSFET0=4
-  -DPINS_MOSFET1=5
-  -DPINS_MOSFET2=25
-  -DDEFAULT_IMOTMAX=40
-  -DDEFAULT_IDCMAX=42
-  -DDEFAULT_NMOTMAX=2000
-  -DDEFAULT_FIELDWEAKMAX=17
-  -DDEFAULT_FIELDADVMAX=40
-  -DDEVICE_PREFIX=bobbyquad
-  -DAP_PASSWORD=Passwort_123
-  -DFEATURE_WEBSERVER
-  -DFEATURE_OTA
-  -DOTA_USERNAME="feedc0de"
-  -DFEATURE_DPAD_5WIRESW_2OUT
-  -DPINS_DPAD_5WIRESW_OUT1=18
-  -DPINS_DPAD_5WIRESW_OUT2=19
-  -DPINS_DPAD_5WIRESW_IN1=27
-  -DPINS_DPAD_5WIRESW_IN2=32
-  -DPINS_DPAD_5WIRESW_IN3=33
-  -DDPAD_5WIRESW_UP=2
-  -DDPAD_5WIRESW_DOWN=11
-  -DDPAD_5WIRESW_CONFIRM=5
-  -DDPAD_5WIRESW_BACK=8
-  -DDPAD_5WIRESW_PROFILE0=4
-  -DDPAD_5WIRESW_PROFILE1=1
-  -DDPAD_5WIRESW_PROFILE2=10
-  -DDPAD_5WIRESW_PROFILE3=7
-  -DDPAD_5WIRESW_BLINK_LEFT=9
-  -DDPAD_5WIRESW_BLINK_RIGHT=0
-  -DDPAD_5WIRESW_QUICKACTION_DOWN=3
-  -DDPAD_5WIRESW_QUICKACTION_UP=6
-#   -DDPAD_5WIRESW_DEBUG
-  -DDEFAULT_GASMIN=200
-  -DDEFAULT_GASMAX=1070
-  -DDEFAULT_BREMSMIN=270
-  -DDEFAULT_BREMSMAX=1800
-  -DFEATURE_BLE
-#  -DFEATURE_BLUETOOTH
-#  -DFEATURE_BMS
-#  -DFEATURE_GAMETRAK
-#  -DPINS_GAMETRAKX=34
-#  -DPINS_GAMETRAKY=39
-#  -DPINS_GAMETRAKDIST=36
-#  -DDEFAULT_GAMETRAKXMIN=0
-#  -DDEFAULT_GAMETRAKXMAX=4095
-#  -DDEFAULT_GAMETRAKYMIN=0
-#  -DDEFAULT_GAMETRAKYMAX=4095
-#  -DDEFAULT_GAMETRAKDISTMIN=0
-#  -DDEFAULT_GAMETRAKDISTMAX=4095
-  -DFEATURE_POWERSUPPLY
-  -DFEATURE_CLOUD
-#  -DFEATURE_UDPCLOUD
-  -DFEATURE_LEDBACKLIGHT
-  -DPINS_LEDBACKLIGHT=23
-  -DLEDBACKLIGHT_INVERTED
-  -DFEATURE_GARAGE
-  -DFEATURE_NTP
-  -DFEATURE_WIRELESS_CONFIG
-  -DFEATURE_LEDSTRIP
-  -DPINS_LEDSTRIP=26
-  -DLEDSTRIP_LENGTH=200
-#  -DHEAP_LRGST_CRASH_TEXT_FIX
-#  -DLEDSTRIP_WRONG_DIRECTION
-  -DLEDSTRIP_ANIMATION_DEFAULT=0
-  -DLEDS_PER_METER=144
-  -DOLD_NVS
-#  -DFEATURE_DNS_NS
-#  -DSWITCH_BLINK
-  -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_FUNKTIONIERT
-#  -DFEATURE_ESPNOW
-)

config_greyhash.cmake

@@ -1,97 +0,0 @@
-set(BOBBY_APP_NAME bobbyquad_greyhash)
-
-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
-  -DFEATURE_ADC_IN
-  -DPINS_GAS=34
-  -DPINS_BREMS=35
-  -DDEFAULT_SWAPSCREENBYTES=false
-#  -DFEATURE_CAN
-#  -DFEATURE_SERIAL
-#  -DPINS_RX1=4
-#  -DPINS_TX1=5
-#  -DPINS_RX2=22
-#  -DPINS_TX2=23
-  -DDEFAULT_INVERTFRONTLEFT=false
-  -DDEFAULT_INVERTFRONTRIGHT=true
-  -DDEFAULT_INVERTBACKLEFT=false
-  -DDEFAULT_INVERTBACKRIGHT=true
-  -DDEFAULT_WHEELDIAMETER=200
-#  -DFEATURE_MOSFETS
-#  -DPINS_MOSFET0=18
-#  -DPINS_MOSFET1=19
-#  -DPINS_MOSFET2=21
-  -DDEFAULT_IMOTMAX=28
-  -DDEFAULT_IDCMAX=30
-  -DDEFAULT_NMOTMAX=2000
-  -DDEFAULT_FIELDWEAKMAX=7
-  -DDEFAULT_FIELDADVMAX=40
-  -DDEVICE_PREFIX=bobbyquad
-#  -DAP_PASSWORD=Passwort_123
-#  -DFEATURE_WEBSERVER
-#  -DFEATURE_OTA
-#  -DOTA_USERNAME="greyhash"
-  -DFEATURE_DPAD_5WIRESW
-  -DPINS_DPAD_5WIRESW_OUT=4
-  -DPINS_DPAD_5WIRESW_IN1=5
-  -DPINS_DPAD_5WIRESW_IN2=27
-  -DPINS_DPAD_5WIRESW_IN3=18
-  -DPINS_DPAD_5WIRESW_IN4=19
-  -DDPAD_5WIRESW_UP=1
-  -DDPAD_5WIRESW_DOWN=5
-  -DDPAD_5WIRESW_CONFIRM=2
-  -DDPAD_5WIRESW_BACK=6
-  -DDPAD_5WIRESW_PROFILE0=4
-  -DDPAD_5WIRESW_PROFILE1=0
-  -DDPAD_5WIRESW_PROFILE2=7
-  -DDPAD_5WIRESW_PROFILE3=3
-#  -DDPAD_5WIRESW_DEBUG
-  -DDEFAULT_GASMIN=842
-  -DDEFAULT_GASMAX=2480
-  -DDEFAULT_BREMSMIN=826
-  -DDEFAULT_BREMSMAX=2502
-#  -DFEATURE_BLE
-#  -DFEATURE_BLUETOOTH
-#  -DFEATURE_BMS
-#  -DFEATURE_GAMETRAK
-#  -DPINS_GAMETRAKX=34
-#  -DPINS_GAMETRAKY=39
-#  -DPINS_GAMETRAKDIST=36
-#  -DDEFAULT_GAMETRAKXMIN=0
-#  -DDEFAULT_GAMETRAKXMAX=4095
-#  -DDEFAULT_GAMETRAKYMIN=0
-#  -DDEFAULT_GAMETRAKYMAX=4095
-#  -DDEFAULT_GAMETRAKDISTMIN=0
-#  -DDEFAULT_GAMETRAKDISTMAX=4095
-#  -DFEATURE_POWERSUPPLY
-#  -DFEATURE_CLOUD
-#  -DFEATURE_UDPCLOUD
-#  -DFEATURE_LEDBACKLIGHT
-#  -DPINS_LEDBACKLIGHT=23
-#  -DLEDBACKLIGHT_INVERTED
-#  -DFEATURE_GARAGE
-#  -DFEATURE_NTP
-#   -DFEATURE_WIRELESS_CONFIG
-#   -DFEATURE_LEDSTRIP
-#   -DPINS_LEDSTRIP=33
-#   -DLEDSTRIP_LENGTH=121
-#   -DLEDSTRIP_DEFAULT_BRIGHTNESS=100
-#  -DLEDSTRIP_WRONG_DIRECTION
-#  -DLEDSTRIP_ANIMATION_DEFAULT=0
-   -DOLD_NVS
-#   -DFEATURE_DNS_NS
-)

config_mick.cmake

@@ -1,101 +0,0 @@
-set(BOBBY_APP_NAME bobbyquad_mick)
-
-add_definitions(
-  -DUSER_SETUP_LOADED=1
-  -DLOAD_GLCD=1
-  -DLOAD_FONT2=1
-  -DLOAD_FONT4=1
-  -DLOAD_FONT7=1
-  -DILI9341_DRIVER=1
-  -DTFT_MOSI=13
-  -DTFT_SCLK=15
-  -DTFT_CS=14
-  -DTFT_DC=12
-  -DTFT_RST=2
-  -DSPI_FREQUENCY=27000000
-)
-
-set(BOBBYCAR_BUILDFLAGS
-  -DFEATURE_ADC_IN
-  -DPINS_GAS=34
-  -DPINS_BREMS=35
-  -DDEFAULT_SWAPSCREENBYTES=false
-  -DFEATURE_CAN
-#  -DFEATURE_SERIAL
-#  -DPINS_RX1=4
-#  -DPINS_TX1=5
-#  -DPINS_RX2=22
-#  -DPINS_TX2=23
-  -DDEFAULT_INVERTFRONTLEFT=false
-  -DDEFAULT_INVERTFRONTRIGHT=true
-  -DDEFAULT_INVERTBACKLEFT=false
-  -DDEFAULT_INVERTBACKRIGHT=true
-  -DDEFAULT_WHEELDIAMETER=200
-#  -DFEATURE_MOSFETS
-#  -DPINS_MOSFET0=18
-#  -DPINS_MOSFET1=19
-#  -DPINS_MOSFET2=21
-  -DDEFAULT_IMOTMAX=28
-  -DDEFAULT_IDCMAX=30
-  -DDEFAULT_NMOTMAX=2000
-  -DDEFAULT_FIELDWEAKMAX=7
-  -DDEFAULT_FIELDADVMAX=40
-  -DDEVICE_PREFIX=bobbyquad
-  -DAP_PASSWORD=Passwort_123
-  -DFEATURE_WEBSERVER
-#  -DFEATURE_OTA
-  -DOTA_USERNAME="mick"
-#  -DFEATURE_DPAD_5WIRESW
-#  -DPINS_DPAD_5WIRESW_OUT=4
-#  -DPINS_DPAD_5WIRESW_IN1=5
-#  -DPINS_DPAD_5WIRESW_IN2=27
-#  -DPINS_DPAD_5WIRESW_IN3=18
-#  -DPINS_DPAD_5WIRESW_IN4=19
-#  -DDPAD_5WIRESW_UP=1
-#  -DDPAD_5WIRESW_DOWN=5
-#  -DDPAD_5WIRESW_CONFIRM=2
-#  -DDPAD_5WIRESW_BACK=6
-#  -DDPAD_5WIRESW_PROFILE0=4
-#  -DDPAD_5WIRESW_PROFILE1=0
-#  -DDPAD_5WIRESW_PROFILE2=7
-#  -DDPAD_5WIRESW_PROFILE3=3
-#  -DDPAD_5WIRESW_DEBUG
-  -DDEFAULT_GASMIN=184
-  -DDEFAULT_GASMAX=1329
-  -DDEFAULT_BREMSMIN=28
-  -DDEFAULT_BREMSMAX=500
-  -DFEATURE_BLE
-#  -DFEATURE_BLUETOOTH
-#  -DFEATURE_BMS
-#  -DFEATURE_GAMETRAK
-#  -DPINS_GAMETRAKX=34
-#  -DPINS_GAMETRAKY=39
-#  -DPINS_GAMETRAKDIST=36
-#  -DDEFAULT_GAMETRAKXMIN=0
-#  -DDEFAULT_GAMETRAKXMAX=4095
-#  -DDEFAULT_GAMETRAKYMIN=0
-#  -DDEFAULT_GAMETRAKYMAX=4095
-#  -DDEFAULT_GAMETRAKDISTMIN=0
-#  -DDEFAULT_GAMETRAKDISTMAX=4095
-#  -DFEATURE_POWERSUPPLY
-#  -DFEATURE_CLOUD
-  -DFEATURE_UDPCLOUD
-  -DFEATURE_LEDBACKLIGHT
-  -DPINS_LEDBACKLIGHT=23
-  -DLEDBACKLIGHT_INVERTED
-#  -DFEATURE_GARAGE
-#  -DFEATURE_NTP
-  -DFEATURE_WIRELESS_CONFIG
-  -DFEATURE_LEDSTRIP
-  -DLEDSTRIP_LENGTH=288
-  -DPINS_LEDSTRIP=33
-#  -DLEDSTRIP_WRONG_DIRECTION
-  -DLEDSTRIP_ANIMATION_DEFAULT=0
-  -DOLD_NVS
-  -DFEATURE_DNS_NS
-)
-
-if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
-    include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
-    message(WARNING "Including lockscreen_plugin")
-endif()

config_peter.cmake

@@ -1,106 +0,0 @@
-set(BOBBY_APP_NAME bobbyquad_peter)
-
-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
-    -DFEATURE_ADC_IN
-    -DPINS_GAS=34
-    -DPINS_BREMS=35
-    -DDEFAULT_SWAPSCREENBYTES=false
-    -DFEATURE_CAN
-    #  -DFEATURE_SERIAL
-    #  -DPINS_RX1=4
-    #  -DPINS_TX1=5
-    #  -DPINS_RX2=22
-    #  -DPINS_TX2=23
-    -DDEFAULT_INVERTFRONTLEFT=false
-    -DDEFAULT_INVERTFRONTRIGHT=true
-    -DDEFAULT_INVERTBACKLEFT=false
-    -DDEFAULT_INVERTBACKRIGHT=true
-    -DDEFAULT_WHEELDIAMETER=200
-    #  -DFEATURE_MOSFETS
-    #  -DPINS_MOSFET0=18
-    #  -DPINS_MOSFET1=19
-    #  -DPINS_MOSFET2=21
-    -DDEFAULT_IMOTMAX=28
-    -DDEFAULT_IDCMAX=30
-    -DDEFAULT_NMOTMAX=2000
-    -DDEFAULT_FIELDWEAKMAX=7
-    -DDEFAULT_FIELDADVMAX=40
-    -DDEVICE_PREFIX=peter_bobbyquad
-    -DAP_PASSWORD=Passwort_123
-    -DFEATURE_WEBSERVER
-    -DFEATURE_OTA
-    -DOTA_USERNAME="peter"
-    -DFEATURE_DPAD_5WIRESW_2OUT
-    -DPINS_DPAD_5WIRESW_OUT1=18
-    -DPINS_DPAD_5WIRESW_OUT2=19
-    -DPINS_DPAD_5WIRESW_IN1=4
-    -DPINS_DPAD_5WIRESW_IN2=5
-    -DPINS_DPAD_5WIRESW_IN3=27
-    -DDPAD_5WIRESW_UP=4
-    -DDPAD_5WIRESW_DOWN=7
-    -DDPAD_5WIRESW_CONFIRM=1
-    -DDPAD_5WIRESW_BACK=10
-    -DDPAD_5WIRESW_PROFILE0=11
-    -DDPAD_5WIRESW_PROFILE1=8
-    -DDPAD_5WIRESW_PROFILE2=5
-    -DDPAD_5WIRESW_PROFILE3=2
-    -DDPAD_5WIRESW_BLINK_LEFT=9
-    -DDPAD_5WIRESW_BLINK_RIGHT=0
-    -DDPAD_5WIRESW_QUICKACTION_DOWN=3
-    -DDPAD_5WIRESW_QUICKACTION_UP=6
-    # -DDPAD_5WIRESW_DEBUG
-    -DDEFAULT_GASMIN=842
-    -DDEFAULT_GASMAX=2480
-    -DDEFAULT_BREMSMIN=826
-    -DDEFAULT_BREMSMAX=2502
-    -DFEATURE_BLE
-    #  -DFEATURE_BLUETOOTH
-    #  -DFEATURE_BMS
-    #  -DFEATURE_GAMETRAK
-    #  -DPINS_GAMETRAKX=34
-    #  -DPINS_GAMETRAKY=39
-    #  -DPINS_GAMETRAKDIST=36
-    #  -DDEFAULT_GAMETRAKXMIN=0
-    #  -DDEFAULT_GAMETRAKXMAX=4095
-    #  -DDEFAULT_GAMETRAKYMIN=0
-    #  -DDEFAULT_GAMETRAKYMAX=4095
-    #  -DDEFAULT_GAMETRAKDISTMIN=0
-    #  -DDEFAULT_GAMETRAKDISTMAX=4095
-    #  -DFEATURE_POWERSUPPLY
-    #  -DFEATURE_CLOUD
-    -DFEATURE_UDPCLOUD
-    -DFEATURE_LEDBACKLIGHT
-    -DPINS_LEDBACKLIGHT=23
-    -DLEDBACKLIGHT_INVERTED
-    -DFEATURE_GARAGE
-    -DFEATURE_NTP
-    -DFEATURE_WIRELESS_CONFIG
-    -DFEATURE_LEDSTRIP
-    -DPINS_LEDSTRIP=33
-    -DLEDSTRIP_LENGTH=288
-    #  -DLEDSTRIP_WRONG_DIRECTION
-    -DLEDSTRIP_ANIMATION_DEFAULT=2
-    -DLEDS_PER_METER=144
-    -DOLD_NVS
-    -DFEATURE_DNS_NS
-)
-
-if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
-    include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
-    message(WARNING "Including lockscreen_plugin")
-endif()

configs/config_allfeatures.cmake

@@ -0,0 +1,80 @@
+set(BOBBY_APP_NAME bobbyquad_allfeatures)
+set(BOBBY_DEFAULT_USERNAME allfeatures)
+
+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
+#    -DFEATURE_JOYSTICK
+#    -DPINS_RX1=4
+#    -DPINS_TX1=5
+#    -DPINS_RX2=22
+#    -DPINS_TX2=23
+#    -DPINS_MOSFET0=18
+#    -DPINS_MOSFET1=19
+#    -DPINS_MOSFET2=21
+#    -DPINS_GAMETRAKX=34
+#    -DPINS_GAMETRAKY=39
+#    -DPINS_GAMETRAKDIST=36
+    -DPINS_LEDBACKLIGHT=23
+    -DPINS_LEDSTRIP=33
+
+# Config flags
+    -DFEATURE_ADC_IN
+    -DFEATURE_CAN
+#    -DFEATURE_SERIAL
+#    -DFEATURE_MOSFETS
+#    -DFEATURE_BLUETOOTH
+#    -DFEATURE_BMS
+#    -DFEATURE_GAMETRAK
+    -DFEATURE_POWERSUPPLY
+    -DFEATURE_LEDBACKLIGHT
+
+    -DLEDBACKLIGHT_INVERTED
+    -DLEDSTRIP_WRONG_DIRECTION
+    -DHEAP_LRGST_CRASH_TEXT_FIX
+
+# Default values
+    -DDEFAULT_SWAPSCREENBYTES=false
+    -DDEFAULT_INVERTFRONTLEFT=false
+    -DDEFAULT_INVERTFRONTRIGHT=true
+    -DDEFAULT_INVERTBACKLEFT=false
+    -DDEFAULT_INVERTBACKRIGHT=true
+    -DDEFAULT_WHEELDIAMETER=200
+    -DDEFAULT_IMOTMAX=28
+    -DDEFAULT_IDCMAX=30
+    -DDEFAULT_NMOTMAX=2000
+    -DDEFAULT_FIELDWEAKMAX=7
+    -DDEFAULT_FIELDADVMAX=40
+
+# DPAD
+#    -DFEATURE_DPAD_5WIRESW
+#    -DPINS_DPAD_5WIRESW_OUT=4
+#    -DPINS_DPAD_5WIRESW_IN1=5
+#    -DPINS_DPAD_5WIRESW_IN2=27
+#    -DPINS_DPAD_5WIRESW_IN3=18
+#    -DPINS_DPAD_5WIRESW_IN4=19
+#    -DPINS_DPAD_EXTRASW_IN5=25
+    -DFEATURE_DPAD_6WIRESW
+    -DPINS_DPAD_6WIRESW_OUT=4
+    -DPINS_DPAD_6WIRESW_IN1=5
+    -DPINS_DPAD_6WIRESW_IN2=27
+    -DPINS_DPAD_6WIRESW_IN3=18
+    -DPINS_DPAD_6WIRESW_IN4=19
+    -DPINS_DPAD_6WIRESW_IN5=26
+    -DFEATURE_GSCHISSENE_DIODE
+#    -DDPAD_BOARDCOMPUTER_V2
+)

configs/config_aveexy.cmake

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

configs/config_comred.cmake

@@ -0,0 +1,87 @@
+set(BOBBY_APP_NAME bobbyquad_comred)
+set(BOBBY_DEFAULT_USERNAMENAME comred)
+
+add_definitions(
+  -DUSER_SETUP_LOADED=1
+  -DLOAD_GLCD=1
+  -DLOAD_FONT2=1
+  -DLOAD_FONT4=1
+  -DLOAD_FONT7=1
+  -DILI9341_DRIVER=1
+  -DTFT_MOSI=13
+  -DTFT_SCLK=15
+  -DTFT_CS=14
+  -DTFT_DC=12
+  -DTFT_RST=2
+  -DSPI_FREQUENCY=40000000
+)
+
+set(BOBBYCAR_BUILDFLAGS
+# Pins
+    -DPINS_GAS=34
+    -DPINS_BREMS=35
+#    -DFEATURE_JOYSTICK
+#    -DPINS_RX1=4
+#    -DPINS_TX1=5
+#    -DPINS_RX2=22
+#    -DPINS_TX2=23
+#    -DPINS_MOSFET0=18
+#    -DPINS_MOSFET1=19
+#    -DPINS_MOSFET2=21
+#    -DPINS_GAMETRAKX=34
+#    -DPINS_GAMETRAKY=39
+#    -DPINS_GAMETRAKDIST=36
+    -DPINS_LEDBACKLIGHT=23
+    -DPINS_LEDSTRIP=33
+
+# Config flags
+    -DFEATURE_ADC_IN
+    -DFEATURE_CAN
+#    -DFEATURE_SERIAL
+#    -DFEATURE_MOSFETS
+#    -DFEATURE_BLUETOOTH
+#    -DFEATURE_BMS
+#    -DFEATURE_GAMETRAK
+#    -DFEATURE_POWERSUPPLY
+    -DFEATURE_LEDBACKLIGHT
+
+    -DLEDBACKLIGHT_INVERTED
+#    -DLEDSTRIP_WRONG_DIRECTION
+    -DHEAP_LRGST_CRASH_TEXT_FIX
+
+# Default values
+    -DDEFAULT_SWAPSCREENBYTES=false
+    -DDEFAULT_INVERTFRONTLEFT=false
+    -DDEFAULT_INVERTFRONTRIGHT=true
+    -DDEFAULT_INVERTBACKLEFT=false
+    -DDEFAULT_INVERTBACKRIGHT=true
+    -DDEFAULT_WHEELDIAMETER=200
+    -DDEFAULT_IMOTMAX=28
+    -DDEFAULT_IDCMAX=30
+    -DDEFAULT_NMOTMAX=2000
+    -DDEFAULT_FIELDWEAKMAX=17
+    -DDEFAULT_FIELDADVMAX=40
+
+# DPAD
+#    -DFEATURE_DPAD_5WIRESW
+#    -DPINS_DPAD_5WIRESW_OUT=4
+#    -DPINS_DPAD_5WIRESW_IN1=5
+#    -DPINS_DPAD_5WIRESW_IN2=27
+#    -DPINS_DPAD_5WIRESW_IN3=18
+#    -DPINS_DPAD_5WIRESW_IN4=19
+#    -DPINS_DPAD_EXTRASW_IN5=25
+    -DFEATURE_DPAD_6WIRESW
+    -DPINS_DPAD_6WIRESW_OUT=4
+    -DPINS_DPAD_6WIRESW_IN1=5
+    -DPINS_DPAD_6WIRESW_IN2=27
+    -DPINS_DPAD_6WIRESW_IN3=18
+    -DPINS_DPAD_6WIRESW_IN4=19
+    -DPINS_DPAD_6WIRESW_IN5=26
+    -DFEATURE_GSCHISSENE_DIODE
+#    -DDPAD_BOARDCOMPUTER_V2
+)
+
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
+    include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
+    message(WARNING "Including plugins")
+endif()

configs/config_comred_new.cmake

@@ -0,0 +1,94 @@
+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
+# )
+
+set(BOBBYCAR_BUILDFLAGS
+# Pins
+    -DPINS_GAS=34
+    -DPINS_BREMS=35
+#    -DFEATURE_JOYSTICK
+#    -DPINS_RX1=4
+#    -DPINS_TX1=5
+#    -DPINS_RX2=22
+#    -DPINS_TX2=23
+#    -DPINS_MOSFET0=18
+#    -DPINS_MOSFET1=19
+#    -DPINS_MOSFET2=21
+#    -DPINS_GAMETRAKX=34
+#    -DPINS_GAMETRAKY=39
+#    -DPINS_GAMETRAKDIST=36
+    -DPINS_LEDBACKLIGHT=23
+    -DPINS_LEDSTRIP=33
+
+# Config flags
+    -DFEATURE_ADC_IN
+    -DFEATURE_CAN
+#    -DFEATURE_SERIAL
+#    -DFEATURE_MOSFETS
+#    -DFEATURE_BLUETOOTH
+#    -DFEATURE_BMS
+#    -DFEATURE_GAMETRAK
+#    -DFEATURE_POWERSUPPLY
+    -DFEATURE_LEDBACKLIGHT
+
+    -DLEDBACKLIGHT_INVERTED
+#    -DLEDSTRIP_WRONG_DIRECTION
+    -DHEAP_LRGST_CRASH_TEXT_FIX
+
+# Default values
+    -DDEFAULT_SWAPSCREENBYTES=false
+    -DDEFAULT_INVERTFRONTLEFT=false
+    -DDEFAULT_INVERTFRONTRIGHT=true
+    -DDEFAULT_INVERTBACKLEFT=false
+    -DDEFAULT_INVERTBACKRIGHT=true
+    -DDEFAULT_WHEELDIAMETER=200
+    -DDEFAULT_IMOTMAX=28
+    -DDEFAULT_IDCMAX=30
+    -DDEFAULT_NMOTMAX=2000
+    -DDEFAULT_FIELDWEAKMAX=17
+    -DDEFAULT_FIELDADVMAX=40
+
+# DPAD
+#    -DFEATURE_DPAD_5WIRESW
+#    -DPINS_DPAD_5WIRESW_OUT=4
+#    -DPINS_DPAD_5WIRESW_IN1=5
+#    -DPINS_DPAD_5WIRESW_IN2=27
+#    -DPINS_DPAD_5WIRESW_IN3=18
+#    -DPINS_DPAD_5WIRESW_IN4=19
+#    -DPINS_DPAD_EXTRASW_IN5=25
+#    -DFEATURE_DPAD_6WIRESW
+#    -DPINS_DPAD_6WIRESW_OUT=4
+#    -DPINS_DPAD_6WIRESW_IN1=5
+#    -DPINS_DPAD_6WIRESW_IN2=27
+#    -DPINS_DPAD_6WIRESW_IN3=18
+#    -DPINS_DPAD_6WIRESW_IN4=19
+#    -DPINS_DPAD_6WIRESW_IN5=26
+#    -DFEATURE_GSCHISSENE_DIODE
+    -DDPAD_BOARDCOMPUTER_V2
+    -DPINS_DPAD_BOARDCOMPUTER_V2_OUT1=19
+    -DPINS_DPAD_BOARDCOMPUTER_V2_OUT2=5
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN1=4
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN2=18
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN3=27
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN4=16
+#    -DDPAD_BOARDCOMPUTER_V2_DEBUG
+)
+
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
+    include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
+    message(WARNING "Including plugins")
+endif()

configs/config_feedc0de.cmake

@@ -0,0 +1,64 @@
+set(BOBBY_APP_NAME bobbyquad_feedc0de)
+set(BOBBY_DEFAULT_USERNAME feedc0de)
+
+set(BOBBYCAR_BUILDFLAGS
+# Pins
+#    -DFEATURE_JOYSTICK
+#    -DPINS_RX1=4
+#    -DPINS_TX1=5
+#    -DPINS_RX2=22
+#    -DPINS_TX2=23
+    -DPINS_MOSFET0=4
+    -DPINS_MOSFET1=5
+    -DPINS_MOSFET2=25
+#    -DPINS_GAMETRAKX=34
+#    -DPINS_GAMETRAKY=39
+#    -DPINS_GAMETRAKDIST=36
+    -DPINS_LEDBACKLIGHT=23
+    -DPINS_LEDSTRIP=26
+
+# Config flags
+    -DFEATURE_ADC_IN
+    -DFEATURE_CAN
+#    -DFEATURE_SERIAL
+    -DFEATURE_MOSFETS
+#    -DFEATURE_BLUETOOTH
+#    -DFEATURE_BMS
+#    -DFEATURE_GAMETRAK
+    -DFEATURE_POWERSUPPLY
+    -DFEATURE_LEDBACKLIGHT
+
+    -DLEDBACKLIGHT_INVERTED
+#    -DLEDSTRIP_WRONG_DIRECTION
+#    -DHEAP_LRGST_CRASH_TEXT_FIX
+
+# Default values
+    -DDEFAULT_SWAPSCREENBYTES=false
+    -DDEFAULT_INVERTFRONTLEFT=false
+    -DDEFAULT_INVERTFRONTRIGHT=true
+    -DDEFAULT_INVERTBACKLEFT=false
+    -DDEFAULT_INVERTBACKRIGHT=true
+    -DDEFAULT_WHEELDIAMETER=255
+    -DDEFAULT_IMOTMAX=40
+    -DDEFAULT_IDCMAX=42
+    -DDEFAULT_NMOTMAX=2000
+    -DDEFAULT_FIELDWEAKMAX=17
+    -DDEFAULT_FIELDADVMAX=40
+
+# DPAD
+    -DFEATURE_DPAD_5WIRESW_2OUT
+    -DPINS_DPAD_5WIRESW_OUT1=18
+    -DPINS_DPAD_5WIRESW_OUT2=19
+    -DPINS_DPAD_5WIRESW_IN1=27
+    -DPINS_DPAD_5WIRESW_IN2=32
+    -DPINS_DPAD_5WIRESW_IN3=33
+#    -DFEATURE_DPAD_6WIRESW
+#    -DPINS_DPAD_6WIRESW_OUT=4
+#    -DPINS_DPAD_6WIRESW_IN1=5
+#    -DPINS_DPAD_6WIRESW_IN2=27
+#    -DPINS_DPAD_6WIRESW_IN3=18
+#    -DPINS_DPAD_6WIRESW_IN4=19
+#    -DPINS_DPAD_6WIRESW_IN5=26
+#    -DFEATURE_GSCHISSENE_DIODE
+#    -DDPAD_BOARDCOMPUTER_V2
+)

configs/config_feedc0de_new.cmake

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

configs/config_gernot.cmake

@@ -0,0 +1,86 @@
+set(BOBBY_APP_NAME bobbyquad_gernot)
+set(BOBBY_DEFAULT_USERNAME gernot)
+
+add_definitions(
+  -DUSER_SETUP_LOADED=1
+  -DLOAD_GLCD=1
+  -DLOAD_FONT2=1
+  -DLOAD_FONT4=1
+  -DLOAD_FONT7=1
+  -DILI9341_DRIVER=1
+  -DTFT_MOSI=13
+  -DTFT_SCLK=15
+  -DTFT_CS=14
+  -DTFT_DC=12
+  -DTFT_RST=2
+  -DSPI_FREQUENCY=40000000
+)
+
+set(BOBBYCAR_BUILDFLAGS
+# Pins
+    -DPINS_GAS=34
+    -DPINS_BREMS=35
+#    -DFEATURE_JOYSTICK
+#    -DPINS_RX1=4
+#    -DPINS_TX1=5
+#    -DPINS_RX2=22
+#    -DPINS_TX2=23
+#    -DPINS_MOSFET0=18
+#    -DPINS_MOSFET1=19
+#    -DPINS_MOSFET2=21
+#    -DPINS_GAMETRAKX=34
+#    -DPINS_GAMETRAKY=39
+#    -DPINS_GAMETRAKDIST=36
+    -DPINS_LEDBACKLIGHT=23
+    -DPINS_LEDSTRIP=33
+
+# Config flags
+    -DFEATURE_ADC_IN
+    -DFEATURE_CAN
+#    -DFEATURE_SERIAL
+#    -DFEATURE_MOSFETS
+#    -DFEATURE_BLUETOOTH
+#    -DFEATURE_BMS
+#    -DFEATURE_GAMETRAK
+#    -DFEATURE_POWERSUPPLY
+    -DFEATURE_LEDBACKLIGHT
+
+    -DLEDBACKLIGHT_INVERTED
+#    -DLEDSTRIP_WRONG_DIRECTION
+#    -DHEAP_LRGST_CRASH_TEXT_FIX
+
+# Default values
+    -DDEFAULT_SWAPSCREENBYTES=false
+    -DDEFAULT_INVERTFRONTLEFT=false
+    -DDEFAULT_INVERTFRONTRIGHT=true
+    -DDEFAULT_INVERTBACKLEFT=false
+    -DDEFAULT_INVERTBACKRIGHT=true
+    -DDEFAULT_WHEELDIAMETER=255
+    -DDEFAULT_IMOTMAX=28
+    -DDEFAULT_IDCMAX=30
+    -DDEFAULT_NMOTMAX=2000
+    -DDEFAULT_FIELDWEAKMAX=7
+    -DDEFAULT_FIELDADVMAX=40
+
+# DPAD
+#    -DFEATURE_DPAD_5WIRESW_2OUT
+#    -DPINS_DPAD_5WIRESW_OUT1=18
+#    -DPINS_DPAD_5WIRESW_OUT2=19
+#    -DPINS_DPAD_5WIRESW_IN1=4
+#    -DPINS_DPAD_5WIRESW_IN2=5
+#    -DPINS_DPAD_5WIRESW_IN3=27
+#    -DFEATURE_DPAD_6WIRESW
+#    -DPINS_DPAD_6WIRESW_OUT=4
+#    -DPINS_DPAD_6WIRESW_IN1=5
+#    -DPINS_DPAD_6WIRESW_IN2=27
+#    -DPINS_DPAD_6WIRESW_IN3=18
+#    -DPINS_DPAD_6WIRESW_IN4=19
+#    -DPINS_DPAD_6WIRESW_IN5=26
+#    -DFEATURE_GSCHISSENE_DIODE
+#    -DDPAD_BOARDCOMPUTER_V2
+)
+
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
+    include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
+    message(WARNING "Including plugins")
+endif()

configs/config_greyhash.cmake

@@ -0,0 +1,78 @@
+set(BOBBY_APP_NAME bobbyquad_greyhash)
+set(BOBBY_DEFAULT_USERNAME greyhash)
+
+add_definitions(
+  -DUSER_SETUP_LOADED=1
+  -DLOAD_GLCD=1
+  -DLOAD_FONT2=1
+  -DLOAD_FONT4=1
+  -DLOAD_FONT7=1
+  -DILI9341_DRIVER=1
+  -DTFT_MOSI=13
+  -DTFT_SCLK=15
+  -DTFT_CS=14
+  -DTFT_DC=12
+  -DTFT_RST=2
+  -DSPI_FREQUENCY=40000000
+)
+
+set(BOBBYCAR_BUILDFLAGS
+# Pins
+    -DPINS_GAS=34
+    -DPINS_BREMS=35
+#    -DFEATURE_JOYSTICK
+#    -DPINS_RX1=4
+#    -DPINS_TX1=5
+#    -DPINS_RX2=22
+#    -DPINS_TX2=23
+#    -DPINS_MOSFET0=18
+#    -DPINS_MOSFET1=19
+#    -DPINS_MOSFET2=21
+#    -DPINS_GAMETRAKX=34
+#    -DPINS_GAMETRAKY=39
+#    -DPINS_GAMETRAKDIST=36
+    -DPINS_LEDBACKLIGHT=23
+    -DPINS_LEDSTRIP=33
+
+# Config flags
+    -DFEATURE_ADC_IN
+    -DFEATURE_CAN
+#    -DFEATURE_SERIAL
+#    -DFEATURE_MOSFETS
+#    -DFEATURE_BLUETOOTH
+#    -DFEATURE_BMS
+#    -DFEATURE_GAMETRAK
+#    -DFEATURE_POWERSUPPLY
+    -DFEATURE_LEDBACKLIGHT
+
+    -DLEDBACKLIGHT_INVERTED
+#    -DLEDSTRIP_WRONG_DIRECTION
+    -DHEAP_LRGST_CRASH_TEXT_FIX
+
+# Default values
+    -DDEFAULT_SWAPSCREENBYTES=false
+    -DDEFAULT_INVERTFRONTLEFT=false
+    -DDEFAULT_INVERTFRONTRIGHT=true
+    -DDEFAULT_INVERTBACKLEFT=false
+    -DDEFAULT_INVERTBACKRIGHT=true
+    -DDEFAULT_WHEELDIAMETER=200
+    -DDEFAULT_IMOTMAX=28
+    -DDEFAULT_IDCMAX=30
+    -DDEFAULT_NMOTMAX=2000
+    -DDEFAULT_FIELDWEAKMAX=17
+    -DDEFAULT_FIELDADVMAX=40
+
+# DPAD
+    -DFEATURE_DPAD_5WIRESW_2OUT
+    -DPINS_DPAD_5WIRESW_OUT1=5
+    -DPINS_DPAD_5WIRESW_OUT2=4
+    -DPINS_DPAD_5WIRESW_IN1=27
+    -DPINS_DPAD_5WIRESW_IN2=19
+    -DPINS_DPAD_5WIRESW_IN3=18
+#    -DDPAD_BOARDCOMPUTER_V2
+)
+
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
+    include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
+    message(WARNING "Including plugins")
+endif()

configs/config_mick.cmake

@@ -0,0 +1,71 @@
+set(BOBBY_APP_NAME bobbyquad_mick)
+set(BOBBY_DEFAULT_USERNAME mick)
+
+set(BOBBYCAR_BUILDFLAGS
+# Pins
+    -DPINS_GAS=34
+    -DPINS_BREMS=35
+#    -DFEATURE_JOYSTICK
+#    -DPINS_RX1=4
+#    -DPINS_TX1=5
+#    -DPINS_RX2=22
+#    -DPINS_TX2=23
+#    -DPINS_MOSFET0=18
+#    -DPINS_MOSFET1=19
+#    -DPINS_MOSFET2=21
+#    -DPINS_GAMETRAKX=34
+#    -DPINS_GAMETRAKY=39
+#    -DPINS_GAMETRAKDIST=36
+    -DPINS_LEDBACKLIGHT=23
+    -DPINS_LEDSTRIP=33
+
+# Config flags
+    -DFEATURE_ADC_IN
+    -DFEATURE_CAN
+#    -DFEATURE_SERIAL
+#    -DFEATURE_MOSFETS
+#    -DFEATURE_BLUETOOTH
+#    -DFEATURE_BMS
+#    -DFEATURE_GAMETRAK
+    -DFEATURE_POWERSUPPLY
+    -DFEATURE_LEDBACKLIGHT
+
+    -DLEDBACKLIGHT_INVERTED
+#    -DLEDSTRIP_WRONG_DIRECTION
+#    -DHEAP_LRGST_CRASH_TEXT_FIX
+
+# Default values
+    -DDEFAULT_SWAPSCREENBYTES=false
+    -DDEFAULT_INVERTFRONTLEFT=false
+    -DDEFAULT_INVERTFRONTRIGHT=true
+    -DDEFAULT_INVERTBACKLEFT=false
+    -DDEFAULT_INVERTBACKRIGHT=true
+    -DDEFAULT_WHEELDIAMETER=200
+    -DDEFAULT_IMOTMAX=28
+    -DDEFAULT_IDCMAX=30
+    -DDEFAULT_NMOTMAX=2000
+    -DDEFAULT_FIELDWEAKMAX=7
+    -DDEFAULT_FIELDADVMAX=40
+
+# DPAD
+    -DFEATURE_DPAD_5WIRESW_2OUT
+    -DPINS_DPAD_5WIRESW_OUT1=5
+    -DPINS_DPAD_5WIRESW_OUT2=19
+    -DPINS_DPAD_5WIRESW_IN1=4
+    -DPINS_DPAD_5WIRESW_IN2=18
+    -DPINS_DPAD_5WIRESW_IN3=27
+#    -DFEATURE_DPAD_6WIRESW
+#    -DPINS_DPAD_6WIRESW_OUT=4
+#    -DPINS_DPAD_6WIRESW_IN1=5
+#    -DPINS_DPAD_6WIRESW_IN2=27
+#    -DPINS_DPAD_6WIRESW_IN3=18
+#    -DPINS_DPAD_6WIRESW_IN4=19
+#    -DPINS_DPAD_6WIRESW_IN5=26
+#    -DFEATURE_GSCHISSENE_DIODE
+#    -DDPAD_BOARDCOMPUTER_V2
+)
+
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
+    include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
+    message(WARNING "Including plugins")
+endif()

configs/config_nofeatures.cmake

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

configs/config_peter.cmake

@@ -0,0 +1,86 @@
+set(BOBBY_APP_NAME bobbyquad_peter)
+set(BOBBY_DEFAULT_USERNAME peter)
+
+add_definitions(
+  -DUSER_SETUP_LOADED=1
+  -DLOAD_GLCD=1
+  -DLOAD_FONT2=1
+  -DLOAD_FONT4=1
+  -DLOAD_FONT7=1
+  -DILI9341_DRIVER=1
+  -DTFT_MOSI=13
+  -DTFT_SCLK=15
+  -DTFT_CS=14
+  -DTFT_DC=12
+  -DTFT_RST=2
+  -DSPI_FREQUENCY=40000000
+)
+
+set(BOBBYCAR_BUILDFLAGS
+# Pins
+    -DPINS_GAS=34
+    -DPINS_BREMS=35
+#    -DFEATURE_JOYSTICK
+#    -DPINS_RX1=4
+#    -DPINS_TX1=5
+#    -DPINS_RX2=22
+#    -DPINS_TX2=23
+#    -DPINS_MOSFET0=18
+#    -DPINS_MOSFET1=19
+#    -DPINS_MOSFET2=21
+#    -DPINS_GAMETRAKX=34
+#    -DPINS_GAMETRAKY=39
+#    -DPINS_GAMETRAKDIST=36
+    -DPINS_LEDBACKLIGHT=23
+    -DPINS_LEDSTRIP=33
+
+# Config flags
+    -DFEATURE_ADC_IN
+    -DFEATURE_CAN
+#    -DFEATURE_SERIAL
+#    -DFEATURE_MOSFETS
+#    -DFEATURE_BLUETOOTH
+#    -DFEATURE_BMS
+#    -DFEATURE_GAMETRAK
+    -DFEATURE_POWERSUPPLY
+    -DFEATURE_LEDBACKLIGHT
+
+    -DLEDBACKLIGHT_INVERTED
+#    -DLEDSTRIP_WRONG_DIRECTION
+#    -DHEAP_LRGST_CRASH_TEXT_FIX
+
+# Default values
+    -DDEFAULT_SWAPSCREENBYTES=false
+    -DDEFAULT_INVERTFRONTLEFT=false
+    -DDEFAULT_INVERTFRONTRIGHT=true
+    -DDEFAULT_INVERTBACKLEFT=false
+    -DDEFAULT_INVERTBACKRIGHT=true
+    -DDEFAULT_WHEELDIAMETER=255
+    -DDEFAULT_IMOTMAX=28
+    -DDEFAULT_IDCMAX=30
+    -DDEFAULT_NMOTMAX=2000
+    -DDEFAULT_FIELDWEAKMAX=7
+    -DDEFAULT_FIELDADVMAX=40
+
+# DPAD
+    -DFEATURE_DPAD_5WIRESW_2OUT
+    -DPINS_DPAD_5WIRESW_OUT1=18
+    -DPINS_DPAD_5WIRESW_OUT2=19
+    -DPINS_DPAD_5WIRESW_IN1=4
+    -DPINS_DPAD_5WIRESW_IN2=5
+    -DPINS_DPAD_5WIRESW_IN3=27
+#    -DFEATURE_DPAD_6WIRESW
+#    -DPINS_DPAD_6WIRESW_OUT=4
+#    -DPINS_DPAD_6WIRESW_IN1=5
+#    -DPINS_DPAD_6WIRESW_IN2=27
+#    -DPINS_DPAD_6WIRESW_IN3=18
+#    -DPINS_DPAD_6WIRESW_IN4=19
+#    -DPINS_DPAD_6WIRESW_IN5=26
+#    -DFEATURE_GSCHISSENE_DIODE
+#    -DDPAD_BOARDCOMPUTER_V2
+)
+
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
+    include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
+    message(WARNING "Including plugins")
+endif()

configs/config_seatbot.cmake

@@ -0,0 +1,79 @@
+set(BOBBY_APP_NAME bobbyquad_seatbot)
+set(BOBBY_DEFAULT_USERNAME seatbot)
+
+add_definitions(
+  -DUSER_SETUP_LOADED=1
+  -DLOAD_GLCD=1
+  -DLOAD_FONT2=1
+  -DLOAD_FONT4=1
+  -DLOAD_FONT7=1
+  -DILI9341_DRIVER=1
+  -DTFT_MOSI=13
+  -DTFT_SCLK=15
+  -DTFT_CS=14
+  -DTFT_DC=12
+  -DTFT_RST=2
+  -DSPI_FREQUENCY=40000000
+)
+
+set(BOBBYCAR_BUILDFLAGS
+# Pins
+    -DPINS_GAS=34
+    -DPINS_BREMS=35
+    -DFEATURE_JOYSTICK
+#    -DPINS_RX1=4
+#    -DPINS_TX1=5
+#    -DPINS_RX2=22
+#    -DPINS_TX2=23
+#    -DPINS_MOSFET0=18
+#    -DPINS_MOSFET1=19
+#    -DPINS_MOSFET2=21
+#    -DPINS_GAMETRAKX=34
+#    -DPINS_GAMETRAKY=39
+#    -DPINS_GAMETRAKDIST=36
+    -DPINS_LEDBACKLIGHT=23
+    -DPINS_LEDSTRIP=33
+
+# Config flags
+    -DFEATURE_ADC_IN
+    -DFEATURE_CAN
+#    -DFEATURE_SERIAL
+#    -DFEATURE_MOSFETS
+#    -DFEATURE_BLUETOOTH
+#    -DFEATURE_BMS
+#    -DFEATURE_GAMETRAK
+#    -DFEATURE_POWERSUPPLY
+    -DFEATURE_LEDBACKLIGHT
+
+    -DLEDBACKLIGHT_INVERTED
+    -DLEDSTRIP_WRONG_DIRECTION
+    -DHEAP_LRGST_CRASH_TEXT_FIX
+
+# Default values
+    -DDEFAULT_SWAPSCREENBYTES=false
+    -DDEFAULT_INVERTFRONTLEFT=false
+    -DDEFAULT_INVERTFRONTRIGHT=true
+    -DDEFAULT_INVERTBACKLEFT=false
+    -DDEFAULT_INVERTBACKRIGHT=true
+    -DDEFAULT_WHEELDIAMETER=200
+    -DDEFAULT_IMOTMAX=28
+    -DDEFAULT_IDCMAX=30
+    -DDEFAULT_NMOTMAX=2000
+    -DDEFAULT_FIELDWEAKMAX=17
+    -DDEFAULT_FIELDADVMAX=40
+
+# DPAD
+    -DFEATURE_DPAD_5WIRESW_2OUT
+    -DPINS_DPAD_5WIRESW_OUT1=4
+    -DPINS_DPAD_5WIRESW_OUT2=5
+    -DPINS_DPAD_5WIRESW_IN1=18
+    -DPINS_DPAD_5WIRESW_IN2=19
+    -DPINS_DPAD_5WIRESW_IN3=27
+#    -DDPAD_BOARDCOMPUTER_V2
+)
+
+#if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
+#    include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
+#    message(WARNING "Including plugins")
+#endif()
+

configs/config_testdevice.cmake

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

configs/config_testdevice2.cmake

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

dependencies.lock

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

export.sh

@@ -1,5 +1,4 @@
 BOBBY_ROOT="$(dirname "$BASH_SOURCE")"
-export PS1="\033[1;32m(bobby-sourced)\033[;0m$PS1"
 
 if [[ ! -f "${BOBBY_ROOT}/esp-idf/export.sh" ]]
 then
@@ -54,3 +53,4 @@ export PATH=$PATH:$(pwd)/tools
 alias open-ide=open_ide
 alias switchconf=./switchconf.sh
 alias bobby-build="idf.py build"
+

main/CMakeLists.txt

@@ -1,7 +1,10 @@
-set(headers
+set(BOBBY_HEADERS
+    accessorhelpers.h
     accessors/globalaccessors.h
     accessors/settingsaccessors.h
     accessors/wifiaccessors.h
+    accessors/wifiapconfigaccessors.h
+    accessors/wifistaconfigaccessors.h
     actions/assertaction.h
     actions/bluetoothbeginaction.h
     actions/bluetoothbeginmasteraction.h
@@ -19,14 +22,16 @@ set(headers
     actions/ledstripblinkactions.h
     actions/loadsettingsaction.h
     actions/modesettingsaction.h
-    actions/multiaction.h
     actions/qraction.h
-    actions/rebootaction.h
+    actions/resetnvsaction.h
     actions/savesettingsaction.h
+    actions/setupactions.h
     actions/switchprofileaction.h
     actions/tempomatmodeapplycurrentpeedaction.h
     actions/updateswapfrontbackaction.h
     actions/wifiscanaction.h
+    actions/wifistascanaction.h
+    actions/wifistascanclearaction.h
     battery.h
     ble_bobby.h
     bletexthelpers.h
@@ -34,37 +39,49 @@ set(headers
     bluetoothmode.h
     bluetoothtexthelpers.h
     bmsutils.h
+    bobbyblinker.h
+    bobbybuttons.h
+    bobbycheckbox.h
+    bobbyerrorhandler.h
+    bobbyhupe.h
+    bobbyquickactions.h
+    bobbyschedulertask.h
+    bobbytypesafeenum.h
     buildserver.h
-    buttons.h
     can.h
     changevaluedisplay_bluetoothmode.h
+    changevaluedisplay_bobbyquickactions.h
     changevaluedisplay_controlmode.h
     changevaluedisplay_controltype.h
-    changevaluedisplay_handbremsmode.h
     changevaluedisplay_larsmmode_mode.h
     changevaluedisplay_unifiedmodelmode.h
-    changevaluedisplay_wifi_mode_t.h
-    changevaluedisplay_wifi_power_t.h
     cloud.h
     cloudtexthelpers.h
+    configutils_bobby.h
     controller.h
     debugcolorhelpers.h
     debuginputhandler.h
     debugtexthelpers.h
+    displays/batterygraphdisplay.h
+    displays/batteryinfodisplay.h
     displays/bmsdisplay.h
-    displays/calibratedisplay.h
+    displays/bobbychangevaluedisplay.h
+    displays/bobbydisplay.h
+    displays/bobbydisplaywithtitle.h
+    displays/bobbygraphdisplay.h
+    displays/bobbymenudisplay.h
+    displays/bobbypopupdisplay.h
+    displays/bobbysplitgraphdisplay.h
     displays/calibratevoltagedisplay.h
-    displays/qrdisplay.h
-    displays/dpad5wire2outdebugdisplay.h
-    displays/dpad5wiredebugdisplay.h
-    displays/dpad6wiredebugdisplay.h
+    displays/confiscationdisplay.h
     displays/gameoflifedisplay.h
     displays/gametrakcalibratedisplay.h
-    displays/garagedisplay.h
+    displays/joystickdebugdisplay.h
     displays/ledstripcolorsdisplay.h
     displays/lockscreen.h
+    displays/menudisplaywithtime.cpp
+    displays/menudisplaywithtime.h
     displays/menus/aboutmenu.h
-    displays/menus/accesspointwifisettingsmenu.h
     displays/menus/batterydebugmenu.h
     displays/menus/batterymenu.h
     displays/menus/blesettingsmenu.h
@@ -72,6 +89,7 @@ set(headers
     displays/menus/bmsmenu.h
     displays/menus/boardcomputerhardwaresettingsmenu.h
     displays/menus/buzzermenu.h
+    displays/menus/candebugmenu.h
     displays/menus/cloudsettingsmenu.h
     displays/menus/commanddebugmenu.h
     displays/menus/controllerhardwaresettingsmenu.h
@@ -83,64 +101,88 @@ set(headers
     displays/menus/enablemenu.h
     displays/menus/espnowmenu.h
     displays/menus/espnowsettingsmenu.h
+    displays/menus/extrabuttoncalibratemenu.h
+    displays/menus/featureflagsmenu.h
     displays/menus/feedbackdebugmenu.h
     displays/menus/gametrakmodesettingsmenu.h
-    displays/menus/genericwifisettingsmenu.h
+    displays/menus/garagemenu.h
+    displays/menus/gitmenu.h
     displays/menus/graphsmenu.h
     displays/menus/greenpassmenu.h
     displays/menus/handbremssettingsmenu.h
     displays/menus/invertmenu.h
     displays/menus/larsmmodesettingsmenu.h
     displays/menus/ledstripmenu.h
-    displays/menus/ledstripselectanimationmenu.h
     displays/menus/ledstripselectblinkmenu.h
     displays/menus/ledstripselectotamode.h
     displays/menus/limitssettingsmenu.h
     displays/menus/lockscreensettingsmenu.h
     displays/menus/mainmenu.h
+    displays/menus/manageprofilesmenu.h
+    displays/menus/mickmodesettingsmenu.h
     displays/menus/modessettingsmenu.h
     displays/menus/mosfetsmenu.h
     displays/menus/motorfeedbackdebugmenu.h
     displays/menus/motorstatedebugmenu.h
     displays/menus/motortestmodesettingsmenu.h
+    displays/menus/networksettingsmenu.h
     displays/menus/otamenu.h
-    displays/menus/presetsmenu.h
     displays/menus/profilesmenu.h
-    displays/menus/selectbatterytypemenu.h
+    displays/menus/recoverymenu.h
+    displays/menus/remotecontrolmodesettingsmenu.h
     displays/menus/selectbuildserverbranch.h
     displays/menus/selectbuildservermenu.h
     displays/menus/selectmodemenu.h
     displays/menus/selectotabuildmenu.h
     displays/menus/settingsmenu.h
-    displays/menus/stationwifisettingsmenu.h
+    displays/menus/setupquickactionsmenu.h
     displays/menus/statisticsmenu.h
     displays/menus/taskmanagermenu.h
     displays/menus/tempomatmodesettingsmenu.h
     displays/menus/timersmenu.h
     displays/menus/timesettingsmenu.h
+    displays/menus/typesafeenumchangemenu.h
     displays/menus/udpcloudsettingsmenu.h
-    displays/menus/wifiscanmenu.h
-    displays/menus/wifisettingsmenu.h
+    displays/menus/wifiapclientsmenu.h
+    displays/menus/wifiapsettingsmenu.h
+    displays/menus/wifistaconfigentrymenu.h
+    displays/menus/wifistaconfigsmenu.h
+    displays/menus/wifistascanentrymenu.h
+    displays/menus/wifistascanmenu.h
+    displays/menus/wifistasettingsmenu.h
     displays/metersdisplay.h
     displays/pingpongdisplay.h
-    displays/popups/alertdisplay.h
+    displays/potiscalibratedisplay.h
     displays/poweroffdisplay.h
     displays/powersupplydisplay.h
     displays/qrcodedebug.h
+    displays/qrdisplay.h
     displays/qrimportdisplay.h
+    displays/rebootscreen.h
+    displays/setup/ask_calibrate_other_buttons.h
+    displays/setup/ask_setup_clouds.h
+    displays/setup/basic_buttons.h
+    displays/setup/calibrate_potis.h
+    displays/setup/final_information.h
+    displays/setup/information.h
+    displays/setup/setup_cloud.h
+    displays/speedinfodisplay.h
     displays/spirodisplay.h
     displays/starfielddisplay.h
     displays/statusdisplay.h
     displays/updatedisplay.h
+    displays/xydebugdisplay.h
     dnsannounce.h
     dpad.h
     dpad3wire.h
     dpad5wire.h
     dpad5wire_2out.h
     dpad6wire.h
+    dpad_boardcomputer_v2.h
     drivingstatistics.h
-    esptexthelpers.h
     espnowfunctions.h
+    esptexthelpers.h
+    feedbackemulator.h
     feedbackparser.h
     globals.h
     handbremse.h
@@ -152,6 +194,7 @@ set(headers
     icons/buzzer.h
     icons/close.h
     icons/demos.h
+    icons/git.h
     icons/graph.h
     icons/greenpass.h
     icons/hardware.h
@@ -165,6 +208,7 @@ set(headers
     icons/reboot.h
     icons/scan.h
     icons/settings.h
+    icons/shortcircuit.h
     icons/statistics.h
     icons/time.h
     icons/update.h
@@ -178,28 +222,36 @@ set(headers
     modes/gametrakmode.h
     modes/ignoreinputmode.h
     modes/larsmmode.h
+    modes/mickmode.h
     modes/motortestmode.h
     modes/remotecontrolmode.h
     modes/tempomatmode.h
+    modes/wheelchairmode.h
     mosfets.h
+    motorpwmlimiter.h
     newsettings.h
     ota.h
     potis.h
     presets.h
+    profilesettings.h
     qrimport.h
     rotary.h
     screens.h
     serial_bobby.h
-    settings.h
     settingspersister.h
     settingsutils.h
+    setup.h
+    softpwmlimiter.h
     statistics.h
     statustexthelper.h
-    stringsettings.h
     taskmanager.h
-    texts.h
+    tempomat.h
+    texthelpers/networktexthelpers.h
+    texthelpers/wifiaptexthelpers.h
+    texthelpers/wifistatexthelpers.h
     time_bobbycar.h
     types.h
+    typeutils.h
     udpcloud.h
     unifiedmodelmode.h
     utils.h
@@ -207,19 +259,16 @@ set(headers
     webserver_displaycontrol.h
     webserver_dumpnvs.h
     webserver_lock.h
+    webserver_newsettings.h
     webserver_ota.h
     webserver_settings.h
-    webserver_stringsettings.h
     widgets/doubleprogressbar.h
-    widgets/menudisplaywithtime.h
     wifi_bobbycar.h
-    wifitexthelpers.h
+    wifiguiutils.h
 )
 
-set(sources
-    accessors/globalaccessors.cpp
-    accessors/settingsaccessors.cpp
-    accessors/wifiaccessors.cpp
+set(BOBBY_SOURCES
+    accessors/wifistaconfigaccessors.cpp
     actions/assertaction.cpp
     actions/bluetoothbeginaction.cpp
     actions/bluetoothbeginmasteraction.cpp
@@ -237,14 +286,16 @@ set(sources
     actions/ledstripblinkactions.cpp
     actions/loadsettingsaction.cpp
     actions/modesettingsaction.cpp
-    actions/multiaction.cpp
     actions/qraction.cpp
-    actions/rebootaction.cpp
+    actions/resetnvsaction.cpp
     actions/savesettingsaction.cpp
+    actions/setupactions.cpp
     actions/switchprofileaction.cpp
     actions/tempomatmodeapplycurrentpeedaction.cpp
     actions/updateswapfrontbackaction.cpp
     actions/wifiscanaction.cpp
+    actions/wifistascanaction.cpp
+    actions/wifistascanclearaction.cpp
     battery.cpp
     ble_bobby.cpp
     bletexthelpers.cpp
@@ -252,37 +303,44 @@ set(sources
     bluetoothmode.cpp
     bluetoothtexthelpers.cpp
     bmsutils.cpp
+    bobbyblinker.cpp
+    bobbybuttons.cpp
+    bobbyerrorhandler.cpp
+    bobbyhupe.cpp
+    bobbyquickactions.cpp
     buildserver.cpp
-    buttons.cpp
     can.cpp
     changevaluedisplay_bluetoothmode.cpp
+    changevaluedisplay_bobbyquickactions.cpp
     changevaluedisplay_controlmode.cpp
     changevaluedisplay_controltype.cpp
-    changevaluedisplay_handbremsmode.cpp
     changevaluedisplay_larsmmode_mode.cpp
     changevaluedisplay_unifiedmodelmode.cpp
-    changevaluedisplay_wifi_mode_t.cpp
-    changevaluedisplay_wifi_power_t.cpp
     cloud.cpp
     cloudtexthelpers.cpp
+    configwrapper_bobby.cpp
     controller.cpp
     debugcolorhelpers.cpp
     debuginputhandler.cpp
     debugtexthelpers.cpp
+    displays/batterygraphdisplay.cpp
+    displays/batteryinfodisplay.cpp
     displays/bmsdisplay.cpp
-    displays/calibratedisplay.cpp
+    displays/bobbychangevaluedisplay.cpp
+    displays/bobbydisplay.cpp
+    displays/bobbydisplaywithtitle.cpp
+    displays/bobbygraphdisplay.cpp
+    displays/bobbymenudisplay.cpp
+    displays/bobbypopupdisplay.cpp
+    displays/bobbysplitgraphdisplay.cpp
     displays/calibratevoltagedisplay.cpp
-    displays/qrdisplay.cpp
-    displays/dpad5wire2outdebugdisplay.cpp
-    displays/dpad5wiredebugdisplay.cpp
-    displays/dpad6wiredebugdisplay.cpp
+    displays/confiscationdisplay.cpp
     displays/gameoflifedisplay.cpp
     displays/gametrakcalibratedisplay.cpp
-    displays/garagedisplay.cpp
+    displays/joystickdebugdisplay.cpp
     displays/ledstripcolorsdisplay.cpp
     displays/lockscreen.cpp
     displays/menus/aboutmenu.cpp
-    displays/menus/accesspointwifisettingsmenu.cpp
     displays/menus/batterydebugmenu.cpp
     displays/menus/batterymenu.cpp
     displays/menus/blesettingsmenu.cpp
@@ -290,6 +348,7 @@ set(sources
     displays/menus/bmsmenu.cpp
     displays/menus/boardcomputerhardwaresettingsmenu.cpp
     displays/menus/buzzermenu.cpp
+    displays/menus/candebugmenu.cpp
     displays/menus/cloudsettingsmenu.cpp
     displays/menus/commanddebugmenu.cpp
     displays/menus/controllerhardwaresettingsmenu.cpp
@@ -301,64 +360,88 @@ set(sources
     displays/menus/enablemenu.cpp
     displays/menus/espnowmenu.cpp
     displays/menus/espnowsettingsmenu.cpp
+    displays/menus/extrabuttoncalibratemenu.cpp
+    displays/menus/featureflagsmenu.cpp
     displays/menus/feedbackdebugmenu.cpp
     displays/menus/gametrakmodesettingsmenu.cpp
-    displays/menus/genericwifisettingsmenu.cpp
+    displays/menus/garagemenu.cpp
+    displays/menus/gitmenu.cpp
     displays/menus/graphsmenu.cpp
     displays/menus/greenpassmenu.cpp
     displays/menus/handbremssettingsmenu.cpp
     displays/menus/invertmenu.cpp
     displays/menus/larsmmodesettingsmenu.cpp
     displays/menus/ledstripmenu.cpp
-    displays/menus/ledstripselectanimationmenu.cpp
     displays/menus/ledstripselectblinkmenu.cpp
     displays/menus/ledstripselectotamode.cpp
     displays/menus/limitssettingsmenu.cpp
     displays/menus/lockscreensettingsmenu.cpp
     displays/menus/mainmenu.cpp
+    displays/menus/manageprofilesmenu.cpp
+    displays/menus/mickmodesettingsmenu.cpp
     displays/menus/modessettingsmenu.cpp
     displays/menus/mosfetsmenu.cpp
     displays/menus/motorfeedbackdebugmenu.cpp
     displays/menus/motorstatedebugmenu.cpp
     displays/menus/motortestmodesettingsmenu.cpp
+    displays/menus/networksettingsmenu.cpp
     displays/menus/otamenu.cpp
-    displays/menus/presetsmenu.cpp
     displays/menus/profilesmenu.cpp
-    displays/menus/selectbatterytypemenu.cpp
+    displays/menus/recoverymenu.cpp
+    displays/menus/remotecontrolmodesettingsmenu.cpp
     displays/menus/selectbuildserverbranch.cpp
     displays/menus/selectbuildservermenu.cpp
     displays/menus/selectmodemenu.cpp
     displays/menus/selectotabuildmenu.cpp
     displays/menus/settingsmenu.cpp
-    displays/menus/stationwifisettingsmenu.cpp
+    displays/menus/setupquickactionsmenu.cpp
     displays/menus/statisticsmenu.cpp
     displays/menus/taskmanagermenu.cpp
     displays/menus/tempomatmodesettingsmenu.cpp
     displays/menus/timersmenu.cpp
     displays/menus/timesettingsmenu.cpp
+    displays/menus/typesafeenumchangemenu.cpp
     displays/menus/udpcloudsettingsmenu.cpp
-    displays/menus/wifiscanmenu.cpp
-    displays/menus/wifisettingsmenu.cpp
+    displays/menus/wifiapclientsmenu.cpp
+    displays/menus/wifiapsettingsmenu.cpp
+    displays/menus/wifistaconfigentrymenu.cpp
+    displays/menus/wifistaconfigsmenu.cpp
+    displays/menus/wifistascanentrymenu.cpp
+    displays/menus/wifistascanmenu.cpp
+    displays/menus/wifistasettingsmenu.cpp
     displays/metersdisplay.cpp
     displays/pingpongdisplay.cpp
-    displays/popups/alertdisplay.cpp
+    displays/potiscalibratedisplay.cpp
     displays/poweroffdisplay.cpp
     displays/powersupplydisplay.cpp
     displays/qrcodedebug.cpp
+    displays/qrdisplay.cpp
     displays/qrimportdisplay.cpp
+    displays/rebootscreen.cpp
+    displays/setup/ask_calibrate_other_buttons.cpp
+    displays/setup/ask_setup_clouds.cpp
+    displays/setup/basic_buttons.cpp
+    displays/setup/calibrate_potis.cpp
+    displays/setup/final_information.cpp
+    displays/setup/information.cpp
+    displays/setup/setup_cloud.cpp
+    displays/speedinfodisplay.cpp
     displays/spirodisplay.cpp
     displays/starfielddisplay.cpp
     displays/statusdisplay.cpp
     displays/updatedisplay.cpp
+    displays/xydebugdisplay.cpp
     dnsannounce.cpp
     dpad.cpp
     dpad3wire.cpp
     dpad5wire.cpp
     dpad5wire_2out.cpp
     dpad6wire.cpp
+    dpad_boardcomputer_v2.cpp
     drivingstatistics.cpp
-    esptexthelpers.cpp
     espnowfunctions.cpp
+    esptexthelpers.cpp
+    feedbackemulator.cpp
     feedbackparser.cpp
     globals.cpp
     handbremse.cpp
@@ -370,6 +453,7 @@ set(sources
     icons/buzzer.cpp
     icons/close.cpp
     icons/demos.cpp
+    icons/git.cpp
     icons/graph.cpp
     icons/greenpass.cpp
     icons/hardware.cpp
@@ -383,6 +467,7 @@ set(sources
     icons/reboot.cpp
     icons/scan.cpp
     icons/settings.cpp
+    icons/shortcircuit.cpp
     icons/statistics.cpp
     icons/time.cpp
     icons/update.cpp
@@ -397,26 +482,33 @@ set(sources
     modes/gametrakmode.cpp
     modes/ignoreinputmode.cpp
     modes/larsmmode.cpp
+    modes/mickmode.cpp
     modes/motortestmode.cpp
     modes/remotecontrolmode.cpp
     modes/tempomatmode.cpp
+    modes/wheelchairmode.cpp
     mosfets.cpp
+    motorpwmlimiter.cpp
     newsettings.cpp
     ota.cpp
     potis.cpp
     presets.cpp
+    profilesettings.cpp
     qrimport.cpp
     rotary.cpp
     screens.cpp
     serial_bobby.cpp
-    settings.cpp
     settingspersister.cpp
     settingsutils.cpp
+    setup.cpp
+    softpwmlimiter.cpp
     statistics.cpp
     statustexthelper.cpp
-    stringsettings.cpp
     taskmanager.cpp
-    texts.cpp
+    tempomat.cpp
+    texthelpers/networktexthelpers.cpp
+    texthelpers/wifiaptexthelpers.cpp
+    texthelpers/wifistatexthelpers.cpp
     time_bobbycar.cpp
     types.cpp
     udpcloud.cpp
@@ -426,32 +518,71 @@ set(sources
     webserver_displaycontrol.cpp
     webserver_dumpnvs.cpp
     webserver_lock.cpp
+    webserver_newsettings.cpp
     webserver_ota.cpp
     webserver_settings.cpp
-    webserver_stringsettings.cpp
     widgets/doubleprogressbar.cpp
-    widgets/menudisplaywithtime.cpp
     wifi_bobbycar.cpp
-    wifitexthelpers.cpp
+    wifiguiutils.cpp
 )
 
 set(dependencies
-    freertos nvs_flash esp_http_server esp_https_ota mdns app_update esp_system esp_websocket_client driver
+    freertos nvs_flash esp_http_server esp_https_ota mdns app_update esp_system esp_websocket_client driver esp_adc
     arduino-esp32 ArduinoJson esp-nimble-cpp FastLED-idf TFT_eSPI QRCode-esp32
-    bobbycar-protocol cpputils cxx-ring-buffer date
-    espasynchttpreq espasyncota espchrono espcpputils espconfiglib esp-gui-lib esphttpdutils espwifistack expected fmt
+    bobbycar-protocol cpputils cxx-ring-buffer date sunset
+    espasynchttpreq espasyncota espchrono espcpputils espconfiglib esp-gui-lib esphttpdutils espwifistack fmt
 )
 
 idf_component_register(
     SRCS
-        ${headers}
-        ${sources}
+        ${BOBBY_HEADERS}
+        ${BOBBY_SOURCES}
     INCLUDE_DIRS
         .
     REQUIRES
         ${dependencies}
 )
 
+execute_process(COMMAND git rev-parse HEAD
+        OUTPUT_VARIABLE GIT_REV ERROR_QUIET
+)
+execute_process(
+        COMMAND git log -1 --pretty=%B
+        OUTPUT_VARIABLE GIT_MESSAGE ERROR_QUIET
+)
+execute_process(
+        COMMAND git rev-parse --abbrev-ref HEAD
+        OUTPUT_VARIABLE GIT_BRANCH
+)
+execute_process(
+        COMMAND git status --short
+        OUTPUT_VARIABLE GIT_STATUS
+)
+
+if (NOT GIT_STATUS STREQUAL "")
+    set(GIT_STATUS "dirty")
+else()
+    set(GIT_STATUS "clean")
+endif()
+
+string(STRIP "${GIT_REV}" GIT_REV)
+string(SUBSTRING "${GIT_REV}" 1 7 GIT_SHORT_REV)
+string(STRIP "${GIT_MESSAGE}" GIT_MESSAGE)
+string(REPLACE "\n" " " GIT_MESSAGE "${GIT_MESSAGE}")
+string(REPLACE "\"" "\\\"" GIT_MESSAGE "${GIT_MESSAGE}")
+string(SUBSTRING "${GIT_MESSAGE}" 0 100 GIT_MESSAGE)
+string(STRIP "${GIT_BRANCH}" GIT_BRANCH)
+
+message(WARNING "Git revision: ${GIT_REV}")
+message(WARNING "Git short revision: ${GIT_SHORT_REV}")
+message(WARNING "Git message: ${GIT_MESSAGE}")
+message(WARNING "Git branch: ${GIT_BRANCH}")
+message(WARNING "Git status: ${GIT_STATUS}")
+
+if(NOT DEFINED BOBBY_DEFAULT_USERNAME)
+    message(FATAL_ERROR "Please define BOBBY_DEFAULT_USERNAME")
+endif()
+
 target_compile_options(${COMPONENT_TARGET}
     PRIVATE
         -fstack-reuse=all
@@ -461,5 +592,10 @@ target_compile_options(${COMPONENT_TARGET}
         -Wno-deprecated-declarations
         -Wno-missing-field-initializers
         -Wno-parentheses
+        -DGIT_REV="${GIT_REV}"
+        -DGIT_SHORT_REV="${GIT_SHORT_REV}"
+        -DGIT_MESSAGE="${GIT_MESSAGE}"
+        -DGIT_BRANCH="${GIT_BRANCH}"
+        -DBOBBY_DEFAULT_USERNAME="${BOBBY_DEFAULT_USERNAME}"
         ${BOBBYCAR_BUILDFLAGS}
 )

main/accessorhelpers.h

@@ -0,0 +1,78 @@
+#pragma once
+
+// system includes
+#include <cstdint>
+#include <expected>
+
+// 3rdparty lib includes
+#include <accessorinterface.h>
+
+// local includes
+#include "utils.h"
+#include "newsettings.h"
+
+//! Special type of RefAccessor that also saves settings after setValue()
+template<typename T>
+struct RefAccessorSaveSettings : public virtual espgui::RefAccessor<T>
+{
+    typename espgui::AccessorInterface<T>::setter_result_t setValue(T value) override
+    {
+        espgui::RefAccessor<T>::setValue(value);
+
+        if (!saveProfileSettings())
+            return std::unexpected("saveProfileSettings() failed!");
+
+        return {};
+    };
+};
+
+template<typename T>
+struct NewSettingsAccessor : public virtual espgui::AccessorInterface<T>
+{
+    virtual ConfigWrapper<T>& getConfig() const = 0;
+
+    T getValue() const override
+    {
+        return getConfig().value();
+    }
+
+    typename espgui::AccessorInterface<T>::setter_result_t setValue(T value) override
+    {
+        return configs.write_config(getConfig(), value);
+    }
+};
+
+template<typename T>
+struct NewSettingsChronoAdaptorAccessor;
+
+template<>
+struct NewSettingsChronoAdaptorAccessor<espchrono::minutes32> : public virtual espgui::AccessorInterface<int32_t>
+{
+    virtual ConfigWrapper<espchrono::minutes32>& getConfig() const = 0;
+
+    int32_t getValue() const override
+    {
+        return getConfig().value().count();
+    }
+
+    typename espgui::AccessorInterface<int32_t>::setter_result_t setValue(int32_t value) override
+    {
+        return configs.write_config(getConfig(), espchrono::minutes32{value});
+    }
+};
+
+template<>
+struct NewSettingsChronoAdaptorAccessor<espchrono::milliseconds32> : public virtual espgui::AccessorInterface<int32_t>
+{
+    virtual ConfigWrapper<espchrono::milliseconds32>& getConfig() const = 0;
+
+    int32_t getValue() const override
+    {
+        return getConfig().value().count();
+    }
+
+    typename espgui::AccessorInterface<int32_t>::setter_result_t setValue(int32_t value) override
+    {
+        return configs.write_config(getConfig(), espchrono::milliseconds32{value});
+    }
+};

main/accessors/globalaccessors.cpp

@@ -1 +0,0 @@
-#include "globalaccessors.h"

main/accessors/settingsaccessors.cpp

@@ -1 +0,0 @@
-#include "settingsaccessors.h"

main/accessors/settingsaccessors.h

@@ -1,227 +1,279 @@
 #pragma once
 
+// system includes
+#include <expected>
+
 // 3rdparty lib includes
 #include <accessorinterface.h>
 
 // local includes
 #include "globals.h"
 #include "utils.h"
-
-//! Special type of RefAccessor that also saves settings after setValue()
-template<typename T>
-struct RefAccessorSaveSettings : public virtual espgui::RefAccessor<T>
-{
-    void setValue(T value) override { espgui::RefAccessor<T>::setValue(value); saveSettings(); };
-};
-
-// Bms
-#ifdef FEATURE_BMS
-struct AutoConnectBmsAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.autoConnectBms; } };
-#endif
-
-// Buzzer
-struct ReverseBeepAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.buzzer.reverseBeep; } };
-struct ReverseBeepFreq0Accessor : public RefAccessorSaveSettings<uint8_t> { uint8_t &getRef() const override { return settings.buzzer.reverseBeepFreq0; } };
-struct ReverseBeepFreq1Accessor : public RefAccessorSaveSettings<uint8_t> { uint8_t &getRef() const override { return settings.buzzer.reverseBeepFreq1; } };
-struct ReverseBeepDuration0Accessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.buzzer.reverseBeepDuration0; } };
-struct ReverseBeepDuration1Accessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.buzzer.reverseBeepDuration1; } };
-
-// Limits
-struct IMotMaxAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.limits.iMotMax; } };
-struct IDcMaxAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.limits.iDcMax; } };
-struct NMotMaxKmhAccessor : public virtual espgui::AccessorInterface<int16_t>
-{
-    int16_t getValue() const override { return convertToKmh(settings.limits.nMotMax); }
-    void setValue(int16_t value) override { settings.limits.nMotMax = convertFromKmh(value); saveSettings(); }
-};
-struct NMotMaxRpmAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.limits.nMotMax; } };
-struct FieldWeakMaxAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.limits.fieldWeakMax; } };
-struct PhaseAdvMaxAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.limits.phaseAdvMax; } };
-
-// WiFi
-struct WifiStaEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.wifiSettings.wifiStaEnabled; } };
-struct WifiApEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.wifiSettings.wifiApEnabled; } };
+#include "accessorhelpers.h"
+#include "newsettings.h"
 
 // Bluetooth
-#ifdef FEATURE_BLUETOOTH
-struct AutoBluetoothModeAccessor : public RefAccessorSaveSettings<BluetoothMode> { BluetoothMode &getRef() const override { return settings.bluetoothSettings.autoBluetoothMode; } };
-#endif
+struct BluetoothNameAccessor : public NewSettingsAccessor<std::string> { ConfigWrapper<std::string> &getConfig() const override { return configs.bluetoothName; } };
+
+// Buzzer
+struct ReverseBeepAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.reverseBeep; } };
+struct ReverseBeepFreq0Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.reverseBeepFreq0; } };
+struct ReverseBeepFreq1Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.reverseBeepFreq1; } };
+struct ReverseBeepDuration0Accessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.reverseBeepDuration0; } };
+struct ReverseBeepDuration1Accessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.reverseBeepDuration1; } };
+
+// Limits
+struct IMotMaxAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return profileSettings.limits.iMotMax; } };
+struct IDcMaxAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return profileSettings.limits.iDcMax; } };
+struct NMotMaxKmhAccessor : public virtual espgui::AccessorInterface<int16_t>
+{
+    int16_t getValue() const override { return convertToKmh(profileSettings.limits.nMotMax); }
+    espgui::AccessorInterface<int16_t>::setter_result_t setValue(int16_t value) override
+    {
+        profileSettings.limits.nMotMax = convertFromKmh(value);
+        if (!saveProfileSettings())
+            return std::unexpected("saveProfileSettings() failed!");
+        return {};
+    }
+};
+struct NMotMaxRpmAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return profileSettings.limits.nMotMax; } };
+struct FieldWeakMaxAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return profileSettings.limits.fieldWeakMax; } };
+struct PhaseAdvMaxAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return profileSettings.limits.phaseAdvMax; } };
 
 // Bluetooth Low Energy
-#ifdef FEATURE_BLE
-struct BleEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.bleSettings.bleEnabled; } };
-#endif
+struct BleEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.bleSettings.bleEnabled; } };
+struct BleFenceEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.bleSettings.bleFenceEnabled; } };
 
 // Cloud
-#ifdef FEATURE_CLOUD
-struct CloudEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.cloudSettings.cloudEnabled; } };
-struct CloudTransmitTimeoutAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.cloudSettings.cloudTransmitTimeout; } };
-#endif
+struct CloudEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.cloudSettings.cloudEnabled; } };
+struct CloudTransmitTimeoutAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.cloudSettings.cloudTransmitTimeout; } };
+struct CloudSendStatisticsAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.cloudSettings.sendStatistic; } };
+struct CloudURLAccessor : public NewSettingsAccessor<std::string> { ConfigWrapper<std::string> &getConfig() const override { return configs.cloudUrl; } };
+struct CloudKeyAccessor : public NewSettingsAccessor<std::string> { ConfigWrapper<std::string> &getConfig() const override { return configs.cloudSettings.cloudKey; } };
 
 // Time
-struct TimezoneOffsetAccessor : public virtual espgui::AccessorInterface<int32_t>
-{
-    int32_t getValue() const override { return settings.timeSettings.timezoneOffset.count(); }
-    void setValue(int32_t value) override { settings.timeSettings.timezoneOffset = espchrono::minutes32{value}; saveSettings(); }
-};
-struct DaylightSavingModeAccessor : public RefAccessorSaveSettings<espchrono::DayLightSavingMode> { espchrono::DayLightSavingMode &getRef() const override { return settings.timeSettings.daylightSavingMode; } };
-#ifdef FEATURE_NTP
-struct TimeServerEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.timeSettings.timeServerEnabled; } };
-struct TimeSyncModeAccessor : public RefAccessorSaveSettings<sntp_sync_mode_t> { sntp_sync_mode_t &getRef() const override { return settings.timeSettings.timeSyncMode; } };
-struct TimeSyncIntervalAccessor : public virtual espgui::AccessorInterface<int32_t>
-{
-    int32_t getValue() const override { return settings.timeSettings.timeSyncInterval.count(); }
-    void setValue(int32_t value) override { settings.timeSettings.timeSyncInterval = espchrono::milliseconds32{value}; saveSettings(); }
-};
-#endif
+//struct TimezoneOffsetAccessor : public NewSettingsAccessor<int32_t> { ConfigWrapper<int32_t> &getConfig() const override { return configs.timezoneOffset; } };
+struct TimezoneOffsetAccessor : public NewSettingsChronoAdaptorAccessor<espchrono::minutes32> { ConfigWrapper<espchrono::minutes32> &getConfig() const override { return configs.timezoneOffset; } };
+struct DaylightSavingModeAccessor : public NewSettingsAccessor<espchrono::DayLightSavingMode> { ConfigWrapper<espchrono::DayLightSavingMode> &getConfig() const override { return configs.timeDst; } };
+struct TimeServerEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.timeServerEnabled; } };
+struct TimeServerAccessor : public NewSettingsAccessor<std::string> { ConfigWrapper<std::string> &getConfig() const override { return configs.timeServer; } };
+struct TimeSyncModeAccessor : public NewSettingsAccessor<sntp_sync_mode_t> { ConfigWrapper<sntp_sync_mode_t> &getConfig() const override { return configs.timeSyncMode; } };
+//struct TimeSyncIntervalAccessor : public NewSettingsAccessor<int32_t> { ConfigWrapper<int32_t> &getConfig() const override { return configs.timeSyncInterval; } };
+struct TimeSyncIntervalAccessor : public NewSettingsChronoAdaptorAccessor<espchrono::milliseconds32> { ConfigWrapper<espchrono::milliseconds32> &getConfig() const override { return configs.timeSyncInterval; } };
 
 // Controller Hardware
-struct FrontLeftEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.controllerHardware.enableFrontLeft; } };
-struct FrontRightEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.controllerHardware.enableFrontRight; } };
-struct BackLeftEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.controllerHardware.enableBackLeft; } };
-struct BackRightEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.controllerHardware.enableBackRight; } };
+struct FrontLeftEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.controllerHardware.enableFrontLeft; } };
+struct FrontRightEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.controllerHardware.enableFrontRight; } };
+struct BackLeftEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.controllerHardware.enableBackLeft; } };
+struct BackRightEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.controllerHardware.enableBackRight; } };
 
-struct FrontLeftInvertedAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.controllerHardware.invertFrontLeft; } };
-struct FrontRightInvertedAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.controllerHardware.invertFrontRight; } };
-struct BackLeftInvertedAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.controllerHardware.invertBackLeft; } };
-struct BackRightInvertedAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.controllerHardware.invertBackRight; } };
+struct FrontLeftInvertedAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.controllerHardware.invertFrontLeft; } };
+struct FrontRightInvertedAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.controllerHardware.invertFrontRight; } };
+struct BackLeftInvertedAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.controllerHardware.invertBackLeft; } };
+struct BackRightInvertedAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.controllerHardware.invertBackRight; } };
 
-struct WheelDiameterMmAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.controllerHardware.wheelDiameter; } };
+struct WheelDiameterMmAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.controllerHardware.wheelDiameter; } };
 struct WheelDiameterInchAccessor : public virtual espgui::AccessorInterface<float>
 {
-    float getValue() const override { return convertToInch(settings.controllerHardware.wheelDiameter); }
-    void setValue(float value) override { settings.controllerHardware.wheelDiameter = convertFromInch(value); saveSettings(); }
+    float getValue() const override { return convertToInch(configs.controllerHardware.wheelDiameter.value()); }
+    espgui::AccessorInterface<int16_t>::setter_result_t setValue(float value) override
+    {
+//        profileSettings.controllerHardware.wheelDiameter = convertFromInch(value);
+//        if (!saveProfileSettings())
+//            return std::unexpected("saveProfileSettings() failed!");
+//        return {};
+        return configs.write_config(configs.controllerHardware.wheelDiameter, convertFromInch(value));
+    }
 };
-struct NumMagnetPolesAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.controllerHardware.numMagnetPoles; } };
-struct SwapFrontBackAccessor : public RefAccessorSaveSettings<bool> {
-    bool &getRef() const override { return settings.controllerHardware.swapFrontBack; }
+struct NumMagnetPolesAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.controllerHardware.numMagnetPoles; } };
+struct SwapFrontBackAccessor : public virtual espgui::AccessorInterface<bool> {
+    bool getValue() const override { return configs.controllerHardware.swapFrontBack.value(); }
+    setter_result_t setValue(bool value) override
+    {
+        const auto err = configs.write_config(configs.controllerHardware.swapFrontBack, value);
 #ifdef FEATURE_SERIAL
-    void setValue(bool value) override { RefAccessorSaveSettings<bool>::setValue(value); updateSwapFrontBack(); };
+        updateSwapFrontBack();
 #endif
+        return err;
+    }
 };
 
 // CAN
 #ifdef FEATURE_CAN
-struct SendFrontCanCmdAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.controllerHardware.sendFrontCanCmd; } };
-struct SendBackCanCmdAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.controllerHardware.sendBackCanCmd; } };
-struct CanTransmitTimeoutAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.controllerHardware.canTransmitTimeout; } };
-struct CanReceiveTimeoutAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.controllerHardware.canReceiveTimeout; } };
+struct SendFrontCanCmdAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.controllerHardware.sendFrontCanCmd; } };
+struct SendBackCanCmdAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.controllerHardware.sendBackCanCmd; } };
+struct CanTransmitTimeoutAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.controllerHardware.canTransmitTimeout; } };
+struct CanReceiveTimeoutAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.controllerHardware.canReceiveTimeout; } };
 #endif
 
 // Input devices
-struct SampleCountAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.sampleCount; } };
-struct GasMinAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.gasMin; } };
-struct GasMaxAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.gasMax; } };
-struct BremsMinAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.bremsMin; } };
-struct BremsMaxAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.bremsMax; } };
-#if defined(FEATURE_DPAD) || defined(FEATURE_DPAD_3WIRESW) || defined(FEATURE_DPAD_5WIRESW) || defined(FEATURE_DPAD_5WIRESW_2OUT) || defined (FEATURE_DPAD_6WIRESW)
-struct DPadDebounceAccessor : public RefAccessorSaveSettings<uint8_t> { uint8_t &getRef() const override { return settings.boardcomputerHardware.dpadDebounce; } };
+struct SampleCountAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.sampleCount; } };
+struct GasMinAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.gasMin; } };
+struct GasMaxAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.gasMax; } };
+struct BremsMinAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.bremsMin; } };
+struct BremsMaxAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.bremsMax; } };
+#if defined(FEATURE_DPAD) || defined(FEATURE_DPAD_3WIRESW) || defined(FEATURE_DPAD_5WIRESW) || defined(FEATURE_DPAD_5WIRESW_2OUT) || defined (FEATURE_DPAD_6WIRESW) || defined (DPAD_BOARDCOMPUTER_V2)
+struct DPadDebounceAccessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadDebounce; } };
+struct ButtonDelayAccessor : public NewSettingsAccessor<uint16_t> { ConfigWrapper<uint16_t> &getConfig() const override { return configs.buttonReadDelay; } };
 #endif
 #ifdef FEATURE_GAMETRAK
-struct GametrakXMinAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.gametrakXMin; } };
-struct GametrakXMaxAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.gametrakXMax; } };
-struct GametrakYMinAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.gametrakYMin; } };
-struct GametrakYMaxAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.gametrakYMax; } };
-struct GametrakDistMinAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.gametrakDistMin; } };
-struct GametrakDistMaxAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.gametrakDistMax; } };
+struct GametrakXMinAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.boardcomputerHardware.gametrakXMin; } };
+struct GametrakXMaxAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.boardcomputerHardware.gametrakXMax; } };
+struct GametrakYMinAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.boardcomputerHardware.gametrakYMin; } };
+struct GametrakYMaxAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.boardcomputerHardware.gametrakYMax; } };
+struct GametrakDistMinAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.boardcomputerHardware.gametrakDistMin; } };
+struct GametrakDistMaxAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.boardcomputerHardware.gametrakDistMax; } };
 #endif
-struct StatsUpdateRateAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.timersSettings.statsUpdateRate; } };
+struct StatsUpdateRateAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.boardcomputerHardware.timersSettings.statsUpdateRate; } };
 
 // Cloud
-#ifdef FEATURE_CLOUD
-struct CloudCollectRateAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.timersSettings.cloudCollectRate; } };
-struct CloudSendRateAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.timersSettings.cloudSendRate; } };
-#endif
+struct CloudCollectRateAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.boardcomputerHardware.timersSettings.cloudCollectRate; } };
+struct CloudSendRateAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.boardcomputerHardware.timersSettings.cloudSendRate; } };
 
-#ifdef FEATURE_UDPCLOUD
-struct UdpCloudSendIntervalAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.boardcomputerHardware.timersSettings.udpSendRateMs; } };
-struct UdpCloudEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.udpCloudSettings.udpCloudEnabled; } };
-struct CloudDebugEnableAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.udpCloudSettings.enableCloudDebug; } };
-struct UdpUseStdStringAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.udpCloudSettings.udpUseStdString; } };
-#endif
+struct UdpCloudSendIntervalAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.boardcomputerHardware.timersSettings.udpSendRateMs; } };
+struct UdpCloudEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.udpCloudSettings.udpCloudEnabled; } };
+struct UdpCloudDebugEnableAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.udpCloudSettings.enableCloudDebug; } };
+struct UdpCloudHostAccessor : public NewSettingsAccessor<std::string> { ConfigWrapper<std::string> &getConfig() const override { return configs.udpCloudSettings.udpCloudHost; } };
+struct UdpCloudPortAccessor : public NewSettingsAccessor<uint16_t> { ConfigWrapper<uint16_t> &getConfig() const override { return configs.udpCloudSettings.udpCloudPort; } };
 
 // DefaultMode
-struct DefaultModeModelModeAccessor : public RefAccessorSaveSettings<UnifiedModelMode> { UnifiedModelMode &getRef() const override { return settings.defaultMode.modelMode; } };
-struct DefaultModeHybridModelModeAccessor : public RefAccessorSaveSettings<UnifiedModelMode> { UnifiedModelMode &getRef() const override { return settings.hybrid.hybridMode; } };
-struct DefaultModeSquareGasAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.defaultMode.squareGas; } };
-struct DefaultModeSquareBremsAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.defaultMode.squareBrems; } };
+struct DefaultModeModelModeAccessor : public RefAccessorSaveSettings<UnifiedModelMode> { UnifiedModelMode &getRef() const override { return profileSettings.defaultMode.modelMode; } };
+struct DefaultModeAllowRemoteControlAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.defaultMode.allowRemoteControl; } };
+struct DefaultModeSquareGasAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.defaultMode.squareGas; } };
+struct DefaultModeSquareBremsAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.defaultMode.squareBrems; } };
 
-struct DefaultModeEnableSmoothingUpAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.defaultMode.enableSmoothingUp; } };
-struct DefaultModeEnableSmoothingDownAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.defaultMode.enableSmoothingDown; } };
-struct DefaultModeEnableFieldWeakSmoothingUpAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.defaultMode.enableFieldWeakSmoothingUp; } };
-struct DefaultModeEnableFieldWeakSmoothingDownAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.defaultMode.enableFieldWeakSmoothingDown; } };
-struct DefaultModeEnableFieldWeakSmoothingLowerLimitAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.defaultMode.fwSmoothLowerLimit; } };
+struct DefaultModeEnableSmoothingUpAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.defaultMode.enableSmoothingUp; } };
+struct DefaultModeEnableSmoothingDownAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.defaultMode.enableSmoothingDown; } };
+struct DefaultModeEnableFieldWeakSmoothingUpAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.defaultMode.enableFieldWeakSmoothingUp; } };
+struct DefaultModeEnableFieldWeakSmoothingDownAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return profileSettings.defaultMode.enableFieldWeakSmoothingDown; } };
+struct DefaultModeEnableFieldWeakSmoothingLowerLimitAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return profileSettings.defaultMode.fwSmoothLowerLimit; } };
 
-struct DefaultModeSmoothingAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.defaultMode.smoothing; } };
-struct DefaultModeFrontPercentageAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.defaultMode.frontPercentage; } };
-struct DefaultModeBackPercentageAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.defaultMode.backPercentage; } };
-struct DefaultModeAddSchwelleAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.defaultMode.add_schwelle; } };
-struct DefaultModeGas1WertAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.defaultMode.gas1_wert; } };
-struct DefaultModeGas2WertAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.defaultMode.gas2_wert; } };
-struct DefaultModeBrems1WertAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.defaultMode.brems1_wert; } };
-struct DefaultModeBrems2WertAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.defaultMode.brems2_wert; } };
-
-struct DefaultModeEnableHybridAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.hybrid.enable; } };
-struct DefaultModeHybridActivationLimitAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.hybrid.activationLimit; } };
-struct DefaultModeHybridDeactivationLimitAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.hybrid.deactivationLimit; } };
+struct DefaultModeSmoothingAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return profileSettings.defaultMode.smoothing; } };
+struct DefaultModeFrontPercentageAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return profileSettings.defaultMode.frontPercentage; } };
+struct DefaultModeBackPercentageAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return profileSettings.defaultMode.backPercentage; } };
+struct DefaultModeAddSchwelleAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return profileSettings.defaultMode.add_schwelle; } };
+struct DefaultModeGas1WertAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return profileSettings.defaultMode.gas1_wert; } };
+struct DefaultModeGas2WertAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return profileSettings.defaultMode.gas2_wert; } };
+struct DefaultModeBrems1WertAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return profileSettings.defaultMode.brems1_wert; } };
+struct DefaultModeBrems2WertAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return profileSettings.defaultMode.brems2_wert; } };
 
 // TempomatMode
-struct TempomatModeModelModeAccessor : public RefAccessorSaveSettings<UnifiedModelMode> { UnifiedModelMode &getRef() const override { return settings.tempomatMode.modelMode; } };
+struct TempomatModeModelModeAccessor : public RefAccessorSaveSettings<UnifiedModelMode> { UnifiedModelMode &getRef() const override { return profileSettings.tempomatMode.modelMode; } };
 
 // LarsmMode
-struct LarsmModeModelModeAccessor : public RefAccessorSaveSettings<UnifiedModelMode> { UnifiedModelMode &getRef() const override { return settings.larsmMode.modelMode; } };
-struct LarsmModeModeAccessor : public RefAccessorSaveSettings<LarsmModeMode> { LarsmModeMode &getRef() const override { return settings.larsmMode.mode; } };
-struct LarsmModeIterationsAccessor : public RefAccessorSaveSettings<uint8_t> { uint8_t &getRef() const override { return settings.larsmMode.iterations; } };
+struct LarsmModeModelModeAccessor : public RefAccessorSaveSettings<UnifiedModelMode> { UnifiedModelMode &getRef() const override { return profileSettings.larsmMode.modelMode; } };
+struct LarsmModeModeAccessor : public RefAccessorSaveSettings<LarsmModeMode> { LarsmModeMode &getRef() const override { return profileSettings.larsmMode.mode; } };
+struct LarsmModeIterationsAccessor : public RefAccessorSaveSettings<uint8_t> { uint8_t &getRef() const override { return profileSettings.larsmMode.iterations; } };
 
 // MotortestMode
-struct MotortestModeMultiplikatorAccessor : public RefAccessorSaveSettings<uint8_t> { uint8_t &getRef() const override { return settings.motortestMode.multiplikator; } };
-struct MotortestMaxPwmAccessor : public RefAccessorSaveSettings<uint16_t> { uint16_t &getRef() const override { return settings.motortestMode.maxPwm; } };
+struct MotortestModeMultiplikatorAccessor : public RefAccessorSaveSettings<uint8_t> { uint8_t &getRef() const override { return profileSettings.motortestMode.multiplikator; } };
+struct MotortestMaxPwmAccessor : public RefAccessorSaveSettings<uint16_t> { uint16_t &getRef() const override { return profileSettings.motortestMode.maxPwm; } };
+
+// MickMode
+struct MickModeModelModeAccessor : public RefAccessorSaveSettings<UnifiedModelMode> { UnifiedModelMode &getRef() const override { return profileSettings.mickMode.modelMode; } };
+struct MickModeSmoothingAccessor : public RefAccessorSaveSettings<uint16_t> { uint16_t &getRef() const override { return profileSettings.mickMode.smoothing; } };
+
+// Remote Control Mode
+struct RemoteControlModeModelModeAccessor : public RefAccessorSaveSettings<UnifiedModelMode> { UnifiedModelMode &getRef() const override { return profileSettings.remoteControlMode.modelMode; } };
 
 // Ledstrip
-#ifdef FEATURE_LEDSTRIP
-struct EnableLedAnimationAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.ledstrip.enableLedAnimation; } };
-struct EnableBrakeLightsAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.ledstrip.enableBrakeLights; } };
-struct LedsCountAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.ledstrip.ledsCount; } };
-struct CenterOffsetAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.ledstrip.centerOffset; } };
-struct SmallOffsetAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.ledstrip.smallOffset; } };
-struct BigOffsetAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.ledstrip.bigOffset; } };
-struct DeziampereAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.ledstrip.deziampere; } };
-struct EnableBeepWhenBlinkAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.ledstrip.enableBeepWhenBlink; } };
-struct EnableFullBlinkAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.ledstrip.enableFullBlink; } };
-struct EnableLedstripStVOAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.ledstrip.enableStVO; } };
-struct LedsStVOFrontOffsetAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.ledstrip.stvoFrontOffset; } };
-struct LedsStVOFrontLengthAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.ledstrip.stvoFrontLength; } };
-struct EnableLedstripStVOFrontlight : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.ledstrip.stvoFrontEnable; } };
-struct AnimationMultiplierAccessor : public RefAccessorSaveSettings<int16_t> { int16_t &getRef() const override { return settings.ledstrip.animationMultiplier; } };
-struct LedstripBrightnessAccessor : public RefAccessorSaveSettings<uint8_t> { uint8_t &getRef() const override { return settings.ledstrip.brightness; } };
-struct LedstripEnableBlinkAnimationAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.ledstrip.enableAnimBlink; } };
-#ifdef FEATURE_OTA
-struct LedstripOtaAnimationAccessor : public RefAccessorSaveSettings<OtaAnimationModes> { OtaAnimationModes &getRef() const override { return settings.ledstrip.otaMode; } };
-#endif
-#endif
+struct EnableLedAnimationAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.ledstrip.enableLedAnimation; } };
+struct EnableBrakeLightsAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.ledstrip.enableBrakeLights; } };
+struct LedsCountAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.ledstrip.ledsCount; } };
+struct CenterOffsetAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.ledstrip.centerOffset; } };
+struct SmallOffsetAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.ledstrip.smallOffset; } };
+struct BigOffsetAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.ledstrip.bigOffset; } };
+struct LedStripMaxMilliampsAccessor : public NewSettingsAccessor<uint32_t> { ConfigWrapper<uint32_t> &getConfig() const override { return configs.ledstrip.maxMilliamps; } };
+struct LedStripMaxAmpereAccessor : public virtual espgui::AccessorInterface<float>
+{
+    float getValue() const override
+    {
+        return configs.ledstrip.maxMilliamps.value() / 1000.f;
+    }
+
+    espgui::AccessorInterface<float>::setter_result_t setValue(float value) override
+    {
+        return configs.write_config(configs.ledstrip.maxMilliamps, value * 1000);
+    }
+};
+struct EnableBeepWhenBlinkAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.ledstrip.enableBeepWhenBlink; } };
+struct EnableFullBlinkAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.ledstrip.enableFullBlink; } };
+struct EnableLedstripStVOAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.ledstrip.enableStVO; } };
+struct LedsStVOFrontOffsetAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.ledstrip.stvoFrontOffset; } };
+struct LedsStVOFrontLengthAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.ledstrip.stvoFrontLength; } };
+struct EnableLedstripStVOFrontlight : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.ledstrip.stvoFrontEnable; } };
+struct AnimationMultiplierAccessor : public NewSettingsAccessor<int16_t> { ConfigWrapper<int16_t> &getConfig() const override { return configs.ledstrip.animationMultiplier; } };
+struct LedstripBrightnessAccessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.ledstrip.brightness; } };
+struct LedstripEnableBlinkAnimationAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.ledstrip.enableAnimBlink; } };
+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 RefAccessorSaveSettings<uint8_t> { uint8_t &getRef() const override { return settings.battery.cellsSeries; } };
-struct BatteryParallelCellsAccessor : public RefAccessorSaveSettings<uint8_t> { uint8_t &getRef() const override { return settings.battery.cellsParallel; } };
-struct BatteryWHperKMAccessor : public RefAccessorSaveSettings<uint16_t> { uint16_t &getRef() const override { return settings.battery.watthoursPerKilometer; } };
-struct BatteryApplyCalibrationAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.battery.applyCalibration; } };
+struct BatterySeriesCellsAccessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.battery.cellsSeries; } };
+struct BatteryParallelCellsAccessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.battery.cellsParallel; } };
+struct BatteryWHperKMAccessor : public NewSettingsAccessor<uint16_t> { ConfigWrapper<uint16_t> &getConfig() const override { return configs.battery.watthoursPerKilometer; } };
+struct BatteryApplyCalibrationAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.battery.applyCalibration; } };
 
 // Lockscreen
-struct LockscreenAllowPresetSwitchAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.lockscreen.allowPresetSwitch; } };
+struct LockscreenAllowPresetSwitchAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.lockscreen.allowPresetSwitch; } };
 template<uint8_t index>
-struct LockscreenPinDigitAccessor : public RefAccessorSaveSettings<int8_t> { int8_t &getRef() const override { return settings.lockscreen.pin[index]; } };
-struct LockscreenKeepLockedAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.lockscreen.keepLockedAfterReboot; } };
+struct LockscreenPinDigitAccessor : public NewSettingsAccessor<int8_t> { ConfigWrapper<int8_t> &getConfig() const override { return configs.lockscreen.pin[index]; } };
+struct LockscreenKeepLockedAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.lockscreen.keepLockedAfterReboot; } };
 
 // Handbremse
-struct HandbremsEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.handbremse.enable; } };
-struct HandbremsModeAccessor : public RefAccessorSaveSettings<HandbremseMode> { HandbremseMode &getRef() const override { return settings.handbremse.mode; } };
-struct HandbremsTimeoutAccessor : public RefAccessorSaveSettings<uint16_t> { uint16_t &getRef() const override { return settings.handbremse.triggerTimeout; } };
-struct HandbremsAutomaticAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.handbremse.automatic; } };
-struct HandbremsVisualizeAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.handbremse.visualize; } };
+struct HandbremsEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.handbremse.enable; } };
+struct HandbremsModeAccessor : public NewSettingsAccessor<HandbremseMode> { ConfigWrapper<HandbremseMode> &getConfig() const override { return configs.handbremse.mode; } };
+struct HandbremsTimeoutAccessor : public NewSettingsAccessor<uint16_t> { ConfigWrapper<uint16_t> &getConfig() const override { return configs.handbremse.triggerTimeout; } };
+struct HandbremsAutomaticAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.handbremse.automatic; } };
+struct HandbremsVisualizeAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.handbremse.visualize; } };
 
 // ESP Now
-#ifdef FEATURE_ESPNOW
-struct ESPNowSyncTimeEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.espnow.syncTime; } };
-struct ESPNowSyncTimeWithOthersEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.espnow.syncTimeWithOthers; } };
-struct ESPNowSyncBlinkEnabledAccessor : public RefAccessorSaveSettings<bool> { bool &getRef() const override { return settings.espnow.syncBlink; } };
-#endif
+struct ESPNowSyncTimeEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.espnow.syncTime; } };
+struct ESPNowSyncTimeWithOthersEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.espnow.syncTimeWithOthers; } };
+struct ESPNowSyncBlinkEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.espnow.syncBlink; } };
+
+// Button Mapping accessors
+struct ButtonLeftAccessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingLeft; } };
+struct ButtonRightAccessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingRight; } };
+struct ButtonUpAccessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingUp; } };
+struct ButtonDownAccessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingDown; } };
+
+struct ButtonLeft2Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingLeft2; } };
+struct ButtonRight2Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingRight2; } };
+struct ButtonUp2Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingUp2; } };
+struct ButtonDown2Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingDown2; } };
+
+struct ButtonProfile0Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingProfile0; } };
+struct ButtonProfile1Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingProfile1; } };
+struct ButtonProfile2Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingProfile2; } };
+struct ButtonProfile3Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingProfile3; } };
+
+struct ButtonExtra1Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingExtra1; } };
+struct ButtonExtra2Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingExtra2; } };
+struct ButtonExtra3Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingExtra3; } };
+struct ButtonExtra4Accessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingExtra4; } };
+
+// Can
+struct CanResetOnErrorAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.canResetOnError; } };
+struct CanReinstallDriverAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.canUninstallOnReset; } };
+
+// Quick Actions
+struct QuickActionLeft2Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionLeft2; } };
+struct QuickActionRight2Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionRight2; } };
+struct QuickActionUp2Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionUp2; } };
+struct QuickActionDown2Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionDown2; } };
+struct QuickActionExtra1Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionExtra1; } };
+struct QuickActionExtra2Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionExtra2; } };
+struct QuickActionExtra3Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionExtra3; } };
+struct QuickActionExtra4Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionExtra4; } };
+
+// boardcomputer-hardware
+struct FlipScreenAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.boardcomputerHardware.flipScreen; } };
+
+// Other
+struct AnhaengerIdAccessor : public NewSettingsAccessor<uint16_t> { ConfigWrapper<uint16_t> &getConfig() const override { return configs.anhaenger_id; } };
+struct UsernameAccessor : public NewSettingsAccessor<std::string> { ConfigWrapper<std::string> &getConfig() const override { return configs.otaUsername; } };

main/accessors/wifiapconfigaccessors.h

@@ -0,0 +1,15 @@
+#pragma once
+
+// local includes
+#include "accessorhelpers.h"
+#include "newsettings.h"
+
+struct WifiApEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.wifiApEnabled; } };
+//struct WifiApDisableWhenOnlineAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.wifiDisableApWhenOnline; } };
+struct WifiApSsidAccessor : public NewSettingsAccessor<std::string> { ConfigWrapper<std::string> &getConfig() const override { return configs.wifiApName; } };
+struct WifiApKeyAccessor : public NewSettingsAccessor<std::string> { ConfigWrapper<std::string> &getConfig() const override { return configs.wifiApKey; } };
+struct WifiApIpAccessor : public NewSettingsAccessor<wifi_stack::ip_address_t> { ConfigWrapper<wifi_stack::ip_address_t> &getConfig() const override { return configs.wifiApIp; } };
+struct WifiApMaskAccessor : public NewSettingsAccessor<wifi_stack::ip_address_t> { ConfigWrapper<wifi_stack::ip_address_t> &getConfig() const override { return configs.wifiApMask; } };
+struct WifiApChannelAccessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.wifiApChannel; } };
+struct WifiApAuthmodeAccessor : public NewSettingsAccessor<wifi_auth_mode_t> { ConfigWrapper<wifi_auth_mode_t> &getConfig() const override { return configs.wifiApAuthmode; } };
+struct WiFiApHiddenAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.wifiApHidden; } };

main/accessors/wifistaconfigaccessors.cpp

@@ -0,0 +1,3 @@
+#include "wifistaconfigaccessors.h"
+
+

main/accessors/wifistaconfigaccessors.h

@@ -0,0 +1,107 @@
+#pragma once
+
+#include "sdkconfig.h"
+
+// system includes
+#include <string>
+
+// 3rdparty lib includes
+#include <accessorinterface.h>
+#include <espwifiutils.h>
+
+// local includes
+#include "newsettings.h"
+#include "accessorhelpers.h"
+
+struct WifiStaEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.wifiStaEnabled; } };
+struct WifiStaMinRssiAccessor : public NewSettingsAccessor<int8_t> { ConfigWrapper<int8_t> &getConfig() const override { return configs.wifiStaMinRssi; } };
+
+class WifiStaConfigSsidAccessor : public virtual NewSettingsAccessor<std::string>
+{
+public:
+    WifiStaConfigSsidAccessor(int index) : m_index{index} {}
+    ConfigWrapper<std::string>& getConfig() const override { return configs.wifi_configs[m_index].ssid; }
+private:
+    const int m_index;
+};
+
+class WifiStaConfigKeyAccessor : public virtual NewSettingsAccessor<std::string>
+{
+public:
+    WifiStaConfigKeyAccessor(int index) : m_index{index} {}
+    ConfigWrapper<std::string>& getConfig() const override { return configs.wifi_configs[m_index].key; }
+private:
+    const int m_index;
+};
+
+class WifiStaConfigUseStaticIpAccessor : public virtual NewSettingsAccessor<bool>
+{
+public:
+    WifiStaConfigUseStaticIpAccessor(int index) : m_index{index} {}
+    ConfigWrapper<bool>& getConfig() const override { return configs.wifi_configs[m_index].useStaticIp; }
+private:
+    const int m_index;
+};
+
+class WifiStaConfigStaticIpAccessor : public virtual NewSettingsAccessor<wifi_stack::ip_address_t>
+{
+public:
+    WifiStaConfigStaticIpAccessor(int index) : m_index{index} {}
+    ConfigWrapper<wifi_stack::ip_address_t>& getConfig() const override { return configs.wifi_configs[m_index].staticIp; }
+private:
+    const int m_index;
+};
+
+class WifiStaConfigStaticSubnetAccessor : public virtual NewSettingsAccessor<wifi_stack::ip_address_t>
+{
+public:
+    WifiStaConfigStaticSubnetAccessor(int index) : m_index{index} {}
+    ConfigWrapper<wifi_stack::ip_address_t>& getConfig() const override { return configs.wifi_configs[m_index].staticSubnet; }
+private:
+    const int m_index;
+};
+
+class WifiStaConfigStaticGatewayAccessor : public virtual NewSettingsAccessor<wifi_stack::ip_address_t>
+{
+public:
+    WifiStaConfigStaticGatewayAccessor(int index) : m_index{index} {}
+    ConfigWrapper<wifi_stack::ip_address_t>& getConfig() const override { return configs.wifi_configs[m_index].staticGateway; }
+private:
+    const int m_index;
+};
+
+class WifiStaConfigUseStaticDnsAccessor : public virtual NewSettingsAccessor<bool>
+{
+public:
+    WifiStaConfigUseStaticDnsAccessor(int index) : m_index{index} {}
+    ConfigWrapper<bool>& getConfig() const override { return configs.wifi_configs[m_index].useStaticDns; }
+private:
+    const int m_index;
+};
+
+class WifiStaConfigStaticDns0Accessor : public virtual NewSettingsAccessor<wifi_stack::ip_address_t>
+{
+public:
+    WifiStaConfigStaticDns0Accessor(int index) : m_index{index} {}
+    ConfigWrapper<wifi_stack::ip_address_t>& getConfig() const override { return configs.wifi_configs[m_index].staticDns0; }
+private:
+    const int m_index;
+};
+
+class WifiStaConfigStaticDns1Accessor : public virtual NewSettingsAccessor<wifi_stack::ip_address_t>
+{
+public:
+    WifiStaConfigStaticDns1Accessor(int index) : m_index{index} {}
+    ConfigWrapper<wifi_stack::ip_address_t>& getConfig() const override { return configs.wifi_configs[m_index].staticDns1; }
+private:
+    const int m_index;
+};
+
+class WifiStaConfigStaticDns2Accessor : public virtual NewSettingsAccessor<wifi_stack::ip_address_t>
+{
+public:
+    WifiStaConfigStaticDns2Accessor(int index) : m_index{index} {}
+    ConfigWrapper<wifi_stack::ip_address_t>& getConfig() const override { return configs.wifi_configs[m_index].staticDns2; }
+private:
+    const int m_index;
+};

main/actions/bluetoothbeginaction.cpp

@@ -2,11 +2,12 @@
 
 // local includes
 #include "globals.h"
+#include "newsettings.h"
 
 #ifdef FEATURE_BLUETOOTH
 void BluetoothBeginAction::triggered()
 {
-    if (!bluetoothSerial.begin(deviceName))
+    if (!bluetoothSerial.begin(configs.bluetoothName.value.c_str()))
     {
         //Serial.println("Could not begin bluetooth");
         // TODO: better error handling

main/actions/bluetoothbeginmasteraction.h

@@ -2,6 +2,7 @@
 
 #include "actioninterface.h"
 #include "globals.h"
+#include "newsettings.h"
 
 using namespace espgui;
 
@@ -12,7 +13,7 @@ class BluetoothBeginMasterAction : public virtual ActionInterface
 public:
     void triggered() override
     {
-        if (!bluetoothSerial.begin(deviceName, true))
+        if (!bluetoothSerial.begin(configs.bluetoothName.value.c_str(), true))
         {
             //Serial.println("Could not begin bluetooth master");
             // TODO: better error handling

main/actions/erasenvsaction.h

@@ -24,14 +24,7 @@ public:
             //return;
         }
 
-        settings = presets::defaultSettings;
-        stringSettings = presets::makeDefaultStringSettings();
-
-        if (!settingsPersister.openCommon())
-        {
-            ESP_LOGE("BOBBY", "openCommon() failed");
-            //return;
-        }
+        profileSettings = presets::defaultProfileSettings;
 
         if (profile)
         {
@@ -42,17 +35,11 @@ public:
             }
         }
 
-        if (!settingsPersister.load(settings))
+        if (!settingsPersister.load(profileSettings))
         {
             ESP_LOGE("BOBBY", "load() for settings failed");
             //return;
         }
-
-        if (!settingsPersister.load(stringSettings))
-        {
-            ESP_LOGE("BOBBY", "load() for stringSettings failed");
-            //return;
-        }
     }
 };
 }

main/actions/ledstripanimationactions.cpp

@@ -0,0 +1,8 @@
+#include "ledstripanimationactions.h"
+#ifdef FEATURE_LEDSTRIP
+void LedStripSetAnimationAction::triggered()
+{
+    if (auto result = configs.write_config(configs.ledstrip.animationType, m_animation); !result)
+        BobbyErrorHandler{}.errorOccured(std::move(result).error());
+}
+#endif

main/actions/ledstripanimationactions.h

@@ -1,14 +1,30 @@
 #pragma once
 
+// 3rdparty lib includes
 #include "actioninterface.h"
-#include "ledstrip.h"
-// #include "ledstripdefines.h"
 
-#ifdef FEATURE_LEDSTRIP
-template<uint16_t type>
+// local includes
+#include "ledstrip.h"
+#include "ledstripdefines.h"
+#include "newsettings.h"
+#include "bobbyerrorhandler.h"
+
+template<LedstripAnimation type>
+class LedStripSetAnimationActionStatic : public virtual espgui::ActionInterface
+{
+public:
+    void triggered() override
+    {
+        if (auto result = configs.write_config(configs.ledstrip.animationType, type); !result)
+            BobbyErrorHandler{}.errorOccurred(std::move(result).error());
+    }
+};
+
 class LedStripSetAnimationAction : public virtual espgui::ActionInterface
 {
 public:
-    void triggered() override { animation_type = type; }
+    LedStripSetAnimationAction(LedstripAnimation animation) : m_animation{animation} {};
+    void triggered() override;
+private:
+    const LedstripAnimation m_animation;
 };
-#endif

main/actions/ledstripblinkactions.cpp

@@ -1,6 +1,5 @@
 #include "ledstripblinkactions.h"
 
-#ifdef FEATURE_LEDSTRIP
 #include "ledstrip.h"
 #include "ledstripdefines.h"
 
@@ -39,4 +38,3 @@ void LedstripAnimationBlinkBothAction::triggered()
 {
     blinkAnimation = LEDSTRIP_OVERWRITE_BLINKBOTH;
 }
-#endif

main/actions/ledstripblinkactions.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#ifdef FEATURE_LEDSTRIP
 #include "actioninterface.h"
 
 class LedstripAnimationBlinkNoneAction : public virtual espgui::ActionInterface
@@ -34,4 +33,3 @@ class LedstripAnimationBlinkBothAction : public virtual espgui::ActionInterface
 public:
     void triggered() override;
 };
-#endif

main/actions/loadsettingsaction.h

@@ -9,6 +9,6 @@ namespace {
 class LoadSettingsAction : public virtual ActionInterface
 {
 public:
-    void triggered() override { loadSettings(); }
+    void triggered() override { loadProfileSettings(); }
 };
 }

main/actions/modesettingsaction.cpp

@@ -0,0 +1,56 @@
+#include "modesettingsaction.h"
+
+// 3rdparty lib includes
+#include <screenmanager.h>
+
+// local includes
+#include "globals.h"
+#include "modes/defaultmode.h"
+#include "modes/mickmode.h"
+#include "modes/tempomatmode.h"
+#include "modes/larsmmode.h"
+#ifdef FEATURE_GAMETRAK
+#include "modes/gametrakmode.h"
+#endif
+#include "modes/motortestmode.h"
+#ifdef FEATURE_JOYSTICK
+#include "modes/wheelchairmode.h"
+#endif
+#include "modes/remotecontrolmode.h"
+#include "displays/menus/defaultmodesettingsmenu.h"
+#include "displays/menus/tempomatmodesettingsmenu.h"
+#include "displays/menus/larsmmodesettingsmenu.h"
+#ifdef FEATURE_GAMETRAK
+#include "displays/menus/gametrakmodesettingsmenu.h"
+#endif
+#include "displays/menus/mickmodesettingsmenu.h"
+#include "displays/menus/motortestmodesettingsmenu.h"
+#include "displays/menus/remotecontrolmodesettingsmenu.h"
+
+void ModeSettingsAction::triggered()
+{
+    if (currentMode == &modes::defaultMode
+#ifdef FEATURE_JOYSTICK
+        || currentMode == &modes::wheelchairMode
+#endif
+            )
+        pushScreen<DefaultModeSettingsMenu>();
+    else if (currentMode == &modes::tempomatMode)
+        pushScreen<TempomatModeSettingsMenu>();
+    else if (currentMode == &modes::larsmMode)
+        pushScreen<LarsmModeSettingsMenu>();
+    else if (currentMode == &modes::mickMode)
+        pushScreen<MickModeSettingsMenu>();
+    else if (currentMode == &modes::motortestMode)
+        pushScreen<MotortestModeSettingsMenu>();
+    else if (currentMode == &modes::remoteControlMode)
+        pushScreen<RemoteControlModeSettingsMenu>();
+#ifdef FEATURE_GAMETRAK
+        else if (currentMode == &modes::gametrakMode)
+        pushScreen<GametrakModeSettingsMenu>();
+#endif
+    else
+    {
+        //Serial.println("Unknown mode, cannot open settings for it");
+    }
+}

main/actions/modesettingsaction.h

@@ -1,45 +1,11 @@
 #pragma once
 
 #include "actioninterface.h"
-#include "globals.h"
-#include "modes/defaultmode.h"
-#include "modes/tempomatmode.h"
-#include "modes/larsmmode.h"
-#include "modes/gametrakmode.h"
-#include "modes/motortestmode.h"
-#include "displays/menus/defaultmodesettingsmenu.h"
-#include "displays/menus/tempomatmodesettingsmenu.h"
-#include "displays/menus/larsmmodesettingsmenu.h"
-#include "displays/menus/gametrakmodesettingsmenu.h"
-#include "displays/menus/motortestmodesettingsmenu.h"
-#include "screenmanager.h"
 
 using namespace espgui;
 
-namespace {
 class ModeSettingsAction : public virtual ActionInterface
 {
 public:
     void triggered() override;
 };
-
-void ModeSettingsAction::triggered()
-{
-    if (currentMode == &modes::defaultMode)
-        switchScreen<DefaultModeSettingsMenu>();
-    else if (currentMode == &modes::tempomatMode)
-        switchScreen<TempomatModeSettingsMenu>();
-    else if (currentMode == &modes::larsmMode)
-        switchScreen<LarsmModeSettingsMenu>();
-    else if (currentMode == &modes::motortestMode)
-        switchScreen<MotortestModeSettingsMenu>();
-#ifdef FEATURE_GAMETRAK
-    else if (currentMode == &modes::gametrakMode)
-        switchScreen<GametrakModeSettingsMenu>();
-#endif
-    else
-    {
-        //Serial.println("Unknown mode, cannot open settings for it");
-    }
-}
-}

main/actions/multiaction.h

@@ -1,31 +0,0 @@
-#pragma once
-
-#include "actioninterface.h"
-
-using namespace espgui;
-
-namespace {
-template<typename ...T>
-class MultiAction;
-
-template<typename T>
-class MultiAction<T> : public virtual ActionInterface
-{
-public:
-    void triggered() override
-    {
-        T{}.triggered();
-    }
-};
-
-template<typename T, typename ...Tmore>
-class MultiAction<T, Tmore...> : public virtual MultiAction<Tmore...>
-{
-public:
-    void triggered() override
-    {
-        T{}.triggered();
-        MultiAction<Tmore...>::triggered();
-    }
-};
-}

main/actions/qraction.cpp

@@ -1,23 +1 @@
 #include "qraction.h"
-
-#include <actioninterface.h>
-#include <string>
-#include <screenmanager.h>
-#include "displays/qrdisplay.h"
-#include "displays/qrimportdisplay.h"
-
-using namespace espgui;
-
-SwitchQrDisplayAction::SwitchQrDisplayAction(qraction::QrMenu qrmenu) : m_msg{qrmenu.message}, m_ver{qrmenu.ver} {}
-
-void SwitchQrDisplayAction::triggered()
-{
-    switchScreen<QrDisplay>(m_msg, m_ver);
-}
-
-SwitchQrImportDisplayAction::SwitchQrImportDisplayAction(std::string nvskey) : m_nvskey{nvskey} {}
-
-void SwitchQrImportDisplayAction::triggered()
-{
-    switchScreen<QrImportDisplay>(m_nvskey);
-}

main/actions/qraction.h

@@ -1,35 +1,47 @@
 #pragma once
 
-#include <actioninterface.h>
+// system includes
 #include <string>
 
+// 3rdparty lib includes
+#include <actioninterface.h>
+
+// local includes
 #include "actions/qraction.h"
+#include "displays/qrdisplay.h"
+#include "displays/qrimportdisplay.h"
 
 namespace qraction {
 struct QrMenu {
     std::string message;
     std::string text;
-    uint8_t ver;
 };
 } // namespace
 
-class SwitchQrDisplayAction : public virtual espgui::ActionInterface
+class PushQrDisplayAction : public virtual espgui::ActionInterface
 {
 public:
-    SwitchQrDisplayAction(qraction::QrMenu qrmenu);
+    explicit PushQrDisplayAction(const qraction::QrMenu &qrmenu) : m_msg{qrmenu.message} {}
+    explicit PushQrDisplayAction(qraction::QrMenu &&qrmenu) : m_msg{std::move(qrmenu.message)} {}
 
-    void triggered() override;
+    void triggered() override
+    {
+        espgui::pushScreen<QrDisplay>(m_msg);
+    }
 private:
     std::string m_msg;
-    uint8_t m_ver;
 };
 
-class SwitchQrImportDisplayAction : public virtual espgui::ActionInterface
+class PushQrImportDisplayAction : public virtual espgui::ActionInterface
 {
 public:
-    SwitchQrImportDisplayAction(std::string nvskey);
+    explicit PushQrImportDisplayAction(const std::string &nvskey) : m_nvskey{nvskey} {}
+    explicit PushQrImportDisplayAction(std::string &&nvskey) : m_nvskey{std::move(nvskey)} {}
 
-    void triggered() override;
+    void triggered() override
+    {
+        espgui::pushScreen<QrImportDisplay>(std::move(m_nvskey));
+    }
 private:
     std::string m_nvskey;
 };

main/actions/rebootaction.cpp

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

main/actions/rebootaction.h

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

main/actions/resetnvsaction.h

@@ -0,0 +1,40 @@
+#pragma once
+
+// system includes
+#include <esp_system.h>
+
+// 3rdparty lib includes
+#include <actioninterface.h>
+#include <tftcolors.h>
+
+// local includes
+#include "newsettings.h"
+
+template<bool reboot>
+class ResetNVSAction : public virtual espgui::ActionInterface
+{
+public:
+    void triggered() override
+    {
+        if (reboot)
+        {
+            tft.fillScreen(espgui::TFT_BLACK);
+            tft.setTextColor(espgui::TFT_YELLOW);
+
+            tft.drawString("Reboot", 5, 5, 4);
+
+            tft.fillRect(0, 34, tft.width(), 3, espgui::TFT_WHITE);
+
+            tft.setTextColor(espgui::TFT_WHITE);
+            tft.drawString("Rebooting now...", 0, 50, 4);
+
+            configs.reset();
+
+            esp_restart();
+        }
+        else
+        {
+            configs.reset();
+        }
+    }
+};

main/actions/savesettingsaction.h

@@ -9,6 +9,6 @@ namespace {
 class SaveSettingsAction : public virtual ActionInterface
 {
 public:
-    void triggered() override { saveSettings(); }
+    void triggered() override { saveProfileSettings(); }
 };
 }

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
+}