From c8ae580031b4bd65021526fa8b69e1ef0dba7b99 Mon Sep 17 00:00:00 2001 From: Jacob Nite Date: Sat, 4 Mar 2017 21:11:11 -0700 Subject: [PATCH 1/4] Modified for compatability with Particle v2 library structure. --- LICENSE | 3 +++ examples/usage/usage.ino | 16 ++++++++++++++++ include/ArduinoJson/Print.hpp | 2 ++ src/ArduinoJson.cpp | 0 src/ArduinoJson.h | 8 ++++++++ 5 files changed, 29 insertions(+) create mode 100644 LICENSE create mode 100644 examples/usage/usage.ino create mode 100644 src/ArduinoJson.cpp create mode 100644 src/ArduinoJson.h diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..b73812f5 --- /dev/null +++ b/LICENSE @@ -0,0 +1,3 @@ +Copyright 2017 Benoit Blanchon + + diff --git a/examples/usage/usage.ino b/examples/usage/usage.ino new file mode 100644 index 00000000..c0f52a91 --- /dev/null +++ b/examples/usage/usage.ino @@ -0,0 +1,16 @@ +// Example usage for ArduinoJson library by Benoit Blanchon . + +#include "arduinoJson.h" + +// Initialize objects from the lib +ArduinoJson arduinoJson; + +void setup() { + // Call functions on initialized library objects that require hardware + arduinoJson.begin(); +} + +void loop() { + // Use the library's initialized objects and functions + arduinoJson.process(); +} diff --git a/include/ArduinoJson/Print.hpp b/include/ArduinoJson/Print.hpp index 9f3dee70..0f61694b 100644 --- a/include/ArduinoJson/Print.hpp +++ b/include/ArduinoJson/Print.hpp @@ -7,6 +7,7 @@ #pragma once +#ifndef PARTICLE #ifndef ARDUINO #include @@ -42,3 +43,4 @@ class Print { #include #endif +#endif diff --git a/src/ArduinoJson.cpp b/src/ArduinoJson.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/ArduinoJson.h b/src/ArduinoJson.h new file mode 100644 index 00000000..a83180dc --- /dev/null +++ b/src/ArduinoJson.h @@ -0,0 +1,8 @@ +// Copyright Benoit Blanchon 2014-2017 +// MIT License +// +// Arduino JSON library +// https://github.com/bblanchon/ArduinoJson +// If you like this project, please add a star! + +#include "../include/ArduinoJson.h" From f50cbc5c0aeb8ec925f4b1a14b19ad41b17ec784 Mon Sep 17 00:00:00 2001 From: Jacob Nite Date: Sat, 4 Mar 2017 21:18:07 -0700 Subject: [PATCH 2/4] Copied LICENSE.md to LICENSE (the file generated by particle v2 format) --- LICENSE | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index b73812f5..9f35ed44 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,10 @@ -Copyright 2017 Benoit Blanchon +The MIT License (MIT) +--------------------- - +Copyright © 2014-2017 Benoit BLANCHON + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From 324bc03b4aff49f1ac6e4d64831a0dcf6f891ff6 Mon Sep 17 00:00:00 2001 From: Jacob Nite Date: Tue, 7 Mar 2017 09:55:43 -0700 Subject: [PATCH 3/4] Removed optional files created by particle library manager --- LICENSE | 10 ---------- examples/usage/usage.ino | 16 ---------------- 2 files changed, 26 deletions(-) delete mode 100644 LICENSE delete mode 100644 examples/usage/usage.ino diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 9f35ed44..00000000 --- a/LICENSE +++ /dev/null @@ -1,10 +0,0 @@ -The MIT License (MIT) ---------------------- - -Copyright © 2014-2017 Benoit BLANCHON - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/examples/usage/usage.ino b/examples/usage/usage.ino deleted file mode 100644 index c0f52a91..00000000 --- a/examples/usage/usage.ino +++ /dev/null @@ -1,16 +0,0 @@ -// Example usage for ArduinoJson library by Benoit Blanchon . - -#include "arduinoJson.h" - -// Initialize objects from the lib -ArduinoJson arduinoJson; - -void setup() { - // Call functions on initialized library objects that require hardware - arduinoJson.begin(); -} - -void loop() { - // Use the library's initialized objects and functions - arduinoJson.process(); -} From 796c8f5505609ca44bef032684db1d5bcb3f3cef Mon Sep 17 00:00:00 2001 From: Jacob Nite Date: Wed, 19 Apr 2017 22:21:58 -0600 Subject: [PATCH 4/4] Removed empty .cpp file. Issue spark/particle-library-manager#26 was fixed and merged. --- src/ArduinoJson.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/ArduinoJson.cpp diff --git a/src/ArduinoJson.cpp b/src/ArduinoJson.cpp deleted file mode 100644 index e69de29b..00000000