Skip to content

Commit 86a14b7

Browse files
proppyproppy
committed
third-party/arduino-json: bump to 5.3
1 parent e643dcb commit 86a14b7

File tree

84 files changed

+581
-259
lines changed

Some content is hidden

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

84 files changed

+581
-259
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ install:
2323
- ( cd ${ARDUINO_ESP8266_ROOT}/tools && python get.py )
2424
before_script:
2525
- mkdir -p ${ARDUINO_HOME}/libraries
26-
- ( cd ${ARDUINO_HOME}/libraries && ln -s ${TRAVIS_BUILD_DIR} firebase-arduino && ln -s ${TRAVIS_BUILD_DIR}/src/third-party/arduino-json-5.2 ArduinoJson && ln -s ${HOME}/SoftwareSerial ./ && ln -s ${HOME}/Adafruit_NeoPixel ./ && ln -s ${HOME}/Adafruit-GFX-Library ./ && ln -s ${HOME}/Adafruit_SSD1306 ./)
26+
- ( cd ${ARDUINO_HOME}/libraries && ln -s ${TRAVIS_BUILD_DIR} firebase-arduino && ln -s ${TRAVIS_BUILD_DIR}/src/third-party/arduino-json-5.3 ArduinoJson && ln -s ${HOME}/SoftwareSerial ./ && ln -s ${HOME}/Adafruit_NeoPixel ./ && ln -s ${HOME}/Adafruit-GFX-Library ./ && ln -s ${HOME}/Adafruit_SSD1306 ./)
2727
script:
2828
- ${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/FirebaseDemo_ESP8266/FirebaseDemo_ESP8266.ino
2929
- ${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/FirebaseSerialHost_ESP8266/FirebaseSerialHost_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
#define ARDUINO_STRING_OVERRIDE
29-
#include "third-party/arduino-json-5.2/include/ArduinoJson.h"
29+
#include "third-party/arduino-json-5.3/include/ArduinoJson.h"
3030

3131
class FirebaseGet;
3232
class FirebaseSet;

‎src/third-party/arduino-json-5.2/include/ArduinoJson/Arduino/Print.hpp

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

‎src/third-party/arduino-json-5.2/include/ArduinoJson/Internals/JsonWriter.hpp

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

‎src/third-party/arduino-json-5.2/CHANGELOG.md renamed to ‎src/third-party/arduino-json-5.3/CHANGELOG.md

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

4+
v5.3.0
5+
------
6+
7+
* Added custom implementation of `ftoa` (issues #266, #267, #269 and #270)
8+
* Added `JsonVariant JsonBuffer::parse()` (issue #265)
9+
* Fixed `unsigned long` printed as `signed long` (issue #170)
10+
411
v5.2.0
512
------
613

‎src/third-party/arduino-json-5.2/LICENSE.md renamed to ‎src/third-party/arduino-json-5.3/LICENSE.md

File renamed without changes.

‎src/third-party/arduino-json-5.2/README.md renamed to ‎src/third-party/arduino-json-5.3/README.md

File renamed without changes.

‎src/third-party/arduino-json-5.2/examples/IndentedPrintExample/IndentedPrintExample.ino renamed to ‎src/third-party/arduino-json-5.3/examples/IndentedPrintExample/IndentedPrintExample.ino

File renamed without changes.

‎src/third-party/arduino-json-5.2/examples/JsonGeneratorExample/JsonGeneratorExample.ino renamed to ‎src/third-party/arduino-json-5.3/examples/JsonGeneratorExample/JsonGeneratorExample.ino

File renamed without changes.

‎src/third-party/arduino-json-5.2/examples/JsonHttpClient/JsonHttpClient.ino renamed to ‎src/third-party/arduino-json-5.3/examples/JsonHttpClient/JsonHttpClient.ino

File renamed without changes.

0 commit comments

Comments
 (0)