From 03139a08af30bd8c96d872b0aae7f7d2a86f1fad Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Wed, 12 Apr 2023 11:24:49 +0200 Subject: [PATCH] Set default for `ARDUINOJSON_ENABLE_PROGMEM` to `1` on AVR Ported from 082ae69e8649cccc6b853301a0fe914f4cb342d4 --- extras/conf_test/avr.cpp | 2 ++ src/ArduinoJson/Configuration.hpp | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/extras/conf_test/avr.cpp b/extras/conf_test/avr.cpp index fda94464..b2b105e3 100644 --- a/extras/conf_test/avr.cpp +++ b/extras/conf_test/avr.cpp @@ -1,5 +1,7 @@ #include +static_assert(ARDUINOJSON_ENABLE_PROGMEM == 1, "ARDUINOJSON_ENABLE_PROGMEM"); + static_assert(ARDUINOJSON_USE_LONG_LONG == 0, "ARDUINOJSON_USE_LONG_LONG"); static_assert(ARDUINOJSON_SLOT_OFFSET_SIZE == 1, diff --git a/src/ArduinoJson/Configuration.hpp b/src/ArduinoJson/Configuration.hpp index 56b23f8d..9d3485bc 100644 --- a/src/ArduinoJson/Configuration.hpp +++ b/src/ArduinoJson/Configuration.hpp @@ -130,9 +130,13 @@ # define ARDUINOJSON_ENABLE_ARDUINO_PRINT 0 # endif -// Disable support for PROGMEM +// Enable PROGMEM support on AVR only # ifndef ARDUINOJSON_ENABLE_PROGMEM -# define ARDUINOJSON_ENABLE_PROGMEM 0 +# ifdef __AVR__ +# define ARDUINOJSON_ENABLE_PROGMEM 1 +# else +# define ARDUINOJSON_ENABLE_PROGMEM 0 +# endif # endif #endif // ARDUINO