andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-14 19:59:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

moved back to std:: containers for esp32

Browse Source
This commit is contained in:
proddy
2021-01-03 18:03:41 +01:00
parent fa040fb2d5
commit 22f5e56622
14 changed files with 498 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
platformio.ini
View File

@@ -1,8 +1,8 @@
; PlatformIO Project Configuration File for EMS-ESP
[platformio]
default_envs = esp8266
; default_envs = esp32
; default_envs = esp8266
default_envs = esp32
# override any settings with your own local ones in pio_local.ini
extra_configs =
@@ -11,27 +11,24 @@ extra_configs =
[common]
; default platformio compile flags are: -fno-rtti -std=c++11 -Os -mlongcalls -mtext-section-literals -falign-functions=4 -ffunction-sections -fdata-sections -fno-exceptions -Wall
core_build_flags = -Wno-deprecated-declarations
-mtarget-align
-free
-fipa-pta
-Wreturn-type
-DCORE_DEBUG_LEVEL=0
-DNDEBUG
-DFP_IN_IROM
-DBEARSSL_SSL_BASIC
-DVTABLES_IN_FLASH
-DPSTR_ALIGN=1 ; remove the 4-bytes alignment for PSTR()
-std=c17
-std=c++17
-std=gnu++17
core_build_flags = -Wno-deprecated-declarations
-Wreturn-type
-DCORE_DEBUG_LEVEL=0
-DNDEBUG
esp8266_build_flags = -free
-mtarget-align
-fipa-pta
-Wreturn-type
-DFP_IN_IROM
-DBEARSSL_SSL_BASIC
-DVTABLES_IN_FLASH
-DPSTR_ALIGN=1 ; remove the 4-bytes alignment for PSTR()
-std=c17 -std=c++17 -std=gnu++17
debug_flags =
; -D EMSESP_DEBUG
; -D EMSESP_UART_DEBUG
; -D EMSESP_TEST
; -D EMSESP_FORCE_SERIAL
; -D ENABLE_CORS
esp32_build_flags = -DARDUINO_ARCH_ESP32=1
-DESP32=1
-DBOARD_HAS_PSRAM
build_flags =
${common.core_build_flags}
@@ -50,7 +47,17 @@ build_flags =
build_unflags = -Wall
-Wdeprecated-declarations
-std=gnu++11
esp8266_build_unflags = -std=gnu++11
esp32_build_unflags =
debug_flags =
; -D EMSESP_DEBUG
; -D EMSESP_UART_DEBUG
; -D EMSESP_TEST
; -D EMSESP_FORCE_SERIAL
; -D ENABLE_CORS
[env]
framework = arduino
@@ -75,7 +82,8 @@ board = esp12e
platform = espressif8266
board_build.filesystem = littlefs
board_build.f_cpu = 160000000L
build_flags = ${common.build_flags}
build_flags = ${common.build_flags} ${common.esp8266_build_flags}
build_unflags = ${common.build_unflags} ${common.esp8266_build_unflags}
; build for GitHub Actions CI
[env:esp32-ci]
@@ -84,7 +92,8 @@ extra_scripts =
board = esp32dev
platform = espressif32
board_build.partitions = min_spiffs.csv
build_flags = ${common.build_flags}
build_flags = ${common.build_flags} ${common.esp32_build_flags}
build_unflags = ${common.build_unflags} ${common.esp32_build_unflags}
[env:esp8266]
extra_scripts =
@@ -105,8 +114,8 @@ board_build.f_cpu = 160000000L ; 160MHz
; eagle.flash.4m1m.ld = 1019 KB sketch, 1000 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 2052 KB OTA & buffer
; eagle.flash.4m2m.ld = 1019 KB sketch, 2024 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 1028 KB OTA & buffer
; board_build.ldscript = eagle.flash.4m2m.ld
build_flags = ${common.build_flags} ${common.debug_flags}
build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} ${common.esp8266_build_flags} ${common.debug_flags}
build_unflags = ${common.build_unflags} ${common.esp8266_build_unflags}
lib_ignore =
AsyncTCP
@@ -116,6 +125,11 @@ extra_scripts =
scripts/rename_fw.py
board = esp32dev
platform = espressif32
; platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#idf-release/v4.0
; ; toolchain-xtensa32 @ 2.80200.200226
; ; toolchain-xtensa32 @ 5.100200.201223
; toolchain-xtensa32 @ 2.80400.2020 ; c70ec8a-toolchain-xtensa32-linux_x86_64-2.80400.2020.tar.gz
; platform = https://github.com/platformio/platform-espressif32.git
board_build.partitions = min_spiffs.csv ; https://github.com/espressif/arduino-esp32/blob/master/tools/partitions/
build_flags = ${common.build_flags} ${common.debug_flags}
build_flags = ${common.build_flags} ${common.esp32_build_flags} ${common.debug_flags}
build_unflags = ${common.build_unflags} ${common.esp32_build_unflags}