Develop

.github/workflows/build_installer_manifests.yml

@@ -157,6 +157,14 @@ jobs:
           ref: 1.12.0
           path: CustomAdafruit_NeoPixel
 
+      - name: Install APA102 for LilyGo T-Dongle C5
+        if: matrix.board.flag == 'MARAUDER_T_DONGLE_C5'
+        uses: actions/checkout@v4
+        with:
+          repository: pololu/apa102-arduino
+          ref: 3.0.0
+          path: CustomAPA102
+
       - name: Install ArduinoJson
         uses: actions/checkout@v4
         with:
@@ -227,6 +235,10 @@ jobs:
             done
           fi
 
+      - name: Configure LilyGo T-Dongle C5 partition table
+        if: matrix.board.flag == 'MARAUDER_T_DONGLE_C5'
+        run: cp installer/partitions/t_dongle_c5.csv esp32_marauder/partitions.csv
+
       - name: Build Marauder for ${{ matrix.board.name }}
         uses: ArminJo/arduino-test-compile@v3.3.0
         with:

.github/workflows/build_parallel.yml

@@ -36,7 +36,8 @@ jobs:
           - { 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: "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: "M5Cardputer ADV",               flag: "MARAUDER_CARDPUTER_ADV",   fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=8M,PSRAM=disabled",                    file_name: "m5cardputer_adv",         tft: true,  tft_file: "User_Setup_marauder_m5cardputer_adv.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:FlashSize=8M,PartitionScheme=min_spiffs,PSRAM=enabled",                     file_name: "esp32c5devkitc1",         tft: false, tft_file: "",                                   build_dir: "esp32c5",                    addr: "0x2000",   idf_ver: "3.3.4",    nimble_ver: "2.3.8",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "ESP32-C5-DevKitC-1",            flag: "MARAUDER_C5",              fbqn: "esp32:esp32:esp32c5:FlashSize=8M,PartitionScheme=default_8MB,PSRAM=enabled",                    file_name: "esp32c5devkitc1",         tft: false, tft_file: "",                                   build_dir: "esp32c5",                    addr: "0x2000",   idf_ver: "3.3.4",    nimble_ver: "2.3.8",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "LilyGo T-Dongle C5",            flag: "MARAUDER_T_DONGLE_C5",     fbqn: "esp32:esp32:esp32c5:CDCOnBoot=cdc,FlashMode=qio,FlashSize=16M,PartitionScheme=custom,PSRAM=enabled", file_name: "t_dongle_c5", tft: true, tft_file: "User_Setup_marauder_t_dongle_c5.h", tft_repo: "H4W9/TFT_eSPI", tft_ref: "ESP32-C5", build_dir: "esp32c5", addr: "0x2000", idf_ver: "3.3.4", nimble_ver: "2.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" }
           - { name: "M5NanoC6",                      flag: "MARAUDER_M5_NANO_C6",      fbqn: "esp32:esp32:esp32c6:CDCOnBoot=cdc,PartitionScheme=min_spiffs",                                  file_name: "m5nanoc6",                tft: false, tft_file: "",                                   build_dir: "esp32c6",                    addr: "0x2000",   idf_ver: "3.3.4",    nimble_ver: "2.3.8",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
           - { name: "Marauder Pancake",              flag: "MARAUDER_PANCAKE",         fbqn: "esp32:esp32:esp32c5:FlashSize=8M,PartitionScheme=default_8MB,PSRAM=enabled",                    file_name: "pancake",                 tft: true,  tft_file: "User_Setup_marauder_pancake.h",      build_dir: "esp32c5",                    addr: "0x2000",   idf_ver: "3.3.4",    nimble_ver: "2.3.8",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master", tft_repo: "H4W9/TFT_eSPI", tft_ref: "ESP32-C5" }
 
@@ -148,6 +149,14 @@ jobs:
           ref: 1.12.0
           path: CustomAdafruit_NeoPixel
 
+      - name: Install APA102 for LilyGo T-Dongle C5
+        if: matrix.board.flag == 'MARAUDER_T_DONGLE_C5'
+        uses: actions/checkout@v4
+        with:
+          repository: pololu/apa102-arduino
+          ref: 3.0.0
+          path: CustomAPA102
+
       - name: Install ArduinoJson
         uses: actions/checkout@v2
         with:
@@ -235,6 +244,10 @@ jobs:
             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: Configure LilyGo T-Dongle C5 partition table
+        if: matrix.board.flag == 'MARAUDER_T_DONGLE_C5'
+        run: cp installer/partitions/t_dongle_c5.csv esp32_marauder/partitions.csv
+
       - name: Build Marauder for ${{ matrix.board.name }}
         uses: ArminJo/arduino-test-compile@v3.3.0
         with:
@@ -342,6 +355,7 @@ jobs:
             | M5 Cardputer | `_m5cardputer.bin` (Available on M5 Burner) |
             | M5 Cardputer ADV | `_m5cardputer_adv.bin` |
             | ESP32-C5 DevKit | [`_esp32c5_devkit.bin`](https://github.com/justcallmekoko/ESP32Marauder/wiki/ESP32%E2%80%90C5%E2%80%90DevKitC%E2%80%901) |
+            | LilyGo T-Dongle C5 | `_t_dongle_c5.bin` |
             | 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` |

.github/workflows/nightly_build.yml

@@ -99,7 +99,8 @@ jobs:
           - { 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: "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: "M5Cardputer ADV",               flag: "MARAUDER_CARDPUTER_ADV",   fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=8M,PSRAM=disabled",                    file_name: "m5cardputer_adv",         tft: true,  tft_file: "User_Setup_marauder_m5cardputer_adv.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:FlashSize=8M,PartitionScheme=min_spiffs,PSRAM=enabled",                     file_name: "esp32c5devkitc1",         tft: false, tft_file: "",                                   build_dir: "esp32c5",                    addr: "0x2000",   idf_ver: "3.3.4",    nimble_ver: "2.3.8",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "ESP32-C5-DevKitC-1",            flag: "MARAUDER_C5",              fbqn: "esp32:esp32:esp32c5:FlashSize=8M,PartitionScheme=default_8MB,PSRAM=enabled",                    file_name: "esp32c5devkitc1",         tft: false, tft_file: "",                                   build_dir: "esp32c5",                    addr: "0x2000",   idf_ver: "3.3.4",    nimble_ver: "2.3.8",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "LilyGo T-Dongle C5",            flag: "MARAUDER_T_DONGLE_C5",     fbqn: "esp32:esp32:esp32c5:CDCOnBoot=cdc,FlashMode=qio,FlashSize=16M,PartitionScheme=custom,PSRAM=enabled", file_name: "t_dongle_c5", tft: true, tft_file: "User_Setup_marauder_t_dongle_c5.h", tft_repo: "H4W9/TFT_eSPI", tft_ref: "ESP32-C5", build_dir: "esp32c5", addr: "0x2000", idf_ver: "3.3.4", nimble_ver: "2.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" }
           - { name: "M5NanoC6",                      flag: "MARAUDER_M5_NANO_C6",      fbqn: "esp32:esp32:esp32c6:CDCOnBoot=cdc,PartitionScheme=min_spiffs",                                  file_name: "m5nanoc6",                tft: false, tft_file: "",                                   build_dir: "esp32c6",                    addr: "0x2000",   idf_ver: "3.3.4",    nimble_ver: "2.3.8",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
 
     steps:
@@ -162,8 +163,8 @@ jobs:
       - name: Install TFT_eSPI
         uses: actions/checkout@v2
         with:
-          repository: Bodmer/TFT_eSPI
-          ref: V2.5.34
+          repository: ${{ matrix.board.tft_repo || 'Bodmer/TFT_eSPI' }}
+          ref: ${{ matrix.board.tft_ref || 'V2.5.34' }}
           path: CustomTFT_eSPI
 
       - name: Install XPT2046_Touchscreen
@@ -201,6 +202,14 @@ jobs:
           ref: 1.12.0
           path: CustomAdafruit_NeoPixel
 
+      - name: Install APA102 for LilyGo T-Dongle C5
+        if: matrix.board.flag == 'MARAUDER_T_DONGLE_C5'
+        uses: actions/checkout@v4
+        with:
+          repository: pololu/apa102-arduino
+          ref: 3.0.0
+          path: CustomAPA102
+
       - name: Install ArduinoJson
         uses: actions/checkout@v2
         with:
@@ -288,6 +297,10 @@ jobs:
             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: Configure LilyGo T-Dongle C5 partition table
+        if: matrix.board.flag == 'MARAUDER_T_DONGLE_C5'
+        run: cp installer/partitions/t_dongle_c5.csv esp32_marauder/partitions.csv
+
       - name: Build Marauder for ${{ matrix.board.name }}
         uses: ArminJo/arduino-test-compile@v3.3.0
         with:
@@ -431,4 +444,3 @@ jobs:
             | 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` |
-

User_Setup_Select.h

@@ -38,6 +38,7 @@
 //#include <User_Setup_marauder_m5cardputer_adv.h>
 //#include <User_Setup_cyd_3_5_inch.h>
 //#include <User_Setup_marauder_pancake.h>
+//#include <User_Setup_marauder_t_dongle_c5.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_marauder_t_dongle_c5.h

@@ -0,0 +1,19 @@
+// TFT_eSPI setup for the LilyGo T-Dongle C5 onboard 80x160 ST7735 display.
+#define ST7735_DRIVER
+#define TFT_WIDTH  80
+#define TFT_HEIGHT 160
+#define ST7735_GREENTAB160x80
+#define TFT_RGB_ORDER TFT_BGR
+
+#define TFT_MISO  7
+#define TFT_MOSI  2
+#define TFT_SCLK  6
+#define TFT_CS   10
+#define TFT_DC    3
+#define TFT_RST   1
+#define TFT_BL    0
+#define TFT_BACKLIGHT_ON LOW
+
+#define LOAD_GLCD
+#define SPI_FREQUENCY 27000000
+#define SPI_READ_FREQUENCY 16000000

esp32_marauder/CommandLine.cpp

@@ -1289,11 +1289,11 @@ void CommandLine::runCommand(String input) {
       this->startScanFromCLI(WIFI_PING_SCAN, TFT_GREEN, "Ping Scan");
     }
 
-    #ifndef HAS_DUAL_BAND
-      if (cmd_args.get(0) == ARP_SCAN_CMD) {
-        this->startScanFromCLI(WIFI_ARP_SCAN, TFT_CYAN, "ARP Scan");
-      }
-    #endif
+    // GCOVR_EXCL_START -- command dispatch requires the firmware CLI runtime.
+    if (cmd_args.get(0) == ARP_SCAN_CMD) {
+      this->startScanFromCLI(WIFI_ARP_SCAN, TFT_CYAN, "ARP Scan");
+    }
+    // GCOVR_EXCL_STOP
 
     // GPS POI
     if (cmd_args.get(0) == GPS_POI_CMD) {

esp32_marauder/IPv4Range.cpp

@@ -0,0 +1,43 @@
+#include "IPv4Range.h"
+
+namespace marauder {
+
+namespace {
+
+bool isContiguousMask(uint32_t mask) {
+  const uint32_t inverted = ~mask;
+  return (inverted & (inverted + 1U)) == 0U;
+}
+
+}  // namespace
+
+IPv4HostRange ipv4HostRange(uint32_t address, uint32_t subnetMask) {
+  const uint32_t network = address & subnetMask;
+  const uint32_t broadcast = network | ~subnetMask;
+  const bool valid = isContiguousMask(subnetMask) &&
+                     (broadcast - network) >= 2U;
+
+  return {network, broadcast, valid ? network + 1U : 0U,
+          valid ? broadcast - 1U : 0U, valid};
+}
+
+uint32_t nextIPv4Host(uint32_t current, const IPv4HostRange& range) {
+  if (!range.valid || current >= range.last) {
+    return 0U;
+  }
+  if (current < range.first) {
+    return range.first;
+  }
+  return current + 1U;
+}
+
+uint32_t previousIPv4Host(uint32_t current, uint32_t steps,
+                          const IPv4HostRange& range) {
+  if (!range.valid || current < range.first || current > range.last ||
+      steps > current - range.first) {
+    return 0U;
+  }
+  return current - steps;
+}
+
+}  // namespace marauder

esp32_marauder/IPv4Range.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <cstdint>
+
+namespace marauder {
+
+struct IPv4HostRange {
+  uint32_t network;
+  uint32_t broadcast;
+  uint32_t first;
+  uint32_t last;
+  bool valid;
+};
+
+IPv4HostRange ipv4HostRange(uint32_t address, uint32_t subnetMask);
+uint32_t nextIPv4Host(uint32_t current, const IPv4HostRange& range);
+uint32_t previousIPv4Host(uint32_t current, uint32_t steps,
+                          const IPv4HostRange& range);
+
+}  // namespace marauder

esp32_marauder/LedInterface.cpp

@@ -23,26 +23,41 @@ void LedInterface::RunSetup() {
     strip.show();
   #endif
 
+  #ifdef HAS_T_DONGLE_LED
+    pinMode(T_DONGLE_LED_DATA_PIN, OUTPUT);
+    pinMode(T_DONGLE_LED_CLOCK_PIN, OUTPUT);
+    this->writeApa102Color(0, 0, 0);
+  #endif
+
   this->initTime = millis();
 }
 
 void LedInterface::main(uint32_t currentTime) {
-  if ((!settings_obj.loadSetting<bool>("EnableLED")) ||
-      (this->current_mode == MODE_OFF)) {
+  uint8_t mode_to_render = settings_obj.loadSetting<bool>("EnableLED")
+                             ? this->current_mode : MODE_OFF;
+
+  #ifdef HAS_T_DONGLE_LED
+    // Only clock a frame when the state changes.  Continuously sending idle
+    // frames can make some APA102-compatible parts fall back to white.
+    if (mode_to_render == this->last_t_dongle_mode) return;
+    this->last_t_dongle_mode = mode_to_render;
+  #endif
+
+  if (mode_to_render == MODE_OFF) {
     this->ledOff();
     return;
   }
 
-  else if (this->current_mode == MODE_RAINBOW) {
+  else if (mode_to_render == MODE_RAINBOW) {
     this->rainbow();
   }
-  else if (this->current_mode == MODE_ATTACK) {
+  else if (mode_to_render == MODE_ATTACK) {
     this->attackLed();
   }
-  else if (this->current_mode == MODE_SNIFF) {
+  else if (mode_to_render == MODE_SNIFF) {
     this->sniffLed();
   }
-  else if (this->current_mode == MODE_CUSTOM) {
+  else if (mode_to_render == MODE_CUSTOM) {
     return;
   }
   else {
@@ -58,13 +73,35 @@ uint8_t LedInterface::getMode() {
   return this->current_mode;
 }
 
+#ifdef HAS_T_DONGLE_LED
+void LedInterface::refresh() {
+  // GPIO2 is shared with the display MOSI line. Re-send the intended LED
+  // frame after display traffic, even when the Marauder mode did not change.
+  this->last_t_dongle_mode = 0xFF;
+  this->main(millis());
+}
+#endif
+
 void LedInterface::setColor(int r, int g, int b) {
   #ifdef HAS_NEOPIXEL_LED
     strip.setPixelColor(0, strip.Color(r, g, b));
     strip.show();
   #endif
+  #ifdef HAS_T_DONGLE_LED
+    this->writeApa102Color(static_cast<uint8_t>(r), static_cast<uint8_t>(g),
+                          static_cast<uint8_t>(b));
+  #endif
 }
 
+#ifdef HAS_T_DONGLE_LED
+void LedInterface::writeApa102Color(uint8_t red, uint8_t green, uint8_t blue) {
+  const uint8_t brightness = (red || green || blue) ? 10 : 0;
+  this->t_dongle_led.startFrame();
+  this->t_dongle_led.sendColor(red, green, blue, brightness);
+  this->t_dongle_led.endFrame(1);
+}
+#endif
+
 void LedInterface::sniffLed() {
   this->setColor(0, 0, 255);
 }
@@ -103,4 +140,5 @@ uint32_t LedInterface::Wheel(byte WheelPos) {
     WheelPos -= 170;
     return strip.Color(WheelPos * 3, 255 - WheelPos * 3, 0);
   #endif
-}
+  return 0;
+}

esp32_marauder/LedInterface.h

@@ -9,6 +9,9 @@
 #ifdef HAS_NEOPIXEL_LED
   #include <Adafruit_NeoPixel.h>
 #endif
+#ifdef HAS_T_DONGLE_LED
+  #include <APA102.h>
+#endif
 
 #define Pixels 1
 
@@ -23,6 +26,11 @@ class LedInterface {
   private:
     uint32_t initTime = 0;
 
+    #ifdef HAS_T_DONGLE_LED
+      uint8_t last_t_dongle_mode = 0xFF;
+      APA102<T_DONGLE_LED_DATA_PIN, T_DONGLE_LED_CLOCK_PIN> t_dongle_led;
+    #endif
+
     int current_fade_itter = 1;
     int wheel_pos = 255;
     int wheel_speed = 1; // lower = slower
@@ -35,13 +43,21 @@ class LedInterface {
     void ledOff();
     void attackLed();
     void sniffLed();
+
+    #ifdef HAS_T_DONGLE_LED
+      void writeApa102Color(uint8_t red, uint8_t green, uint8_t blue);
+    #endif
 
   public:
     LedInterface();
 
     void RunSetup();
     void main(uint32_t currentTime);
 
+    #ifdef HAS_T_DONGLE_LED
+      void refresh();
+    #endif
+
     void setMode(uint8_t);
     void setColor(int r, int g, int b);
     uint8_t getMode();