github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-10-31 16:14:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed the default value of ARDUINOJSON_ENABLE_PROGMEM (fixes #1433)

Browse Source 
It now checks that the pgm_read_XXX macros are defined before enabling PROGMEM.
This commit is contained in:
Benoit Blanchon
2020-11-10 14:58:31 +01:00
parent aa7cc5351c
commit 16e51b83ab
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -5,6 +5,8 @@ HEAD
---- ----
* Fixed invalid conversion error in `operator|(JsonVariant, char*)` (issue #1432) * Fixed invalid conversion error in `operator|(JsonVariant, char*)` (issue #1432)
* Changed the default value of `ARDUINOJSON_ENABLE_PROGMEM` (issue #1433).
It now checks that the `pgm_read_XXX` macros are defined before enabling `PROGMEM`.
v6.17.1 (2020-11-07) v6.17.1 (2020-11-07)
------- -------

3
src/ArduinoJson/Configuration.hpp
View File

@@ -172,7 +172,8 @@
#endif // ARDUINO #endif // ARDUINO
#ifndef ARDUINOJSON_ENABLE_PROGMEM #ifndef ARDUINOJSON_ENABLE_PROGMEM
#ifdef PROGMEM #if defined(PROGMEM) && defined(pgm_read_byte) && defined(pgm_read_dword) && \
defined(pgm_read_ptr) && defined(pgm_read_float)
#define ARDUINOJSON_ENABLE_PROGMEM 1 #define ARDUINOJSON_ENABLE_PROGMEM 1
#else #else
#define ARDUINOJSON_ENABLE_PROGMEM 0 #define ARDUINOJSON_ENABLE_PROGMEM 0