Commit6b768f9

committed

Fix contrib directory to use external ArduinoJson library.

1 parente175110 commit6b768f9Copy full SHA for 6b768f9

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#include"Arduino.h"`
`2`	`2`	`#include"thing/Config.h"`
`3`		`-#include"third-party/arduino-json-5.6.7/include/ArduinoJson.h"`
	`3`	`+#include<ArduinoJson.h>`
`4`	`4`
`5`	`5`	`namespacething {`
`6`	`6`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#include"Arduino.h"`
`5`	`5`	`#include<string>`
`6`	`6`	`#include<functional>`
`7`		`-#include"third-party/arduino-json-5.6.7/include/ArduinoJson.h"`
	`7`	`+#include<ArduinoJson.h>`
`8`	`8`
`9`	`9`	`namespacething {`
`10`	`10`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#include"thing/Portal.h"`
`2`		`-#include"third-party/arduino-json-5.6.7/include/ArduinoJson.h"`
	`2`	`+#include<ArduinoJson.h>`
`3`	`3`
`4`	`4`	`namespacething {`
`5`	`5`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`FIREBASE_DIR=../..`
`18`	`18`	`GTEST_DIR=googletest/googletest`
`19`		`-ARDUINOJSON_DIR=../../src/third-party/arduino-json-5.6.7`
	`19`	`+ARDUINOJSON_DIR=${ARDUINO_HOME}/libraries/ArduinoJson`
`20`	`20`
`21`	`21`	`FIREBASE_SRCS=${FIREBASE_DIR}/src/FirebaseObject.cpp`
`22`	`22`	`GTEST_SRCS=${GTEST_DIR}/src/gtest-all.cpp`
`@@ -27,7 +27,7 @@ SRCS=FirebaseArduino_test.cpp\`
`27`	`27`
`28`	`28`	`OBJS=${SRCS:.cpp=.o}`
`29`	`29`
`30`		`-CXXFLAGS=-I. -I${FIREBASE_DIR}/src -Igoogletest/googletest/include -Igoogletest/googletest -std=c++11 -g`
	`30`	`+CXXFLAGS=-I. -I${FIREBASE_DIR}/src -I${ARDUINOJSON_DIR}/src -Igoogletest/googletest/include -Igoogletest/googletest -std=c++11 -g`
`31`	`31`	`LDFLAGS=-lpthread`
`32`	`32`
`33`	`33`	`all: check`

Comments

(0)