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

Add support for ElectronicCats Wi-Fi Marauder Flipper Shield #415

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for ElectronicCats Wi-Fi Marauder Flipper Shield #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb00607
Add support for ElectronicCats Wi-Fi Marauder Flipper Shield
b1scoito Nov 30, 2023
ab4f2fd
Add missing defined
b1scoito Dec 16, 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
15 changes: 12 additions & 3 deletions esp32_marauder/configs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@
//#define HAS_NEOPIXEL_LED
//#define HAS_PWR_MGMT
//#define HAS_SCREEN
// To support ElectronicCats Wi-Fi Marauder
//#define EC_ESP32_S3
#define HAS_GPS
#ifndef WRITE_PACKETS_SERIAL
#define HAS_SD
Expand Down Expand Up @@ -197,9 +199,9 @@
//// FLIPPER ZERO HAT SETTINGS
#ifdef FLIPPER_ZERO_HAT

//#ifdef MARAUDER_FLIPPER
// #define USE_FLIPPER_SD
//#endif
#ifdef MARAUDER_FLIPPER
#define USE_FLIPPER_SD
#endif

#ifdef XIAO_ESP32_S3
#define USE_FLIPPER_SD
Expand Down Expand Up @@ -788,6 +790,13 @@
#define XIAO_TX1 2
#endif
#endif

#ifdef EC_ESP32_S3
#ifdef USE_FLIPPER_SD
#define EC_ESP32_S3_RX1 18
#define EC_ESP32_S3_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(EC_ESP32_S3)
Serial1.begin(115200, SERIAL_8N1, EC_ESP32_S3_RX1, EC_ESP32_S3_TX1);
#else
Serial1.begin(115200);
#endif
Expand Down