From ed3e24ff4b8f13424952a2fcc614ad88e4cc0800 Mon Sep 17 00:00:00 2001 From: Max Prokhorov Date: Tue, 18 Sep 2018 01:09:46 +0300 Subject: [PATCH] Inline getFreeStack and mention 2.5.0 helper method --- code/espurna/config/prototypes.h | 19 +++++++++++++++++++ code/espurna/utils.ino | 25 ------------------------- 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/code/espurna/config/prototypes.h b/code/espurna/config/prototypes.h index 26d6f936..d8cf3430 100644 --- a/code/espurna/config/prototypes.h +++ b/code/espurna/config/prototypes.h @@ -36,6 +36,25 @@ extern "C" { void custom_crash_callback(struct rst_info*, uint32_t, uint32_t); } +// Core version 2.4.2 and higher changed the cont_t structure to a pointer: +// https://github.com/esp8266/Arduino/commit/5d5ea92a4d004ab009d5f642629946a0cb8893dd#diff-3fa12668b289ccb95b7ab334833a4ba8L35 +// Core version 2.5.0 introduced EspClass helper method: +// https://github.com/esp8266/Arduino/commit/0e0e34c614fe8a47544c9998201b1d9b3c24eb18 +extern "C" { + #include +#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) \ + || defined(ARDUINO_ESP8266_RELEASE_2_4_0) \ + || defined(ARDUINO_ESP8266_RELEASE_2_4_1) + extern cont_t g_cont; + #define getFreeStack() cont_get_free_stack(&g_cont) +#elif defined(ARDUINO_ESP8266_RELEASE_2_4_2) + extern cont_t* g_pcont; + #define getFreeStack() cont_get_free_stack(g_pcont) +#else + #define getFreeStack() ESP.getFreeContStack() +#endif +} + // ----------------------------------------------------------------------------- // Domoticz // ----------------------------------------------------------------------------- diff --git a/code/espurna/utils.ino b/code/espurna/utils.ino index 7cb42f45..fc156f0d 100644 --- a/code/espurna/utils.ino +++ b/code/espurna/utils.ino @@ -6,31 +6,6 @@ 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;