Differential D16181 Diff 43556 src/core/seriallayer.cpp

Changeset View

Standalone View

src/core/seriallayer.cpp

Context not available.
31		31
32	namespace	32		namespace
33	{	33		{
34	QByteArray _return = QByteArray("\r");
35	QByteArray _newLine = QByteArray("\n");
36	QByteArray _newLineReturn = QByteArray("\n\r");
37	QStringList _validBaudRates = {	34		QStringList _validBaudRates = {
38	QStringLiteral("9600"),	35		QStringLiteral("9600"),
39	QStringLiteral("14400"),	36		QStringLiteral("14400"),
Context not available.
58	public:	55		public:
59	bool _serialOpened; //!< @param _serialOpened: is serial port opened	56		bool _serialOpened; //!< @param _serialOpened: is serial port opened
60	QSerialPort::SerialPortError _lastError; //!< @param _lastError: the last reported error	57		QSerialPort::SerialPortError _lastError; //!< @param _lastError: the last reported error
61	QByteArray _rawData; //!< @param _rawData: the raw serial data
62	QVector<QByteArray> _rByteCommands; //!< @param _rByteCommand: received Messages
63	QVector<QByteArray> _sByteCommands; //!< @param _sByteCommand: sent Messages	58		QVector<QByteArray> _sByteCommands; //!< @param _sByteCommand: sent Messages
64	};	59		};
65		60
Context not available.
77		72
78	void SerialLayer::readAllData()	73		void SerialLayer::readAllData()
79	{	74		{
80	d->_rawData.append(readAll());	75		// Some firmwares can return \n, \r, \n\r or \r\n
81		76		QStringList tempList = QString::fromLatin1(readAll()).split(QRegExp(QStringLiteral("(\\n\|\\r)")));
82	//Remove any \r in the string, then split by \n.	77		for (const auto& command : tempList) {
83	//This removes any trailing \r or \n from the commands	78		// Remove empty strings if there is any
84	// Proper line endings are added when the command is pushed.	79		if(!command.isEmpty()) {
85	d->_rawData = d->_rawData.replace(_return, QByteArray());	80		emit receivedCommand(command.toLocal8Bit());
86
87	QList<QByteArray> tempList = d->_rawData.split(_newLine.at(0));
88	for (auto i = tempList.begin(); i != tempList.end(); ++i) {
89	// Get finished line to _byteCommands
90	if (i < tempList.end() - 1) {
91	d->_rByteCommands.append(*i);
92	emit receivedCommand(*i);
93	} else {
94	d->_rawData.clear();
95	d->_rawData.append(*i);
96	}	81		}
97	}	82		}
98	}	83		}
			tcanabravaUnsubmitted Not Done qAsConst(tempList) or create the QStringList as const. tcanabrava: qAsConst(tempList) or create the QStringList as const.
Context not available.
111		96
112	void SerialLayer::pushCommand(const QByteArray &comm)	97		void SerialLayer::pushCommand(const QByteArray &comm)
113	{	98		{
114	pushCommand(comm, _newLineReturn);	99		pushCommand(comm);
115	}	100		}
116		101
117	void SerialLayer::add(const QByteArray &comm, const QByteArray &term)	102		void SerialLayer::add(const QByteArray &comm, const QByteArray &term)
Context not available.
122		107
123	void SerialLayer::add(const QByteArray &comm)	108		void SerialLayer::add(const QByteArray &comm)
124	{	109		{
125	add(comm, _newLineReturn);	110		add(comm);
126	}	111		}
127		112
128	void SerialLayer::push()	113		void SerialLayer::push()
Context not available.
138	d->_sByteCommands.clear();	123		d->_sByteCommands.clear();
139	}	124		}
140		125
141	bool SerialLayer::commandAvailable() const
142	{
143	return !d->_rByteCommands.isEmpty();
144	}
145
146	QStringList SerialLayer::validBaudRates() const	126		QStringList SerialLayer::validBaudRates() const
147	{	127		{
148	return _validBaudRates;	128		return _validBaudRates;
Context not available.