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

Commit055a72d

Browse files
committed
Merge remote-tracking branch 'upstream/master' into firethings
2 parents1bc895e +e854670 commit055a72d

File tree

100 files changed

+1902
-1235
lines changed

Some content is hidden

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

100 files changed

+1902
-1235
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ install:
2222
-( cd ${ARDUINO_ESP8266_ROOT}/tools && python get.py )
2323
before_script:
2424
-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 ./)
2626
script:
2727
-${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
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/FirebaseSerialHost_ESP8266/FirebaseSerialHost_ESP8266.ino

‎examples/FirebaseDemo_ESP8266/README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,17 @@ FirebaseDemo is a sample that shows basic usage of the `FirebaseArduino` API.
1313

1414
##Configuration
1515

16-
1. Go tohttps://www.firebase.com/ and create a new Firebase
17-
1. Copy the`Firebase Hostname`
18-
1. Go to`Secrets`
19-
1. Click`Firebase Secrets > Show`
20-
1. Copy the`Firebase Secret`
2116
1. Start Arduino
22-
1. Open`File > Examples > FirebaseArduino > FirebaseDemo_ESP8266`
23-
1. Replace`WIFI_SSID` and`WIFI_PASSWORD` with WiFi credentials
24-
1. Replace`FIREBASE_HOST` with the`Firebase Hostname` from step`2.`
25-
1. Replace`FIREBASE_AUTH` with`Firebase Secret` from step`5.`
17+
1. Open`File > Examples > FirebaseArduino > FirebaseRoom_ESP8266`
18+
1. In`FirebaseRoom_ESP8266`: Replace`WIFI_SSID` and`WIFI_PASSWORD` with WiFi credentials
19+
1. Go tohttps://firebase.google.com/console/ and create a new Firebase Project
20+
1. Go to`Database`
21+
1. Copy the`Database hostname` (Database URL without`https://` and trailing`/`)
22+
1. In`FirebaseRoom_ESP8266`: replace`FIREBASE_HOST` with the`Database Hostname`
23+
1. Go to`⚙ > Project Settings > Database > Database secrets`
24+
1. Click`Firebase Secrets > Show`
25+
1. Copy the`Database Secret`
26+
1. In`FirebaseRoom_ESP8266`: Replace`FIREBASE_AUTH` with`Database Secret`
2627
1. Select the board`Board > ESP8266 Modules > NodeMCU 1.0`
2728
1. Select the serial port`Port > /dev/tty...`
2829
1. Select the upload speed`Upload Speed > 115200`

‎examples/FirebaseNeoPixel_ESP8266/README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,17 @@ FirebaseNeoPixel is a sample that shows how to set pixel data from Firebase web
2424

2525
##Configuration
2626

27-
1. Go tohttps://www.firebase.com/ and create a new Firebase
28-
1. Copy the`Firebase Hostname`
29-
1. Go to`Secrets`
30-
1. Click`Firebase Secrets > Show`
31-
1. Copy the`Firebase Secret`
3227
1. Start Arduino
33-
1. Click`File > Examples > FirebaseArduino > FirebaseRoom_ESP8266`
34-
1. Replace`WIFI_SSID` and`WIFI_PASSWORD` with WiFi credentials
35-
1. Replace`FIREBASE_HOST` with the`Firebase Hostname` from step`2.`
36-
1. Replace`FIREBASE_AUTH` with`Firebase Secret` from step`5.`
28+
1. Open`File > Examples > FirebaseArduino > FirebaseRoom_ESP8266`
29+
1. In`FirebaseRoom_ESP8266`: Replace`WIFI_SSID` and`WIFI_PASSWORD` with WiFi credentials
30+
1. Go tohttps://firebase.google.com/console/ and create a new Firebase Project
31+
1. Go to`Database`
32+
1. Copy the`Database hostname` (Database URL without`https://` and trailing`/`)
33+
1. In`FirebaseRoom_ESP8266`: replace`FIREBASE_HOST` with the`Database Hostname`
34+
1. Go to`⚙ > Project Settings > Database > Database secrets`
35+
1. Click`Firebase Secrets > Show`
36+
1. Copy the`Database Secret`
37+
1. In`FirebaseRoom_ESP8266`: Replace`FIREBASE_AUTH` with`Database Secret`
3738
1. Select the board`Board > ESP8266 Modules > NodeMCU 1.0`
3839
1. Select the serial port`Port > /dev/tty...`
3940
1. Select the upload speed`Upload Speed > 115200`

‎examples/FirebaseRoom_ESP8266/README.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,17 @@ sensor data to Firebase, and trigger actuators from Firebase.
2525

2626
##Configuration
2727

28-
1. Go tohttps://www.firebase.com/ and create a new Firebase
29-
1. Copy the`Firebase Hostname`
30-
1. Go to`Secrets`
31-
1. Click`Firebase Secrets > Show`
32-
1. Copy the`Firebase Secret`
3328
1. Start Arduino
3429
1. Open`File > Examples > FirebaseArduino > FirebaseRoom_ESP8266`
35-
1. Replace`WIFI_SSID` and`WIFI_PASSWORD` with WiFi credentials
36-
1. Replace`FIREBASE_HOST` with the`Firebase Hostname` from step`2.`
37-
1. Replace`FIREBASE_AUTH` with`Firebase Secret` from step`5.`
30+
1. In`FirebaseRoom_ESP8266`: Replace`WIFI_SSID` and`WIFI_PASSWORD` with WiFi credentials
31+
1. Go tohttps://firebase.google.com/console/ and create a new Firebase Project
32+
1. Go to`Database`
33+
1. Copy the`Database hostname` (Database URL without`https://` and trailing`/`)
34+
1. In`FirebaseRoom_ESP8266`: replace`FIREBASE_HOST` with the`Database Hostname`
35+
1. Go to`⚙ > Project Settings > Database > Database secrets`
36+
1. Click`Firebase Secrets > Show`
37+
1. Copy the`Database Secret`
38+
1. In`FirebaseRoom_ESP8266`: Replace`FIREBASE_AUTH` with`Database Secret`
3839
1. Select the board`Board > ESP8266 Modules > NodeMCU 1.0`
3940
1. Select the serial port`Port > /dev/tty...`
4041
1. Select the upload speed`Upload Speed > 115200`

‎examples/FirebaseStream_ESP8266/README.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,16 @@ https://publicdata-cryptocurrency.firebaseio.com.
2929
##Configuration
3030

3131
1. Start Arduino
32-
1. Open`File > Examples > FirebaseArduino > FirebaseStream_ESP8266`
33-
1. Replace`WIFI_SSID` and`WIFI_PASSWORD` with WiFi credentials
32+
1. Open`File > Examples > FirebaseArduino > FirebaseRoom_ESP8266`
33+
1. In`FirebaseRoom_ESP8266`: Replace`WIFI_SSID` and`WIFI_PASSWORD` with WiFi credentials
34+
1. Go tohttps://firebase.google.com/console/ and create a new Firebase Project
35+
1. Go to`Database`
36+
1. Copy the`Database hostname` (Database URL without`https://` and trailing`/`)
37+
1. In`FirebaseRoom_ESP8266`: replace`FIREBASE_HOST` with the`Database Hostname`
38+
1. Go to`⚙ > Project Settings > Database > Database secrets`
39+
1. Click`Firebase Secrets > Show`
40+
1. Copy the`Database Secret`
41+
1. In`FirebaseRoom_ESP8266`: Replace`FIREBASE_AUTH` with`Database Secret`
3442
1. Select the board`Board > ESP8266 Modules > NodeMCU 1.0`
3543
1. Select the serial port`Port > /dev/tty...`
3644
1. Select the upload speed`Upload Speed > 115200`

‎src/Firebase.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@
2424
#include<memory>
2525
#include"FirebaseHttpClient.h"
2626
#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"
3129

3230
classFirebaseGet;
3331
classFirebaseSet;

‎src/FirebaseArduino.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,9 @@ class FirebaseArduino {
189189
* You should check success() after calling.
190190
* This changes the state of this object. Once this is called you may start
191191
* monitoring available() and calling readEvent() to get new events.
192+
* WARNING: Currently you cannot make another call while the stream is
193+
* running, otherwise you will crash due to memory issues. See:
194+
* https://github.com/googlesamples/firebase-arduino/issues/48
192195
* \param path The path inside of your db to the node you wish to monitor.
193196
*/
194197
voidstream(const String& path);

‎src/FirebaseCloudMessaging.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
#include<vector>
2727
#include"FirebaseHttpClient.h"
2828
#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"
3031

3132
// Defines the actual message to the client, for more detail on
3233
// options and settings see:

‎src/FirebaseObject.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
#ifndef FIREBASE_OBJECT_H
1818
#defineFIREBASE_OBJECT_H
1919

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"
2122

2223
#ifndef FIREBASE_JSONBUFFER_SIZE
2324
#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.

0 commit comments

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