Differential D18586 Diff 50788 src/core/temperature.cpp

Changeset View

Standalone View

View Options

src/core/temperature.cpp

Show All 27 Lines
28#include "temperature.h" 28​#include "temperature.h"
29/** 29​/**
30 * @brief The TemperaturePrivate class 30​ * @brief The TemperaturePrivate class
31 * 31​ *
32 * Private Data of Temperature 32​ * Private Data of Temperature
33 */ 33​ */
34 34​
35struct Temperature::TemperaturePrivate { 35​struct Temperature::TemperaturePrivate {
36 /** Regex to capture Bed Temperature grabs : B: to the next space */ 36​ /** Regex to capture Bed Temperature. Looks for B: then grabs ##.## */
37 static const QRegularExpression bedRegEx; 37​ static const QRegularExpression bedRegEx;
38 /** bedTemp: Bed current temperature */ 38​ /** bedTemp: Bed current temperature */
39 float bedTemp = 0.0; 39​ float bedTemp = 0.0;
40 /** bedTargetTemp: Bed target temperature */ 40​ /** bedTargetTemp: Bed target temperature */
41 float bedTargetTemp = 0.0; 41​ float bedTargetTemp = 0.0;
42 /** extruderTemp: Extruder current temperature */ 42​ /** extruderTemp: Extruder current temperature */
43 float extruderTemp = 0.0; 43​ float extruderTemp = 0.0;
44 /** extruderTargetTemp: Extruder target temperature */ 44​ /** extruderTargetTemp: Extruder target temperature */
45 float extruderTargetTemp = 0.0; 45​ float extruderTargetTemp = 0.0;
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. Looks for T: then grabs ##.## */
51 static const QRegularExpression tempRegEx; 51​ static const QRegularExpression tempRegEx;
52}; 52​};
53 53​
54const QRegularExpression Temperature::TemperaturePrivate::bedRegEx = QRegularExpression(QStringLiteral(R"(B:(?<bed>\d+\.\d*))")); 54​/**
55​ * @brief Temperature::TemperaturePrivate::bedRegEx
56​ * Look for B: capture Any int or float as "bed"
57​ * Examples:
58​ * B: 25.0/50.0 (Captures 25.0)
59​ * B: 25/50 (Captures 25)
60​ */
61​const QRegularExpression Temperature::TemperaturePrivate::bedRegEx = QRegularExpression(QStringLiteral(R"(B:(?<bed>\d+\.?\d*))"));
62​
63​/**
64​ * @brief Temperature::TemperaturePrivate::targetBedRegEx
65​ * Look for B: [anything ] /. Capture any int or float after the '/' as "bedTarget"
66​ * Examples:
67​ * B: 25.0 /50.0 (Captures 50.0)
68​ * B: 25/50 (Captures 50)
69​ */
55const QRegularExpression Temperature::TemperaturePrivate::targetBedRegEx = QRegularExpression(QStringLiteral(R"(B:[^\/]*\/(?<bedTarget>\d+\.?\d*))")); 70​const QRegularExpression Temperature::TemperaturePrivate::targetBedRegEx = QRegularExpression(QStringLiteral(R"(B:[^\/]*\/(?<bedTarget>\d+\.?\d*))"));
71​
72​/**
73​ * @brief Temperature::TemperaturePrivate::targetTempRegEx
74​ * Look for T: [anything ] /. Capture any int or float after the '/' as "extruderTarget"
75​ * Examples:
76​ * T: 25.0 /50.0 (Captures 50.0)
77​ * T: 25/50 (Captures 50)
78​ */
56const QRegularExpression Temperature::TemperaturePrivate::targetTempRegEx = QRegularExpression(QStringLiteral(R"(T:[^\/]*\/(?<extruderTarget>\d+\.?\d*))")); 79​const QRegularExpression Temperature::TemperaturePrivate::targetTempRegEx = QRegularExpression(QStringLiteral(R"(T:[^\/]*\/(?<extruderTarget>\d+\.?\d*))"));
57const QRegularExpression Temperature::TemperaturePrivate::tempRegEx = QRegularExpression(QStringLiteral(R"(T:(?<extruder>\d+\.\d*))")); 80​
81​/**
82​ * @brief Temperature::TemperaturePrivate::tempRegEx
83​ * Look for T: capture Any int or float as "extruder"
84​ * Examples:
85​ * T: 25.0 /50 (Captures 25.0)
86​ * T: 25/50 (Captures 25)
87​ */
88​const QRegularExpression Temperature::TemperaturePrivate::tempRegEx = QRegularExpression(QStringLiteral(R"(T:(?<extruder>\d+\.?\d*))"));
patrickelectricUnsubmitted
Done

Can we put examples of this both regex ?

patrickelectric: Can we put examples of this both regex ?
58 89​
59Temperature::Temperature(QObject *parent) 90​Temperature::Temperature(QObject *parent)
60 : QObject(parent) 91​ : QObject(parent)
61 , d(new TemperaturePrivate) 92​ , d(new TemperaturePrivate)
62{ 93​{
63} 94​}
64 95​
65float Temperature::bedTargetTemperature() const 96​float Temperature::bedTargetTemperature() const
▲ Show 20 Lines • Show All 70 Lines • Show Last 20 Lines