Commitf674694

committed

Merge pull requestFirebaseExtended#115 from proppy/bump-arduino-json-5.3

Bump arduino json 5.3

2 parentse643dcb +ce1bd8f commitf674694Copy full SHA for f674694

File tree

85 files changed

+582

-753

lines changed

.travis.yml
src
- Firebase.h
- FirebaseObject.h
- third-party
  - arduino-json-5.2
    - examples
      - IndentedPrintExample
        IndentedPrintExample.ino
      - JsonGeneratorExample
        JsonGeneratorExample.ino
      - JsonHttpClient
        JsonHttpClient.ino
      - JsonParserExample
        JsonParserExample.ino
      - JsonServer
        JsonServer.ino
      - JsonUdpBeacon
        JsonUdpBeacon.ino
    - include/ArduinoJson
      - Arduino
        Print.hpp
      - Internals
        JsonWriter.hpp
  - arduino-json-5.3
test
- Makefile
- modem
  - Makefile

Some content is hidden

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

85 files changed

+582

-753

lines changed

`‎.travis.yml‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ install:`
`23`	`23`	`-( cd ${ARDUINO_ESP8266_ROOT}/tools && python get.py )`
`24`	`24`	`before_script:`
`25`	`25`	`-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 ./)`
`27`	`27`	`script:`
`28`	`28`	`-${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`
`29`	`29`	`-${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 number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`// TODO(edcoyne): move this into our mock_arduino fork where we actually do the`
`27`	`27`	`// override.`
`28`	`28`	`#defineARDUINO_STRING_OVERRIDE`
`29`		`-#include"third-party/arduino-json-5.2/include/ArduinoJson.h"`
	`29`	`+#include"third-party/arduino-json-5.3/include/ArduinoJson.h"`
`30`	`30`
`31`	`31`	`classFirebaseGet;`
`32`	`32`	`classFirebaseSet;`

`‎src/FirebaseObject.h‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`#ifndef FIREBASE_OBJECT_H`
`18`	`18`	`#defineFIREBASE_OBJECT_H`
`19`	`19`
`20`		`-#include"third-party/arduino-json-5.2/include/ArduinoJson.h"`
	`20`	`+#include"third-party/arduino-json-5.3/include/ArduinoJson.h"`
`21`	`21`
`22`	`22`	`#defineFIREBASE_JSONBUFFER_SIZE200`
`23`	`23`

`‎src/third-party/arduino-json-5.2/examples/IndentedPrintExample/IndentedPrintExample.ino‎`

Lines changed: 0 additions & 35 deletions

This file was deleted.

`‎src/third-party/arduino-json-5.2/examples/JsonGeneratorExample/JsonGeneratorExample.ino‎`

Lines changed: 0 additions & 70 deletions

This file was deleted.

`‎src/third-party/arduino-json-5.2/examples/JsonHttpClient/JsonHttpClient.ino‎`

Lines changed: 0 additions & 195 deletions

This file was deleted.

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf674694

File tree

85 files changed

Some content is hidden

85 files changed

`‎.travis.yml‎`

`‎src/Firebase.h‎`

`‎src/FirebaseObject.h‎`

`‎src/third-party/arduino-json-5.2/examples/IndentedPrintExample/IndentedPrintExample.ino‎`

`‎src/third-party/arduino-json-5.2/examples/JsonGeneratorExample/JsonGeneratorExample.ino‎`

`‎src/third-party/arduino-json-5.2/examples/JsonHttpClient/JsonHttpClient.ino‎`

`‎src/third-party/arduino-json-5.2/examples/JsonParserExample/JsonParserExample.ino‎`

0 commit comments