Code cleanup

Author: feer9

eeprom_programmer_PC/eeprom-programmer.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 6.0.2, 2022-03-27T20:57:38. -->
+<!-- Written by QtCreator 6.0.2, 2022-03-27T21:54:08. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -244,6 +244,7 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/run/media/Datos/git/eeprom-programmer/eeprom_programmer_PC/eeprom-programmer.pro</value>
     <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/run/media/Datos/git/eeprom-programmer/eeprom_programmer_PC/eeprom-programmer.pro</value>
+    <value type="QString" key="RunConfiguration.Arguments">24LC64 -r</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
     <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>

eeprom_programmer_PC/src/main.cpp

@@ -36,13 +36,14 @@ int main(int argc, char *argv[])
 
 	App app(argc, argv);
 
-#ifdef __unix
+#ifdef Q_OS_UNIX
 	// https://github.com/sijk/qt-unix-signals
 	UnixSignalWatcher sigwatch;
 	sigwatch.watchForSignal(SIGINT);
 	sigwatch.watchForSignal(SIGTERM);
 	QObject::connect(&sigwatch, SIGNAL(unixSignal(int)), &app, SLOT(quit()));	
 #endif
+
 	return app.exec();
 }
 

eeprom_programmer_PC/src/memorycomm.cpp

@@ -76,16 +76,16 @@ void MemoryComm::handleAppQuit()
 	if(m_serialPort.isOpen()) {
 		qDebug() << "SerialPort connected. Sending CMD_DISCONNECT...";
 		sendCommand(CMD_DISCONNECT);
-		while( m_serialPortWriter.busy() == true
-			&& m_serialPort.waitForBytesWritten(5000) != false);
+		while(m_serialPortWriter.busy() == true)
+			if(m_serialPort.waitForBytesWritten(100) == false)
+				break;
 		// TODO: this doesn't seems to return on time on linux.
 		// Nor does the signal bytesWritten get emmited.
 		m_serialPort.close();
 	}
 	else {
 		qDebug() << "SerialPort not connected.";
 	}
-//	MemoryComm::quit();
 }
 
 #ifdef _WIN32

eeprom_programmer_PC/src/serialportwriter.cpp

@@ -43,49 +43,6 @@ void SerialPortWriter::handleError(QSerialPort::SerialPortError serialPortError)
 	}
 }
 
-/*void SerialPortWriter::finishTxXfer(int status)
-{
-	m_busy = false;
-	m_tries = 0;
-	emit txXferComplete(status);
-}*/
-
-/*void SerialPortWriter::transmitNextPackage()
-{
-	m_tries = 0;
-	m_bytesRemaining -= PKG_DATA_MAX;
-
-	if (m_bytesRemaining == 0)
-	{
-		finishTxXfer(CMD_TXRX_ACK);
-	}
-	else
-	{
-		int pos = m_data.size() - m_bytesRemaining;
-		m_packageData = m_data.mid(pos, PKG_DATA_MAX);
-		sendPackage();
-	}
-}
-
-void SerialPortWriter::targetRxError()
-{
-	if(++m_tries < 3)
-		sendPackage();
-//		send(m_cmd, m_data);
-
-	else
-		finishTxXfer(CMD_TXRX_ERR);
-}
-
-void SerialPortWriter::handleTargetReportRxStatus(int status)
-{
-	if(status == CMD_TXRX_ACK)
-		transmitNextPackage();
-
-	else
-		targetRxError();
-}*/
-
 // QSerialPort callback from signal bytesWritten
 void SerialPortWriter::handleBytesWritten(qint64 bytes)
 {
@@ -155,6 +112,7 @@ qint64 SerialPortWriter::send(commands_e cmd, const QByteArray &data) {
 		m_packageData = data.left(PKG_DATA_MAX);
 		m_bytesRemaining = data.size();
 	}
+	m_packageBytesWritten = 0;
 
 	return sendPackage();
 }

eeprom_programmer_PC/src/serialportwriter.h

@@ -50,7 +50,6 @@ private slots:
 
 	QTextStream m_standardOutput;
 	QSerialPort *m_serialPort = nullptr;
-	SerialPortReader *m_serialPortReader = nullptr;
 	QTimer m_timer;
 
 	QByteArray m_package;				/* current package with command, data, chksum... */