Merge pull request #975 from justcallmekoko/develop

pee pee poo poo

.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" }
@@ -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: |

.github/workflows/nightly_build.yml

@@ -7,107 +7,57 @@ on:
     - cron: '0 3 * * *'
 
 jobs:
-  should_release:
-    name: "Decide: publish nightly prerelease?"
+  decide:
+    name: Detect new commits on default branch
     runs-on: ubuntu-latest
     outputs:
-      result: ${{ steps.check.outputs.result }}
+      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
-        # no heavy fetch needed for this check, but we want commit info:
-        with:
-          fetch-depth: 0
+        with: { fetch-depth: 0 }
 
-      - name: Check for new commits since last release / pre-release
-        id: check
-        uses: actions/github-script@v6
+      - id: decide
+        uses: actions/github-script@v7
         with:
           script: |
             const owner = context.repo.owner;
-            const repo = context.repo.repo;
+            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 || 'main';
+            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);
 
-            const branchCommit = await github.rest.repos.getCommit({
-              owner, repo, ref: defaultBranch
-            });
-            const branchCommitDate = new Date(branchCommit.data.commit.author.date);
-
-            const rels = await github.rest.repos.listReleases({ owner, repo, per_page: 100 });
-            const releases = rels.data.filter(r => !r.draft);
-
-            let latestReleaseDate = null;
-            let latestRelease = null;
-            if (releases.length > 0) {
-              latestRelease = releases.reduce((a,b) => {
-                const da = a.published_at ? new Date(a.published_at) : null;
-                const db = b.published_at ? new Date(b.published_at) : null;
-                if (!da) return b;
-                if (!db) return a;
-                return da > db ? a : b;
+            // Try get the existing nightly release (single static tag)
+            let nightlyRelease = null;
+            try {
+              nightlyRelease = await github.rest.repos.getReleaseByTag({
+                owner, repo, tag: 'nightly'
               });
-              latestReleaseDate = latestRelease.published_at ? new Date(latestRelease.published_at) : null;
+            } catch (e) {
+              if (e.status !== 404) throw e;
             }
 
-            const isManual = (context.eventName === 'workflow_dispatch');
-
-            let shouldPublish = false;
-            let prerelease = false;
-            let releaseSuffix = "";
-            let tagName = "";
-            let releaseName = "";
-
-            // Build tag_name and release_name (nightly)
-            const now = new Date();
-            const pad = (v) => v.toString().padStart(2,'0');
-            const Y = now.getUTCFullYear();
-            const M = pad(now.getUTCMonth()+1);
-            const D = pad(now.getUTCDate());
-            const h = pad(now.getUTCHours());
-            const m = pad(now.getUTCMinutes());
-            const shortSha = branchCommit.data.sha.substring(0,7);
-
-            if (isManual) {
-              shouldPublish = true;
-              prerelease = false;
-              releaseSuffix = "";
-              tagName = `manual-${Y}${M}${D}-${h}${m}-${shortSha}`;
-              releaseName = `Manual Release ${Y}-${M}-${D} ${h}:${m} UTC`;
-            } else if (context.eventName === 'schedule') {
-              if (!latestReleaseDate) {
-                // no prior releases -> publish nightly prerelease
-                shouldPublish = true;
-                prerelease = true;
-                releaseSuffix = "_beta";
-              } else if (branchCommitDate > latestReleaseDate) {
-                shouldPublish = true;
-                prerelease = true;
-                releaseSuffix = "_beta";
-              } else {
-                shouldPublish = false;
+            // 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
               }
-              tagName = `nightly-${Y}${M}${D}-${h}${m}-${shortSha}`;
-              releaseName = `Nightly Beta ${Y}-${M}-${D} ${h}:${m} UTC`;
-            } else {
-              shouldPublish = (context.eventName === 'push' || context.eventName === 'pull_request') ? false : false;
-              prerelease = false;
-              releaseSuffix = "";
-              tagName = `run-${Y}${M}${D}-${h}${m}-${shortSha}`;
-              releaseName = `Automatic Run ${Y}-${M}-${D} ${h}:${m} UTC`;
             }
 
-            return JSON.stringify({
-              should_release: shouldPublish,
-              prerelease: prerelease,
-              release_suffix: releaseSuffix,
-              tag_name: tagName,
-              release_name: releaseName,
-              default_branch: defaultBranch,
-              branch_commit: branchCommit.data.sha,
-              branch_commit_date: branchCommitDate.toISOString(),
-              latest_release_published_at: latestReleaseDate ? latestReleaseDate.toISOString() : null
-            });
+            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 }}
@@ -132,6 +82,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" }
@@ -232,7 +183,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
@@ -338,6 +289,7 @@ jobs:
 
           echo "artifact_name=$OUTPUT_BIN" >> $GITHUB_ENV
           echo "artifact_path=$BUILD_DIR/$OUTPUT_BIN" >> $GITHUB_ENV
+          echo "wild_card=esp32_marauder_${VERSION}_beta_${DATE}_*.bin" >> $GITHUB_ENV
           
       - name: Upload ${{ matrix.board.name }} Artifact
         uses: actions/upload-artifact@v4
@@ -347,11 +299,11 @@ jobs:
           retention-days: 5
 
   post_compile_steps:
-    name: Create Release (pre-release when nightly)
+    name: Create Nightly Release
     runs-on: ubuntu-latest
-    needs: [compile_sketch, should_release]
+    needs: [compile_sketch, decide]
     # create release if manual dispatch OR should_release decided true for scheduled run
-    if: ${{ github.event_name == 'workflow_dispatch' || fromJSON(needs.should_release.outputs.result).should_release == true }}
+    if: ${{ needs.decide.outputs.should_build == 'true' }}
     steps:
       - uses: actions/checkout@v4
 
@@ -363,6 +315,8 @@ jobs:
         id: meta
         shell: bash
         run: |
+          VERSION=$(grep '#define MARAUDER_VERSION' ./esp32_marauder/configs.h | sed -E 's/.*"v([^"]+)"/v\1/' | tr '.' '_')
+          DATE=$(date +%Y%m%d)
           SHORT_SHA="$(git rev-parse --short HEAD)"
           if [[ "${{ github.event_name }}" == "schedule" ]]; then
             echo "name=${SHORT_SHA}_nightly" >> $GITHUB_OUTPUT
@@ -374,17 +328,45 @@ jobs:
             echo "tag=manual-$(date -u +'%Y%m%d')-${SHORT_SHA}" >> $GITHUB_OUTPUT
             echo "prerelease=false" >> $GITHUB_OUTPUT
           fi
+          
+          echo "wild_card=esp32_marauder_${VERSION}_beta_${DATE}_*.bin" >> $GITHUB_ENV
+          
+          echo ${{ env.wild_card }}
+          
+      - 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: ${{ steps.meta.outputs.name }} 
-          tag_name: nightly
-          prerelease: ${{ steps.meta.outputs.prerelease }}
-          generate_release_notes: true
+          name: ${{ needs.decide.outputs.short_sha }}_nightly
+          tag_name: nightly_${{ needs.decide.outputs.short_sha }}
+          prerelease: true
+          generate_release_notes: false
           draft: false
           files: |
-            esp32_marauder_v*.bin
+            ${{ env.wild_card }}
           body: |
             [justcallmekokollc.com](https://justcallmekokollc.com)
 

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

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

esp32_marauder/CommandLine.cpp

@@ -312,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
   }

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

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

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);
@@ -222,15 +223,23 @@ class MenuFunctions
 
     // 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);
     void drawMaxLine(int16_t value, uint16_t color);
+    void drawMaxLine(uint8_t value, uint16_t color);
     float calculateGraphScale(int16_t value);
+    float calculateGraphScale(uint8_t value);
     float graphScaleCheck(const int16_t array[TFT_WIDTH]);
+    #ifndef HAS_DUAL_BAND
+      float graphScaleCheckSmall(const uint8_t array[MAX_CHANNEL]);
+    #else
+      float graphScaleCheckSmall(const uint8_t array[DUAL_BAND_CHANNELS]);
+    #endif
     void drawGraph(int16_t *values);
+    void drawGraphSmall(uint8_t *values);
     void renderGraphUI(uint8_t scan_mode = 0);
     //void addNodes(Menu* menu, String name, uint16_t color, Menu* child, int place, std::function<void()> callable, bool selected = false, String command = "");
     void addNodes(Menu* menu, String name, uint8_t color, Menu* child, int place, std::function<void()> callable, bool selected = false, String command = "");
@@ -284,7 +293,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();
@@ -294,7 +303,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);

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

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);

esp32_marauder/WiFiScan.h

@@ -135,6 +135,9 @@
 #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_SCAN_CHAN_ACT 71
 
 #define WIFI_ATTACK_FUNNY_BEACON 99 
 
@@ -215,6 +218,8 @@ struct AirTag {
     std::vector<uint8_t> payload; // Payload data
     uint16_t payloadSize;
     bool selected;
+    int8_t rssi;
+    uint32_t last_seen;
 };
 
 struct Flipper {
@@ -235,6 +240,8 @@ class WiFiScan
       struct mac_addr mac_history[mac_history_len];
     #endif
 
+    uint32_t chanActTime = 0;
+
     uint8_t ap_mac[6] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
     uint8_t sta_mac[6] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
 
@@ -541,6 +548,7 @@ class WiFiScan
 
     void signalAnalyzerLoop(uint32_t tick);
     void channelAnalyzerLoop(uint32_t tick);
+    void channelActivityLoop(uint32_t tick);
     void packetRateLoop(uint32_t tick);
     void packetMonitorMain(uint32_t currentTime);
     void eapolMonitorMain(uint32_t currentTime);
@@ -613,6 +621,14 @@ class WiFiScan
     bool save_pcap = false;
     bool ep_deauth = false;
 
+    #ifdef HAS_DUAL_BAND
+      uint8_t channel_activity[DUAL_BAND_CHANNELS] = {};
+    #else
+      uint8_t channel_activity[MAX_CHANNEL] = {};
+    #endif
+
+    uint8_t activity_page = 1;
+
     String analyzer_name_string = "";
     
     uint8_t analyzer_frames_recvd = 0;
@@ -695,9 +711,11 @@ class WiFiScan
 
     wifi_config_t ap_config;
 
+    void drawChannelLine();
     #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 +739,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 +761,7 @@ class WiFiScan
     void RunSaveATList(bool save_as = true);
     void RunLoadATList();
     void RunSetupGPSTracker(uint8_t scan_mode);
-    void channelHop();
+    void channelHop(bool filtered = false, bool ranged = false);
     uint8_t currentScanMode = 0;
     void main(uint32_t currentTime);
     void StartScan(uint8_t scan_mode, uint16_t color = 0);

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.7"
+  #define MARAUDER_VERSION "v1.8.10"
 
   #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
@@ -220,7 +226,7 @@
     #define HAS_TOUCH
     #define HAS_FLIPPER_LED
     //#define FLIPPER_ZERO_HAT
-    #define HAS_BATTERY
+    //#define HAS_BATTERY
     #define HAS_BT
     #define HAS_BT_REMOTE
     #define HAS_BUTTONS
@@ -239,7 +245,7 @@
     #define HAS_TOUCH
     #define HAS_FLIPPER_LED
     //#define FLIPPER_ZERO_HAT
-    #define HAS_BATTERY
+    //#define HAS_BATTERY
     #define HAS_BT
     #define HAS_BT_REMOTE
     #define HAS_BUTTONS
@@ -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
@@ -644,6 +711,8 @@
   #ifdef HAS_SCREEN
 
     #ifdef MARAUDER_M5STICKC
+      #define CHAN_PER_PAGE 7
+
       #define SCREEN_CHAR_WIDTH 40
       //#define TFT_MISO 19
       #define TFT_MOSI 15
@@ -669,7 +738,7 @@
         #define TFT_HEIGHT 240
       #endif
 
-      #define GRAPH_VERT_LIM TFT_HEIGHT/2
+      #define GRAPH_VERT_LIM TFT_HEIGHT/2 - 1
 
       #define EXT_BUTTON_WIDTH 0
 
@@ -718,6 +787,8 @@
     #endif
 
   #if defined(MARAUDER_M5STICKCP2)
+      #define CHAN_PER_PAGE 7
+
       #define MARAUDER_M5STICKC // From now on, everything is the same, except for one check in esp32_marauder.ino amd stickc_led.cpp/h
 
       #define SCREEN_CHAR_WIDTH 40
@@ -743,7 +814,7 @@
         #define TFT_HEIGHT 240
       #endif
 
-      #define GRAPH_VERT_LIM TFT_HEIGHT/2
+      #define GRAPH_VERT_LIM TFT_HEIGHT/2 - 1
 
       #define EXT_BUTTON_WIDTH 0
 
@@ -792,6 +863,8 @@
     #endif
 
     #ifdef MARAUDER_CARDPUTER
+      #define CHAN_PER_PAGE 7
+
       #define SCREEN_CHAR_WIDTH 40
       //#define TFT_MISO -1
       #define TFT_MOSI 35
@@ -816,7 +889,7 @@
         #define TFT_HEIGHT 240
       #endif
 
-      #define GRAPH_VERT_LIM TFT_HEIGHT/2
+      #define GRAPH_VERT_LIM TFT_HEIGHT/2 - 1
 
       #define EXT_BUTTON_WIDTH 0
 
@@ -865,6 +938,8 @@
     #endif
 
     #ifdef MARAUDER_V4
+      #define CHAN_PER_PAGE 7
+
       #define SCREEN_CHAR_WIDTH 40
       #define HAS_ILI9341
       #define BANNER_TEXT_SIZE 2
@@ -879,7 +954,7 @@
 
       #define TFT_SHIELD
 
-      #define GRAPH_VERT_LIM TFT_HEIGHT/2
+      #define GRAPH_VERT_LIM TFT_HEIGHT/2 - 1
 
       #define EXT_BUTTON_WIDTH 20
 
@@ -929,6 +1004,8 @@
     #endif
 
     #if defined(MARAUDER_V6) || defined(MARAUDER_V6_1)
+      #define CHAN_PER_PAGE 7
+
       #define SCREEN_CHAR_WIDTH 40
       #define HAS_ILI9341
     
@@ -943,10 +1020,84 @@
       #endif
 
       #ifndef MARAUDER_CYD_MICRO
-        #define TFT_DIY
+        #define TFT_DIY      
       #endif
 
-      #define GRAPH_VERT_LIM TFT_HEIGHT/2
+      #define GRAPH_VERT_LIM TFT_HEIGHT/2 - 1
+
+      #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
+
+    #if defined(MARAUDER_V8)
+      #define CHAN_PER_PAGE 7
+
+      #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 - 1
 
       #define EXT_BUTTON_WIDTH 20
 
@@ -1000,6 +1151,8 @@
     #endif 
 
     #if defined(MARAUDER_CYD_MICRO)
+      #define CHAN_PER_PAGE 7
+
       #define SCREEN_CHAR_WIDTH 40
       #define HAS_ILI9341
     
@@ -1013,7 +1166,7 @@
         #define TFT_HEIGHT 320
       #endif
 
-      #define GRAPH_VERT_LIM TFT_HEIGHT/2
+      #define GRAPH_VERT_LIM TFT_HEIGHT/2 - 1
 
       #define EXT_BUTTON_WIDTH 20
 
@@ -1067,6 +1220,8 @@
     #endif
 
     #if defined(MARAUDER_CYD_2USB)
+      #define CHAN_PER_PAGE 7
+
       #define SCREEN_CHAR_WIDTH 40
       #define HAS_ILI9341
       #define HAS_ST7789
@@ -1081,7 +1236,7 @@
         #define TFT_HEIGHT 320
       #endif
 
-      #define GRAPH_VERT_LIM TFT_HEIGHT/2
+      #define GRAPH_VERT_LIM TFT_HEIGHT/2 - 1
 
       #define EXT_BUTTON_WIDTH 20
 
@@ -1134,7 +1289,81 @@
       #define KIT_LED_BUILTIN 13
     #endif
 
+    #if defined(MARAUDER_CYD_3_5_INCH)
+      #define CHAN_PER_PAGE 7
+
+      #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 - 1
+
+      #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 CHAN_PER_PAGE 7
+
       #define SCREEN_CHAR_WIDTH 40
       #define HAS_ILI9341
     
@@ -1150,7 +1379,7 @@
 
       #define TFT_DIY
 
-      #define GRAPH_VERT_LIM TFT_HEIGHT/2
+      #define GRAPH_VERT_LIM TFT_HEIGHT/2 - 1
 
       #define EXT_BUTTON_WIDTH 20
 
@@ -1204,6 +1433,8 @@
     #endif
 
     #ifdef MARAUDER_V7
+      #define CHAN_PER_PAGE 7
+
       #define SCREEN_CHAR_WIDTH 40
       //#define HAS_ILI9341
     
@@ -1217,7 +1448,7 @@
         #define TFT_HEIGHT 320
       #endif
 
-      #define GRAPH_VERT_LIM TFT_HEIGHT/2
+      #define GRAPH_VERT_LIM TFT_HEIGHT/2 - 1
 
       #define TFT_DIY
 
@@ -1273,6 +1504,8 @@
     #endif
 
     #ifdef MARAUDER_V7_1
+      #define CHAN_PER_PAGE 7
+
       #define SCREEN_CHAR_WIDTH 40
       //#define HAS_ILI9341
     
@@ -1286,7 +1519,7 @@
         #define TFT_HEIGHT 320
       #endif
 
-      #define GRAPH_VERT_LIM TFT_HEIGHT/2
+      #define GRAPH_VERT_LIM TFT_HEIGHT/2 - 1
 
       #define TFT_DIY
 
@@ -1342,6 +1575,8 @@
     #endif
 
     #ifdef MARAUDER_KIT
+      #define CHAN_PER_PAGE 7
+
       #define SCREEN_CHAR_WIDTH 40
       #define HAS_ILI9341
     
@@ -1355,7 +1590,7 @@
         #define TFT_HEIGHT 320
       #endif
 
-      #define GRAPH_VERT_LIM TFT_HEIGHT/2
+      #define GRAPH_VERT_LIM TFT_HEIGHT/2 - 1
 
       #define TFT_DIY
       #define KIT
@@ -1408,6 +1643,8 @@
     #endif
   
     #ifdef MARAUDER_MINI
+      #define CHAN_PER_PAGE 7
+
       #define SCREEN_CHAR_WIDTH 40
       #define TFT_MISO 19
       #define TFT_MOSI 23
@@ -1433,7 +1670,7 @@
         #define TFT_HEIGHT 128
       #endif
 
-      #define GRAPH_VERT_LIM TFT_HEIGHT/2
+      #define GRAPH_VERT_LIM TFT_HEIGHT/2 - 1
 
       #define EXT_BUTTON_WIDTH 0
 
@@ -1481,6 +1718,8 @@
     #endif
 
     #ifdef MARAUDER_REV_FEATHER
+      #define CHAN_PER_PAGE 7
+
       #define SCREEN_CHAR_WIDTH 40
       //#define TFT_MISO 37
       //#define TFT_MOSI 35
@@ -1506,7 +1745,7 @@
         #define TFT_HEIGHT 135
       #endif
 
-      #define GRAPH_VERT_LIM TFT_HEIGHT/2
+      #define GRAPH_VERT_LIM TFT_HEIGHT/2 - 1
 
       #define EXT_BUTTON_WIDTH 0
 
@@ -1595,6 +1834,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 +1891,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 +2082,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 +2146,10 @@
       #define SD_CS 10
     #endif
 
+    #ifdef MARAUDER_V8
+      #define SD_CS 10
+    #endif
+
   #endif
   //// END SD DEFINITIONS
 
@@ -1911,6 +2196,8 @@
     #define STANDARD_FONT_CHAR_LIMIT 40
     #define FLASH_BUTTON -1
 
+    #define CHAN_PER_PAGE 7
+
     #include <FS.h>
     #include <functional>
     #include <LinkedList.h>
@@ -1942,6 +2229,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 +2249,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 +2267,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
@@ -2009,12 +2304,16 @@
       #define GPS_RX 13
     #elif defined(MARAUDER_CYD_MICRO)
       #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
+      #define GPS_TX 22 // Whoever thought it would be a good idea to use UART0 for GPS...
+      #define GPS_RX 27 // Now maybe we will be able to use CLI
     #elif defined(MARAUDER_CYD_2USB)
       #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
+      #define GPS_TX 22 // Whoever thought it would be a good idea to use UART0 for GPS...
+      #define GPS_RX 27 // Now maybe we will be able to use CLI
+    #elif defined(MARAUDER_CYD_3_5_INCH)
+      #define GPS_SERIAL_INDEX 2
+      #define GPS_TX 21
+      #define GPS_RX 25
     #elif defined(MARAUDER_CYD_GUITION)
       #define GPS_SERIAL_INDEX 2
       #define GPS_TX 21 // Fits the extended I/O
@@ -2067,6 +2366,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 +2429,21 @@
       #define I2C_SCL 27
     #endif
 
+    #ifdef MARAUDER_CYD_3_5_INCH
+      #define I2C_SDA 32
+      #define I2C_SCL 25
+    #endif
+
+    #ifdef MARAUDER_CYD_GUITION
+      #define I2C_SDA 22
+      #define I2C_SCL 21
+    #endif
+
+    #ifdef MARAUDER_V8
+      #define I2C_SCL 4
+      #define I2C_SDA 5
+    #endif
+
   #endif
 
   //// MARAUDER TITLE STUFF
@@ -2137,6 +2455,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 +2471,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 +2494,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 +2519,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 +2566,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 +2586,6 @@
   #ifndef HAS_DUAL_BAND
     #define HOP_DELAY 1000
   #else
-    #define HOP_DELAY 100
+    #define HOP_DELAY 250
   #endif
 #endif

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();

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 ";