From 9c2902e73789a6975089304db2dfab685f08298f Mon Sep 17 00:00:00 2001 From: coded-with-claws <79459323+coded-with-claws@users.noreply.github.com> Date: Tue, 21 Nov 2023 18:54:17 +0100 Subject: [PATCH] adapted write_packets_serial pins for esp32-wroom-32 --- esp32_marauder/configs.h | 13 ++++++++++--- esp32_marauder/esp32_marauder.ino | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index c787e7620..44efcca04 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -6,13 +6,13 @@ //Indicates that it must redirect the stream with the captured packets to serial (1) //If not defined, will write packages to SD card if supported - //#define WRITE_PACKETS_SERIAL + #define WRITE_PACKETS_SERIAL //// BOARD TARGETS //#define MARAUDER_M5STICKC //#define MARAUDER_MINI - //#define MARAUDER_V4 - #define MARAUDER_V6 + #define MARAUDER_V4 + //#define MARAUDER_V6 //#define MARAUDER_V6_1 //#define MARAUDER_KIT //#define GENERIC_ESP32 @@ -20,6 +20,7 @@ //#define ESP32_LDDB //#define MARAUDER_DEV_BOARD_PRO //#define XIAO_ESP32_S3 + #define ESP32_WROOM32 //// END BOARD TARGETS #define MARAUDER_VERSION "v0.13.5" @@ -761,6 +762,12 @@ #define XIAO_TX1 2 #endif #endif + #ifdef ESP32_WROOM32 + #ifdef WRITE_PACKETS_SERIAL + #define WROOM32_RX1 16 + #define WROOM32_TX1 17 + #endif + #endif //// END BOARD PIN OVERRIDES //// EVIL PORTAL STUFF diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index 83a664162..192ac6339 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -203,6 +203,8 @@ void setup() #ifdef XIAO_ESP32_S3 Serial1.begin(115200, SERIAL_8N1, XIAO_RX1, XIAO_TX1); + #elif defined(ESP32_WROOM32) + Serial1.begin(115200, SERIAL_8N1, WROOM32_RX1, WROOM32_TX1); #else Serial1.begin(115200); #endif