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

Fix for compile error "[...] undefined reference to `sd_obj' ": #479

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for compile error "[...] undefined reference to `sd_obj' ": #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion esp32_marauder/EvilPortal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ bool EvilPortal::setHtml() {
return true;
}
Serial.println("Setting HTML...");
#ifdef HAS_SD
File html_file = sd_obj.getFile("/" + this->target_html_name);
if (!html_file) {
#ifdef HAS_SCREEN
Expand Down Expand Up @@ -123,6 +124,7 @@ bool EvilPortal::setHtml() {
html_file.close();
return true;
}
#endif

}

Expand All @@ -136,6 +138,7 @@ bool EvilPortal::setAP(LinkedList<ssid>* ssids, LinkedList<AccessPoint>* access_
break;
}
}
#ifdef HAS_SD
// If there are no SSIDs and there are no APs selected, pull from file
// This means the file is last resort
if ((ssids->size() <= 0) && (temp_ap_name == "")) {
Expand Down Expand Up @@ -177,9 +180,10 @@ bool EvilPortal::setAP(LinkedList<ssid>* ssids, LinkedList<AccessPoint>* access_
ap_config_file.close();
}
}
#endif
// There are SSIDs in the list but there could also be an AP selected
// Priority is SSID list before AP selected and config file
else if (ssids->size() > 0) {
if (ssids->size() > 0) {
ap_config = ssids->get(0).essid;
if (ap_config.length() > MAX_AP_NAME_SIZE) {
#ifdef HAS_SCREEN
Expand Down
30 changes: 29 additions & 1 deletion esp32_marauder/configs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@
//#define MARAUDER_M5STICKC
//#define MARAUDER_MINI
//#define MARAUDER_V4
#define MARAUDER_V6
//#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 MARAUDER_FEBERIS_BOARD
//// END BOARD TARGETS

#define MARAUDER_VERSION "v0.13.7"
Expand All @@ -43,6 +44,8 @@
#define HARDWARE_NAME "Flipper Zero Dev Board Pro"
#elif defined(XIAO_ESP32_S3)
#define HARDWARE_NAME "XIAO ESP32 S3"
#elif defined(MARAUDER_FEBERIS_BOARD)
#define HARDWARE_NAME "BPM Circuits FEBERIS"
#else
#define HARDWARE_NAME "ESP32"
#endif
Expand Down Expand Up @@ -188,6 +191,20 @@
//#define HAS_TEMP_SENSOR
//#define HAS_GPS
#endif

#ifdef MARAUDER_FEBERIS_BOARD
#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_SD
//#define USE_SD
//#define HAS_TEMP_SENSOR
//#define HAS_GPS
#endif
//// END BOARD FEATURES

//// POWER MANAGEMENT
Expand Down Expand Up @@ -740,6 +757,8 @@
#define MEM_LOWER_LIM 20000
#elif defined(XIAO_ESP32_S3)
#define MEM_LOWER_LIM 20000
#elif defined(MARAUDER_FEBERIS_BOARD)
#define MEM_LOWER_LIM 20000
#endif
//// END MEMORY LOWER LIMIT STUFF

Expand Down Expand Up @@ -778,6 +797,8 @@
#define MAX_HTML_SIZE 20000
#elif defined(XIAO_ESP32_S3)
#define MAX_HTML_SIZE 20000
#elif defined(MARAUDER_FEBERIS_BOARD)
#define MAX_HTML_SIZE 11400
#else
#define MAX_HTML_SIZE 20000
#endif
Expand Down Expand Up @@ -820,6 +841,11 @@
#define GPS_TX 33
#define GPS_RX 32
#define mac_history_len 512
#elif defined(MARAUDER_FEBERIS_BOARD)
#define GPS_SERIAL_INDEX 2
#define GPS_TX 4
#define GPS_RX 13
#define mac_history_len 512
#endif
#else
#define mac_history_len 512
Expand All @@ -835,6 +861,8 @@
#define MARAUDER_TITLE_BYTES 13578
#elif defined(MARAUDER_MINI)
#define MARAUDER_TITLE_BYTES 13578
#elif defined(MARAUDER_FEBERIS_BOARD)
#define MARAUDER_TITLE_BYTES 13578
#else
#define MARAUDER_TITLE_BYTES 13578
#endif
Expand Down