updated all examples

Author: ed7coyne

examples/FirebaseDemo_ESP8266/FirebaseDemo_ESP8266.ino

@@ -28,12 +28,9 @@
 
 void setup() {
   Serial.begin(9600);
-  if (password != "") {
-    WiFi.begin(ssid.c_str(), password.c_str());
-  } else {
-    WiFi.begin(ssid.c_str());
-  }
 
+  // connect to wifi.
+  WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
   Serial.print("connecting");
   while (WiFi.status() != WL_CONNECTED) {
     Serial.print(".");
@@ -42,8 +39,7 @@ void setup() {
   Serial.println();
   Serial.print("connected: ");
   Serial.println(WiFi.localIP());
-
-  ConnectWifi(WIFI_SSID, WIFI_PASSWORD);
+  
   Firebase.begin(FIREBASE_HOST, FIREBASE_AUTH);
 }
 

examples/FirebaseRoom_ESP8266/FirebaseRoom_ESP8266.ino

@@ -20,6 +20,12 @@
 #include <ESP8266WiFi.h>
 #include <FirebaseArduino.h>
 
+// Set these to run example.
+#define FIREBASE_HOST "example.firebaseio.com"
+#define FIREBASE_AUTH "token_or_secret"
+#define WIFI_SSID "SSID"
+#define WIFI_PASSWORD "PASSWORD"
+
 const int grovePowerPin = 15;
 const int vibratorPin = 5;
 const int lightSensorPin = A0;
@@ -29,8 +35,6 @@ const int fanPin = 13;
 
 void setup() {
   Serial.begin(9600);
-  ConnectWifi(WIFI_SSID, WIFI_PASSWORD);
-  Firebase.begin(FIREBASE_HOST, FIREBASE_AUTH);
 
   pinMode(grovePowerPin, OUTPUT);
   digitalWrite(grovePowerPin, HIGH);
@@ -42,7 +46,7 @@ void setup() {
   pinMode(fanPin, OUTPUT);
 
   // connect to wifi.
-  WiFi.begin("SSID", "PASSWORD");
+  WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
   Serial.print("connecting");
   while (WiFi.status() != WL_CONNECTED) {
     Serial.print(".");
@@ -52,7 +56,7 @@ void setup() {
   Serial.print("connected: ");
   Serial.println(WiFi.localIP());
 
-  Firebase.begin("example.firebaseio.com", "secret_or_token");
+  Firebase.begin(FIREBASE_HOST, FIREBASE_AUTH);
   Firebase.set("pushbutton", 0);
   Firebase.set("sunlight", 0);
   Firebase.set("redlight", 0);

examples/FirebaseSerialHost_ESP8266/FirebaseSerialHost_ESP8266.ino

@@ -36,20 +36,18 @@
 #include <Firebase.h>
 #include <SerialTransceiver.h>
 
-SoftwareSerial data_serial(5 /*RX*/, 4/*TX*/);
-firebase::modem::SerialTransceiver transceiver;
-
 // Set these to run example.
 #define WIFI_SSID "SSID"
 #define WIFI_PASSWORD "PASSWORD"
 
-void ConnectWifi(const String& ssid, const String& password = "") {
-  if (password != "") {
-    WiFi.begin(ssid.c_str(), password.c_str());
-  } else {
-    WiFi.begin(ssid.c_str());
-  }
+SoftwareSerial data_serial(5 /*RX*/, 4/*TX*/);
+firebase::modem::SerialTransceiver transceiver;
 
+void setup() {
+  Serial.begin(9600);
+
+  // connect to wifi.
+  WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
   Serial.print("connecting");
   while (WiFi.status() != WL_CONNECTED) {
     Serial.print(".");
@@ -58,11 +56,6 @@ void ConnectWifi(const String& ssid, const String& password = "") {
   Serial.println();
   Serial.print("connected: ");
   Serial.println(WiFi.localIP());
-}
-
-void setup() {
-  Serial.begin(9600);
-  ConnectWifi(WIFI_SSID, WIFI_PASSWORD);
 
   data_serial.begin(9600);
   while (!data_serial) {

examples/FirebaseStream_ESP8266/FirebaseStream_ESP8266.ino

@@ -22,12 +22,21 @@
 #include <Adafruit_GFX.h>
 #include <Adafruit_SSD1306.h>
 
+// Set these to run example.
+#define WIFI_SSID "SSID"
+#define WIFI_PASSWORD "PASSWORD"
+
 #define OLED_RESET 3
 Adafruit_SSD1306 display(OLED_RESET);
 
 void setup() {
   Serial.begin(9600);
 
+  display.begin(SSD1306_SWITCHCAPVCC, 0x3C);  // initialize with the I2C addr 0x3C (for the 128x32)
+  display.display();
+
+  // connect to wifi.
+  WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
   Serial.print("connecting");
   while (WiFi.status() != WL_CONNECTED) {
     Serial.print(".");
@@ -36,16 +45,6 @@ void setup() {
   Serial.println();
   Serial.print("connected: ");
   Serial.println(WiFi.localIP());
-}
-
-void setup() {
-  Serial.begin(9600);
-  ConnectWifi(WIFI_SSID, WIFI_PASSWORD);
-
-  display.begin(SSD1306_SWITCHCAPVCC, 0x3C);  // initialize with the I2C addr 0x3C (for the 128x32)
-  display.display();
-
-  stream = fbase.stream("/bitcoin/last");  
 
   Firebase.begin("publicdata-cryptocurrency.firebaseio.com");
   Firebase.stream("/bitcoin/last");