mirror of
				https://github.com/eledio-devices/thirdparty-ArduinoJson.git
				synced 2025-10-31 16:14:11 +01:00 
			
		
		
		
	Allow using PROGMEM outside of Arduino (fixes #1903)
This commit is contained in:
		| @@ -2,8 +2,6 @@ | ||||
| // Copyright © 2014-2023, Benoit BLANCHON | ||||
| // MIT License | ||||
|  | ||||
| #include "progmem_emulation.hpp" | ||||
|  | ||||
| #define ARDUINOJSON_ENABLE_PROGMEM 1 | ||||
| #include <ArduinoJson.h> | ||||
|  | ||||
|   | ||||
| @@ -2,8 +2,6 @@ | ||||
| // Copyright © 2014-2023, Benoit BLANCHON | ||||
| // MIT License | ||||
|  | ||||
| #include "progmem_emulation.hpp" | ||||
|  | ||||
| #define ARDUINOJSON_ENABLE_ARDUINO_STRING 1 | ||||
| #define ARDUINOJSON_ENABLE_PROGMEM 1 | ||||
| #define ARDUINOJSON_ENABLE_STRING_DEDUPLICATION 0 | ||||
|   | ||||
| @@ -2,8 +2,6 @@ | ||||
| // Copyright © 2014-2023, Benoit BLANCHON | ||||
| // MIT License | ||||
|  | ||||
| #include "progmem_emulation.hpp" | ||||
|  | ||||
| #define ARDUINOJSON_ENABLE_ARDUINO_STRING 1 | ||||
| #define ARDUINOJSON_ENABLE_PROGMEM 1 | ||||
| #define ARDUINOJSON_ENABLE_STRING_DEDUPLICATION 1 | ||||
|   | ||||
| @@ -5,8 +5,6 @@ | ||||
| #define ARDUINO | ||||
| #define memcpy_P(dest, src, n) memcpy((dest), (src), (n)) | ||||
|  | ||||
| #include "progmem_emulation.hpp" | ||||
|  | ||||
| #include <ArduinoJson.h> | ||||
|  | ||||
| #include <catch.hpp> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user