Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adapted write_packets_serial pins for esp32-wroom-32 #401

Closed
wants to merge 3 commits into from
Closed

adapted write_packets_serial pins for esp32-wroom-32 #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c2902e
adapted write_packets_serial pins for esp32-wroom-32
coded-with-claws Nov 21, 2023
2345f25
Merge pull request #409 from justcallmekoko/develop
justcallmekoko Nov 26, 2023
f095cda
Merge branch 'master' into esp32wroom32
coded-with-claws Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions esp32_marauder/configs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,21 @@

//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
//#define MARAUDER_FLIPPER
//#define ESP32_LDDB
//#define MARAUDER_DEV_BOARD_PRO
//#define XIAO_ESP32_S3
#define ESP32_WROOM32
//// END BOARD TARGETS

#define MARAUDER_VERSION "v0.13.5"
Expand Down Expand Up @@ -788,6 +789,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
Expand Down
2 changes: 2 additions & 0 deletions esp32_marauder/esp32_marauder.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down