[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [atcore] src/plugins: Merge branch 'arcpatch-D4844'
From: Chris Rizzitello <null () kde ! org>
Date: 2017-03-01 1:45:04
Message-ID: E1citKC-0008F2-HZ () code ! kde ! org
[Download RAW message or body]
Git commit 61f3b922593064f14ca090e7a2e0d328856363d6 by Chris Rizzitello.
Committed on 01/03/2017 at 01:44.
Pushed by rizzitello into branch 'master'.
Merge branch 'arcpatch-D4844'
M +33 -14 src/plugins/marlinplugin.cpp
M +4 -0 src/plugins/marlinplugin.h
https://commits.kde.org/atcore/61f3b922593064f14ca090e7a2e0d328856363d6
diff --cc src/plugins/marlinplugin.cpp
index e94ced2,060501e..636bbe5
--- a/src/plugins/marlinplugin.cpp
+++ b/src/plugins/marlinplugin.cpp
@@@ -40,25 -50,40 +49,35 @@@ MarlinPlugin::MarlinPlugin()
qCDebug(MARLIN_PLUGIN) << name() << " plugin loaded!";
}
-bool MarlinPlugin::idleWait() const
-{
- return false;
-}
-
void MarlinPlugin::extractTemp(const QString &lastMessage)
{
- // ok T:185.4 /185.0 B:60.5 /60.0
QStringList list = lastMessage.split(QChar::fromLatin1(' '));
if (list.length() < 5) {
- // list don't have all neccessary data
- return;
- }
- // T:185.4 - current temperature
- core()->temperature().setExtruderTemperature(list[1].mid(2).toFloat());
+ // T:151.10 E:0 B:63.2
+ // T:142.6 E:0 W:?
- // /185.0 - target temperature
- core()->temperature().setExtruderTargetTemperature(list[2].mid(1).toFloat());
+ if (list[0].indexOf(_extruderTemp) == 0) {
+ _lastExtruderTemp = list[0].mid(2).toFloat();
+ }
+ if (list[2].indexOf(_bedTemp) == 0) {
+ _lastBedTemp = list[2].mid(2).toFloat();
+ }
+ } else {
+ // ok T:185.4 /185.0 B:60.5 /60.0
- // B:185.4 - current temperature
- core()->temperature().setBedTemperature(list[3].mid(2).toFloat());
-
- // /60.0 - target temperature
- core()->temperature().setBedTargetTemperature(list[4].mid(1).toFloat());
+ // T:185.4 - current temperature
+ _lastExtruderTemp = list[1].mid(2).toFloat();
+ // /185.0 - target temperature
+ _lastTargetExtruderTemp = list[2].mid(1).toFloat();
+ // B:185.4 - current temperature
+ _lastBedTemp = list[3].mid(2).toFloat();
+ // /60.0 - target temperature
+ _lastTargetBedTemp = list[4].mid(1).toFloat();
+ }
+ core()->temperature().setExtruderTemperature(_lastExtruderTemp);
+ core()->temperature().setExtruderTargetTemperature(_lastTargetExtruderTemp);
+ core()->temperature().setBedTemperature(_lastBedTemp);
+ core()->temperature().setBedTargetTemperature(_lastTargetBedTemp);
}
void MarlinPlugin::validateCommand(const QString &lastMessage)
diff --cc src/plugins/marlinplugin.h
index 765e164,91b6f88..040f550
--- a/src/plugins/marlinplugin.h
+++ b/src/plugins/marlinplugin.h
@@@ -30,8 -30,13 +30,12 @@@ class MarlinPlugin : public IFirmwar
Q_INTERFACES(IFirmware)
private:
static QString _ok;
- static QString _wait;
static QString _extruderTemp;
static QString _bedTemp;
+ float _lastBedTemp;
+ float _lastExtruderTemp;
+ float _lastTargetBedTemp;
+ float _lastTargetExtruderTemp;
public:
MarlinPlugin();
QString name() const override;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic