Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc4608b0

Browse files
committed
Merge pull requestFirebaseExtended#97 from proppy/bump-arduino-json
third-party: bump arduino-json to 5.2
2 parents9ad4b70 +ec9a2b2 commitc4608b0

File tree

78 files changed

+444
-173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+444
-173
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ install:
1010
-( cd ${ARDUINO_ESP8266_ROOT}/tools && python get.py )
1111
before_script:
1212
-mkdir -p ${ARDUINO_HOME}/libraries
13-
-( cd ${ARDUINO_HOME}/libraries && ln -s ${TRAVIS_BUILD_DIR} firebase-arduino && ln -s ${TRAVIS_BUILD_DIR}/src/third-party/arduino-json-5.1.1 ArduinoJson )
13+
-( cd ${ARDUINO_HOME}/libraries && ln -s ${TRAVIS_BUILD_DIR} firebase-arduino && ln -s ${TRAVIS_BUILD_DIR}/src/third-party/arduino-json-5.2 ArduinoJson )
1414
script:
1515
-${ARDUINO_ROOT}/arduino-builder -verbose -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M examples/FirebasePush_ESP8266/FirebasePush_ESP8266.ino

‎src/Firebase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
// TODO(edcoyne): move this into our mock_arduino fork where we actually do the
2727
// override.
2828
#defineARDUINO_STRING_OVERRIDE
29-
#include"third-party/arduino-json-5.1.1/include/ArduinoJson.h"
29+
#include"third-party/arduino-json-5.2/include/ArduinoJson.h"
3030

3131
classFirebaseGet;
3232
classFirebaseSet;

‎src/third-party/arduino-json-5.1.1/include/ArduinoJson/JsonVariant.ipp

Lines changed: 0 additions & 150 deletions
This file was deleted.

‎src/third-party/arduino-json-5.1.1/CHANGELOG.mdrenamed to‎src/third-party/arduino-json-5.2/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
ArduinoJson: change log
22
=======================
33

4+
v5.2.0
5+
------
6+
7+
* Added`JsonVariant::as<char*>()` as a synonym for`JsonVariant::as<const char*>()` (issue#257)
8+
* Added example`JsonHttpClient` (issue#256)
9+
* Added`JsonArray::copyTo()` and`JsonArray::copyFrom()` (issue#254)
10+
* Added`RawJson()` to insert pregenerated JSON portions (issue#259)
11+
412
v5.1.1
513
------
614

‎src/third-party/arduino-json-5.1.1/README.mdrenamed to‎src/third-party/arduino-json-5.2/README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ Features
1515
* JSON decoding (comments are supported)
1616
* JSON encoding (with optional indentation)
1717
* Elegant API, very easy to use
18-
* Efficient (no malloc, nor copy)
18+
* Fixed memory allocation (zero malloc)
19+
* No data duplication (zero copy)
1920
* Portable (written in C++98)
2021
* Self-contained (no external dependency)
2122
* Small footprint
@@ -91,19 +92,19 @@ From StackOverflow user `thegreendroid`:
9192
>It has a really elegant, simple API and it works like a charm on embedded and Windows/Linux platforms. We recently started using this on an embedded project and I can vouch for its quality.
9293
9394
From GitHub user`zacsketches`:
94-
9595
>Thanks for a great library!!!
9696
>I've been watching you consistently develop this library over the past six months, and I used it today for a publish and subscribe architecture designed to help hobbyists move into more advanced robotics. Your library allowed me to implement remote subscription in order to facilitate multi-processor robots.
9797
>ArduinoJson saved me a week's worth of time!!
9898
9999
[From Reddit user`erm_what_`](https://www.reddit.com/r/arduino/comments/3jj6ep/announcing_arduinojson_50/cusjk8c):
100-
101100
>This is a great library and I wouldn't be able to do the project I'm doing without it. I completely recommend it.
102101
103102
[From Reddit user`makerhacks`](https://www.reddit.com/r/arduino/comments/3jj6ep/announcing_arduinojson_50/cusqg7b):
104-
105103
>I am just starting an ESP8266 clock project and now I can output JSON from my server script and interpret it painlessly.
106104
105+
[From Twitter user`@hemalchevli`](https://twitter.com/hemalchevli/status/715788439397011456):
106+
>ArduinoJson library should be used as a benchmark/reference for making libraries. Truly elegant.
107+
107108
Donators
108109
--------
109110

@@ -116,6 +117,7 @@ Special thanks to the following persons and companies who made generous donation
116117
* A B Doodkorte
117118
* Scott Smith
118119
* Johann Stieger
120+
* Gustavo Donizeti Gini
119121

120122
---
121123

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp