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

rollback to c++11 to save on flash

Browse Source
This commit is contained in:
proddy
2022-12-25 20:05:46 +01:00
parent 83438129a2
commit 327cf7ec75
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -22,13 +22,16 @@ INCLUDES := src lib_standalone lib/ArduinoJson/src lib/uuid-common/src lib/uuid
LIBRARIES := LIBRARIES :=
CPPCHECK = cppcheck CPPCHECK = cppcheck
CHECKFLAGS = -q --force --std=c++17 # CHECKFLAGS = -q --force --std=c++17
CHECKFLAGS = -q --force --std=c++11
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Languages Standard # Languages Standard
#---------------------------------------------------------------------- #----------------------------------------------------------------------
C_STANDARD := -std=c17 # C_STANDARD := -std=c17
CXX_STANDARD := -std=c++17 # CXX_STANDARD := -std=c++17
C_STANDARD := -std=c11
CXX_STANDARD := -std=c++11
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Defined Symbols # Defined Symbols

4
lib/semver/version.inl
View File

@@ -90,13 +90,13 @@ int Basic_version<Parser, Comparator>::patch() const {
template <typename Parser, typename Comparator> template <typename Parser, typename Comparator>
const std::string Basic_version<Parser, Comparator>::prerelease() const { const std::string Basic_version<Parser, Comparator>::prerelease() const {
std::string ss; std::string ss;
return splice(ss, ver_.prerelease_ids, ".", [](const auto & id) { return id.first; }); return splice(ss, ver_.prerelease_ids, ".", [](const Prerelease_identifier & id) { return id.first; });
} }
template <typename Parser, typename Comparator> template <typename Parser, typename Comparator>
const std::string Basic_version<Parser, Comparator>::build() const { const std::string Basic_version<Parser, Comparator>::build() const {
std::string ss; std::string ss;
return splice(ss, ver_.build_ids, ".", [](const auto & id) { return id; }); return splice(ss, ver_.build_ids, ".", [](const std::string & id) { return id; });
} }
template <typename Parser, typename Comparator> template <typename Parser, typename Comparator>

8
platformio.ini
View File

@@ -16,10 +16,10 @@ core_build_flags =
-D NDEBUG -D NDEBUG
-D ARDUINO_ARCH_ESP32=1 -D ARDUINO_ARCH_ESP32=1
-D ESP32=1 -D ESP32=1
-std=gnu++17 -Os ; -Os
core_unbuild_flags = -std=gnu++11 ; core_unbuild_flags = -std=gnu++11
; core_unbuild_flags = core_unbuild_flags =
; my_build_flags is set in pio_local.ini ; my_build_flags is set in pio_local.ini
my_build_flags = my_build_flags =
@@ -68,8 +68,6 @@ extra_scripts =
scripts/rename_fw.py scripts/rename_fw.py
board = esp32dev board = esp32dev
platform = espressif32 platform = espressif32
; platform_packages =
; framework-arduinoespressif32@3.20005.220925
board_upload.flash_size = 4MB board_upload.flash_size = 4MB
board_build.partitions = esp32_partition_4M.csv board_build.partitions = esp32_partition_4M.csv
build_flags = ${common.build_flags} build_flags = ${common.build_flags}