Add base for SerialTransciever.

Getting serial example together

Cleaning up

Changes to make both arduino and tests compile

All existing examples work now.

changes to get SerialHost building

Fixed up Stream example

Fixed up Stream example

Fixes to get FirebaseSerialHost.ino working!

Switch to huzzah module.

All examples are working

Add instructions to example and test files.

unit tests are all working with new changes

Cleanup comments

remove arduino-mock

Revert "remove arduino-mock"

This reverts commit e7aa75f.

remove old arduino-mock

Add modified submodule

Added stream command using simple syntax.

Fixes from testing with serial modem

Author: ed7coyne

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://github.com/google/googletest.git
 [submodule "test/arduino-mock"]
 	path = test/arduino-mock
-	url = https://github.com/ikeyasu/arduino-mock.git
+	url = https://github.com/ed7coyne/arduino-mock.git

FirebaseHttpClient.h

@@ -5,7 +5,7 @@
 #include "Stream.h"
 
 struct HttpStatus {
-  static const int TEMPORARY_REDIRECT = 302;
+  static const int TEMPORARY_REDIRECT = 307;
 };
 
 class FirebaseHttpClient {
@@ -19,7 +19,7 @@ class FirebaseHttpClient {
   virtual void end() = 0;
 
   virtual void addHeader(const String& name, const String& value) = 0;
-  virtual void collectHeaders(const String header_keys[],
+  virtual void collectHeaders(const char* header_keys[],
                               const int header_key_count) = 0;
   virtual String header(const String& name) = 0;
 

FirebaseHttpClient_Esp8266.cpp

@@ -1,8 +1,10 @@
 
 #include "FirebaseHttpClient.h"
-#include <ESP8266HTTPClient.h>
-#include <ESP8266WiFi.h>
+
+// The ordering of these includes matters greatly.
 #include <WiFiClientSecure.h>
+#include <ESP8266WiFi.h>
+#include <ESP8266HTTPClient.h>
 
 // Detect whether stable version of HTTP library is installed instead of
 // master branch and patch in missing status and methods.
@@ -11,13 +13,12 @@
 #define USE_ESP_ARDUINO_CORE_2_0_0
 #endif
 
-
 class FirebaseHttpClientEsp8266 : public FirebaseHttpClient {
  public:
   FirebaseHttpClientEsp8266() {}
 
-  void SetReuseConnection(bool reuse) override {
-    http_.reuse(reuse);
+  void setReuseConnection(bool reuse) override {
+    http_.setReuse(reuse);
   }
 
   void begin(const String& url) override {
@@ -36,16 +37,16 @@ class FirebaseHttpClientEsp8266 : public FirebaseHttpClient {
     http_.addHeader(name, value);
   }
 
-  void collectHeaders(const String[]& header_keys, const int count) override {
+  void collectHeaders(const char* header_keys[], const int count) override {
     http_.collectHeaders(header_keys, count);
   }
 
   String header(const String& name) override {
-    return http_.header(name);
+    return http_.header(name.c_str());
   }
 
   int sendRequest(const String& method, const String& data) override {
-    return http_.sendRequest(method, data);
+    return http_.sendRequest(method.c_str(), (uint8_t*)data.c_str(), data.length());
   }
 
   String getString() override {
@@ -56,19 +57,19 @@ class FirebaseHttpClientEsp8266 : public FirebaseHttpClient {
     return http_.getStreamPtr();
   }
 
-  String errorToStream(int error_code) override {
+  String errorToString(int error_code) override {
 #ifdef USE_ESP_ARDUINO_CORE_2_0_0
-    return  String(status);
+    return  String(error_code);
 #else
-    return HTTPClient::errorToString(status);
+    return HTTPClient::errorToString(error_code);
 #endif
   }
 
  private:
   HTTPClient http_;
 };
 
-Firebase* FirebaseHttpClient::create() {
+FirebaseHttpClient* FirebaseHttpClient::create() {
   return new FirebaseHttpClientEsp8266();
 }
 

SerialTransceiver.cpp

@@ -0,0 +1,61 @@
+#include "SerialTransceiver.h"
+
+namespace firebase {
+namespace modem {
+
+void SerialTransceiver::begin(Stream* serial) {
+  std::unique_ptr<Firebase> fbase;
+
+  in_.reset(new ArduinoInputStream(serial));
+  out_.reset(new ArduinoOutputStream(serial));
+}
+
+void SerialTransceiver::loop() {
+  String command_name = in_->readStringUntil(' ');
+
+  if (command_name.length() == 0 // Generally means a timeout has occured.
+      || command_name == "\n") {
+    return;
+  }
+
+  if (command_name == "BEGIN") {
+    BeginCommand command;
+    if (command.execute(command_name, in_.get(), out_.get())) {
+      fbase_ = std::move(command.firebase());
+    }
+    return;
+  } else if (!fbase_) {
+    in_->drain();
+    out_->println("-FAIL Must call BEGIN before anything else.");
+    return;
+  }
+
+  std::unique_ptr<Command> command = CreateCommand(command_name, fbase_.get());
+  if (!command) {
+    in_->drain();
+    out_->println(String("-FAIL Invalid command '") + command_name + "'." );
+    return;
+  }
+
+  command->execute(command_name, in_.get(), out_.get());
+}
+
+std::unique_ptr<Command> SerialTransceiver::CreateCommand(const String& text,
+                                                          Firebase* fbase) {
+  std::unique_ptr<Command> command;
+  if (text == "GET") {
+    command.reset(new GetCommand(fbase));
+  } else if (text == "SET") {
+    command.reset(new SetCommand(fbase));
+  } else if (text == "PUSH") {
+    command.reset(new PushCommand(fbase));
+  } else if (text == "REMOVE") {
+    command.reset(new RemoveCommand(fbase));
+  } else if (text == "BEGIN_STREAM") {
+    command.reset(new StreamCommand(fbase));
+  }
+  return command;
+}
+
+}  // modem
+}  // firebase

SerialTransceiver.h

@@ -0,0 +1,28 @@
+#ifndef MODEM_SERIAL_TRANSCIEVER_H
+#define MODEM_SERIAL_TRANSCIEVER_H
+
+#include <memory>
+
+#include "Firebase.h"
+#include "modem/commands.h"
+
+namespace firebase {
+namespace modem {
+
+class SerialTransceiver {
+ public:
+  void begin(Stream* serial);
+  void loop();
+
+ private:
+  std::unique_ptr<Command> CreateCommand(const String& name, Firebase* fbase);
+
+  std::unique_ptr<Firebase> fbase_;
+  std::unique_ptr<ArduinoInputStream> in_;
+  std::unique_ptr<ArduinoOutputStream> out_;
+};
+
+}  // modem
+}  // firebase
+
+#endif // MODEM_SERIAL_TRANSCIEVER_H

examples/FirebasePush_ESP8266/FirebasePush_ESP8266.ino

@@ -17,11 +17,14 @@
 // FirebasePush_ESP8266 is a sample that push a new timestamp to firebase
 // on each reset.
 
+#include <ESP8266WiFi.h>
+
 #include <Firebase.h>
 
 // create firebase client.
-Firebase fbase = Firebase("example.firebaseio.com")
-                   .auth("secret_or_token");
+Firebase fbase("example.firebaseio.com")
+	.auth("secret_or_token");
+
 void setup() {
   Serial.begin(9600);
 

examples/FirebaseSerialHost_ESP8266/FirebaseSerialHost_ESP8266.ino

@@ -0,0 +1,67 @@
+//
+// Copyright 2015 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+
+// FirebasePush_ESP8266 is a sample that will start our serial transciever
+// listening on a software port and allow debug over the main serial port.
+//
+// A suggested setup for testing this example would be a USB to TTL cable
+// with the green wire connected to pin 5 and the white wire connected to
+// pin 4 (on the huzzah feather esp8266).
+// First edit begin.txt and put in your host and secret.
+// Then run the following commands to setup the serial port in linux:
+// stty -F /dev/ttyUSB0 9600 raw -echo -echoe -echok
+// Then on one console do:
+// cat /dev/ttyUSB0 &
+// This console will now read all responses from the modem. Then do:
+// cat begin.txt > /dev/ttyUSB0
+// You should see +OK and you can now feed in the other example commmands.
+
+#include <SoftwareSerial.h>
+#include <ESP8266WiFi.h>
+
+#include <Firebase.h>
+#include <SerialTransceiver.h>
+
+SoftwareSerial data_serial(5 /*RX*/, 4/*TX*/);
+firebase::modem::SerialTransceiver transceiver;
+
+void setup() {
+  Serial.begin(9600);
+
+  // connect to wifi.
+  WiFi.begin("SSID", "PASSWORD");
+  Serial.print("connecting");
+  while (WiFi.status() != WL_CONNECTED) {
+    Serial.print(".");
+    delay(500);
+  }
+  Serial.println();
+  Serial.print("connected: ");
+  Serial.println(WiFi.localIP());
+
+  data_serial.begin(9600);
+  while (!data_serial) {
+    Serial.println("Error initilizing serial.");
+    delay(5000);
+  }
+
+  transceiver.begin(&data_serial);
+}
+
+void loop() {
+  transceiver.loop();
+}

examples/FirebaseSerialHost_ESP8266/begin.txt

@@ -0,0 +1,2 @@
+BEGIN $YOUR_HOST $YOUR_SECRET
+

examples/FirebaseSerialHost_ESP8266/begin_stream.txt

@@ -0,0 +1,2 @@
+BEGIN_STREAM /serial/test
+

examples/FirebaseSerialHost_ESP8266/end_stream.txt

@@ -0,0 +1,2 @@
+END_STREAM
+

examples/FirebaseSerialHost_ESP8266/get.txt

@@ -0,0 +1,2 @@
+GET /serial/test
+

examples/FirebaseSerialHost_ESP8266/get_push.txt

@@ -0,0 +1 @@
+GET /serial/push_test

examples/FirebaseSerialHost_ESP8266/push.txt

@@ -0,0 +1 @@
+PUSH /seria/push_test "this is a test string \ "

examples/FirebaseSerialHost_ESP8266/remove.txt

@@ -0,0 +1 @@
+REMOVE /serial/test

examples/FirebaseSerialHost_ESP8266/set.txt

@@ -0,0 +1,2 @@
+SET /serial/test this is a test string \ "
+

examples/FirebaseStream_ESP8266/FirebaseStream_ESP8266.ino

@@ -18,6 +18,7 @@
 // public Firebase and optionally display them on a OLED i2c screen.
 
 #include <Firebase.h>
+#include <ESP8266WiFi.h>
 #include <Adafruit_GFX.h>
 #include <Adafruit_SSD1306.h>
 #include <ArduinoJson.h>
@@ -65,7 +66,7 @@ void loop() {
        Serial.println(event);
        JsonObject& json = buf.parseObject((char*)event.c_str());
        String path = json["path"];
-       float data = json["data"];       
+       float data = json["data"]["last"];       
 
        // TODO(proppy): parse JSON object.
        display.clearDisplay();

modem/begin-command.cc renamed to modem/begin-command.cpp

@@ -17,26 +17,24 @@ bool BeginCommand::execute(const String& command,
   String auth;
 
   String data(in->readLine());
-  // Remove leading ' '.
-  data = data.substring(1);
 
   int space_index = data.indexOf(' ');
   if (space_index == -1) {
     // host only.
     host = data;
   } else {
     // host and auth.
-    host = data.substr(0, space_index);
-    auth = data.substr(space_index + 1);
+    host = data.substring(0, space_index);
+    auth = data.substring(space_index + 1);
   }
 
-  if (host.empty()) {
+  if (host.length() == 0) {
     out->println("-FAIL Missing host");
     return false;
   }
 
   new_firebase_.reset(new Firebase(host));
-  if (!auth.empty()) {
+  if (auth.length() != 0) {
     new_firebase_->auth(auth);
   }
 

modem/commands.h

@@ -66,6 +66,13 @@ class BeginCommand : public Command {
   std::unique_ptr<Firebase> new_firebase_;
 };
 
+class StreamCommand : public Command {
+ public:
+  StreamCommand(Firebase* fbase) : Command(fbase) {}
+
+  bool execute(const String& command, InputStream* in, OutputStream* out);
+};
+
 }  // modem
 }  // firebase