GPSDO: Make sure read_uart() returns only complete strings for all devices.

1 files changed, 12 insertions, 5 deletions

diff --git a/host/lib/usrp/e100/e100_ctrl.cpp b/host/lib/usrp/e100/e100_ctrl.cpp
index cdbbff6dd..3b59a93e1 100644
--- a/host/lib/usrp/e100/e100_ctrl.cpp
+++ b/host/lib/usrp/e100/e100_ctrl.cpp
@@ -232,10 +232,15 @@ public:
 
             //got a character -> process it
             if (ret == 1){
-                const bool flush  = ch == '\n' or ch == '\r';
-                if (flush and line.empty()) continue; //avoid flushing on empty lines
-                line += std::string(1, ch);
-                if (flush) break;
+                if (ch == '\r') continue;
+                if (ch == '\n' and _line.empty()) continue;
+                _line += ch;
+                if (ch == '\n')
+                {
+                    line = _line;
+                    _line.clear();
+                    break;
+                }
             }
 
             //didnt get a character, check the timeout
@@ -251,7 +256,9 @@ public:
         return line;
     }
 
-private: int _node_fd;
+private:
+    int _node_fd;
+    std::string _line;
 };
 
 uhd::uart_iface::sptr e100_ctrl::make_gps_uart_iface(const std::string &node){