Differential D14136 Diff 41236 src/plugins/marlinplugin.cpp

Changeset View

Standalone View

src/plugins/marlinplugin.cpp

Show All 17 Lines		1	/* AtCore KDE Libary for 3D Printers
18	but WITHOUT ANY WARRANTY; without even the implied warranty of	18		but WITHOUT ANY WARRANTY; without even the implied warranty of
19	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	19		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
20	Lesser General Public License for more details.	20		Lesser General Public License for more details.
21		21
22	You should have received a copy of the GNU Lesser General Public	22		You should have received a copy of the GNU Lesser General Public
23	License along with this library. If not, see <http://www.gnu.org/licenses/>.	23		License along with this library. If not, see <http://www.gnu.org/licenses/>.
24	*/	24		*/
25	#include <QLoggingCategory>	25		#include <QLoggingCategory>
		26		#include <QRegularExpression>
26	#include <QString>	27		#include <QString>
27		28
28	#include "marlinplugin.h"	29		#include "marlinplugin.h"
29	#include "atcore.h"	30		#include "atcore.h"
30		31
31	Q_LOGGING_CATEGORY(MARLIN_PLUGIN, "org.kde.atelier.core.firmware.marlin")	32		Q_LOGGING_CATEGORY(MARLIN_PLUGIN, "org.kde.atelier.core.firmware.marlin")
32		33
33	QString MarlinPlugin::name() const	34		QString MarlinPlugin::name() const
34	{	35		{
35	return QStringLiteral("Marlin");	36		return QStringLiteral("Marlin");
36	}	37		}
37		38
38	bool MarlinPlugin::isSdSupported() const	39		bool MarlinPlugin::isSdSupported() const
39	{	40		{
40	return true;	41		return true;
41	}	42		}
42		43
43	MarlinPlugin::MarlinPlugin()	44		MarlinPlugin::MarlinPlugin()
44	{	45		{
45	qCDebug(MARLIN_PLUGIN) << name() << " plugin loaded!";	46		qCDebug(MARLIN_PLUGIN) << name() << " plugin loaded!";
46	}	47		}
47		48
		49		QByteArray MarlinPlugin::translate(const QString &command)
		50		{
		51		//Capture M28 <string>
		52		static const auto marlin_M28RegEx = QRegularExpression(QStringLiteral("M28 \\S+"));
			patrickelectricUnsubmitted Done M280 is a valid gcode. patrickelectric: M280 is a valid gcode.
			rizzitelloAuthorUnsubmitted Done Good point I will change it to a Regex that looks for M28 <string> rizzitello: Good point I will change it to a Regex that looks for M28 <string>
		53		//Capture both M29 and M29 String but not M290
		54		static const auto marlin_M29RegEx = QRegularExpression(QStringLiteral("M29( \\S*)?[^0]"));
		55
		56		QString temp = command;
		57		if (marlin_M28RegEx.match(command).hasMatch()) {
		58		QString filename = temp.mid(4, temp.length());
		59		filename = shortName(filename);
		60		temp = QStringLiteral("M28 %1").arg(filename);
		61
		62		} else if (marlin_M29RegEx.match(command).hasMatch()) {
		63		if (temp.length() > 3) {
		64		//command contains file name
		65		QString filename = temp.mid(4, temp.length());
		66		filename = shortName(filename);
		67		temp = QStringLiteral("M29 %1").arg(filename);
		68		} else {
		69		temp = QStringLiteral("M29");
		70		}
			tcanabravaUnsubmitted Not Done temp = QStringLiteral("M29"); if (temp.length()) { ... temp += " " + filename; } ? tcanabrava: temp = QStringLiteral("M29"); if (temp.length()) { ... temp += " " + filename; } ?
		71		}
		72
		73		return temp.toLocal8Bit();
		74		}
		75
48	void MarlinPlugin::validateCommand(const QString &lastMessage)	76		void MarlinPlugin::validateCommand(const QString &lastMessage)
49	{	77		{
50	if (lastMessage.contains(QStringLiteral("End file list"))) {	78		if (lastMessage.contains(QStringLiteral("End file list"))) {
51	core()->setReadingSdCardList(false);	79		core()->setReadingSdCardList(false);
52	} else if (core()->isReadingSdCardList()) {	80		} else if (core()->isReadingSdCardList()) {
53	// Below is to not add directories	81		// Below is to not add directories
54	if (!lastMessage.endsWith(QChar::fromLatin1('/'))) {	82		if (!lastMessage.endsWith(QChar::fromLatin1('/'))) {
55	QString fileName = lastMessage;	83		QString fileName = lastMessage;
Show All 35 Lines		117	} else {
91	core()->setState(AtCore::IDLE);	119		core()->setState(AtCore::IDLE);
92	}	120		}
93	}	121		}
94	if (lastMessage.contains(QStringLiteral("ok"))) {	122		if (lastMessage.contains(QStringLiteral("ok"))) {
95	emit readyForCommand();	123		emit readyForCommand();
96	}	124		}
97	}	125		}
98	}	126		}
		127
		128		QString MarlinPlugin::shortName(const QString &fileName)
		129		{
		130		//Generate an 8.3 Like FileName.
		131		QString newName;
			tcanabravaUnsubmitted Not Done QLatin1Char('.') ? tcanabrava: QLatin1Char('.') ?
		132		if (fileName.lastIndexOf(QStringLiteral(".") < 9)) {
			patrickelectricUnsubmitted Not Done Check qfileinfo patrickelectric: Check qfileinfo
			rizzitelloAuthorUnsubmitted Not Done This class does not currently include QFileInfo is that lighter then doing this one call? rizzitello: This class does not currently include QFileInfo is that lighter then doing this one call?
			patrickelectricUnsubmitted Done There is at least 3 places to use qfileinfo in this patch. patrickelectric: There is at least 3 places to use qfileinfo in this patch.
			patrickelectricUnsubmitted Done Sorry, about this file, I do see why not, and this will be only be called once. patrickelectric: Sorry, about this file, I do see why not, and this will be only be called once.
		133		newName = fileName.mid(0, fileName.lastIndexOf(QStringLiteral(".")));
		134		} else {
		135		newName = fileName.mid(0, 8);
		136		}
		137		if (newName.length() > 8) {
		138		newName.resize(8);
		139		}
		140		newName = newName.append(fileName.mid(fileName.lastIndexOf(QStringLiteral(".")), 4));
		141		return newName.toUpper();
		142		}