Changeset View

Standalone View

Context not available.
51	}	51	}
52	}	52	}
53		53
54	QByteArray GrblPlugin::translate(const QString &command)	54	QByteArray GrblPlugin::translate(QString command)
55	{	55	{
56	QString temp = command;	56	return command.append(QStringLiteral("\n")).toLocal8Bit();
57	//Match all G and M commands followed by one or more digits up to and include the space,
	rizzitelloUnsubmitted Not Done Is this code retained somewhere or does the reading behavior change where this is no longer needed to correctly send lines made of a few commands? If not why are we removing it? rizzitello: Is this code retained somewhere or does the reading behavior change where this is no longer…
58	//if thats followed by a letter capture any non G or M starting text
59	//else just grab the digits that follow.
60	//ex: G28 X Y M1 would capture "G28 X Y" and "M1"
61	static const auto regEx = QRegularExpression(QStringLiteral("[GM]\\d+.(?(?=\\D)[^GM]+\|\\d+)?"));
62
63	QRegularExpressionMatch secondCommand = regEx.match(temp, 1);
64
65	if (secondCommand.hasMatch()) {
66	QRegularExpressionMatchIterator commandMatch = regEx.globalMatch(temp);
67	temp.clear();
68	while (commandMatch.hasNext()) {
69	QRegularExpressionMatch t = commandMatch.next();
70	temp.append(t.captured().simplified());
71	if (commandMatch.hasNext()) {
72	temp.append(QStringLiteral("\r\n"));
73	}
74	}
75	}
76	return temp.toLocal8Bit();
77	}	57	}
Context not available.