From 38e1137e5effdc8a8552885d344597e49be94635 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Tue, 27 Oct 2020 10:21:06 +0100 Subject: [PATCH] Updated to GCC 8.4.0 and C++17 --- bobbycar.csv | 6 +++--- bobbycar_noota.csv | 4 ++-- platformio.ini | 17 ++++++++++++++++- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/bobbycar.csv b/bobbycar.csv index dc6ef99..28c65bd 100644 --- a/bobbycar.csv +++ b/bobbycar.csv @@ -1,6 +1,6 @@ # Name, Type, SubType, Offset, Size, Flags nvs, data, nvs, 0x9000, 0x5000, otadata, data, ota, 0xe000, 0x2000, -app0, app, ota_0, 0x10000, 0x250000, -app1, app, ota_1, 0x260000, 0x250000, -spiffs, data, spiffs, 0x520000, 0x250000, +app0, app, ota_0, 0x10000, 0x2F0000, +app1, app, ota_1, 0x300000, 0x2F0000, +spiffs, data, spiffs, 0x5F0000, 0x100000, diff --git a/bobbycar_noota.csv b/bobbycar_noota.csv index 6c9d8a5..b762859 100644 --- a/bobbycar_noota.csv +++ b/bobbycar_noota.csv @@ -1,5 +1,5 @@ # Name, Type, SubType, Offset, Size, Flags nvs, data, nvs, 0x9000, 0x5000, otadata, data, ota, 0xe000, 0x2000, -app0, app, ota_0, 0x10000, 0x250000, -spiffs, data, spiffs, 0x260000, 0x1a0000, +app0, app, ota_0, 0x10000, 0x2F0000, +spiffs, data, spiffs, 0x260000, 0x100000, diff --git a/platformio.ini b/platformio.ini index 3fbcc1d..f09e92c 100644 --- a/platformio.ini +++ b/platformio.ini @@ -13,6 +13,10 @@ platform = espressif32 board = esp32dev framework = arduino +platform_packages = + toolchain-xtensa32 @ https://brunner.ninja/esp32_neuer_gcc_1.tar.gz + framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#idf-release/v4.0 + lib_deps = TFT_eSPI https://github.com/Ferdi265/cxx-ring-buffer @@ -26,7 +30,7 @@ build_unflags = build_flags = -std=gnu++17 -O3 - -Werror +; -Werror -Wall -Wno-unused-function -DUSER_SETUP_LOADED=1 @@ -95,6 +99,7 @@ build_flags = platform = ${common_env_data.platform} board = ${common_env_data.board} framework = ${common_env_data.framework} +platform_packages = ${common_env_data.platform_packages} board_build.partitions = ${no_ota_common.board_build.partitions} lib_deps = ${common_env_data.lib_deps} lib_compat_mode = ${common_env_data.lib_compat_mode} @@ -163,6 +168,7 @@ build_flags = platform = ${feedc0de.platform} board = ${feedc0de.board} framework = ${feedc0de.framework} +platform_packages = ${feedc0de.platform_packages} board_build.partitions = ${feedc0de.board_build.partitions} lib_deps = ${feedc0de.lib_deps} lib_compat_mode = ${feedc0de.lib_compat_mode} @@ -176,6 +182,7 @@ upload_port = /dev/ttyUSB* platform = ${feedc0de.platform} board = ${feedc0de.board} framework = ${feedc0de.framework} +platform_packages = ${feedc0de.platform_packages} board_build.partitions = ${feedc0de.board_build.partitions} lib_deps = ${feedc0de.lib_deps} lib_compat_mode = ${feedc0de.lib_compat_mode} @@ -191,6 +198,7 @@ upload_port = 192.168.127.124 platform = ${common_env_data.platform} board = ${common_env_data.board} framework = ${common_env_data.framework} +platform_packages = ${common_env_data.platform_packages} board_build.partitions = ${ota_common.board_build.partitions} lib_deps = ${common_env_data.lib_deps} lib_compat_mode = ${common_env_data.lib_compat_mode} @@ -218,6 +226,7 @@ build_flags = platform = ${greyhash.platform} board = ${greyhash.board} framework = ${greyhash.framework} +platform_packages = ${greyhash.platform_packages} board_build.partitions = ${greyhash.board_build.partitions} lib_deps = ${greyhash.lib_deps} lib_compat_mode = ${greyhash.lib_compat_mode} @@ -231,6 +240,7 @@ upload_port = /dev/ttyUSB* platform = ${greyhash.platform} board = ${greyhash.board} framework = ${greyhash.framework} +platform_packages = ${greyhash.platform_packages} board_build.partitions = ${greyhash.board_build.partitions} lib_deps = ${greyhash.lib_deps} lib_compat_mode = ${greyhash.lib_compat_mode} @@ -246,6 +256,7 @@ upload_port = 192.168.127.198 platform = ${common_env_data.platform} board = ${common_env_data.board} framework = ${common_env_data.framework} +platform_packages = ${common_env_data.platform_packages} board_build.partitions = ${ota_common.board_build.partitions} lib_deps = ${common_env_data.lib_deps} lib_compat_mode = ${common_env_data.lib_compat_mode} @@ -279,6 +290,7 @@ build_flags = platform = ${common_env_data.platform} board = ${common_env_data.board} framework = ${common_env_data.framework} +platform_packages = ${common_env_data.platform_packages} board_build.partitions = ${no_ota_common.board_build.partitions} lib_deps = ${common_env_data.lib_deps} lib_compat_mode = ${common_env_data.lib_compat_mode} @@ -327,6 +339,7 @@ build_flags = platform = ${common_env_data.platform} board = ${common_env_data.board} framework = ${common_env_data.framework} +platform_packages = ${common_env_data.platform_packages} board_build.partitions = ${ota_common.board_build.partitions} lib_deps = ${common_env_data.lib_deps} lib_compat_mode = ${common_env_data.lib_compat_mode} @@ -349,6 +362,7 @@ build_flags = platform = ${peter.platform} board = ${peter.board} framework = ${peter.framework} +platform_packages = ${peter.platform_packages} board_build.partitions = ${peter.board_build.partitions} lib_deps = ${peter.lib_deps} lib_compat_mode = ${peter.lib_compat_mode} @@ -361,6 +375,7 @@ upload_speed = 921600 platform = ${peter.platform} board = ${peter.board} framework = ${peter.framework} +platform_packages = ${peter.platform_packages} board_build.partitions = ${peter.board_build.partitions} lib_deps = ${peter.lib_deps} lib_compat_mode = ${peter.lib_compat_mode}