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

Allow using PROGMEM outside of Arduino (fixes #1903)

Browse Source
This commit is contained in:
Benoit Blanchon
2023-04-07 18:19:33 +02:00
parent 31ce648e63
commit 40daf56b5a
13 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ArduinoJson.hpp
View File

@@ -13,7 +13,8 @@
// Include Arduino.h before stdlib.h to avoid conflict with atexit()
// https://github.com/bblanchon/ArduinoJson/pull/1693#issuecomment-1001060240
#if ARDUINOJSON_ENABLE_ARDUINO_STRING || ARDUINOJSON_ENABLE_ARDUINO_STREAM || \
ARDUINOJSON_ENABLE_ARDUINO_PRINT || ARDUINOJSON_ENABLE_PROGMEM
ARDUINOJSON_ENABLE_ARDUINO_PRINT || \
(ARDUINOJSON_ENABLE_PROGMEM && defined(ARDUINO))
# include <Arduino.h>
#endif

2
src/ArduinoJson/Deserialization/Readers/FlashReader.hpp
View File

@@ -4,7 +4,7 @@
#pragma once
#include <Arduino.h>
#include <ArduinoJson/Polyfills/pgmspace.hpp>
ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE

8
src/ArduinoJson/Polyfills/pgmspace.hpp
View File

@@ -4,7 +4,13 @@
#pragma once
#include <Arduino.h>
#ifdef ARDUINO
# include <Arduino.h>
#else
// Allow using PROGMEM outside of Arduino (issue #1903)
class __FlashStringHelper;
# include <avr/pgmspace.h>
#endif
#include <ArduinoJson/Configuration.hpp>
#include <ArduinoJson/Namespace.hpp>

2
src/ArduinoJson/Strings/Adapters/FlashString.hpp
View File

@@ -4,8 +4,6 @@
#pragma once
#include <Arduino.h>
#include <ArduinoJson/Polyfills/pgmspace.hpp>
#include <ArduinoJson/Strings/StringAdapter.hpp>