From 18b1d57d77ee1e655941310d115397a58d236499 Mon Sep 17 00:00:00 2001 From: Max Prokhorov Date: Wed, 12 Sep 2018 15:46:13 +0300 Subject: [PATCH 1/3] Use core_version.h from arduino core --- code/espurna/config/all.h | 4 ---- code/espurna/config/prototypes.h | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/code/espurna/config/all.h b/code/espurna/config/all.h index 03d55c92..d734e0ba 100644 --- a/code/espurna/config/all.h +++ b/code/espurna/config/all.h @@ -35,7 +35,3 @@ #include "sensors.h" #include "webui.h" #include "progmem.h" - -#ifdef USE_CORE_VERSION_H -#include "core_version.h" -#endif diff --git a/code/espurna/config/prototypes.h b/code/espurna/config/prototypes.h index 4cc80db9..26d6f936 100644 --- a/code/espurna/config/prototypes.h +++ b/code/espurna/config/prototypes.h @@ -2,6 +2,7 @@ #include #include #include +#include extern "C" { #include "user_interface.h" From c22bb1149bd626b26e1a419b662f7419e104771f Mon Sep 17 00:00:00 2001 From: Max Prokhorov Date: Wed, 12 Sep 2018 15:10:21 +0300 Subject: [PATCH 2/3] Build travis02 and travis03 with latest platform --- code/platformio.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/platformio.ini b/code/platformio.ini index baed8782..fdf67189 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -18,6 +18,7 @@ platform_150 = espressif8266@1.5.0 platform_160 = espressif8266@1.6.0 platform_173 = espressif8266@1.7.3 platform_180 = espressif8266@1.8.0 +platform_latest = ${common.platform_180} platform = ${common.platform_150} # ------------------------------------------------------------------------------ @@ -193,7 +194,7 @@ monitor_speed = ${common.monitor_speed} extra_scripts = ${common.extra_scripts} [env:travis02] -platform = ${common.platform_173} +platform = ${common.platform_latest} framework = ${common.framework} board = ${common.board_4m} board_build.flash_mode = ${common.flash_mode} @@ -204,7 +205,7 @@ monitor_speed = ${common.monitor_speed} extra_scripts = ${common.extra_scripts} [env:travis03] -platform = ${common.platform_173} +platform = ${common.platform_latest} framework = ${common.framework} board = ${common.board_4m} board_build.flash_mode = ${common.flash_mode} From d463d7cfdd1f2dee8fcd1b7feffef9b44e0b0663 Mon Sep 17 00:00:00 2001 From: Max Prokhorov Date: Wed, 12 Sep 2018 15:10:57 +0300 Subject: [PATCH 3/3] Proper cont_t name for core 2.4.2 and higher --- code/espurna/utils.ino | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/code/espurna/utils.ino b/code/espurna/utils.ino index 16cf7a47..7cb42f45 100644 --- a/code/espurna/utils.ino +++ b/code/espurna/utils.ino @@ -6,11 +6,31 @@ Copyright (C) 2017-2018 by Xose Pérez */ +// Core version 2.4.2 and higher changed the cont_t structure to a pointer: +// https://github.com/esp8266/Arduino/commit/5d5ea92a4d004ab009d5f642629946a0cb8893dd#diff-3fa12668b289ccb95b7ab334833a4ba8L35 +#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) \ + || defined(ARDUINO_ESP8266_RELEASE_2_4_0) \ + || defined(ARDUINO_ESP8266_RELEASE_2_4_1) extern "C" { #include extern cont_t g_cont; + +} + +unsigned int getFreeStack() { + return cont_get_free_stack(&g_cont); +} +#else +extern "C" { + #include + extern cont_t* g_pcont; } +unsigned int getFreeStack() { + return cont_get_free_stack(g_pcont); +} +#endif // defined(ARDUINO_ESP8266_RELEASE_2_3_0/2_4_0/2_4_1) + #include Ticker _defer_reset; @@ -81,10 +101,6 @@ unsigned int getUsedHeap() { return getInitialFreeHeap() - getFreeHeap(); } -unsigned int getFreeStack() { - return cont_get_free_stack(&g_cont); -} - String getEspurnaModules() { return FPSTR(espurna_modules); }