Merge pull request #962 from justcallmekoko/develop

Add last seen to airtag monitor
2026-01-26 03:05:00 -08:00 · 2025-10-30 14:15:57 -04:00 · 2025-10-30 13:59:16 -04:00 · 2025-10-30 13:00:11 -04:00 · 2025-10-30 12:56:27 -04:00 · 2025-10-30 12:48:20 -04:00
21 changed files with 2079 additions and 729 deletions
--- a/.github/workflows/build_parallel.yml
+++ b/.github/workflows/build_parallel.yml
@@ -33,6 +33,7 @@ jobs:
          - { name: "Marauder CYD 2432S028",         flag: "MARAUDER_CYD_MICRO",       fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "cyd_2432S028",            tft: true,  tft_file: "User_Setup_cyd_micro.h",             build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "Marauder CYD 2432S024 GUITION", flag: "MARAUDER_CYD_GUITION",     fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "cyd_2432S024_guition",    tft: true,  tft_file: "User_Setup_cyd_guition.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "Marauder CYD 2432S028 2 USB",   flag: "MARAUDER_CYD_2USB",        fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "cyd_2432S028_2usb",       tft: true,  tft_file: "User_Setup_cyd_2usb.h",              build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder CYD 3.5inch",          flag: "MARAUDER_CYD_3_5_INCH",    fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "cyd_3_5_inch",            tft: true,  tft_file: "User_Setup_cyd_3_5_inch.h",          build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "Marauder v7.1",                 flag: "MARAUDER_V7_1",            fbqn: "esp32:esp32:dfrobot_firebeetle2_esp32e:FlashSize=16M,PartitionScheme=min_spiffs,PSRAM=enabled", file_name: "marauder_v7_1",           tft: true,  tft_file: "User_Setup_dual_nrf24.h",            build_dir: "dfrobot_firebeetle2_esp32e", addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "M5Cardputer",                   flag: "MARAUDER_CARDPUTER",       fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=8M,PSRAM=disabled",                    file_name: "m5cardputer",             tft: true,  tft_file: "User_Setup_marauder_m5cardputer.h",  build_dir: "esp32s3",                    addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "ESP32-C5-DevKitC-1",            flag: "MARAUDER_C5",              fbqn: "esp32:esp32:esp32c5:PartitionScheme=min_spiffs",                                                file_name: "esp32c5devkitc1",         tft: false, tft_file: "",                                   build_dir: "esp32c5",                    addr: "0x2000",   idf_ver: "3.3.0",    nimble_ver: "2.3.0",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
@@ -81,8 +82,8 @@ jobs:
      - name: Install AsyncTCP
        uses: actions/checkout@v2
        with:
-          repository: me-no-dev/AsyncTCP
-          ref: master
+          repository: ESP32Async/AsyncTCP
+          ref: v3.4.8
          path: CustomAsyncTCP
          
      - name: Install MicroNMEA
@@ -92,16 +93,16 @@ jobs:
          ref: v2.0.6
          path: CustomMicroNMEA
          
-      #- name: Install ESPAsyncWebServer
-      #  uses: actions/checkout@v2
-      #  with:
-      #    repository: ${{ matrix.board.esp_async }}
-      #    ref: ${{ matrix.board.esp_async_ver }}
-      #    path: CustomESPAsyncWebServer
-      
      - name: Install ESPAsyncWebServer
-        run: |
-          cp -r libraries/ESPAsyncWebServer ./CustomESPAsyncWebServer
+        uses: actions/checkout@v2
+        with:
+          repository: ESP32Async/ESPAsyncWebServer
+          ref: v3.8.1
+          path: CustomESPAsyncWebServer
+      
+      #- name: Install ESPAsyncWebServer
+      #  run: |
+      #    cp -r libraries/ESPAsyncWebServer ./CustomESPAsyncWebServer
          
      - name: Install TFT_eSPI
        uses: actions/checkout@v2
@@ -142,7 +143,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: adafruit/Adafruit_NeoPixel
-          ref: 1.10.7
+          ref: 1.12.0
          path: CustomAdafruit_NeoPixel

      - name: Install ArduinoJson
@@ -241,16 +242,19 @@ jobs:
      - name: Rename and Upload ${{ matrix.board.name }} Artifact
        run: |
          VERSION=$(grep '#define MARAUDER_VERSION' ./esp32_marauder/configs.h | sed -E 's/.*"v([^"]+)"/v\1/' | tr '.' '_')
+          VERSION_DOT=$(grep '#define MARAUDER_VERSION' ./esp32_marauder/configs.h | sed -E 's/.*"v([^"]+)"/v\1/')
          DATE=$(date +%Y%m%d)

          BUILD_DIR=./esp32_marauder/build/esp32.esp32.${{ matrix.board.build_dir }}
          INPUT_BIN=$BUILD_DIR/esp32_marauder.ino.bin
          OUTPUT_BIN=esp32_marauder_${VERSION}_${DATE}_${{ matrix.board.file_name }}.bin
+          VERSION_DOT=${VERSION_DOT}

          mv "$INPUT_BIN" "$BUILD_DIR/$OUTPUT_BIN"

          echo "artifact_name=$OUTPUT_BIN" >> $GITHUB_ENV
          echo "artifact_path=$BUILD_DIR/$OUTPUT_BIN" >> $GITHUB_ENV
+          echo "version_dot=$VERSION_DOT" >> $GITHUB_ENV
      - name: Upload ${{ matrix.board.name }} Artifact
        uses: actions/upload-artifact@v4
        with:
@@ -272,7 +276,7 @@ jobs:
        uses: softprops/action-gh-release@v1
        with:
          name: "Marauder Release ${{ github.ref_name }}"
-          tag_name: ${{ github.ref_name }}
+          tag_name: ${{ env.version_dot }}
          generate_release_notes: true
          draft: true
          files: |
--- a/.github/workflows/nightly_build.yml
+++ b/.github/workflows/nightly_build.yml
@@ -0,0 +1,402 @@
+name: Build and (Nightly) Pre-release
+
+on:
+  workflow_dispatch:
+  schedule:
+    # daily at 03:00 UTC (adjust to your preferred time)
+    - cron: '0 3 * * *'
+
+jobs:
+  decide:
+    name: Detect new commits on default branch
+    runs-on: ubuntu-latest
+    outputs:
+      should_build: ${{ steps.decide.outputs.should_build }}
+      default_branch: ${{ steps.decide.outputs.default_branch }}
+      head_sha: ${{ steps.decide.outputs.head_sha }}
+      short_sha: ${{ steps.decide.outputs.short_sha }}
+    steps:
+      - uses: actions/checkout@v4
+        with: { fetch-depth: 0 }
+
+      - id: decide
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const owner = context.repo.owner;
+            const repo  = context.repo.repo;
+
+            // Find default branch and its HEAD
+            const repoInfo = await github.rest.repos.get({ owner, repo });
+            const defaultBranch = repoInfo.data.default_branch;
+            const head = await github.rest.repos.getBranch({ owner, repo, branch: defaultBranch });
+            const headSha = head.data.commit.sha;
+            const shortSha = headSha.slice(0,7);
+
+            // Try get the existing nightly release (single static tag)
+            let nightlyRelease = null;
+            try {
+              nightlyRelease = await github.rest.repos.getReleaseByTag({
+                owner, repo, tag: 'nightly'
+              });
+            } catch (e) {
+              if (e.status !== 404) throw e;
+            }
+
+            // Decide if we need to rebuild: compare short SHA in the release name
+            // Name format we set: "<shortsha>_nightly"
+            let shouldBuild = true;
+            if (nightlyRelease) {
+              const name = nightlyRelease.data.name || '';
+              const m = name.match(/^([0-9a-f]{7})_nightly$/i);
+              if (m && m[1] === shortSha) {
+                shouldBuild = false; // no new commits since last nightly
+              }
+            }
+
+            core.setOutput('should_build', String(shouldBuild));
+            core.setOutput('default_branch', defaultBranch);
+            core.setOutput('head_sha', headSha);
+            core.setOutput('short_sha', shortSha);
+            
+  compile_sketch:
+    name: build ${{ matrix.board.name }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        board:
+          - { name: "Flipper Zero WiFi Dev Board",   flag: "MARAUDER_FLIPPER",         fbqn: "esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled",                     file_name: "flipper",                 tft: false, tft_file: "",                                   build_dir: "esp32s2",                    addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Flipper Zero Multi Board S3",   flag: "MARAUDER_MULTIBOARD_S3",   fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=4M",                                   file_name: "multiboardS3",            tft: false, tft_file: "",                                   build_dir: "esp32s3",                    addr: "0x0",      idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "OG Marauder",                   flag: "MARAUDER_V4",              fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "old_hardware",            tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder v6",                   flag: "MARAUDER_V6",              fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "v6",                      tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder v6.1",                 flag: "MARAUDER_V6_1",            fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "v6_1",                    tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder Kit",                  flag: "MARAUDER_KIT",             fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "kit",                     tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder Mini",                 flag: "MARAUDER_MINI",            fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "mini",                    tft: true,  tft_file: "User_Setup_marauder_mini.h",         build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "ESP32 LDDB",                    flag: "ESP32_LDDB",               fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "esp32_lddb",              tft: false, tft_file: "",                                   build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder Dev Board Pro",        flag: "MARAUDER_DEV_BOARD_PRO",   fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "marauder_dev_board_pro",  tft: false, tft_file: "",                                   build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "M5StickCPlus",                  flag: "MARAUDER_M5STICKC",        fbqn: "esp32:esp32:m5stick-c:PartitionScheme=min_spiffs",                                              file_name: "m5stickc_plus",           tft: true,  tft_file: "User_Setup_marauder_m5stickc.h",     build_dir: "m5stick-c",                  addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "M5StickCPlus 2",                flag: "MARAUDER_M5STICKCP2",      fbqn: "esp32:esp32:m5stick-c:PartitionScheme=min_spiffs",                                              file_name: "m5stickc_plus2",          tft: true,  tft_file: "User_Setup_marauder_m5stickcp2.h",   build_dir: "m5stick-c",                  addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Rev Feather",                   flag: "MARAUDER_REV_FEATHER",     fbqn: "esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled",                     file_name: "rev_feather",             tft: true,  tft_file: "User_Setup_marauder_rev_feather.h",  build_dir: "esp32s2",                    addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder v7",                   flag: "MARAUDER_V7",              fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "marauder_v7",             tft: true,  tft_file: "User_Setup_dual_nrf24.h",            build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder CYD 2432S028",         flag: "MARAUDER_CYD_MICRO",       fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "cyd_2432S028",            tft: true,  tft_file: "User_Setup_cyd_micro.h",             build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder CYD 2432S024 GUITION", flag: "MARAUDER_CYD_GUITION",     fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "cyd_2432S024_guition",    tft: true,  tft_file: "User_Setup_cyd_guition.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder CYD 2432S028 2 USB",   flag: "MARAUDER_CYD_2USB",        fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "cyd_2432S028_2usb",       tft: true,  tft_file: "User_Setup_cyd_2usb.h",              build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder CYD 3.5inch",          flag: "MARAUDER_CYD_3_5_INCH",    fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "cyd_3_5_inch",            tft: true,  tft_file: "User_Setup_cyd_3_5_inch.h",          build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder v7.1",                 flag: "MARAUDER_V7_1",            fbqn: "esp32:esp32:dfrobot_firebeetle2_esp32e:FlashSize=16M,PartitionScheme=min_spiffs,PSRAM=enabled", file_name: "marauder_v7_1",           tft: true,  tft_file: "User_Setup_dual_nrf24.h",            build_dir: "dfrobot_firebeetle2_esp32e", addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "M5Cardputer",                   flag: "MARAUDER_CARDPUTER",       fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=8M,PSRAM=disabled",                    file_name: "m5cardputer",             tft: true,  tft_file: "User_Setup_marauder_m5cardputer.h",  build_dir: "esp32s3",                    addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "ESP32-C5-DevKitC-1",            flag: "MARAUDER_C5",              fbqn: "esp32:esp32:esp32c5:PartitionScheme=min_spiffs",                                                file_name: "esp32c5devkitc1",         tft: false, tft_file: "",                                   build_dir: "esp32c5",                    addr: "0x2000",   idf_ver: "3.3.0",    nimble_ver: "2.3.0",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+          
+      - name: Install Arduino CLI
+        run: |
+          curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | sh
+          echo "/home/runner/work/ESP32Marauder/ESP32Marauder/bin" >> $GITHUB_PATH
+          export PATH=$PATH:/home/runner/work/ESP32Marauder/ESP32Marauder/bin
+          arduino-cli version
+
+      - name: Verify Installed Cores
+        run: arduino-cli core list
+
+      - name: Build TestFile with ESP32 v${{ matrix.board.idf_ver }}
+        uses: ArminJo/arduino-test-compile@v3.2.1
+        with:
+          sketch-names: TestFile.ino
+          arduino-board-fqbn: esp32:esp32:esp32s2
+          arduino-platform: esp32:esp32@${{ matrix.board.idf_ver }}
+          platform-url: https://github.com/espressif/arduino-esp32/releases/download/${{ matrix.board.idf_ver }}/package_esp32_dev_index.json
+
+      - name: Verify Installed Cores Again
+        run: arduino-cli core list
+          
+      - name: Show Arduino dir structure
+        run: |
+          find /home/runner/.arduino15/packages/esp32/hardware/
+          
+      - name: Install ESP32Ping
+        uses: actions/checkout@v2
+        with:
+          repository: marian-craciunescu/ESP32Ping
+          ref: 1.6
+          path: CustomESP32Ping
+          
+      - name: Install AsyncTCP
+        uses: actions/checkout@v2
+        with:
+          repository: ESP32Async/AsyncTCP
+          ref: v3.4.8
+          path: CustomAsyncTCP
+          
+      - name: Install MicroNMEA
+        uses: actions/checkout@v2
+        with:
+          repository: stevemarple/MicroNMEA
+          ref: v2.0.6
+          path: CustomMicroNMEA
+          
+      - name: Install ESPAsyncWebServer
+        uses: actions/checkout@v2
+        with:
+          repository: ESP32Async/ESPAsyncWebServer
+          ref: v3.8.1
+          path: CustomESPAsyncWebServer
+          
+      - name: Install TFT_eSPI
+        uses: actions/checkout@v2
+        with:
+          repository: Bodmer/TFT_eSPI
+          ref: V2.5.34
+          path: CustomTFT_eSPI
+          
+      - name: Install XPT2046_Touchscreen
+        uses: actions/checkout@v2
+        with:
+          repository: PaulStoffregen/XPT2046_Touchscreen
+          ref: v1.4
+          path: CustomXPT2046_Touchscreen
+
+      - name: Install lv_arduino
+        uses: actions/checkout@v2
+        with:
+          repository: lvgl/lv_arduino
+          ref: 3.0.0
+          path: Customlv_arduino
+
+      - name: Install JPEGDecoder
+        uses: actions/checkout@v2
+        with:
+          repository: Bodmer/JPEGDecoder
+          ref: 1.8.0
+          path: CustomJPEGDecoder
+
+      - name: Install NimBLE-Arduino
+        uses: actions/checkout@v2
+        with:
+          repository: h2zero/NimBLE-Arduino
+          ref: ${{ matrix.board.nimble_ver }}
+          path: CustomNimBLE-Arduino
+
+      - name: Install Adafruit_NeoPixel
+        uses: actions/checkout@v2
+        with:
+          repository: adafruit/Adafruit_NeoPixel
+          ref: 1.12.0
+          path: CustomAdafruit_NeoPixel
+
+      - name: Install ArduinoJson
+        uses: actions/checkout@v2
+        with:
+          repository: bblanchon/ArduinoJson
+          ref: v6.18.2
+          path: CustomArduinoJson
+          
+      - name: Install LinkedList
+        uses: actions/checkout@v2
+        with:
+          repository: ivanseidel/LinkedList
+          ref: v1.3.3
+          path: CustomLinkedList
+          
+      - name: Install EspSoftwareSerial
+        uses: actions/checkout@v2
+        with:
+          repository: plerup/espsoftwareserial
+          ref: 8.1.0
+          path: CustomEspSoftwareSerial
+          
+      - name: Install Adafruit_BusIO
+        uses: actions/checkout@v2
+        with:
+          repository: adafruit/Adafruit_BusIO
+          ref: 1.15.0
+          path: CustomAdafruit_BusIO
+          
+      - name: Install Adafruit_MAX1704X
+        uses: actions/checkout@v2
+        with:
+          repository: adafruit/Adafruit_MAX1704X
+          ref: 1.0.2
+          path: CustomAdafruit_MAX1704X
+          
+      - name: Show Libraries
+        run: |
+          find /home/runner/ -name "Custom*"
+          
+      - name: Configure TFT_eSPI
+        run: |
+          rm -f CustomTFT_eSPI/User_Setup_Select.h
+          cp User*.h CustomTFT_eSPI/
+          pwd
+          ls -la
+          ls -la CustomTFT_eSPI
+
+      - name: Install Esptool
+        run: |
+          pip install esptool
+
+      - name: Modify platform.txt
+        run: |
+          if [[ ${{ matrix.board.idf_ver }} == "2.0.11" ]]; then
+            for i in $(find /home/runner/.arduino15/packages/esp32/hardware/esp32/ -name "platform.txt"); do
+              sed -i 's/compiler.c.elf.libs.esp32c3=/compiler.c.elf.libs.esp32c3=-zmuldefs /' "$i"
+              sed -i 's/compiler.c.elf.libs.esp32s3=/compiler.c.elf.libs.esp32s3=-zmuldefs /' "$i"
+              sed -i 's/compiler.c.elf.libs.esp32s2=/compiler.c.elf.libs.esp32s2=-zmuldefs /' "$i"
+              sed -i 's/compiler.c.elf.libs.esp32=/compiler.c.elf.libs.esp32=-zmuldefs /' "$i"
+              cat "$i" | grep compiler.c.elf.libs.esp32c3
+              cat "$i" | grep compiler.c.elf.libs.esp32s3
+              cat "$i" | grep compiler.c.elf.libs.esp32s2
+              cat "$i" | grep compiler.c.elf.libs.esp32
+            done
+          fi
+          
+          if [[ ${{ matrix.board.idf_ver }} == "3.3.0" ]]; then
+            for i in $(find /home/runner/.arduino15/packages/esp32/hardware/esp32/ -name "platform.txt"); do
+              sed -i 's/compiler.c.elf.extra_flags=/compiler.c.elf.extra_flags=-Wl,-zmuldefs /' "$i"
+            done
+          fi
+          
+      - name: Configure TFT_eSPI (if needed)
+        run: |
+          pwd
+          if [[ ${{ matrix.board.tft }} == true ]]; then
+            find /home/runner/ -name "*TFT_eSPI*"
+            sed -i 's/^\/\/#include <${{ matrix.board.tft_file }}>/#include <${{ matrix.board.tft_file }}>/' /home/runner/work/ESP32Marauder/ESP32Marauder/CustomTFT_eSPI/User_Setup_Select.h
+          fi
+
+      - name: Build Marauder for ${{ matrix.board.name }}
+        uses: ArminJo/arduino-test-compile@v3.3.0
+        with:
+          sketch-names: esp32_marauder.ino
+          arduino-board-fqbn: ${{ matrix.board.fbqn }}
+          extra-arduino-cli-args: "--warnings none --build-property compiler.cpp.extra_flags='-D${{ matrix.board.flag }}'"
+          arduino-platform: esp32:esp32@${{ matrix.board.idf_ver }}
+          platform-url: https://github.com/espressif/arduino-esp32/releases/download/${{ matrix.board.idf_ver }}/package_esp32_dev_index.json
+      
+      - name: Rename and Upload ${{ matrix.board.name }} Artifact
+        run: |
+          VERSION=$(grep '#define MARAUDER_VERSION' ./esp32_marauder/configs.h | sed -E 's/.*"v([^"]+)"/v\1/' | tr '.' '_')
+          DATE=$(date +%Y%m%d)
+
+          BUILD_DIR=./esp32_marauder/build/esp32.esp32.${{ matrix.board.build_dir }}
+          INPUT_BIN=$BUILD_DIR/esp32_marauder.ino.bin
+          
+          OUTPUT_BIN=esp32_marauder_${VERSION}_beta_${DATE}_${{ matrix.board.file_name }}.bin
+
+          mv "$INPUT_BIN" "$BUILD_DIR/$OUTPUT_BIN"
+
+          echo "artifact_name=$OUTPUT_BIN" >> $GITHUB_ENV
+          echo "artifact_path=$BUILD_DIR/$OUTPUT_BIN" >> $GITHUB_ENV
+          
+      - name: Upload ${{ matrix.board.name }} Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.artifact_name }}
+          path: ${{ env.artifact_path }}
+          retention-days: 5
+
+  post_compile_steps:
+    name: Create Nightly Release
+    runs-on: ubuntu-latest
+    needs: [compile_sketch, decide]
+    # create release if manual dispatch OR should_release decided true for scheduled run
+    if: ${{ needs.decide.outputs.should_build == 'true' }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/download-artifact@v4
+        with:
+          merge-multiple: true
+          
+      - name: Compute release title/tag
+        id: meta
+        shell: bash
+        run: |
+          SHORT_SHA="$(git rev-parse --short HEAD)"
+          if [[ "${{ github.event_name }}" == "schedule" ]]; then
+            echo "name=${SHORT_SHA}_nightly" >> $GITHUB_OUTPUT
+            # keep your existing tag, or set one here:
+            echo "tag=nightly-$(date -u +'%Y%m%d')-${SHORT_SHA}" >> $GITHUB_OUTPUT
+            echo "prerelease=true" >> $GITHUB_OUTPUT
+          else
+            echo "name=${SHORT_SHA}" >> $GITHUB_OUTPUT
+            echo "tag=manual-$(date -u +'%Y%m%d')-${SHORT_SHA}" >> $GITHUB_OUTPUT
+            echo "prerelease=false" >> $GITHUB_OUTPUT
+          fi
+          
+      - name: Delete old assets on nightly release (if any)
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const owner = context.repo.owner;
+            const repo  = context.repo.repo;
+
+            let rel;
+            try {
+              rel = await github.rest.repos.getReleaseByTag({ owner, repo, tag: 'nightly' });
+            } catch (e) {
+              if (e.status === 404) {
+                // No release yet — nothing to delete
+                return;
+              }
+              throw e;
+            }
+
+            const assets = rel.data.assets || [];
+            for (const a of assets) {
+              await github.rest.repos.deleteReleaseAsset({ owner, repo, asset_id: a.id });
+              core.info(`Deleted old asset: ${a.name}`);
+            }
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v1
+        with:
+          name: ${{ needs.decide.outputs.short_sha }}_nightly
+          tag_name: nightly_${{ needs.decide.outputs.short_sha }}
+          prerelease: true
+          generate_release_notes: true
+          draft: false
+          files: |
+            esp32_marauder_v*.bin
+          body: |
+            [justcallmekokollc.com](https://justcallmekokollc.com)
+
+            ### This is an automated pre-release / beta created by CI.
+
+            ### Please see [GPS Modification](https://github.com/justcallmekoko/ESP32Marauder/wiki/gps-modification) to find out how to add GPS capabilities to your Marauder.
+            **Flipper Zero Marauder Companion App:**
+            **Be sure to install the latest version of the [Marauder Companion](https://github.com/0xchocolate/flipperzero-wifi-marauder/releases/latest) to use these new features on your Flipper Zero**
+
+            **Additional Resources**
+            **[Project Issues](https://github.com/justcallmekoko/ESP32Marauder/issues)**
+            **[Install/Update Instructions](https://github.com/justcallmekoko/ESP32Marauder/wiki/update-firmware)**
+            **[ESP32 Marauder companion app](https://github.com/0xchocolate/flipperzero-firmware-with-wifi-marauder-companion/releases/latest)**
+            **[My Discord](https://discord.com/servers/willstunforfood-776211399918878760)**
+
+            **Note:** Nightly pre-releases are for testing and evaluation. Use them at your own risk.
+            
+            | Hardware | Binary Version |
+            | -------- | -------------- |
+            | v4 (OG) | `_old_hardware.bin` |
+            | v6 | `_new_hardware.bin`/`_v6.bin` |
+            | v6.1/v6.2 | `_v6_1.bin` |
+            | v7 | `_v7.bin` |
+            | Kit | `_kit.bin` |
+            | Mini | `_mini.bin` |
+            | Flipper Zero | `_flipper.bin` |
+            | MutliBoard S3 | `_multiboardS3.bin` |
+            | LDDB/NodeMCU/Wemos | `_lddb.bin` |
+            | Dev Board Pro | `_marauder_dev_board_pro.bin` |
+            | BFFB | `_marauder_dev_board_pro.bin` |
+            | ESP32-S2 Reverse Feather | `_rev_feather.bin` |
+            | CYD 2432S028(R) | `_cyd_2432S028.bin` |
+            | RL Phantom | `_cyd_2432S024_guition.bin` |
+            | CYD 2432S028 2 USB | `_cyd_2432S028_2usb.bin` |
+            | M5 Cardputer | `_m5cardputer.bin` (Available on M5 Burner) |
+            | ESP32-C5 DevKit | [`_esp32c5_devkit.bin`](https://github.com/justcallmekoko/ESP32Marauder/wiki/ESP32%E2%80%90C5%E2%80%90DevKitC%E2%80%901) |
+            | AWOK V2/V3 screen (white usb) | `_v6_1.bin` |
+            | AWOK V2 flipper (orange usb) | `_flipper.bin` |
+            | AWOK V3 flipper (orange usb) | `_marauder_dev_board_pro.bin` |
+
--- a/User_Setup_Select.h
+++ b/User_Setup_Select.h
@@ -35,6 +35,7 @@
 //#include <User_Setup_cyd_guition.h>
 //#include <User_Setup_cyd_2usb.h>
 //#include <User_Setup_marauder_m5cardputer.h>
+//#include <User_Setup_cyd_3_5_inch.h>

 //#include <User_Setups/Setup1_ILI9341.h>  // Setup file configured for my ILI9341
 //#include <User_Setups/Setup2_ST7735.h>   // Setup file configured for my ST7735
--- a/User_Setup_cyd_3_5_inch.h
+++ b/User_Setup_cyd_3_5_inch.h
@@ -0,0 +1,299 @@
+//                            USER DEFINED SETTINGS
+//   Set driver type, fonts to be loaded, pins used and SPI control method etc
+//
+//   See the User_Setup_Select.h file if you wish to be able to define multiple
+//   setups and then easily select which setup file is used by the compiler.
+//
+//   If this file is edited correctly then all the library example sketches should
+//   run without the need to make any more changes for a particular hardware setup!
+//   Note that some sketches are designed for a particular TFT pixel width/height
+
+
+// ##################################################################################
+//
+// Section 1. Call up the right driver file and any options for it
+//
+// ##################################################################################
+
+// Display type -  only define if RPi display
+//#define RPI_DRIVER
+
+// Only define one driver, the other ones must be commented out
+//#define ILI9341_DRIVER // OG Marauder
+//#define ST7735_DRIVER    // Marauder Mini  // Define additional parameters below for this display
+//#define ILI9163_DRIVER     // Define additional parameters below for this display
+//#define S6D02A1_DRIVER
+//#define RPI_ILI9486_DRIVER // 20MHz maximum SPI
+//#define HX8357D_DRIVER
+//#define ILI9481_DRIVER
+//#define ILI9486_DRIVER
+//#define ILI9488_DRIVER     // WARNING: Do not connect ILI9488 display SDO to MISO if other devices share the SPI bus (TFT SDO does NOT tristate when CS is high)
+//#define ST7789_DRIVER      // Full configuration option, define additional parameters below for this display
+//#define ST7789_2_DRIVER    // Minimal configuration option, define additional parameters below for this display
+//#define R61581_DRIVER
+//#define RM68140_DRIVER
+#define ST7796_DRIVER
+
+// Some displays support SPI reads via the MISO pin, other displays have a single
+// bi-directional SDA pin and the library will try to read this via the MOSI line.
+// To use the SDA line for reading data from the TFT uncomment the following line:
+
+// #define TFT_SDA_READ      // This option is for ESP32 ONLY, tested with ST7789 display only
+
+// For ST7789 and ILI9341 ONLY, define the colour order IF the blue and red are swapped on your display
+// Try ONE option at a time to find the correct colour order for your display
+
+//  #define TFT_RGB_ORDER TFT_RGB  // Colour order Red-Green-Blue
+//  #define TFT_RGB_ORDER TFT_BGR  // Colour order Blue-Green-Red
+
+// For M5Stack ESP32 module with integrated ILI9341 display ONLY, remove // in line below
+
+// #define M5STACK
+
+// For ST7789, ST7735 and ILI9163 ONLY, define the pixel width and height in portrait orientation
+// #define TFT_WIDTH  80
+// #define TFT_WIDTH  128 // Marauder Mini
+ #define TFT_WIDTH  320 // ST7789 240 x 240 and 240 x 320
+// #define TFT_HEIGHT 160
+// #define TFT_HEIGHT 128 // Marauder Mini
+// #define TFT_HEIGHT 240 // ST7789 240 x 240
+ #define TFT_HEIGHT 480 // ST7789 240 x 320
+
+// For ST7735 ONLY, define the type of display, originally this was based on the
+// colour of the tab on the screen protector film but this is not always true, so try
+// out the different options below if the screen does not display graphics correctly,
+// e.g. colours wrong, mirror images, or tray pixels at the edges.
+// Comment out ALL BUT ONE of these options for a ST7735 display driver, save this
+// this User_Setup file, then rebuild and upload the sketch to the board again:
+
+// #define ST7735_INITB
+// #define ST7735_GREENTAB
+// #define ST7735_GREENTAB2
+// #define ST7735_GREENTAB3
+// #define ST7735_GREENTAB128    // For 128 x 128 display
+// #define ST7735_GREENTAB160x80 // For 160 x 80 display (BGR, inverted, 26 offset)
+// #define ST7735_REDTAB
+// #define ST7735_BLACKTAB
+// #define ST7735_REDTAB160x80   // For 160 x 80 display with 24 pixel offset
+
+// If colours are inverted (white shows as black) then uncomment one of the next
+// 2 lines try both options, one of the options should correct the inversion.
+
+// #define TFT_INVERSION_ON
+// #define TFT_INVERSION_OFF
+
+// If a backlight control signal is available then define the TFT_BL pin in Section 2
+// below. The backlight will be turned ON when tft.begin() is called, but the library
+// needs to know if the LEDs are ON with the pin HIGH or LOW. If the LEDs are to be
+// driven with a PWM signal or turned OFF/ON then this must be handled by the user
+// sketch. e.g. with digitalWrite(TFT_BL, LOW);
+
+// #define TFT_BACKLIGHT_ON LOW  // HIGH or LOW are options
+
+// ##################################################################################
+//
+// Section 2. Define the pins that are used to interface with the display here
+//
+// ##################################################################################
+
+// We must use hardware SPI, a minimum of 3 GPIO pins is needed.
+// Typical setup for ESP8266 NodeMCU ESP-12 is :
+//
+// Display SDO/MISO  to NodeMCU pin D6 (or leave disconnected if not reading TFT)
+// Display LED       to NodeMCU pin VIN (or 5V, see below)
+// Display SCK       to NodeMCU pin D5
+// Display SDI/MOSI  to NodeMCU pin D7
+// Display DC (RS/AO)to NodeMCU pin D3
+// Display RESET     to NodeMCU pin D4 (or RST, see below)
+// Display CS        to NodeMCU pin D8 (or GND, see below)
+// Display GND       to NodeMCU pin GND (0V)
+// Display VCC       to NodeMCU 5V or 3.3V
+//
+// The TFT RESET pin can be connected to the NodeMCU RST pin or 3.3V to free up a control pin
+//
+// The DC (Data Command) pin may be labeled AO or RS (Register Select)
+//
+// With some displays such as the ILI9341 the TFT CS pin can be connected to GND if no more
+// SPI devices (e.g. an SD Card) are connected, in this case comment out the #define TFT_CS
+// line below so it is NOT defined. Other displays such at the ST7735 require the TFT CS pin
+// to be toggled during setup, so in these cases the TFT_CS line must be defined and connected.
+//
+// The NodeMCU D0 pin can be used for RST
+//
+//
+// Note: only some versions of the NodeMCU provide the USB 5V on the VIN pin
+// If 5V is not available at a pin you can use 3.3V but backlight brightness
+// will be lower.
+
+
+// ###### EDIT THE PIN NUMBERS IN THE LINES FOLLOWING TO SUIT YOUR ESP8266 SETUP ######
+
+// For NodeMCU - use pin numbers in the form PIN_Dx where Dx is the NodeMCU pin designation
+//#define TFT_CS   PIN_D8  // Chip select control pin D8
+//#define TFT_DC   PIN_D3  // Data Command control pin
+//#define TFT_RST  PIN_D4  // Reset pin (could connect to NodeMCU RST, see next line)
+//#define TFT_RST  -1    // Set TFT_RST to -1 if the display RESET is connected to NodeMCU RST or 3.3V
+
+//#define TFT_BL PIN_D1  // LED back-light (only for ST7789 with backlight control pin)
+
+//#define TOUCH_CS PIN_D2     // Chip select pin (T_CS) of touch screen
+
+//#define TFT_WR PIN_D2       // Write strobe for modified Raspberry Pi TFT only
+
+
+// ######  FOR ESP8266 OVERLAP MODE EDIT THE PIN NUMBERS IN THE FOLLOWING LINES  ######
+
+// Overlap mode shares the ESP8266 FLASH SPI bus with the TFT so has a performance impact
+// but saves pins for other functions. It is best not to connect MISO as some displays
+// do not tristate that line wjen chip select is high!
+// On NodeMCU 1.0 SD0=MISO, SD1=MOSI, CLK=SCLK to connect to TFT in overlap mode
+// On NodeMCU V3  S0 =MISO, S1 =MOSI, S2 =SCLK
+// In ESP8266 overlap mode the following must be defined
+
+//#define TFT_SPI_OVERLAP
+
+// In ESP8266 overlap mode the TFT chip select MUST connect to pin D3
+//#define TFT_CS   PIN_D3
+//#define TFT_DC   PIN_D5  // Data Command control pin
+//#define TFT_RST  PIN_D4  // Reset pin (could connect to NodeMCU RST, see next line)
+//#define TFT_RST  -1  // Set TFT_RST to -1 if the display RESET is connected to NodeMCU RST or 3.3V
+
+
+// ###### EDIT THE PIN NUMBERS IN THE LINES FOLLOWING TO SUIT YOUR ESP32 SETUP   ######
+
+// For ESP32 Dev board (only tested with ILI9341 display)
+// The hardware SPI can be mapped to any pins
+
+// Marauder Mini
+/*
+#define TFT_CS   17  // Chip select control pin D8
+#define TFT_DC   16  // Data Command control pin
+#define TFT_RST  5  // Reset pin (could connect to NodeMCU RST, see next line)
+//#define TFT_MISO 19
+//#define TFT_MOSI 23
+//#define TFT_SCLK 18
+//#define TFT_BL   32
+*/
+
+// ESP32 Marauder 
+#define TFT_MISO 12
+#define TFT_MOSI 13
+#define TFT_SCLK 14
+#define TFT_CS   15  // Chip select control pin
+#define TFT_DC   2  // Data Command control pin
+#define TFT_RST   -1  // Reset pin (could connect to RST pin)
+//#define TFT_RST  -1  // Set TFT_RST to -1 if display RESET is connected to ESP32 board RST
+
+#define TFT_BL   27  // LED back-light (only for ST7789 with backlight control pin)
+
+#define TOUCH_CS   33     // Chip select pin (T_CS) of touch screen
+
+
+//#define TFT_WR 22    // Write strobe for modified Raspberry Pi TFT only
+
+// For the M5Stack module use these #define lines
+//#define TFT_MISO 19
+//#define TFT_MOSI 23
+//#define TFT_SCLK 18
+//#define TFT_CS   14  // Chip select control pin
+//#define TFT_DC   27  // Data Command control pin
+//#define TFT_RST  33  // Reset pin (could connect to Arduino RESET pin)
+//#define TFT_BL   32  // LED back-light (required for M5Stack)
+
+// ######       EDIT THE PINs BELOW TO SUIT YOUR ESP32 PARALLEL TFT SETUP        ######
+
+// The library supports 8 bit parallel TFTs with the ESP32, the pin
+// selection below is compatible with ESP32 boards in UNO format.
+// Wemos D32 boards need to be modified, see diagram in Tools folder.
+// Only ILI9481 and ILI9341 based displays have been tested!
+
+// Parallel bus is only supported on ESP32
+// Uncomment line below to use ESP32 Parallel interface instead of SPI
+
+//#define ESP32_PARALLEL
+
+// The ESP32 and TFT the pins used for testing are:
+//#define TFT_CS   33  // Chip select control pin (library pulls permanently low
+//#define TFT_DC   15  // Data Command control pin - must use a pin in the range 0-31
+//#define TFT_RST  32  // Reset pin, toggles on startup
+
+//#define TFT_WR    4  // Write strobe control pin - must use a pin in the range 0-31
+//#define TFT_RD    2  // Read strobe control pin
+
+//#define TFT_D0   12  // Must use pins in the range 0-31 for the data bus
+//#define TFT_D1   13  // so a single register write sets/clears all bits.
+//#define TFT_D2   26  // Pins can be randomly assigned, this does not affect
+//#define TFT_D3   25  // TFT screen update performance.
+//#define TFT_D4   17
+//#define TFT_D5   16
+//#define TFT_D6   27
+//#define TFT_D7   14
+
+
+// ##################################################################################
+//
+// Section 3. Define the fonts that are to be used here
+//
+// ##################################################################################
+
+// Comment out the #defines below with // to stop that font being loaded
+// The ESP8366 and ESP32 have plenty of memory so commenting out fonts is not
+// normally necessary. If all fonts are loaded the extra FLASH space required is
+// about 17Kbytes. To save FLASH space only enable the fonts you need!
+
+#define LOAD_GLCD   // Font 1. Original Adafruit 8 pixel font needs ~1820 bytes in FLASH
+#define LOAD_FONT2  // Font 2. Small 16 pixel high font, needs ~3534 bytes in FLASH, 96 characters
+#define LOAD_FONT4  // Font 4. Medium 26 pixel high font, needs ~5848 bytes in FLASH, 96 characters
+#define LOAD_FONT6  // Font 6. Large 48 pixel font, needs ~2666 bytes in FLASH, only characters 1234567890:-.apm
+#define LOAD_FONT7  // Font 7. 7 segment 48 pixel font, needs ~2438 bytes in FLASH, only characters 1234567890:-.
+#define LOAD_FONT8  // Font 8. Large 75 pixel font needs ~3256 bytes in FLASH, only characters 1234567890:-.
+//#define LOAD_FONT8N // Font 8. Alternative to Font 8 above, slightly narrower, so 3 digits fit a 160 pixel TFT
+#define LOAD_GFXFF  // FreeFonts. Include access to the 48 Adafruit_GFX free fonts FF1 to FF48 and custom fonts
+
+// Comment out the #define below to stop the SPIFFS filing system and smooth font code being loaded
+// this will save ~20kbytes of FLASH
+#define SMOOTH_FONT
+
+
+// ##################################################################################
+//
+// Section 4. Other options
+//
+// ##################################################################################
+
+// Define the SPI clock frequency, this affects the graphics rendering speed. Too
+// fast and the TFT driver will not keep up and display corruption appears.
+// With an ILI9341 display 40MHz works OK, 80MHz sometimes fails
+// With a ST7735 display more than 27MHz may not work (spurious pixels and lines)
+// With an ILI9163 display 27 MHz works OK.
+
+// #define SPI_FREQUENCY   1000000
+//#define SPI_FREQUENCY   5000000
+// #define SPI_FREQUENCY  10000000
+// #define SPI_FREQUENCY  20000000
+#define SPI_FREQUENCY  27000000 // Marauder // Actually sets it to 26.67MHz = 80/3
+// #define SPI_FREQUENCY  40000000
+// #define SPI_FREQUENCY  80000000
+
+// Optional reduced SPI frequency for reading TFT
+#define SPI_READ_FREQUENCY  20000000
+
+// The XPT2046 requires a lower SPI clock rate of 2.5MHz so we define that here:
+#define SPI_TOUCH_FREQUENCY  2500000
+
+// The ESP32 has 2 free SPI ports i.e. VSPI and HSPI, the VSPI is the default.
+// If the VSPI port is in use and pins are not accessible (e.g. TTGO T-Beam)
+// then uncomment the following line:
+#define USE_HSPI_PORT
+
+// Comment out the following #define if "SPI Transactions" do not need to be
+// supported. When commented out the code size will be smaller and sketches will
+// run slightly faster, so leave it commented out unless you need it!
+
+// Transaction support is needed to work with SD library but not needed with TFT_SdFat
+// Transaction support is required if other SPI devices are connected.
+
+// Transactions are automatically enabled by the library for an ESP32 (to use HAL mutex)
+// so changing it here has no effect
+
+// #define SUPPORT_TRANSACTIONS
--- a/esp32_marauder/BatteryInterface.cpp
+++ b/esp32_marauder/BatteryInterface.cpp
@@ -26,63 +26,41 @@ void BatteryInterface::RunSetup() {

  #ifdef HAS_BATTERY

-    Wire.begin(I2C_SDA, I2C_SCL);
-
    Serial.println("Checking for battery monitors...");

-    Wire.beginTransmission(IP5306_ADDR);
-    error = Wire.endTransmission();
+    #ifndef HAS_AXP2101
+      Wire.begin(I2C_SDA, I2C_SCL);

-    if (error == 0) {
-      Serial.println("Detected IP5306");
-      this->has_ip5306 = true;
-      this->i2c_supported = true;
-    }
-
-    Wire.beginTransmission(MAX17048_ADDR);
-    error = Wire.endTransmission();
-
-    if (error == 0) {
-      if (maxlipo.begin()) {
-        Serial.println("Detected MAX17048");
-        this->has_max17048 = true;
-        this->i2c_supported = true;
-      }
-    }
-
-    /*for(addr = 1; addr < 127; addr++ ) {
-      Wire.beginTransmission(addr);
+      Wire.beginTransmission(IP5306_ADDR);
      error = Wire.endTransmission();

-      if (error == 0)
-      {
-        Serial.print("I2C device found at address 0x");
-        
-        if (addr<16)
-          Serial.print("0");
+      if (error == 0) {
+        Serial.println("Detected IP5306");
+        this->has_ip5306 = true;
+        this->i2c_supported = true;
+      }

-        Serial.println(addr,HEX);
-        
-        if (addr == IP5306_ADDR) {
-          this->has_ip5306 = true;
+      Wire.beginTransmission(MAX17048_ADDR);
+      error = Wire.endTransmission();
+
+      if (error == 0) {
+        if (maxlipo.begin()) {
+          Serial.println("Detected MAX17048");
+          this->has_max17048 = true;
          this->i2c_supported = true;
        }
-
-        if (addr == MAX17048_ADDR) {
-          if (maxlipo.begin()) {
-            Serial.println("Detected MAX17048");
-            this->has_max17048 = true;
-            this->i2c_supported = true;
-          }
-        }
      }
-    }*/
+    #else
+      bool result = this->power.begin(Wire, AXP2101_SLAVE_ADDRESS, I2C_SDA, I2C_SCL);
+
+      if (!result)
+        return;
+
+      Serial.println("Detected AXP2101");

-    /*if (this->maxlipo.begin()) {
-      Serial.println("Detected MAX17048");
-      this->has_max17048 = true;
      this->i2c_supported = true;
-    }*/
+      this->has_axp2101 = true;
+    #endif
    
    this->initTime = millis();
  #endif
@@ -120,4 +98,10 @@ int8_t BatteryInterface::getBatteryLevel() {
    else
      return percent;
  }
+
+  #ifdef HAS_AXP2101
+    if (this->has_axp2101) {
+      return this->power.getBatteryPercent();
+    }
+  #endif
 }
--- a/esp32_marauder/BatteryInterface.h
+++ b/esp32_marauder/BatteryInterface.h
@@ -8,6 +8,11 @@
 #include "configs.h"
 #include "Adafruit_MAX1704X.h"

+#ifdef HAS_AXP2101
+  #define XPOWERS_CHIP_AXP2101
+  #include "XPowersLib.h"
+#endif
+
 #include <Wire.h>

 #define IP5306_ADDR 0x75
@@ -18,12 +23,17 @@ class BatteryInterface {
    uint32_t initTime = 0;
    Adafruit_MAX17048 maxlipo;

+    #ifdef HAS_AXP2101
+      XPowersPMU power;
+    #endif
+
  public:
    int8_t battery_level = 0;
    int8_t old_level = 0;
    bool i2c_supported = false;
    bool has_max17048 = false;
    bool has_ip5306 = false;
+    bool has_axp2101 = false;

    BatteryInterface();

--- a/esp32_marauder/CommandLine.cpp
+++ b/esp32_marauder/CommandLine.cpp
@@ -217,6 +217,8 @@ void CommandLine::runCommand(String input) {
    Serial.println(HELP_GPS_DATA_CMD);
    Serial.println(HELP_GPS_CMD);
    Serial.println(HELP_NMEA_CMD);
+    Serial.println(HELP_GPS_POI_CMD);
+    Serial.println(HELP_GPS_TRACKER_CMD);
    
    // WiFi sniff/scan
    Serial.println(HELP_EVIL_PORTAL_CMD);
@@ -310,7 +312,7 @@ void CommandLine::runCommand(String input) {

    // If we don't do this, the text and button coordinates will be off
    #ifdef HAS_SCREEN
-      display_obj.tft.init();
+      display_obj.init();
      menu_function_obj.changeMenu(menu_function_obj.current_menu);
    #endif
  }
@@ -1242,14 +1244,61 @@ void CommandLine::runCommand(String input) {
      wifi_scan_obj.StartScan(WIFI_ARP_SCAN, TFT_CYAN);
    }

+    // GPS POI
+    if (cmd_args.get(0) == GPS_POI_CMD) {
+      #ifdef HAS_GPS
+        int start_sw = this->argSearch(&cmd_args, "-s");
+        int mark_sw = this->argSearch(&cmd_args, "-m");
+        int end_sw = this->argSearch(&cmd_args, "-e");
+
+        if (start_sw != -1) {
+          wifi_scan_obj.StartScan(GPS_POI, TFT_CYAN);
+          wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
+          #ifdef HAS_SCREEN
+            menu_function_obj.changeMenu(&menu_function_obj.gpsPOIMenu);
+          #endif
+        }
+        else if (mark_sw != -1) {
+          wifi_scan_obj.currentScanMode = GPS_POI;
+          #ifdef HAS_SCREEN
+            display_obj.tft.setCursor(0, TFT_HEIGHT / 2);
+            display_obj.clearScreen();
+          #endif
+          if (wifi_scan_obj.RunGPSInfo(true, false, true)) {
+            #ifdef HAS_SCREEN
+              display_obj.showCenterText("POI Logged", TFT_HEIGHT / 2);
+            #endif
+          }
+          else {
+            #ifdef HAS_SCREEN
+              display_obj.showCenterText("POI Log Failed", TFT_HEIGHT / 2);
+            #endif
+          }
+          wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
+          delay(2000);
+          //wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
+          #ifdef HAS_SCREEN
+            menu_function_obj.changeMenu(&menu_function_obj.gpsPOIMenu);
+          #endif
+        }
+        else if (end_sw != -1) {
+          wifi_scan_obj.currentScanMode = GPS_POI;
+          wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
+          #ifdef HAS_SCREEN
+            menu_function_obj.changeMenu(menu_function_obj.gpsPOIMenu.parentMenu);
+          #endif
+        }
+      #else
+        Serial.println("Your hardware doesn't have GPS, silly");
+        return;
+      #endif
+    }
+
    // Port Scan
    if (cmd_args.get(0) == PORT_SCAN_CMD) {
      int all_sw = this->argSearch(&cmd_args, "-a");
      int ip_sw = this->argSearch(&cmd_args, "-t");
-      int port_sw = this->argSearch(&cmd_args, "-p");
-
-      if (port_sw != -1)
-        int ip_index = cmd_args.get(ip_sw + 1).toInt();
+      int port_sw = this->argSearch(&cmd_args, "-s");

      // Check they specified ip index
      if (ip_sw != -1) {
@@ -1275,7 +1324,36 @@ void CommandLine::runCommand(String input) {
        }
      }
      else if (port_sw != -1) {
-        
+        String port_name = cmd_args.get(port_sw + 1);
+        port_name.toUpperCase();
+        uint8_t target_mode = 0;
+        if (port_name == "SSH")
+          target_mode = WIFI_SCAN_SSH;
+        else if (port_name == "TELNET")
+          target_mode = WIFI_SCAN_TELNET;
+        else if (port_name == "DNS")
+          target_mode = WIFI_SCAN_DNS;
+        else if (port_name == "HTTP")
+          target_mode = WIFI_SCAN_HTTP;
+        else if (port_name == "SMTP")
+          target_mode = WIFI_SCAN_SMTP;
+        else if (port_name == "HTTPS")
+          target_mode = WIFI_SCAN_HTTPS;
+        else if (port_name == "RDP")
+          target_mode = WIFI_SCAN_RDP;
+
+        if (target_mode != 0) {
+          Serial.println("Starting port scan for service " + port_name);
+          #ifdef HAS_SCREEN
+            display_obj.clearScreen();
+            menu_function_obj.drawStatusBar();
+          #endif
+          wifi_scan_obj.StartScan(target_mode, TFT_CYAN);
+        }
+        else {
+          Serial.println("You did not specify a supported service");
+          return;
+        }
      }
      else {
        Serial.println("You did not specify an IP index");
--- a/esp32_marauder/CommandLine.h
+++ b/esp32_marauder/CommandLine.h
@@ -53,6 +53,8 @@ const char PROGMEM LED_CMD[] = "led";
 const char PROGMEM GPS_DATA_CMD[] = "gpsdata";
 const char PROGMEM GPS_CMD[] = "gps";
 const char PROGMEM NMEA_CMD[] = "nmea";
+const char PROGMEM GPS_POI_CMD[] = "gpspoi";
+const char PROGMEM GPS_TRACKER_CMD[] = "gpstracker";

 // WiFi sniff/scan
 const char PROGMEM EVIL_PORTAL_CMD[] = "evilportal";
@@ -119,7 +121,9 @@ const char PROGMEM HELP_SETTINGS_CMD[] = "settings [-s <setting> enable/disable>
 const char PROGMEM HELP_LS_CMD[] = "ls <directory>";
 const char PROGMEM HELP_LED_CMD[] = "led -s <hex color>/-p <rainbow>";
 const char PROGMEM HELP_GPS_DATA_CMD[] = "gpsdata";
-const char PROGMEM HELP_GPS_CMD[] = "gps [-g] <fix/sat/lon/lat/alt/date/accuracy/text/nmea>\r\n    [-n] <native/all/gps/glonass/galileo/navic/qzss/beidou>\r\n         [-b = use BD vs GB for beidou]";
+const char PROGMEM HELP_GPS_CMD[] = "gps [-t] [-g] <fix/sat/lon/lat/alt/date/accuracy/text/nmea>\r\n    [-n] <native/all/gps/glonass/galileo/navic/qzss/beidou>\r\n         [-b = use BD vs GB for beidou]";
+const char PROGMEM HELP_GPS_POI_CMD[] = "gpspoi -s/-m/-e";
+const char PROGMEM HELP_GPS_TRACKER_CMD[] = "gpstracker -c <start/stop>";
 const char PROGMEM HELP_NMEA_CMD[] = "nmea";

 // WiFi sniff/scan
@@ -142,7 +146,7 @@ const char PROGMEM HELP_SNIFF_PMKID_CMD[] = "sniffpmkid [-c <channel>][-d][-l]";
 const char PROGMEM HELP_STOPSCAN_CMD[] = "stopscan [-f]";
 const char PROGMEM HELP_WARDRIVE_CMD[] = "wardrive [-s]";
 const char PROGMEM HELP_PING_CMD[] = "pingscan";
-const char PROGMEM HELP_PORT_SCAN_CMD[] = "portscan [-a] -t <ip index>";
+const char PROGMEM HELP_PORT_SCAN_CMD[] = "portscan [-a -t <ip index>]/[-s <ssh/telnet/dns/http/smtp/https/rdp>]";
 const char PROGMEM HELP_ARP_SCAN_CMD[] = "arpscan [-f]";

 // WiFi attack
--- a/esp32_marauder/Display.cpp
+++ b/esp32_marauder/Display.cpp
@@ -109,6 +109,47 @@ bool Display::isTouchHeld(uint16_t threshold) {
  return false;
 }

+void Display::init() {
+  tft.init();
+
+  #ifdef HAS_DUAL_BAND
+    digitalWrite(TFT_BL, HIGH);
+  #endif
+}
+
+void Display::setCalData(bool landscape) {
+  #ifndef HAS_CYD_TOUCH
+    if (!landscape) {
+      #ifdef TFT_SHIELD
+        uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait with TFT Shield
+      #elif defined(MARAUDER_CYD_3_5_INCH)
+        uint16_t calData[5] = { 239, 3560, 262, 3643, 4 };
+      #elif defined(MARAUDER_V8)
+        uint16_t calData[5] = { 351, 3279, 214, 3394, 2 };
+      #elif defined(TFT_DIY)
+        uint16_t calData[5] = { 339, 3470, 237, 3438, 2 }; // tft.setRotation(0); // Portrait with DIY TFT
+      #endif
+      #ifdef HAS_ILI9341
+        tft.setTouch(calData);
+      #endif
+    }
+    else {
+      #ifdef TFT_SHIELD
+        uint16_t calData[5] = { 391, 3491, 266, 3505, 7 }; // Landscape TFT Shield
+      #elif defined(MARAUDER_CYD_3_5_INCH)
+        uint16_t calData[5] = { 272, 3648, 234, 3565, 7 };
+      #elif defined(MARAUDER_V8)
+        uint16_t calData[5] = { 213, 3396, 350, 3275, 1 };
+      #else if defined(TFT_DIY)
+        uint16_t calData[5] = { 213, 3469, 320, 3446, 1 }; // Landscape TFT DIY
+      #endif
+      #ifdef HAS_ILI9341
+        tft.setTouch(calData);
+      #endif
+    }
+  #endif
+}
+
 // Function to prepare the display and the menus
 void Display::RunSetup()
 {
@@ -136,12 +177,7 @@ void Display::RunSetup()
  #ifdef HAS_ILI9341

    #ifndef HAS_CYD_TOUCH
-      #ifdef TFT_SHIELD
-        uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait with TFT Shield
-      #elif defined(TFT_DIY)
-        uint16_t calData[5] = { 339, 3470, 237, 3438, 2 }; // tft.setRotation(0); // Portrait with DIY TFT
-      #endif
-      tft.setTouch(calData);
+      this->setCalData();
    #endif

  #endif
@@ -201,11 +237,16 @@ void Display::tftDrawGraphObjects(byte x_scale)
  tft.setCursor(3, 228); tft.print("0"); // "-" at bottom of y axis
 }

-void Display::tftDrawEapolColorKey()
+void Display::tftDrawEapolColorKey(bool filter)
 {
  //Display color key
  tft.setTextSize(1); tft.setTextColor(TFT_WHITE);
-  tft.fillRect(14, 0, 15, 8, TFT_CYAN); tft.setCursor(30, 0); tft.print(" - EAPOL"); 
+  tft.fillRect(14, 0, 15, 8, TFT_CYAN); tft.setCursor(30, 0); tft.println(" - EAPOL"); 
+  if (filter) {
+    uint16_t y = tft.getCursorY();
+    tft.setCursor(14, y);
+    tft.println("Filter Active");
+  }
 }

 void Display::tftDrawColorKey()
@@ -397,7 +438,7 @@ void Display::touchToExit()
 {
  tft.setTextColor(TFT_BLACK, TFT_LIGHTGREY);
  tft.fillRect(0,32,HEIGHT_1,16, TFT_LIGHTGREY);
-  tft.drawCentreString(text11,120,32,2);
+  tft.drawCentreString(text11,TFT_WIDTH / 2,32,2);
 }


@@ -408,6 +449,9 @@ void Display::clearScreen()
  #ifndef MARAUDER_V7
    tft.fillScreen(TFT_BLACK);
    tft.setCursor(0, 0);
+  #elif defined(MARAUDER_MINI)
+    tft.fillRect(0, 0, TFT_WIDTH, TFT_HEIGHT, TFT_BLACK);
+    tft.setCursor(0, 0);
  #else
    tft.fillRect(0, 0, TFT_WIDTH, TFT_HEIGHT, TFT_BLACK);
    tft.setCursor(0, 0);
@@ -570,7 +614,9 @@ void Display::setupScrollArea(uint16_t tfa, uint16_t bfa) {
  //Serial.println("   bfa: " + (String)bfa);
  //Serial.println("yStart: " + (String)this->yStart);
  #ifdef HAS_ILI9341
-    #ifdef HAS_ST7789
+    #ifdef HAS_ST7796
+      tft.writecommand(0x33);
+    #elif defined(HAS_ST7789)
      tft.writecommand(ST7789_VSCRDEF); // Vertical scroll definition
    #else
      tft.writecommand(ILI9341_VSCRDEF);
@@ -589,6 +635,8 @@ void Display::scrollAddress(uint16_t vsp) {
  #ifdef HAS_ILI9341
    #ifdef HAS_ST7789
      tft.writecommand(ST7789_VSCRDEF); // Vertical scroll definition
+    #elif defined(HAS_ST7796)
+      tft.writecommand(0x33);
    #else
      tft.writecommand(ILI9341_VSCRDEF);
    #endif
--- a/esp32_marauder/Display.h
+++ b/esp32_marauder/Display.h
@@ -124,7 +124,7 @@ class Display
    void tftDrawRedOnOffButton();
    void tftDrawGreenOnOffButton();
    void tftDrawGraphObjects(byte x_scale);
-    void tftDrawEapolColorKey();
+    void tftDrawEapolColorKey(bool filter = false);
    void tftDrawColorKey();
    void tftDrawXScaleButtons(byte x_scale);
    void tftDrawYScaleButtons(byte y_scale);
@@ -140,6 +140,7 @@ class Display
    //void jpegRender(int xpos, int ypos);
    void listDir(fs::FS &fs, const char * dirname, uint8_t levels);
    void listFiles();
+    void init();
    void main(uint8_t scan_mode);
    void RunSetup();
    void scrollAddress(uint16_t vsp);
@@ -149,6 +150,7 @@ class Display
    void touchToExit();
    void twoPartDisplay(String center_text);
    void updateBanner(String msg);
+    void setCalData(bool landscape = false);
 };
 #endif
 #endif
--- a/esp32_marauder/EvilPortal.cpp
+++ b/esp32_marauder/EvilPortal.cpp
@@ -125,7 +125,6 @@ void EvilPortal::setupServer() {
      200, "text/html",
      "<html><head><script>setTimeout(() => { window.location.href ='/' }, 100);</script></head><body></body></html>");
  });
-  Serial.println("web server up");
 }

 void EvilPortal::setHtmlFromSerial() {
@@ -340,9 +339,14 @@ void EvilPortal::startAP() {

  this->setupServer();

+  Serial.println("Server endpoints configured");
+
  this->dnsServer.start(53, "*", WiFi.softAPIP());
+  Serial.println("DNS Server started");
  server.addHandler(new CaptiveRequestHandler()).setFilter(ON_AP_FILTER);
+  Serial.println("Captive Portal handler started");
  server.begin();
+  Serial.println("Server started");
  #ifdef HAS_SCREEN
    this->sendToDisplay("Evil Portal READY");
  #endif
--- a/esp32_marauder/EvilPortal.h
+++ b/esp32_marauder/EvilPortal.h
@@ -6,6 +6,7 @@
 #include "ESPAsyncWebServer.h"
 #include <AsyncTCP.h>
 #include <DNSServer.h>
+#include <WiFi.h>

 #include "configs.h"
 #include "settings.h"
--- a/esp32_marauder/MenuFunctions.cpp
+++ b/esp32_marauder/MenuFunctions.cpp
--- a/esp32_marauder/MenuFunctions.h
+++ b/esp32_marauder/MenuFunctions.h
@@ -102,6 +102,7 @@ PROGMEM static lv_color_t buf[LV_HOR_RES_MAX * 10];

 PROGMEM static void ta_event_cb(lv_obj_t * ta, lv_event_t event);
 PROGMEM static void join_wifi_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event);
+PROGMEM static void start_ap_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event);
 PROGMEM static void add_ssid_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event);
 PROGMEM static void html_list_cb(lv_obj_t * btn, lv_event_t event);
 PROGMEM static void ap_list_cb(lv_obj_t * btn, lv_event_t event);
@@ -218,14 +219,12 @@ class MenuFunctions

    Menu evilPortalMenu;

-    Menu gpsPOIMenu;
-
    static void lv_tick_handler();

    // Menu icons

-    void setupSDFileList();
-    void buildSDFileMenu();
+    void setupSDFileList(bool update = false);
+    void buildSDFileMenu(bool update = false);
    void displayMenuButtons();
    uint16_t getColor(uint16_t color);
    void drawAvgLine(int16_t value);
@@ -271,6 +270,7 @@ class MenuFunctions
    #ifdef HAS_GPS
      // GPS Menu
      Menu gpsInfoMenu;
+      Menu gpsPOIMenu;
    #endif

    Menu infoMenu;
@@ -285,7 +285,7 @@ class MenuFunctions

    String loaded_file = "";

-    void joinWiFiGFX(String essid);
+    void joinWiFiGFX(String essid, bool start_ap = false);
    void setGraphScale(float scale);
    void initLVGL();
    void deinitLVGL();
@@ -295,7 +295,7 @@ class MenuFunctions
    void addAPGFX(String type = "AP");
    void addStationGFX();
    void buildButtons(Menu* menu, int starting_index = 0, String button_name = "");
-    void changeMenu(Menu* menu);
+    void changeMenu(Menu* menu, bool simple_change = false);
    void drawStatusBar();
    void displayCurrentMenu(int start_index = 0);
    void main(uint32_t currentTime);
--- a/esp32_marauder/SDInterface.cpp
+++ b/esp32_marauder/SDInterface.cpp
@@ -37,7 +37,7 @@ bool SDInterface::initSD() {
      */
      #if defined(MARAUDER_M5STICKC)
        enum { SPI_SCK = 0, SPI_MISO = 36, SPI_MOSI = 26 };
-      #elif defined(HAS_CYD_TOUCH) || defined(MARAUDER_CARDPUTER)
+      #elif defined(HAS_CYD_TOUCH) || defined(MARAUDER_CARDPUTER) || defined(HAS_SEPARATE_SD)
        enum { SPI_SCK = SD_SCK, SPI_MISO = SD_MISO, SPI_MOSI = SD_MOSI };
      #else
        enum { SPI_SCK = 0, SPI_MISO = 36, SPI_MOSI = 26 };
@@ -165,7 +165,10 @@ void SDInterface::listDir(String str_dir){
  }
 }

-void SDInterface::runUpdate() {
+void SDInterface::runUpdate(String file_name) {
+  if (file_name == "")
+    file_name = "/update.bin";
+
  #ifdef HAS_SCREEN
    display_obj.tft.setTextWrap(false);
    display_obj.tft.setFreeFont(NULL);
@@ -173,16 +176,18 @@ void SDInterface::runUpdate() {
    display_obj.tft.setTextSize(1);
    display_obj.tft.setTextColor(TFT_WHITE);
  
-    display_obj.tft.println(F(text15));
+    display_obj.tft.println("Opening " + file_name + "...");
  #endif
-  File updateBin = SD.open("/update.bin");
+
+  File updateBin = SD.open(file_name);
+
  if (updateBin) {
    if(updateBin.isDirectory()){
      #ifdef HAS_SCREEN
        display_obj.tft.setTextColor(TFT_RED);
        display_obj.tft.println(F(text_table2[0]));
      #endif
-      Serial.println(F("Error, could not find \"update.bin\""));
+      Serial.println("Error, could not find \"" + file_name + "\"");
      #ifdef HAS_SCREEN
        display_obj.tft.setTextColor(TFT_WHITE);
      #endif
--- a/esp32_marauder/SDInterface.h
+++ b/esp32_marauder/SDInterface.h
@@ -65,7 +65,7 @@ class SDInterface {
    void listDir(String str_dir);
    void listDirToLinkedList(LinkedList<String>* file_names, String str_dir = "/", String ext = "");
    File getFile(String path);
-    void runUpdate();
+    void runUpdate(String file_name = "");
    void performUpdate(Stream &updateSource, size_t updateSize);
    void main();
    bool removeFile(String file_path);
--- a/esp32_marauder/WiFiScan.cpp
+++ b/esp32_marauder/WiFiScan.cpp
--- a/esp32_marauder/WiFiScan.h
+++ b/esp32_marauder/WiFiScan.h
@@ -135,6 +135,8 @@
 #define WIFI_SCAN_HTTPS 66
 #define WIFI_SCAN_SMTP 67
 #define WIFI_SCAN_RDP 68
+#define WIFI_HOSTSPOT 69 // Nice
+#define BT_SCAN_AIRTAG_MON 70

 #define WIFI_ATTACK_FUNNY_BEACON 99 

@@ -215,6 +217,8 @@ struct AirTag {
    std::vector<uint8_t> payload; // Payload data
    uint16_t payloadSize;
    bool selected;
+    int8_t rssi;
+    uint32_t last_seen;
 };

 struct Flipper {
@@ -698,6 +702,7 @@ class WiFiScan
    #ifdef HAS_SCREEN
      int8_t checkAnalyzerButtons(uint32_t currentTime);
    #endif
+    bool filterActive();
    bool RunGPSInfo(bool tracker = false, bool display = true, bool poi = false);
    void logPoint(String lat, String lon, float alt, String datetime, bool poi = false);
    void setMac();
@@ -721,6 +726,7 @@ class WiFiScan
    bool shutdownBLE();
    bool scanning();
    bool joinWiFi(String ssid, String password, bool gui = true);
+    bool startWiFi(String ssid, String password, bool gui = true);
    String getStaMAC();
    String getApMAC();
    String freeRAM();
@@ -742,7 +748,7 @@ class WiFiScan
    void RunSaveATList(bool save_as = true);
    void RunLoadATList();
    void RunSetupGPSTracker(uint8_t scan_mode);
-    void channelHop();
+    void channelHop(bool filtered = false);
    uint8_t currentScanMode = 0;
    void main(uint32_t currentTime);
    void StartScan(uint8_t scan_mode, uint16_t color = 0);
--- a/esp32_marauder/configs.h
+++ b/esp32_marauder/configs.h
@@ -26,11 +26,13 @@
  //#define MARAUDER_CYD_MICRO // 2432S028
  //#define MARAUDER_CYD_2USB // Another 2432S028 but it has tWo UsBs OoOoOoO
  //#define MARAUDER_CYD_GUITION // ESP32-2432S024 GUITION
+  //#define MARAUDER_CYD_3_5_INCH
  //#define MARAUDER_C5
  //#define MARAUDER_CARDPUTER
+  //#define MARAUDER_V8
  //// END BOARD TARGETS

-  #define MARAUDER_VERSION "v1.8.6"
+  #define MARAUDER_VERSION "v1.8.9"

  #define GRAPH_REFRESH   100

@@ -60,7 +62,9 @@
  #elif defined(MARAUDER_CYD_MICRO)
    #define HARDWARE_NAME "CYD 2432S028"
  #elif defined(MARAUDER_CYD_2USB)
-    #define HARDWARE_NAME "CYD 2432S028 2USB"  
+    #define HARDWARE_NAME "CYD 2432S028 2USB"
+  #elif defined(MARAUDER_CYD_3_5_INCH)
+    #define HARDWARE_NAME "CYD 3.5inch"
  #elif defined(MARAUDER_CYD_GUITION)
    #define HARDWARE_NAME "CYD 2432S024 GUITION"
  #elif defined(MARAUDER_KIT)
@@ -77,6 +81,8 @@
    #define HARDWARE_NAME "XIAO ESP32 S3"
  #elif defined(MARAUDER_C5)
    #define HARDWARE_NAME "ESP32-C5 DevKit"
+  #elif defined(MARAUDER_V8)
+    #define HARDWARE_NAME "Marauder v8"
  #else
    #define HARDWARE_NAME "ESP32"
  #endif
@@ -255,6 +261,27 @@
    #define HAS_CYD_PORTRAIT
  #endif

+  #ifdef MARAUDER_CYD_3_5_INCH
+    #define HAS_TOUCH
+    #define HAS_FLIPPER_LED
+    //#define FLIPPER_ZERO_HAT
+    #define HAS_BATTERY
+    #define HAS_BT
+    #define HAS_BT_REMOTE
+    #define HAS_BUTTONS
+    //#define HAS_NEOPIXEL_LED
+    //#define HAS_PWR_MGMT
+    #define HAS_SCREEN
+    #define HAS_FULL_SCREEN
+    #define HAS_SD
+    #define USE_SD
+    #define HAS_TEMP_SENSOR
+    #define HAS_GPS
+    //#define HAS_CYD_TOUCH
+    #define HAS_SEPARATE_SD
+    #define HAS_CYD_PORTRAIT
+  #endif
+
  #ifdef MARAUDER_CYD_GUITION
    #define HAS_TOUCH
    #define HAS_FLIPPER_LED
@@ -393,6 +420,26 @@
    //#define HAS_PSRAM
    //#define HAS_TEMP_SENSOR
  #endif
+
+  #ifdef MARAUDER_V8
+    #define HAS_TOUCH
+    //#define HAS_FLIPPER_LED
+    //#define FLIPPER_ZERO_HAT
+    #define HAS_BATTERY
+    //#define HAS_BT
+    //#define HAS_BUTTONS
+    #define HAS_NEOPIXEL_LED
+    //#define HAS_PWR_MGMT
+    #define HAS_SCREEN
+    #define HAS_FULL_SCREEN
+    #define HAS_GPS
+    #define HAS_C5_SD
+    #define HAS_SD
+    #define USE_SD
+    #define HAS_DUAL_BAND
+    #define HAS_PSRAM
+    //#define HAS_TEMP_SENSOR
+  #endif
  //// END BOARD FEATURES

  //// POWER MANAGEMENT
@@ -617,6 +664,26 @@
      #define D_PULL true
    #endif

+    #ifdef MARAUDER_CYD_3_5_INCH
+      #define L_BTN -1
+      #define C_BTN 0
+      #define U_BTN -1
+      #define R_BTN -1
+      #define D_BTN -1
+
+      //#define HAS_L
+      //#define HAS_R
+      //#define HAS_U
+      //#define HAS_D
+      #define HAS_C
+
+      #define L_PULL true
+      #define C_PULL true
+      #define U_PULL true
+      #define R_PULL true
+      #define D_PULL true
+    #endif
+
    #ifdef MARAUDER_CYD_GUITION
      #define L_BTN -1
      #define C_BTN 0
@@ -943,7 +1010,7 @@
      #endif

      #ifndef MARAUDER_CYD_MICRO
-        #define TFT_DIY
+        #define TFT_DIY      
      #endif

      #define GRAPH_VERT_LIM TFT_HEIGHT/2
@@ -996,6 +1063,78 @@
    
      #define STATUSBAR_COLOR 0x4A49
    
+      #define KIT_LED_BUILTIN 13
+    #endif
+
+    #if defined(MARAUDER_V8)
+      #define SCREEN_CHAR_WIDTH 40
+      #define HAS_ILI9341
+    
+      #define BANNER_TEXT_SIZE 2
+
+      #ifndef TFT_WIDTH
+        #define TFT_WIDTH 240
+      #endif
+
+      #ifndef TFT_HEIGHT
+        #define TFT_HEIGHT 320
+      #endif
+
+      //#ifndef MARAUDER_CYD_MICRO
+        //#define TFT_DIY
+        //#define TFT_SHIELD
+      //#endif
+
+      #define GRAPH_VERT_LIM TFT_HEIGHT/2
+
+      #define EXT_BUTTON_WIDTH 20
+
+      #define SCREEN_BUFFER
+
+      #define MAX_SCREEN_BUFFER 22
+
+      #define SCREEN_ORIENTATION 0
+    
+      #define CHAR_WIDTH 12
+      #define SCREEN_WIDTH TFT_WIDTH
+      #define SCREEN_HEIGHT TFT_HEIGHT
+      #define HEIGHT_1 TFT_WIDTH
+      #define WIDTH_1 TFT_HEIGHT
+      #define STANDARD_FONT_CHAR_LIMIT (TFT_WIDTH/6) // number of characters on a single line with normal font
+      #define TEXT_HEIGHT 16 // Height of text to be printed and scrolled
+      #define BOT_FIXED_AREA 0 // Number of lines in bottom fixed area (lines counted from bottom of screen)
+      #define TOP_FIXED_AREA 48 // Number of lines in top fixed area (lines counted from top of screen)
+      #define YMAX 320 // Bottom of screen area
+      #define minimum(a,b)     (((a) < (b)) ? (a) : (b))
+      //#define MENU_FONT NULL
+      #define MENU_FONT &FreeMono9pt7b // Winner
+      //#define MENU_FONT &FreeMonoBold9pt7b
+      //#define MENU_FONT &FreeSans9pt7b
+      //#define MENU_FONT &FreeSansBold9pt7b
+      #define BUTTON_SCREEN_LIMIT 12
+      #define BUTTON_ARRAY_LEN BUTTON_SCREEN_LIMIT
+      #define STATUS_BAR_WIDTH 16
+      #define LVGL_TICK_PERIOD 6
+
+      #define FRAME_X 100
+      #define FRAME_Y 64
+      #define FRAME_W 120
+      #define FRAME_H 50
+    
+      // Red zone size
+      #define REDBUTTON_X FRAME_X
+      #define REDBUTTON_Y FRAME_Y
+      #define REDBUTTON_W (FRAME_W/2)
+      #define REDBUTTON_H FRAME_H
+    
+      // Green zone size
+      #define GREENBUTTON_X (REDBUTTON_X + REDBUTTON_W)
+      #define GREENBUTTON_Y FRAME_Y
+      #define GREENBUTTON_W (FRAME_W/2)
+      #define GREENBUTTON_H FRAME_H
+    
+      #define STATUSBAR_COLOR 0x4A49
+    
      #define KIT_LED_BUILTIN 13
    #endif 

@@ -1134,6 +1273,76 @@
      #define KIT_LED_BUILTIN 13
    #endif

+    #if defined(MARAUDER_CYD_3_5_INCH)
+      #define SCREEN_CHAR_WIDTH 40
+      #define HAS_ILI9341
+      #define HAS_ST7796
+    
+      #define BANNER_TEXT_SIZE 2
+
+      #ifndef TFT_WIDTH
+        #define TFT_WIDTH 320
+      #endif
+
+      #ifndef TFT_HEIGHT
+        #define TFT_HEIGHT 480
+      #endif
+
+      #define TFT_DIY
+
+      #define GRAPH_VERT_LIM TFT_HEIGHT/2
+
+      #define EXT_BUTTON_WIDTH 20
+
+      #define SCREEN_BUFFER
+
+      #define MAX_SCREEN_BUFFER 33
+
+      #define SCREEN_ORIENTATION 0
+    
+      #define CHAR_WIDTH 12
+      #define SCREEN_WIDTH TFT_WIDTH
+      #define SCREEN_HEIGHT TFT_HEIGHT
+      #define HEIGHT_1 TFT_WIDTH
+      #define WIDTH_1 TFT_HEIGHT
+      #define STANDARD_FONT_CHAR_LIMIT (TFT_WIDTH/6) // number of characters on a single line with normal font
+      #define TEXT_HEIGHT 16 // Height of text to be printed and scrolled
+      #define BOT_FIXED_AREA 0 // Number of lines in bottom fixed area (lines counted from bottom of screen)
+      #define TOP_FIXED_AREA 48 // Number of lines in top fixed area (lines counted from top of screen)
+      #define YMAX 480 // Bottom of screen area
+      #define minimum(a,b)     (((a) < (b)) ? (a) : (b))
+      //#define MENU_FONT NULL
+      #define MENU_FONT &FreeMono9pt7b // Winner
+      //#define MENU_FONT &FreeMonoBold9pt7b
+      //#define MENU_FONT &FreeSans9pt7b
+      //#define MENU_FONT &FreeSansBold9pt7b
+      #define BUTTON_SCREEN_LIMIT 12
+      #define BUTTON_ARRAY_LEN BUTTON_SCREEN_LIMIT
+      #define STATUS_BAR_WIDTH 16
+      #define LVGL_TICK_PERIOD 6
+
+      #define FRAME_X 100
+      #define FRAME_Y 64
+      #define FRAME_W TFT_WIDTH / 2
+      #define FRAME_H 50
+    
+      // Red zone size
+      #define REDBUTTON_X FRAME_X
+      #define REDBUTTON_Y FRAME_Y
+      #define REDBUTTON_W (FRAME_W/2)
+      #define REDBUTTON_H FRAME_H
+    
+      // Green zone size
+      #define GREENBUTTON_X (REDBUTTON_X + REDBUTTON_W)
+      #define GREENBUTTON_Y FRAME_Y
+      #define GREENBUTTON_W (FRAME_W/2)
+      #define GREENBUTTON_H FRAME_H
+    
+      #define STATUSBAR_COLOR 0x4A49
+    
+      #define KIT_LED_BUILTIN 13
+    #endif
+
    #if defined(MARAUDER_CYD_GUITION)
      #define SCREEN_CHAR_WIDTH 40
      #define HAS_ILI9341
@@ -1595,6 +1804,25 @@
    //#define BUTTON_ARRAY_LEN 5
  #endif

+  #if defined(MARAUDER_V8)
+    #define BANNER_TIME 100
+    
+    #define COMMAND_PREFIX "!"
+    
+    // Keypad start position, key sizes and spacing
+    #define KEY_X 120 // Centre of key
+    #define KEY_Y 50
+    #define KEY_W 240 // Width and height
+    #define KEY_H 22
+    #define KEY_SPACING_X 0 // X and Y gap
+    #define KEY_SPACING_Y 1
+    #define KEY_TEXTSIZE 1   // Font size multiplier
+    #define ICON_W 22
+    #define ICON_H 22
+    #define BUTTON_PADDING 22
+    //#define BUTTON_ARRAY_LEN 5
+  #endif
+
  #if defined(MARAUDER_CYD_MICRO)
    #define BANNER_TIME 100
    
@@ -1633,6 +1861,25 @@
    //#define BUTTON_ARRAY_LEN 5
  #endif

+  #if defined(MARAUDER_CYD_3_5_INCH)
+    #define BANNER_TIME 100
+    
+    #define COMMAND_PREFIX "!"
+    
+    // Keypad start position, key sizes and spacing
+    #define KEY_X 160 // Centre of key
+    #define KEY_Y 50
+    #define KEY_W 320 // Width and height
+    #define KEY_H 22
+    #define KEY_SPACING_X 0 // X and Y gap
+    #define KEY_SPACING_Y 1
+    #define KEY_TEXTSIZE 1   // Font size multiplier
+    #define ICON_W 22
+    #define ICON_H 22
+    #define BUTTON_PADDING 22
+    //#define BUTTON_ARRAY_LEN 5
+  #endif
+
  #if defined(MARAUDER_CYD_GUITION)
    #define BANNER_TIME 100
    
@@ -1805,6 +2052,10 @@
      #define SD_CS 5
    #endif

+    #ifdef MARAUDER_CYD_3_5_INCH
+      #define SD_CS 5
+    #endif
+
    #ifdef MARAUDER_CYD_GUITION
      #define SD_CS 5
    #endif
@@ -1865,6 +2116,10 @@
      #define SD_CS 10
    #endif

+    #ifdef MARAUDER_V8
+      #define SD_CS 10
+    #endif
+
  #endif
  //// END SD DEFINITIONS

@@ -1942,6 +2197,8 @@
    #define MEM_LOWER_LIM 10000
  #elif defined(MARAUDER_CYD_2USB)
    #define MEM_LOWER_LIM 10000
+  #elif defined(MARAUDER_CYD_3_5_INCH)
+    #define MEM_LOWER_LIM 10000
  #elif defined(MARAUDER_CYD_GUITION)
    #define MEM_LOWER_LIM 10000
  #elif defined(MARAUDER_KIT)
@@ -1960,6 +2217,8 @@
    #define MEM_LOWER_LIM 10000
  #elif defined(MARAUDER_C5)
    #define MEM_LOWER_LIM 10000
+  #elif defined(MARAUDER_V8)
+    #define MEM_LOWER_LIM 10000
  #endif
  //// END MEMORY LOWER LIMIT STUFF

@@ -1976,8 +2235,12 @@
      #define PIN 4
    #elif defined(MARAUDER_CYD_2USB)
      #define PIN 4
+    #elif defined(MARAUDER_CYD_3_5_INCH)
+      #define PIN 22
    #elif defined(MARAUDER_C5)
      #define PIN 27
+    #elif defined(MARAUDER_V8)
+      #define PIN 27
    #else
      #define PIN 25
    #endif
@@ -2015,6 +2278,10 @@
      #define GPS_SERIAL_INDEX 2
      #define GPS_TX 1 // Community pinout matching old forks and even bruce firmware allowing for hardware standardization
      #define GPS_RX 3
+    #elif defined(MARAUDER_CYD_3_5_INCH)
+      #define GPS_SERIAL_INDEX 2
+      #define GPS_TX 21
+      #define GPS_RX 22
    #elif defined(MARAUDER_CYD_GUITION)
      #define GPS_SERIAL_INDEX 2
      #define GPS_TX 21 // Fits the extended I/O
@@ -2067,6 +2334,10 @@
      #define GPS_SERIAL_INDEX 1
      #define GPS_TX 14
      #define GPS_RX 13
+    #elif defined(MARAUDER_V8)
+      #define GPS_SERIAL_INDEX 1
+      #define GPS_TX 14
+      #define GPS_RX 13
    #endif
  #else
    #define mac_history_len 100
@@ -2126,6 +2397,16 @@
      #define I2C_SCL 27
    #endif

+    #ifdef MARAUDER_CYD_3_5_INCH
+      #define I2C_SDA 32
+      #define I2C_SCL 25
+    #endif
+
+    #ifdef MARAUDER_V8
+      #define I2C_SCL 4
+      #define I2C_SDA 5
+    #endif
+
  #endif

  //// MARAUDER TITLE STUFF
@@ -2137,6 +2418,8 @@
    #define MARAUDER_TITLE_BYTES 13578
  #elif defined(MARAUDER_CYD_2USB)
    #define MARAUDER_TITLE_BYTES 13578
+  #elif defined(MARAUDER_CYD_3_5_INCH)
+    #define MARAUDER_TITLE_BYTES 13578
  #elif defined(MARAUDER_CYD_GUITION)
    #define MARAUDER_TITLE_BYTES 13578
  #elif defined(MARAUDER_KIT)
@@ -2151,6 +2434,8 @@
    #define MARAUDER_TITLE_BYTES 13578
  #elif defined(MARAUDER_C5)
    #define MARAUDER_TITLE_BYTES 13578
+  #elif defined(MARAUDER_V8)
+    #define MARAUDER_TITLE_BYTES 13578
  #else
    #define MARAUDER_TITLE_BYTES 13578
  #endif
@@ -2172,7 +2457,7 @@
  //// PCAP BUFFER STUFF

  //// STUPID CYD STUFF
-  #if defined(HAS_CYD_TOUCH) || defined(HAS_C5_SD)
+  #if defined(HAS_CYD_TOUCH) || defined(HAS_C5_SD) || defined(HAS_SEPARATE_SD)
    #ifdef MARAUDER_CYD_MICRO
      #define XPT2046_IRQ  36
      #define XPT2046_MOSI 32
@@ -2197,11 +2482,23 @@
      #define SD_SCK       18
    #endif

+    #ifdef MARAUDER_CYD_3_5_INCH
+      #define SD_MISO      19
+      #define SD_MOSI      23
+      #define SD_SCK       18
+    #endif
+
    #ifdef MARAUDER_C5
      #define SD_MISO 2
      #define SD_MOSI 7
      #define SD_SCK  6
    #endif
+
+    #ifdef MARAUDER_V8
+      #define SD_MISO TFT_MISO
+      #define SD_MOSI TFT_MOSI
+      #define SD_SCK  TFT_SCLK
+    #endif
  #endif
  //// END STUPID CYD STUFF

@@ -2232,6 +2529,12 @@
      #define R_PIN 4
    #endif

+    #ifdef MARAUDER_CYD_3_5_INCH
+      #define B_PIN 17
+      #define G_PIN 16
+      #define R_PIN 22
+    #endif
+
    #ifdef MARAUDER_CYD_GUITION
      #define B_PIN 17
      #define G_PIN 16
@@ -2246,6 +2549,6 @@
  #ifndef HAS_DUAL_BAND
    #define HOP_DELAY 1000
  #else
-    #define HOP_DELAY 100
+    #define HOP_DELAY 250
  #endif
 #endif
--- a/esp32_marauder/esp32_marauder.ino
+++ b/esp32_marauder/esp32_marauder.ino
@@ -236,8 +236,6 @@ void setup()
  backlightOn(); // Need this

  #ifdef HAS_SCREEN
-    //delay(2000);
-
    // Do some stealth mode stuff
    #ifdef HAS_BUTTONS
      if (c_btn.justPressed()) {
@@ -248,18 +246,6 @@ void setup()
        Serial.println("Headless Mode enabled");
      }
    #endif
-
-    //display_obj.clearScreen();
-  
-    //display_obj.tft.setTextColor(TFT_CYAN, TFT_BLACK);
-  
-    //display_obj.tft.println(text_table0[0]);
-  
-    //delay(2000);
-  
-    //display_obj.tft.println("Marauder " + display_obj.version_number + "\n");
-  
-    //display_obj.tft.println(text_table0[1]);
  #endif

  settings_obj.begin();
--- a/esp32_marauder/lang_var.h
+++ b/esp32_marauder/lang_var.h
@@ -168,9 +168,9 @@ PROGMEM const char text4_28[] = "SD Card: Connected";
 PROGMEM const char text4_29[] = "SD Card Size: ";
 PROGMEM const char text4_30[] = "SD Card: Not Connected";
 PROGMEM const char text4_31[] = "SD Card Size: 0";
-PROGMEM const char text4_32[] = "IP5306 I2C: supported";
+PROGMEM const char text4_32[] = "Battery Monitor: supported";
 PROGMEM const char text4_33[] = "Battery Lvl: ";
-PROGMEM const char text4_34[] = "IP5306 I2C: not supported";
+PROGMEM const char text4_34[] = "Battery Monitor: not supported";
 PROGMEM const char text4_35[] = "Internal temp: ";
 PROGMEM const char text4_36[] = " Detect Espressif ";
 PROGMEM const char text4_37[] = " Detect Pwnagotchi ";
Author	SHA1	Message	Date
Just Call Me Koko	9819a6ba1b	Merge pull request #962 from justcallmekoko/develop Add last seen to airtag monitor	2025-10-30 14:15:57 -04:00
Just Call Me Koko	f170caa9d2	Add last seen to airtag monitor	2025-10-30 13:59:16 -04:00
Just Call Me Koko	3838296173	Merge pull request #961 from justcallmekoko/develop Adjust regular and nightly build output	2025-10-30 13:00:11 -04:00
Just Call Me Koko	8526e49189	Hahaha funny	2025-10-30 12:56:27 -04:00
Just Call Me Koko	a3aff9afd6	Add version dot to build parallel	2025-10-30 12:48:20 -04:00
Just Call Me Koko	50033af120	Merge pull request #960 from justcallmekoko/master Update Develop	2025-10-29 17:00:49 -04:00
Just Call Me Koko	2ccb8675dc	Merge pull request #959 from justcallmekoko/develop Add airtag monitor	2025-10-29 16:44:49 -04:00
Just Call Me Koko	05eb6d74a5	Add airtag monitor	2025-10-29 15:32:07 -04:00
Just Call Me Koko	c06e104485	Merge pull request #956 from justcallmekoko/develop Select bin file from list for updating firmware	2025-10-27 15:05:31 -04:00
Just Call Me Koko	0a8d9d2d41	Allow select bin file for firmware update	2025-10-27 14:56:32 -04:00
Just Call Me Koko	ab9870219a	Merge pull request #955 from justcallmekoko/master Update Develop	2025-10-27 12:56:29 -04:00
Just Call Me Koko	941532eba0	Merge pull request #954 from justcallmekoko/develop Develop	2025-10-27 12:36:26 -04:00
Just Call Me Koko	c515873fd5	Merge pull request #951 from H4W9/H4W9-GPS-Option-Fix H4W9 gps option fix	2025-10-27 12:21:27 -04:00
Just Call Me Koko	1bf0b0e2c1	Merge pull request #953 from justcallmekoko/develop Fix station select back button	2025-10-27 12:01:52 -04:00
Just Call Me Koko	9ea5fbc3eb	Fix station menu back button	2025-10-27 11:43:46 -04:00
H4W9	0e8e698254	Update configs.h (RevertDumbCommit) Revert my dumb commit	2025-10-26 12:18:24 -05:00
H4W9	630687359d	Update MenuFunctions.cpp Fix GPS option showing up on Main Menu when GPS Chip is not available.	2025-10-26 11:51:06 -05:00
Just Call Me Koko	5070b9785d	Consolidate display init method	2025-10-25 02:45:09 -04:00
H4W9	b0c8dd5cb4	Update configs.h	2025-10-24 11:24:08 -05:00
Just Call Me Koko	5fa046b599	Merge pull request #947 from justcallmekoko/develop Slow down dual band channel hopping	2025-10-17 11:18:05 -04:00
Just Call Me Koko	48164bc4ec	Hahaha double silly	2025-10-17 10:56:01 -04:00
Just Call Me Koko	68085fc6a7	Haha silly	2025-10-17 10:49:48 -04:00
Just Call Me Koko	0f62303018	Consolidate touch calibration data	2025-10-17 10:40:00 -04:00
Just Call Me Koko	dc7992d040	Update MenuFunctions.cpp	2025-10-14 11:48:29 -04:00
Just Call Me Koko	0764625eb1	Adjust dual band channel hop time	2025-10-10 15:49:22 -04:00
Just Call Me Koko	748afc99e8	Merge pull request #942 from justcallmekoko/master Update Develop	2025-10-10 11:27:32 -04:00
Just Call Me Koko	c4e78293a6	Merge pull request #941 from justcallmekoko/develop Adjust EAPOL sniff filter parameters	2025-10-10 11:12:39 -04:00
Just Call Me Koko	74cd774718	Adjust eapol monitor UI	2025-10-10 10:53:27 -04:00
Just Call Me Koko	feaae672da	Refactor EAPOL sniff filtering	2025-10-09 15:39:08 -04:00
Just Call Me Koko	ba9ec4023e	Remove channel hop from targeted eapol	2025-10-09 11:12:40 -04:00
Just Call Me Koko	7045ce9380	Fix caldata for landscape	2025-10-07 13:21:32 -04:00
Just Call Me Koko	69a7d9b24f	Merge pull request #939 from justcallmekoko/master Update Develop	2025-10-07 12:34:21 -04:00
Just Call Me Koko	11f2cec1fd	Merge pull request #938 from justcallmekoko/develop Update Adafruit NeoPixel library version	2025-10-07 12:27:53 -04:00
Just Call Me Koko	828d0b1760	Update neopixel version for C5	2025-10-07 12:12:58 -04:00
Just Call Me Koko	fc903cc66b	Adjust board definition	2025-10-07 10:26:09 -04:00
Just Call Me Koko	e3d3d8276c	Merge pull request #937 from justcallmekoko/develop Clean up menu transition for Minis	2025-10-06 14:58:11 -04:00
Just Call Me Koko	72951397d8	Clean menu transition for minis	2025-10-06 14:47:10 -04:00
Just Call Me Koko	e5f2466c41	Merge pull request #936 from justcallmekoko/master Update Develop	2025-10-06 12:07:54 -04:00
Just Call Me Koko	d70d141662	Merge pull request #935 from justcallmekoko/develop Fix status bar formatting	2025-10-06 11:34:14 -04:00
Just Call Me Koko	4bd3a1d4b1	Fix status bar formatting	2025-10-06 11:29:38 -04:00
Just Call Me Koko	510e5692b0	Merge pull request #934 from justcallmekoko/develop Delete old nightly assets	2025-10-05 11:07:01 -04:00
Just Call Me Koko	4b5339bf89	Delete old nightly assets	2025-10-05 11:04:32 -04:00
Just Call Me Koko	2efcb63d19	Merge pull request #933 from justcallmekoko/develop Add support for CYD 3.5inch	2025-10-03 15:50:29 -04:00
Just Call Me Koko	871fc356c6	Add build for CYD 3.5inch	2025-10-03 15:42:48 -04:00
Just Call Me Koko	0e1a289678	Fix display formatting for 3.5inch	2025-10-03 15:39:30 -04:00
Just Call Me Koko	a1f4c9dc28	Add support for CYD 3.5inch	2025-10-03 14:57:56 -04:00
Just Call Me Koko	762f6f7ec9	Merge pull request #932 from justcallmekoko/develop Fix nightly workflow conditions	2025-10-03 10:11:01 -04:00
Just Call Me Koko	ffcb2585d5	Double oopsie	2025-10-03 10:06:46 -04:00
Just Call Me Koko	b2cd8efe38	Merge pull request #931 from justcallmekoko/develop Oopsie	2025-10-03 10:00:17 -04:00
Just Call Me Koko	174885dff5	Oopsie	2025-10-03 09:57:14 -04:00
Just Call Me Koko	8e523ed237	Merge pull request #930 from justcallmekoko/develop Update nightly build criteria	2025-10-03 09:49:31 -04:00
Just Call Me Koko	faf1bbb620	Change nightly build criteria	2025-10-03 09:47:26 -04:00
Just Call Me Koko	71c0d2e616	Merge pull request #929 from justcallmekoko/master Update Develop	2025-10-02 11:57:44 -04:00
Just Call Me Koko	3e09d2d816	Merge pull request #928 from justcallmekoko/develop Add softAP to wifi general	2025-10-02 11:50:14 -04:00
Just Call Me Koko	3ce7d45341	Fix menu navigation for AP start	2025-10-02 11:45:45 -04:00
Just Call Me Koko	e86f16934e	softAP feature from #876	2025-10-02 10:42:28 -04:00
Just Call Me Koko	4042e9d43b	Merge pull request #926 from justcallmekoko/develop Oops is boolean	2025-09-30 12:22:20 -04:00
Just Call Me Koko	8a0817e547	Oops is boolean	2025-09-30 12:21:20 -04:00
Just Call Me Koko	02febc63c6	Merge pull request #925 from justcallmekoko/develop Fix release naming convention for nightly	2025-09-30 12:05:37 -04:00
Just Call Me Koko	969a2fff30	Update release naming convention	2025-09-30 12:04:43 -04:00
Just Call Me Koko	8831927580	Merge pull request #924 from justcallmekoko/master Update Develop	2025-09-30 11:46:36 -04:00
Just Call Me Koko	72ed6de7dc	Merge pull request #923 from justcallmekoko/develop Adjust naming and release message body	2025-09-30 11:32:36 -04:00
Just Call Me Koko	ad4b660dd4	Adjust naming and release message body	2025-09-30 11:31:56 -04:00
Just Call Me Koko	f25e2b90d5	Merge pull request #922 from justcallmekoko/develop Create nightly build workflow	2025-09-30 11:19:23 -04:00
Just Call Me Koko	c44be1ecdc	Do not trigger on push and pull	2025-09-30 11:12:13 -04:00
Just Call Me Koko	d74a22b297	Create nightly build workflow	2025-09-30 11:08:23 -04:00
Just Call Me Koko	79cbd91b60	Merge pull request #921 from justcallmekoko/develop Improve signal monitor UI	2025-09-29 15:37:11 -04:00
Just Call Me Koko	7448c266e4	Fix non display hardware	2025-09-29 15:21:39 -04:00
Just Call Me Koko	5088e0bfb4	Improve signal monitor UI	2025-09-29 15:16:06 -04:00
Just Call Me Koko	08517d7587	Get that crap out of here	2025-09-29 13:57:53 -04:00
Just Call Me Koko	d1ad247dd3	Add AXP2102 for cardputer	2025-09-24 18:34:18 -04:00
Just Call Me Koko	71cd5859f4	Merge pull request #917 from justcallmekoko/develop Fix ESP32-C5 event loop errors and Evil Portal	2025-09-24 17:03:25 -04:00
Just Call Me Koko	24f3e18b69	Update ESPAsyncWebServer version	2025-09-24 16:19:06 -04:00
Just Call Me Koko	74f09ee86f	Fix ESP32-C5 event loop errors	2025-09-24 13:40:18 -04:00
Just Call Me Koko	20242245ab	Merge pull request #914 from justcallmekoko/develop Add CLI commands for GPS POI and new port scans	2025-09-23 11:43:27 -04:00
Just Call Me Koko	e8f0c1317e	Fix for non display	2025-09-23 11:30:28 -04:00
Just Call Me Koko	d52b2922e6	and GPS POI and port scan commands	2025-09-23 10:37:40 -04:00