Merge pull request #51 from proppy/new-json

example/stream: use ArduinoJson
LGTM as well

Author: ed7coyne

Firebase.cpp

@@ -65,8 +65,8 @@ FirebaseStream Firebase::stream(const String& path) {
 
 // FirebaseCall
 FirebaseCall::FirebaseCall(const String& host, const String& auth,
-			   const char* method, const String& path,
-			   const String& data, HTTPClient* http) : http_(http) {
+                           const char* method, const String& path,
+                           const String& data, HTTPClient* http) : http_(http) {
   String url = makeFirebaseURL(path, auth);
   http_->setReuse(true);
   http_->begin(host, kFirebasePort, url, true, kFirebaseFingerprint);
@@ -109,8 +109,8 @@ FirebaseCall::FirebaseCall(const String& host, const String& auth,
 
 // FirebaseGet
 FirebaseGet::FirebaseGet(const String& host, const String& auth,
-			 const String& path,
-			 HTTPClient* http)
+                         const String& path,
+                         HTTPClient* http)
   : FirebaseCall(host, auth, "GET", path, "", http) {
 
   if (!error()) {
@@ -132,8 +132,8 @@ FirebaseSet::FirebaseSet(const String& host, const String& auth,
 }
 // FirebasePush
 FirebasePush::FirebasePush(const String& host, const String& auth,
-			   const String& path, const String& value,
-			   HTTPClient* http)
+                           const String& path, const String& value,
+                           HTTPClient* http)
   : FirebaseCall(host, auth, "POST", path, value, http) {
   if (!error()) {
     // TODO: parse name
@@ -143,15 +143,15 @@ FirebasePush::FirebasePush(const String& host, const String& auth,
 
 // FirebasePush
 FirebaseRemove::FirebaseRemove(const String& host, const String& auth,
-			       const String& path,
-			       HTTPClient* http)
+                               const String& path,
+                               HTTPClient* http)
   : FirebaseCall(host, auth, "DELETE", path, "", http) {
 }
 
 // FirebaseStream
 FirebaseStream::FirebaseStream(const String& host, const String& auth,
-			       const String& path,
-			       HTTPClient* http)
+                               const String& path,
+                               HTTPClient* http)
   : FirebaseCall(host, auth, "STREAM", path, "", http) {
 }
 

Firebase.h

@@ -75,9 +75,9 @@ class FirebaseCall {
  public:
   FirebaseCall() {}
   FirebaseCall(const String& host, const String& auth,
-	       const char* method, const String& path,
-	       const String& data = "",	       
-	       HTTPClient* http = NULL);
+               const char* method, const String& path,
+               const String& data = "",        
+               HTTPClient* http = NULL);
   const FirebaseError& error() const {
     return error_;
   }
@@ -94,7 +94,7 @@ class FirebaseGet : public FirebaseCall {
  public:
   FirebaseGet() {}
   FirebaseGet(const String& host, const String& auth,
-	      const String& path, HTTPClient* http = NULL);
+              const String& path, HTTPClient* http = NULL);
 
   const String& json() const {
     return json_;
@@ -122,7 +122,7 @@ class FirebasePush : public FirebaseCall {
  public:
   FirebasePush() {}
   FirebasePush(const String& host, const String& auth,
-	       const String& path, const String& value, HTTPClient* http = NULL);
+               const String& path, const String& value, HTTPClient* http = NULL);
 
   const String& name() const {
     return name_;
@@ -136,15 +136,15 @@ class FirebaseRemove : public FirebaseCall {
  public:
   FirebaseRemove() {}
   FirebaseRemove(const String& host, const String& auth,
-		 const String& path, HTTPClient* http = NULL);
+                 const String& path, HTTPClient* http = NULL);
 };
 
 
 class FirebaseStream : public FirebaseCall {
  public:
   FirebaseStream() {}
   FirebaseStream(const String& host, const String& auth,
-		 const String& path, HTTPClient* http = NULL);
+                 const String& path, HTTPClient* http = NULL);
 
   // Return if there is any event available to read.
   bool available();

examples/FirebaseStream_ESP8266/FirebaseStream_ESP8266.ino

@@ -20,6 +20,7 @@
 #include <Firebase.h>
 #include <Adafruit_GFX.h>
 #include <Adafruit_SSD1306.h>
+#include <ArduinoJson.h>
 
 #define OLED_RESET 10
 Adafruit_SSD1306 display(OLED_RESET);
@@ -47,7 +48,7 @@ void setup() {
 }
 
 
-void loop() {  
+void loop() {
   if (stream.error()) {
     Serial.println("streaming error");
     Serial.println(stream.error().message());
@@ -58,16 +59,21 @@ void loop() {
      auto type = stream.read(event);
      Serial.print("event: ");
      Serial.println(type);
-     if (type != FirebaseStream::Event::UNKNOWN) {
+     if (type == FirebaseStream::Event::PUT) {
+       StaticJsonBuffer<200> buf;
        Serial.print("data: ");
        Serial.println(event);
+       JsonObject& json = buf.parseObject((char*)event.c_str());
+       String path = json["path"];
+       float data = json["data"];       
 
        // TODO(proppy): parse JSON object.
        display.clearDisplay();
-       display.setTextSize(1);
+       display.setTextSize(2);
        display.setTextColor(WHITE);
        display.setCursor(0,0);
-       display.println(event);
+       display.println(path.c_str()+1);
+       display.println(data);
        display.display();
      }
   }