feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Made PROGMEM available on more platforms (issue #381)

Browse Source
This commit is contained in:
Benoit Blanchon
2016-11-16 22:24:58 +01:00
parent f6cd42d916
commit 72d78432c9
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,6 +1,11 @@
ArduinoJson: change log ArduinoJson: change log
======================= =======================
HEAD
----
* Made PROGMEM available on more platforms (issue #381)
v5.7.1 v5.7.1
------ ------

2
examples/ProgmemExample/ProgmemExample.ino
View File

@ -15,7 +15,7 @@
// efficient in term of code size, speed and memory usage. // efficient in term of code size, speed and memory usage.
void setup() { void setup() {
#if ARDUINO_ARCH_AVR #ifdef PROGMEM
DynamicJsonBuffer jsonBuffer; DynamicJsonBuffer jsonBuffer;
// You can use a Flash String as your JSON input. // You can use a Flash String as your JSON input.

2
include/ArduinoJson/Configuration.hpp
View File

@ -29,7 +29,7 @@
// On AVR archiecture, we can use PROGMEM // On AVR archiecture, we can use PROGMEM
#ifndef ARDUINOJSON_ENABLE_PROGMEM #ifndef ARDUINOJSON_ENABLE_PROGMEM
#ifdef ARDUINO_ARCH_AVR #ifdef PROGMEM
#define ARDUINOJSON_ENABLE_PROGMEM 1 #define ARDUINOJSON_ENABLE_PROGMEM 1
#else #else
#define ARDUINOJSON_ENABLE_PROGMEM 0 #define ARDUINOJSON_ENABLE_PROGMEM 0