From 25f47b483bf6b43818ac93257e54b23a7d3d82a7 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 10 Feb 2021 09:27:21 +0100 Subject: [PATCH] [PIO] Update to espressif8266@2.6.3 Plus allow `BUILD_NOTES` to be used in Custom.h --- .gitignore | 2 ++ platformio_core_defs.ini | 6 +++--- src/src/CustomBuild/ESPEasy_buildinfo.h | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 92c0dbfe5..981c8ae04 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,5 @@ tools/vagrant/pio_envlist.txt build_output/ **/__tmpfile.cpp + +src/_Custom.h diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 03ea7cb71..85ca338a7 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -100,7 +100,7 @@ lib_ignore = ${esp82xx_defaults.lib_ignore} [core_2_7_4] extends = esp82xx_2_6_x -platform = espressif8266@2.6.2 +platform = espressif8266@2.6.3 platform_packages = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#2.7.4 build_flags = ${esp82xx_2_6_x.build_flags} @@ -111,7 +111,7 @@ build_flags = ${esp82xx_2_6_x.build_flags} ; e.g. Sonoff Basic R2. [core_2_7_4_alt_wifi] extends = esp82xx_2_6_x -platform = espressif8266@2.6.2 +platform = espressif8266@2.6.3 platform_packages = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#2.7.4 build_flags = ${esp82xx_2_6_x.build_flags} @@ -120,7 +120,7 @@ build_flags = ${esp82xx_2_6_x.build_flags} [core_2_7_4_sdk3] extends = esp82xx_2_6_x -platform = espressif8266@2.6.2 +platform = espressif8266@2.6.3 platform_packages = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#2.7.4 build_flags = ${esp82xx_2_6_x.build_flags} diff --git a/src/src/CustomBuild/ESPEasy_buildinfo.h b/src/src/CustomBuild/ESPEasy_buildinfo.h index 2a7908e2e..b80eefdc4 100644 --- a/src/src/CustomBuild/ESPEasy_buildinfo.h +++ b/src/src/CustomBuild/ESPEasy_buildinfo.h @@ -21,12 +21,14 @@ #define BUILD 20112 // git version e.g. "20103" can be read as "2.1.03" (stored in int16_t) +#ifndef BUILD_NOTES #if defined(ESP8266) # define BUILD_NOTES " - Mega" #endif // if defined(ESP8266) #if defined(ESP32) # define BUILD_NOTES " - Mega32" #endif // if defined(ESP32) +#endif #ifndef BUILD_GIT # define BUILD_GIT "(custom)"