Fixes to get FirebaseSerialHost.ino working!

Author: ed7coyne

SerialTransceiver.cpp

@@ -6,17 +6,15 @@ namespace modem {
 void SerialTransceiver::begin(Stream* serial) {
   std::unique_ptr<Firebase> fbase;
 
-  // Timeout in 5min of waiting for serial.
-  serial->setTimeout(300000);
-
   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.
+
+  if (command_name.length() == 0 // Generally means a timeout has occured.
+      && command_name != '\n') {
     return;
   }
 
@@ -25,6 +23,7 @@ void SerialTransceiver::loop() {
     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.");
@@ -56,6 +55,5 @@ std::unique_ptr<Command> SerialTransceiver::CreateCommand(const String& text,
   return command;
 }
 
-
 }  // modem
 }  // firebase

modem/begin-command.cpp

@@ -17,8 +17,6 @@ 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) {
@@ -30,7 +28,7 @@ bool BeginCommand::execute(const String& command,
     auth = data.substring(space_index + 1);
   }
 
-  if (host.length() != 0) {
+  if (host.length() == 0) {
     out->println("-FAIL Missing host");
     return false;
   }

modem/input-stream.h

@@ -9,6 +9,7 @@ namespace modem {
 class InputStream {
  public:
   virtual String readLine() = 0;
+  // This call consumes the terminator.
   virtual String readStringUntil(const char terminator) = 0;
   virtual void drain() = 0;
 };
@@ -17,16 +18,9 @@ class ArduinoInputStream : public InputStream {
  public:
   ArduinoInputStream(Stream* stream) : stream_(stream) {}
   String readLine() {
-    String out = stream_->readStringUntil('\r');
-    if (stream_->peek() == '\n') {
-      // This should be a '\n' so drop it.
-      stream_->read();
-    } else {
-      // Add \r back, this is not our endline.
-      out += '\r';
-
-      // Recurse until \r\n
-      out += readLine();
+    String out = stream_->readStringUntil('\n');
+    if (out[out.length()-1] == '\r') {
+      out.remove(out.length()-1);
     }
     return out;
   }

modem/test/push-command_test.cc

@@ -20,7 +20,7 @@ class PushCommandTest : public ::testing::Test {
   }
 
   void FeedCommand(const String& path, const String& data) {
-    const String data_fragment(String(" ") + data);
+    const String data_fragment(data);
     EXPECT_CALL(in_, readStringUntil(' '))
         .WillOnce(Return(path));
     EXPECT_CALL(in_, readLine())

modem/test/set-command_test.cc

@@ -20,7 +20,7 @@ class SetCommandTest : public ::testing::Test {
   }
 
   void FeedCommand(const String& path, const String& data) {
-    const String data_fragment(String(" ") + data);
+    const String data_fragment(data);
     EXPECT_CALL(in_, readStringUntil(' '))
         .WillOnce(Return(path));
     EXPECT_CALL(in_, readLine())