Merge pull request #119 from ed7coyne/fix-connection-bp

#define standard variables for wifi and firebase and check to ensure all examples conform

Author: proppy

.travis.yml

@@ -32,3 +32,4 @@ script:
 - ${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/FirebaseRoom_ESP8266/FirebaseRoom_ESP8266.ino
 - ( cd test && make check )
 - ( cd test/modem/ && make test )
+- test/travis/check_all_examples_use_standard_init.sh

examples/FirebaseDemo_ESP8266/FirebaseDemo_ESP8266.ino

@@ -20,11 +20,17 @@
 #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"
+
 void setup() {
   Serial.begin(9600);
 
   // connect to wifi.
-  WiFi.begin("SSID", "PASSWORD");
+  WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
   Serial.print("connecting");
   while (WiFi.status() != WL_CONNECTED) {
     Serial.print(".");
@@ -34,7 +40,7 @@ void setup() {
   Serial.print("connected: ");
   Serial.println(WiFi.localIP());
 
-  Firebase.begin("example.firebaseio.com", "token_or_secret");
+  Firebase.begin(FIREBASE_HOST, FIREBASE_AUTH);
 }
 
 int n = 0;

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;
@@ -40,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(".");
@@ -50,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,14 +36,18 @@
 #include <Firebase.h>
 #include <SerialTransceiver.h>
 
+// Set these to run example.
+#define WIFI_SSID "SSID"
+#define WIFI_PASSWORD "PASSWORD"
+
 SoftwareSerial data_serial(5 /*RX*/, 4/*TX*/);
 firebase::modem::SerialTransceiver transceiver;
 
 void setup() {
   Serial.begin(9600);
 
   // connect to wifi.
-  WiFi.begin("SSID", "PASSWORD");
+  WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
   Serial.print("connecting");
   while (WiFi.status() != WL_CONNECTED) {
     Serial.print(".");

examples/FirebaseStream_ESP8266/FirebaseStream_ESP8266.ino

@@ -22,6 +22,10 @@
 #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);
 
@@ -32,7 +36,7 @@ void setup() {
   display.display();
 
   // connect to wifi.
-  WiFi.begin("SSID", "PASSWORD");
+  WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
   Serial.print("connecting");
   while (WiFi.status() != WL_CONNECTED) {
     Serial.print(".");

examples/Firebase_ESP8266_LEDs/Firebase_ESP8266_Neopixel/Firebase_ESP8266_Neopixel.ino

@@ -22,11 +22,17 @@
 #include <Adafruit_NeoPixel.h>
 #include "colors_ext.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 PIN=13;
 Adafruit_NeoPixel strip = Adafruit_NeoPixel(32, PIN, NEO_GRB + NEO_KHZ800);
 
 // TODO: Replace with your own credentials and keep these safe.
-Firebase fbase = Firebase("YOUR-PROJECT.firebaseio.com", "YOUR_AUTH_SECRET");
+Firebase fbase = Firebase(FIREBASE_HOST, FIREBASE_AUTH);
 
 void setup() {
   Serial.begin(9600);
@@ -39,7 +45,7 @@ void setup() {
   colorWipe(&strip, 0xFF0000, 50);
 
   // connect to wifi.
-  WiFi.begin("GoogleGuest", "");
+  WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
   Serial.print("connecting");
 
   int count = 0;

test/travis/check_all_examples_use_standard_init.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+FBASE_SNIPPET=test/travis/firebase_init.cc.snip
+FBASE_NOAUTH_SNIPPET=test/travis/no_firebase_init.cc.snip
+for example in `find examples/ -name *.ino`;
+do
+  echo $example;
+  (xxd -p $example | tr -d '\n' | grep -q `xxd -p $FBASE_SNIPPET | tr -d '\n'`) ||
+  (xxd -p $example | tr -d '\n' | grep -q `xxd -p $FBASE_NOAUTH_SNIPPET | tr -d '\n'`) ||
+  if [ $? -ne 0 ];
+  then
+    echo $example does not contain standard defined in test/travis/*_init.cc.snip.
+    exit 1;
+  fi;
+done;

test/travis/firebase_init.cc.snip

@@ -0,0 +1,5 @@
+// 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"

test/travis/no_firebase_init.cc.snip

@@ -0,0 +1,3 @@
+// Set these to run example.
+#define WIFI_SSID "SSID"
+#define WIFI_PASSWORD "PASSWORD"