codermery/firebase-arduinoPublic

forked fromFirebaseExtended/firebase-arduino

NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commitdb97591

authored

Merge pull requestFirebaseExtended#209 from proppy/bump-arduino-json

bump arduino-json to 5.6.7

2 parents8ec0b43 +373aaf5 commitdb97591Copy full SHA for db97591

File tree

95 files changed

+1860

-1207

lines changed

.travis.yml
src
- Firebase.h
- FirebaseCloudMessaging.h
- FirebaseObject.h
- third-party
  - arduino-json-5.3
    - include/ArduinoJson
      - Internals
        Prettyfier.hpp
      - JsonArray.ipp
      - JsonObject.ipp
      - JsonVariant.ipp
      - Polyfills
        isInfinity.hpp
        isNaN.hpp
    - src
  - arduino-json-5.6.7
    - ArduinoJson.h
    - CHANGELOG.md
    - LICENSE.md
    - README.md
    - examples
      - IndentedPrintExample
        IndentedPrintExample.ino
      - JsonGeneratorExample
        JsonGeneratorExample.ino
      - JsonHttpClient
        JsonHttpClient.ino
      - JsonParserExample
        JsonParserExample.ino
      - JsonServer
        JsonServer.ino
      - JsonUdpBeacon
        JsonUdpBeacon.ino
    - include
    - keywords.txt
    - library.properties
  - arduino-json-string-override.patch
test
- Makefile
- WString.h
- modem
  - Makefile

Some content is hidden

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

95 files changed

+1860

-1207

lines changed

`‎.travis.yml`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ install:`
`22`	`22`	`-( cd ${ARDUINO_ESP8266_ROOT}/tools && python get.py )`
`23`	`23`	`before_script:`
`24`	`24`	`-mkdir -p ${ARDUINO_HOME}/libraries`
`25`		`--( 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 ./)`
	`25`	`+-( cd ${ARDUINO_HOME}/libraries && ln -s ${TRAVIS_BUILD_DIR} firebase-arduino && ln -s ${TRAVIS_BUILD_DIR}/src/third-party/arduino-json-5.6.7 ArduinoJson && ln -s ${HOME}/SoftwareSerial ./ && ln -s ${HOME}/Adafruit_NeoPixel ./ && ln -s ${HOME}/Adafruit-GFX-Library ./ && ln -s ${HOME}/Adafruit_SSD1306 ./)`
`26`	`26`	`script:`
`27`	`27`	`-${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`
`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/FirebaseSerialHost_ESP8266/FirebaseSerialHost_ESP8266.ino`

`‎src/Firebase.h`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,8 @@`
`24`	`24`	`#include<memory>`
`25`	`25`	`#include"FirebaseHttpClient.h"`
`26`	`26`	`#include"FirebaseError.h"`
`27`		`-// TODO(edcoyne): move this into our mock_arduino fork where we actually do the`
`28`		`-// override.`
`29`		`-#defineARDUINO_STRING_OVERRIDE`
`30`		`-#include"third-party/arduino-json-5.3/include/ArduinoJson.h"`
	`27`	`+#defineARDUINOJSON_USE_ARDUINO_STRING1`
	`28`	`+#include"third-party/arduino-json-5.6.7/include/ArduinoJson.h"`
`31`	`29`
`32`	`30`	`classFirebaseGet;`
`33`	`31`	`classFirebaseSet;`

`‎src/FirebaseCloudMessaging.h`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@`
`26`	`26`	`#include<vector>`
`27`	`27`	`#include"FirebaseHttpClient.h"`
`28`	`28`	`#include"FirebaseError.h"`
`29`		`-#include"third-party/arduino-json-5.3/include/ArduinoJson.h"`
	`29`	`+#defineARDUINOJSON_USE_ARDUINO_STRING1`
	`30`	`+#include"third-party/arduino-json-5.6.7/include/ArduinoJson.h"`
`30`	`31`
`31`	`32`	`// Defines the actual message to the client, for more detail on`
`32`	`33`	`// options and settings see:`

`‎src/FirebaseObject.h`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@`
`17`	`17`	`#ifndef FIREBASE_OBJECT_H`
`18`	`18`	`#defineFIREBASE_OBJECT_H`
`19`	`19`
`20`		`-#include"third-party/arduino-json-5.3/include/ArduinoJson.h"`
	`20`	`+#defineARDUINOJSON_USE_ARDUINO_STRING1`
	`21`	`+#include"third-party/arduino-json-5.6.7/include/ArduinoJson.h"`
`21`	`22`
`22`	`23`	`#ifndef FIREBASE_JSONBUFFER_SIZE`
`23`	`24`	`#defineFIREBASE_JSONBUFFER_SIZEJSON_OBJECT_SIZE(32)`

`‎src/third-party/arduino-json-5.3/include/ArduinoJson/Internals/Prettyfier.hpp`

Lines changed: 0 additions & 47 deletions

This file was deleted.

`‎src/third-party/arduino-json-5.3/include/ArduinoJson/JsonArray.ipp`

Lines changed: 0 additions & 101 deletions

This file was deleted.

`‎src/third-party/arduino-json-5.3/include/ArduinoJson/JsonObject.ipp`

Lines changed: 0 additions & 134 deletions

This file was deleted.

0 commit comments

Comments

(0)

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!

Commitdb97591

File tree

95 files changed

Some content is hidden

95 files changed

`‎.travis.yml`

`‎src/Firebase.h`

`‎src/FirebaseCloudMessaging.h`

`‎src/FirebaseObject.h`

`‎src/third-party/arduino-json-5.3/include/ArduinoJson/Internals/Prettyfier.hpp`

`‎src/third-party/arduino-json-5.3/include/ArduinoJson/JsonArray.ipp`

`‎src/third-party/arduino-json-5.3/include/ArduinoJson/JsonObject.ipp`

0 commit comments