Differential D18584 Diff 50437 src/core/temperature.cpp

Changeset View

Standalone View

src/core/temperature.cpp

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Line(s)		35	struct Temperature::TemperaturePrivate {
46	/** Regex to capture Bed Target Temperature: Find B:## /## and grab the second set of numbers */	46		/** Regex to capture Bed Target Temperature: Find B:## /## and grab the second set of numbers */
47	static const QRegularExpression targetBedRegEx;	47		static const QRegularExpression targetBedRegEx;
48	/** Regex to capture Extruder Target Temperature Finds T:## /## and grabs the second set of numbers */	48		/** Regex to capture Extruder Target Temperature Finds T:## /## and grabs the second set of numbers */
49	static const QRegularExpression targetTempRegEx;	49		static const QRegularExpression targetTempRegEx;
50	/** Regex to capture Extruder Temperature Grabs "T: to next space" */	50		/** Regex to capture Extruder Temperature Grabs "T: to next space" */
51	static const QRegularExpression tempRegEx;	51		static const QRegularExpression tempRegEx;
52	};	52		};
53		53
54	const QRegularExpression Temperature::TemperaturePrivate::bedRegEx = QRegularExpression(QStringLiteral(R"(B:(?<bed>\d+\.\d*))"));	54		const QRegularExpression Temperature::TemperaturePrivate::bedRegEx = QRegularExpression(QStringLiteral(R"(B:(?<bed>\d+\.?\d*))"));
55	const QRegularExpression Temperature::TemperaturePrivate::targetBedRegEx = QRegularExpression(QStringLiteral(R"(B:[^\/]\/(?<bedTarget>\d+\.?\d))"));	55		const QRegularExpression Temperature::TemperaturePrivate::targetBedRegEx = QRegularExpression(QStringLiteral(R"(B:[^\/]\/(?<bedTarget>\d+\.?\d))"));
56	const QRegularExpression Temperature::TemperaturePrivate::targetTempRegEx = QRegularExpression(QStringLiteral(R"(T:[^\/]\/(?<extruderTarget>\d+\.?\d))"));	56		const QRegularExpression Temperature::TemperaturePrivate::targetTempRegEx = QRegularExpression(QStringLiteral(R"(T:[^\/]\/(?<extruderTarget>\d+\.?\d))"));
57	const QRegularExpression Temperature::TemperaturePrivate::tempRegEx = QRegularExpression(QStringLiteral(R"(T:(?<extruder>\d+\.\d*))"));	57		const QRegularExpression Temperature::TemperaturePrivate::tempRegEx = QRegularExpression(QStringLiteral(R"(T:(?<extruder>\d+\.?\d*))"));
58		58
59	Temperature::Temperature(QObject *parent)	59		Temperature::Temperature(QObject *parent)
60	: QObject(parent)	60		: QObject(parent)
61	, d(new TemperaturePrivate)	61		, d(new TemperaturePrivate)
62	{	62		{
63	}	63		}
64		64
65	float Temperature::bedTargetTemperature() const	65		float Temperature::bedTargetTemperature() const
▲ Show 20 Lines • Show All 70 Lines • Show Last 20 Lines