gibberich removed once and for all by discarding first non blocking r…

…ead issue #2 solved
HomeSmartMesh · Oct 6, 2016 · d794955 · d794955
1 parent 0bdf90d
commit d794955
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/ws05_IoT_Mobile_Node/spr01_UART_Server/help.txt b/ws05_IoT_Mobile_Node/spr01_UART_Server/help.txt
@@ -13,7 +13,7 @@ Parameters:
   Optionnal
   e.g 'logfile=logfile.txt'
 
-- logcmd: e.g 'logcmd=1'
+- logout: e.g 'logcmd=1'
   Optional
 
 - configfile:

diff --git a/ws05_IoT_Mobile_Node/spr01_UART_Server/main.cpp b/ws05_IoT_Mobile_Node/spr01_UART_Server/main.cpp
@@ -49,6 +49,15 @@ int main( int argc, char** argv )
 		std::cout << "logfile = " << conf["logfile"] << std::endl;
 		ser.start_logfile(conf["logfile"]);
 	}
+	if(utl::exists(conf,"logout"))
+	{
+		std::cout << "logout = " << conf["logout"] << std::endl;
+		ser.isLogOut = true;//by default
+		if(conf["logout"] == "0")
+		{
+			ser.isLogOut = false;
+		}
+	}
 	if(utl::exists(conf,"port"))
 	{
 		std::cout << "port = " << conf["port"] << std::endl;
@@ -63,11 +72,11 @@ int main( int argc, char** argv )
 
 
 
-	//std::cout << MAGENTA << "Colored " << CYAN << "Text" << RESET << std::endl;
+	//discard first trash buffer if available right after opening the port
+	ser.update();
 
 	while (1) 
 	{
-		//display Received log
 		if(ser.update())
 		{
 			ser.logBuffer();

diff --git a/ws05_IoT_Mobile_Node/spr01_UART_Server/serial.cpp b/ws05_IoT_Mobile_Node/spr01_UART_Server/serial.cpp
@@ -105,6 +105,10 @@ void Serial::start_logfile(std::string fileName)
 void Serial::start(std::string port_name,bool s_500)
 {
 	std::string strlog;
+
+	isLogFile = true;
+	isLogOut = true;
+
 	fd = open (port_name.c_str(), O_RDWR | O_NOCTTY | O_SYNC);
 	if (fd >= 0)
 	{

diff --git a/ws05_IoT_Mobile_Node/spr01_UART_Server/serial.hpp b/ws05_IoT_Mobile_Node/spr01_UART_Server/serial.hpp
@@ -24,6 +24,8 @@ class Serial
 public:
 	std::string 	Name;
 	std::ofstream 	logfile;
+	bool			isLogFile;
+	bool			isLogOut;
 public:
 	void start(std::string port_name,bool s_500 = false);
 	void start_logfile(std::string fileName);