Exclude web server, paxcounter and few others from original ESP32 generation to fix IRAM overflow (#10005)
* Exclude web server, paxcounter and few others from original ESP32 generation to fix IRAM overflow * Update variants/esp32/esp32.ini Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update variants/esp32/esp32.ini Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update build source filter in esp32.ini Removed WiFiAPClient.cpp from build source filter. --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
@@ -5,6 +5,8 @@
|
|||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
|
||||||
|
#if !MESHTASTIC_EXCLUDE_WEBSERVER
|
||||||
|
|
||||||
void initWebServer();
|
void initWebServer();
|
||||||
void createSSLCert();
|
void createSSLCert();
|
||||||
|
|
||||||
@@ -24,3 +26,20 @@ class WebServerThread : private concurrency::OSThread
|
|||||||
};
|
};
|
||||||
|
|
||||||
extern WebServerThread *webServerThread;
|
extern WebServerThread *webServerThread;
|
||||||
|
|
||||||
|
#else
|
||||||
|
// Stub implementations when web server is excluded
|
||||||
|
inline void initWebServer() {}
|
||||||
|
inline void createSSLCert() {}
|
||||||
|
|
||||||
|
class WebServerThread
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
WebServerThread() {}
|
||||||
|
uint32_t requestRestart = 0;
|
||||||
|
void markActivity() {}
|
||||||
|
};
|
||||||
|
|
||||||
|
inline WebServerThread *webServerThread = nullptr;
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -4,24 +4,28 @@
|
|||||||
extends = esp32_common
|
extends = esp32_common
|
||||||
custom_esp32_kind = esp32
|
custom_esp32_kind = esp32
|
||||||
|
|
||||||
|
build_src_filter =
|
||||||
|
${esp32_common.build_src_filter}
|
||||||
|
-<modules/esp32/PaxcounterModule.cpp>
|
||||||
|
-<mesh/http/>
|
||||||
|
|
||||||
build_flags =
|
build_flags =
|
||||||
${esp32_common.build_flags}
|
${esp32_common.build_flags}
|
||||||
-DMESHTASTIC_EXCLUDE_AUDIO=1
|
-DMESHTASTIC_EXCLUDE_AUDIO=1
|
||||||
; Override lib_deps to use environmental_extra_no_bsec instead of environmental_extra
|
-DMESHTASTIC_EXCLUDE_ACCELEROMETER=1
|
||||||
; BSEC library uses ~3.5KB DRAM which causes overflow on original ESP32 targets
|
-DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
|
||||||
|
-DMESHTASTIC_EXCLUDE_WEBSERVER=1
|
||||||
|
-DMESHTASTIC_EXCLUDE_RANGETEST=1
|
||||||
|
|
||||||
lib_deps =
|
lib_deps =
|
||||||
${arduino_base.lib_deps}
|
${arduino_base.lib_deps}
|
||||||
${networking_base.lib_deps}
|
${networking_base.lib_deps}
|
||||||
${networking_extra.lib_deps}
|
${networking_extra.lib_deps}
|
||||||
|
${radiolib_base.lib_deps}
|
||||||
${environmental_base.lib_deps}
|
${environmental_base.lib_deps}
|
||||||
${environmental_extra_no_bsec.lib_deps}
|
${environmental_extra_no_bsec.lib_deps}
|
||||||
${radiolib_base.lib_deps}
|
|
||||||
# renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
|
|
||||||
https://github.com/meshtastic/esp32_https_server/archive/b78f12c86ea65c3ca08968840ff554ff7ed69b60.zip
|
|
||||||
# renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
|
# renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
|
||||||
h2zero/NimBLE-Arduino@^1.4.3
|
h2zero/NimBLE-Arduino@^1.4.3
|
||||||
# renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
|
|
||||||
https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
|
|
||||||
# renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
|
# renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
|
||||||
https://github.com/lewisxhe/XPowersLib/archive/v0.3.3.zip
|
https://github.com/lewisxhe/XPowersLib/archive/v0.3.3.zip
|
||||||
# renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
|
# renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
|
||||||
|
|||||||
@@ -10,6 +10,9 @@ custom_meshtastic_tags = B&Q
|
|||||||
|
|
||||||
extends = esp32_base
|
extends = esp32_base
|
||||||
board = ttgo-t-beam
|
board = ttgo-t-beam
|
||||||
|
build_unflags =
|
||||||
|
${esp32_common.build_unflags}
|
||||||
|
-DBOARD_HAS_PSRAM
|
||||||
build_flags =
|
build_flags =
|
||||||
${esp32_base.build_flags}
|
${esp32_base.build_flags}
|
||||||
-D STATION_G1
|
-D STATION_G1
|
||||||
|
|||||||
Reference in New Issue
Block a user