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