Darkages/SpotMicroESP32-Leika
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allows for all template features

Browse Source
This commit is contained in:
Rune Harlyk
2024-03-29 17:17:46 +01:00
committed by Rune Harlyk
parent f3e5a66589
commit f67071fd74
5 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app2/svelte.config.js
-2
View File
@@ -9,8 +9,6 @@ const config = {
kit: { kit: {
adapter: adapter({ adapter: adapter({
pages: 'build',
assets: 'build',
pages: '../esp32/www', pages: '../esp32/www',
assets: '../esp32/www', assets: '../esp32/www',
fallback: 'index.html', fallback: 'index.html',
esp32/build_settings.ini
+1 -1
View File
@@ -4,5 +4,5 @@ build_flags =
-D ESP32SVELTEKIT_RUNNING_CORE=0 -D ESP32SVELTEKIT_RUNNING_CORE=0
-D EMBED_WWW -D EMBED_WWW
-D ENABLE_CORS -D ENABLE_CORS
-D SERIAL_INFO ;-D SERIAL_INFO
-D CORS_ORIGIN=\"*\" -D CORS_ORIGIN=\"*\"
esp32/features.ini
+8 -6
View File
@@ -1,8 +1,10 @@
[features] [features]
build_flags = build_flags =
-D USE_BATTERY=1 -D FT_BATTERY=0
-D USE_NTP=1 -D FT_NTP=1
-D USE_SECURITY=1 -D FT_SECURITY=1
-D USE_UPLOAD_FIRMWARE=1 -D FT_MQTT=0
-D USE_DOWNLOAD_FIRMWARE=1 -D FT_SLEEP=0
-D USE_ANALYTICS=1 -D FT_UPLOAD_FIRMWARE=1
-D FT_DOWNLOAD_FIRMWARE=1
-D FT_ANALYTICS=1
esp32/platformio.ini
+2 -3
View File
@@ -30,7 +30,7 @@ build_flags =
${features.build_flags} ${features.build_flags}
${build_settings.build_flags} ${build_settings.build_flags}
-D CORE_DEBUG_LEVEL=5 -D CORE_DEBUG_LEVEL=5
-D register= ; -D register=
-std=gnu++17 -std=gnu++17
build_unflags = -std=gnu++11 build_unflags = -std=gnu++11
test_ignore = test_embedded test_ignore = test_embedded
@@ -38,8 +38,6 @@ board_build.filesystem = littlefs
lib_deps = lib_deps =
bblanchon/ArduinoJson@^6.21.2 bblanchon/ArduinoJson@^6.21.2
https://github.com/theelims/PsychicMqttClient.git https://github.com/theelims/PsychicMqttClient.git
;hoeken/PsychicHttp
; https://github.com/me-no-dev/ESPAsyncWebServer.git
; thomasfredericks/Bounce2@ ^2.7.0 ; thomasfredericks/Bounce2@ ^2.7.0
; teckel12/NewPing@^1.9.7 ; teckel12/NewPing@^1.9.7
; adafruit/Adafruit SSD1306@^2.5.7 ; adafruit/Adafruit SSD1306@^2.5.7
@@ -59,6 +57,7 @@ extra_scripts =
scripts/rename_fw.py scripts/rename_fw.py
board_build.embed_files = src/certs/x509_crt_bundle.bin board_build.embed_files = src/certs/x509_crt_bundle.bin
board_ssl_cert_source = adafruit board_ssl_cert_source = adafruit
lib_compat_mode = strict
[env:esp32cam] [env:esp32cam]
board = esp32cam board = esp32cam
esp32/scripts/build_app.py
+1 -4
View File
@@ -52,9 +52,6 @@ def gzip_file(file):
copyfileobj(f_in, f_out) copyfileobj(f_in, f_out)
os.remove(file) os.remove(file)
def is_compressed(filetype):
return filetype.lower() in ['zip', 'gz', 'rar', '7z', 'jpg', 'jpeg', 'png', 'mp4', 'mp3']
def flag_exists(flag): def flag_exists(flag):
for define in buildFlags.get("CPPDEFINES"): for define in buildFlags.get("CPPDEFINES"):
if (define == flag or (isinstance(define, list) and define[0] == flag)): if (define == flag or (isinstance(define, list) and define[0] == flag)):
@@ -76,7 +73,7 @@ def build_progmem():
progmem.write(f'// {asset_path}\n') progmem.write(f'// {asset_path}\n')
progmem.write(f'const uint8_t {asset_var}[] = {{\n ') progmem.write(f'const uint8_t {asset_var}[] = {{\n ')
file_data = gzip.compress(path.read_bytes()) if not is_compressed(filetype) else path.read_bytes() file_data = gzip.compress(path.read_bytes())
for i, byte in enumerate(file_data): for i, byte in enumerate(file_data):
if i and not (i % 16): if i and not (i % 16):