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

Commit59efe7c

Browse files
committed
Merge pull requestFirebaseExtended#110 from ed7coyne/travis-update
Add other examples to travis
2 parents19e9e9c +26d6fab commit59efe7c

File tree

3 files changed

+17
-21
lines changed

3 files changed

+17
-21
lines changed

‎.travis.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
language:c++
2+
cache:ccache
23
sudo:false
34
addons:
45
apt:
@@ -7,22 +8,28 @@ addons:
78
packages:
89
-g++-4.8
910
env:
10-
-ARDUINO_VERSION=1.6.8 ARDUINO_ESP8266_VERSION=2.1.0 ARDUINO_ROOT=${HOME}/arduino-${ARDUINO_VERSION} ARDUINO_ESP8266_ROOT=${ARDUINO_ROOT}/hardware/esp8266com/esp8266 ARDUINO_HOME=${HOME}/Arduino
11-
-ARDUINO_VERSION=1.6.8 ARDUINO_ESP8266_VERSION=2.2.0-rc1 ARDUINO_ROOT=${HOME}/arduino-${ARDUINO_VERSION} ARDUINO_ESP8266_ROOT=${ARDUINO_ROOT}/hardware/esp8266com/esp8266 ARDUINO_HOME=${HOME}/Arduino
12-
-ARDUINO_VERSION=nightly ARDUINO_ESP8266_VERSION=master ARDUINO_ROOT=${HOME}/arduino-${ARDUINO_VERSION} ARDUINO_ESP8266_ROOT=${ARDUINO_ROOT}/hardware/esp8266com/esp8266 ARDUINO_HOME=${HOME}/Arduino
11+
-ARDUINO_VERSION=1.6.8 ARDUINO_ESP8266_VERSION=2.1.0LIB_NEOPIXEL_VERSION=v1.0.5 LIB_GFX_VERSION=v1.1.5 LIB_SSD1306_VERSION=1.1.0ARDUINO_ROOT=${HOME}/arduino-${ARDUINO_VERSION} ARDUINO_ESP8266_ROOT=${ARDUINO_ROOT}/hardware/esp8266com/esp8266 ARDUINO_HOME=${HOME}/Arduino
12+
-ARDUINO_VERSION=1.6.8 ARDUINO_ESP8266_VERSION=2.2.0-rc1LIB_NEOPIXEL_VERSION=v1.0.5 LIB_GFX_VERSION=v1.1.5 LIB_SSD1306_VERSION=1.1.0ARDUINO_ROOT=${HOME}/arduino-${ARDUINO_VERSION} ARDUINO_ESP8266_ROOT=${ARDUINO_ROOT}/hardware/esp8266com/esp8266 ARDUINO_HOME=${HOME}/Arduino
13+
-ARDUINO_VERSION=nightly ARDUINO_ESP8266_VERSION=masterLIB_NEOPIXEL_VERSION=master LIB_GFX_VERSION=master LIB_SSD1306_VERSION=masterARDUINO_ROOT=${HOME}/arduino-${ARDUINO_VERSION} ARDUINO_ESP8266_ROOT=${ARDUINO_ROOT}/hardware/esp8266com/esp8266 ARDUINO_HOME=${HOME}/Arduino
1314
install:
1415
-if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
15-
-( cd ${HOME} && curl -O https://downloads.arduino.cc/arduino-${ARDUINO_VERSION}-linux64.tar.xz && tarxvf arduino-${ARDUINO_VERSION}-linux64.tar.xz )
16+
-( cd ${HOME} && curl -O https://downloads.arduino.cc/arduino-${ARDUINO_VERSION}-linux64.tar.xz && tarxf arduino-${ARDUINO_VERSION}-linux64.tar.xz )
1617
-( cd ${HOME} && wget -q -O SoftwareSerial.zip https://github.com/plerup/espsoftwareserial/archive/097712eb07f5b3a70ef419b6e7a7ed2ada5aab85.zip && unzip -q SoftwareSerial.zip
1718
&& rm -rf SoftwareSerial.zip && mv espsoftwareserial-* SoftwareSerial)
19+
-(LIB=Adafruit_NeoPixel VERSION=$LIB_NEOPIXEL_VERSION && cd ${HOME} && wget https://github.com/adafruit/$LIB/archive/$VERSION.zip -O $LIB.zip && unzip $LIB.zip && mv $LIB-* $LIB)
20+
-(LIB=Adafruit-GFX-Library VERSION=$LIB_GFX_VERSION && cd ${HOME} && wget https://github.com/adafruit/$LIB/archive/$VERSION.zip -O $LIB.zip && unzip $LIB.zip && mv $LIB-* $LIB)
21+
-(LIB=Adafruit_SSD1306 VERSION=$LIB_SSD1306_VERSION && cd ${HOME} && wget https://github.com/adafruit/$LIB/archive/$VERSION.zip -O $LIB.zip && unzip $LIB.zip && mv $LIB-* $LIB)
1822
-git clone --branch ${ARDUINO_ESP8266_VERSION} https://github.com/esp8266/Arduino.git ${ARDUINO_ESP8266_ROOT}
1923
-git submodule init && git submodule update
2024
-( cd ${ARDUINO_ESP8266_ROOT}/tools && python get.py )
2125
before_script:
2226
-mkdir -p ${ARDUINO_HOME}/libraries
23-
-( 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 SoftwareSerial )
27+
-( 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 ./
28+
&& ln -s ${HOME}/Adafruit_NeoPixel ./ && ln -s ${HOME}/Adafruit-GFX-Library ./ && ln -s ${HOME}/Adafruit_SSD1306 ./)
2429
script:
2530
-${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
2631
-${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
32+
-${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/Firebase_ESP8266_LEDs/Firebase_ESP8266_Neopixel/Firebase_ESP8266_Neopixel.ino
33+
-${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/FirebaseStream_ESP8266/FirebaseStream_ESP8266.ino
2734
-(cd test && make check)
2835
-(cd test/modem/ && make test)

‎examples/FirebaseStream_ESP8266/FirebaseStream_ESP8266.ino

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include<ESP8266WiFi.h>
2222
#include<Adafruit_GFX.h>
2323
#include<Adafruit_SSD1306.h>
24-
#include<ArduinoJson.h>
2524

2625
#defineOLED_RESET3
2726
Adafruit_SSD1306display(OLED_RESET);
@@ -66,8 +65,8 @@ void loop() {
6665
Serial.println(event);
6766
JsonObject& json = buf.parseObject((char*)event.c_str());
6867
String path = json["path"];
69-
float data = json["data"];
70-
68+
float data = json["data"];
69+
7170
// TODO(proppy): parse JSON object.
7271
display.clearDisplay();
7372
display.setTextSize(2);

‎examples/Firebase_ESP8266_LEDs/Firebase_ESP8266_Neopixel/Firebase_ESP8266_Neopixel.ino

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
// Firebase_ESP8266-Neopixel is a sample that demonstrates how
1818
// to set pixel data using a firebase stream.
1919
#include<Firebase.h>
20-
#include<ArduinoJson.h>
2120
#include<ESP8266WiFi.h>
2221

2322
#include<Adafruit_NeoPixel.h>
@@ -26,11 +25,8 @@
2625
constint PIN=13;
2726
Adafruit_NeoPixel strip = Adafruit_NeoPixel(32, PIN, NEO_GRB + NEO_KHZ800);
2827

29-
#defineJSON_BUFFER_SIZE10*4
30-
3128
// TODO: Replace with your own credentials and keep these safe.
32-
Firebase fbase = Firebase("YOUR-PROJECT.firebaseio.com")
33-
.auth("YOUR_AUTH_SECRET");
29+
Firebase fbase = Firebase("YOUR-PROJECT.firebaseio.com","YOUR_AUTH_SECRET");
3430

3531
voidsetup() {
3632
Serial.begin(9600);
@@ -75,14 +71,8 @@ void loop() {
7571
return;
7672
}
7773

78-
// Use dynamic for large JSON objects
79-
// DynamicJsonBuffer jsonBuffer;
80-
StaticJsonBuffer<JSON_OBJECT_SIZE(JSON_BUFFER_SIZE)> jsonBuffer;
81-
8274
// create an empty object
83-
String ref = get.json();
84-
Serial.println(ref);
85-
JsonObject& pixelJSON = jsonBuffer.parseObject((char*)ref.c_str());
75+
const JsonObject& pixelJSON = get.json();
8676

8777
if(pixelJSON.success()){
8878
for (int i=0; i < strip.numPixels(); i++) {
@@ -94,7 +84,7 @@ void loop() {
9484
strip.show();
9585
}else {
9686
Serial.println("Parse fail.");
97-
Serial.println(get.json());
87+
Serial.println(get.response());
9888
}
9989
}
10090

0 commit comments

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