Adding CharSize:8bits fallback to TeleinfoSerial (default is 7bits) (#2388)

* TeleinfoSerial will fallback to CSIZE8 if CSIZE7 fail

- Fallback to 8bits per char instead of 7bits
- Exception catched in ASyncSerial::open to close the port

Author: DenisMartin0

hardware/ASyncSerial.cpp

@@ -98,11 +98,19 @@ void AsyncSerial::open(const std::string& devname, unsigned int baud_rate,
 
     setErrorStatus(true);//If an exception is thrown, error_ remains true
     pimpl->port.open(devname);
-    pimpl->port.set_option(boost::asio::serial_port_base::baud_rate(baud_rate));
-    pimpl->port.set_option(opt_parity);
-    pimpl->port.set_option(opt_csize);
-    pimpl->port.set_option(opt_flow);
-    pimpl->port.set_option(opt_stop);
+	try {
+		pimpl->port.set_option(boost::asio::serial_port_base::baud_rate(baud_rate));
+		pimpl->port.set_option(opt_parity);
+		pimpl->port.set_option(opt_csize);
+		pimpl->port.set_option(opt_flow);
+		pimpl->port.set_option(opt_stop);
+	}
+	catch (...)
+	{
+		_log.Log(LOG_ERROR, "ASyncSerial: Error setting options!");
+		pimpl->port.close();
+		throw;
+	}
 
 	pimpl->io.reset();
 
@@ -125,13 +133,17 @@ void AsyncSerial::openOnlyBaud(const std::string& devname, unsigned int baud_rat
 
 	setErrorStatus(true);//If an exception is thrown, error_ remains true
 	pimpl->port.open(devname);
-	pimpl->port.set_option(boost::asio::serial_port_base::baud_rate(baud_rate));
-/*
-	pimpl->port.set_option(opt_parity);
-	pimpl->port.set_option(opt_csize);
-	pimpl->port.set_option(opt_flow);
-	pimpl->port.set_option(opt_stop);
-*/
+
+	try {
+		pimpl->port.set_option(boost::asio::serial_port_base::baud_rate(baud_rate));
+	}
+	catch (...)
+	{
+		_log.Log(LOG_ERROR, "ASyncSerial: Error setting options!");
+		pimpl->port.close();
+		throw;
+	}
+
 	pimpl->io.reset();
 
 	//This gives some work to the io_service before it is started

hardware/TeleinfoSerial.cpp

@@ -85,22 +85,26 @@ bool CTeleinfoSerial::StartHardware()
 	try
 	{
 		_log.Log(LOG_STATUS, "(%s) Teleinfo device uses serial port: %s at %i bauds", Name.c_str(), m_szSerialPort.c_str(), m_iBaudRate);
-		open(
-			m_szSerialPort,
-			m_iBaudRate,
-			m_iOptParity,
-			m_iOptCsize
-			);
+		open(m_szSerialPort, m_iBaudRate, m_iOptParity, m_iOptCsize);
 	}
 	catch (boost::exception & e)
 	{
-		_log.Log(LOG_ERROR, "Teleinfo: Error opening serial port!");
-		#ifdef DEBUG_TeleinfoSerial
+		
+#ifdef DEBUG_TeleinfoSerial
 		_log.Log(LOG_ERROR, "-----------------\n%s\n-----------------", boost::diagnostic_information(e).c_str());
-		#else
+#else
 		(void)e;
-		#endif
-		return false;
+#endif
+		_log.Log(LOG_STATUS, "Teleinfo: Serial port open failed, let's retry with CharSize:8 ...");
+
+		try	{
+			open(m_szSerialPort,m_iBaudRate,m_iOptParity,boost::asio::serial_port_base::character_size(8));
+			_log.Log(LOG_STATUS, "Teleinfo: Serial port open successfully with CharSize:8 ...");
+		}
+		catch (...) {
+			_log.Log(LOG_ERROR, "Teleinfo: Error opening serial port, even with CharSize:8 !");
+			return false;
+		}
 	}
 	catch (...)
 	{