[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [atcore] src: Remove Wait and idleWait from all plugins
From: Chris Rizzitello <null () kde ! org>
Date: 2017-02-28 21:58:44
Message-ID: E1cipnA-000338-El () code ! kde ! org
[Download RAW message or body]
Git commit 208a54a3d433cb71d1c306428395a644440b75bc by Chris Rizzitello, on behalf of Patrick José Pereira.
Committed on 28/02/2017 at 21:58.
Pushed by rizzitello into branch 'master'.
Remove Wait and idleWait from all plugins
Summary: Ignore "wait" returns for all printers and track when ready for a command within atcore.
Reviewers: laysrodrigues, tcanabrava, rizzitello
Subscribers: #atelier_atcore
Differential Revision: https://phabricator.kde.org/D4777
M +5 -15 src/atcore.cpp
M +0 -1 src/ifirmware.h
M +2 -7 src/plugins/aprinterplugin.cpp
M +0 -2 src/plugins/aprinterplugin.h
M +0 -5 src/plugins/grblplugin.cpp
M +0 -1 src/plugins/grblplugin.h
M +2 -7 src/plugins/marlinplugin.cpp
M +0 -2 src/plugins/marlinplugin.h
M +2 -6 src/plugins/repetierplugin.cpp
M +0 -2 src/plugins/repetierplugin.h
M +2 -7 src/plugins/sprinterplugin.cpp
M +0 -2 src/plugins/sprinterplugin.h
M +2 -7 src/plugins/teacupplugin.cpp
M +0 -2 src/plugins/teacupplugin.h
https://commits.kde.org/atcore/208a54a3d433cb71d1c306428395a644440b75bc
diff --git a/src/atcore.cpp b/src/atcore.cpp
index 5f06cde..1718838 100644
--- a/src/atcore.cpp
+++ b/src/atcore.cpp
@@ -229,11 +229,7 @@ void AtCore::newMessage(const QByteArray &message)
d->printerStatus.posString.resize(d->printerStatus.posString.indexOf('E'));
d->printerStatus.posString.replace(':', "");
}
- if (pluginLoaded()) {
- if (!plugin()->idleWait()) {
- d->ready = true;
- }
- }
+
emit(receivedMessage(d->lastMessage));
}
@@ -401,11 +397,6 @@ void AtCore::pause(const QString &pauseActions)
void AtCore::resume()
{
- if (pluginLoaded()) {
- if (!plugin()->idleWait()) {
- d->ready = true;
- }
- }
pushCommand(GCode::toCommand(GCode::G0, QString::fromLatin1(d->printerStatus.posString)));
setState(BUSY);
}
@@ -480,20 +471,19 @@ int AtCore::extruderCount()
void AtCore::processQueue()
{
+ d->ready = true;
+
if (d->commandQueue.isEmpty()) {
return;
}
+
QString text = d->commandQueue.takeAt(0);
if (pluginLoaded()) {
- if (!plugin()->idleWait()) {
- // here we set false so that any new commands durring this time are added to the queue.
- // this prevents the printer from being over welmed with commands
- d->ready = false;
- }
serial()->pushCommand(plugin()->translate(text));
} else {
serial()->pushCommand(text.toLocal8Bit());
}
+ d->ready = false;
}
void AtCore::checkTemperature()
diff --git a/src/ifirmware.h b/src/ifirmware.h
index 22d3a8a..01e20e1 100644
--- a/src/ifirmware.h
+++ b/src/ifirmware.h
@@ -41,7 +41,6 @@ public:
/* virtuals, needs to reimplement */
virtual QString name() const = 0;
virtual QByteArray translate(const QString &command) = 0;
- virtual bool idleWait() const = 0;
AtCore *core() const;
private:
IFirmwarePrivate *d;
diff --git a/src/plugins/aprinterplugin.cpp b/src/plugins/aprinterplugin.cpp
index eaf390f..d025185 100644
--- a/src/plugins/aprinterplugin.cpp
+++ b/src/plugins/aprinterplugin.cpp
@@ -26,7 +26,6 @@
#include <QString>
QString AprinterPlugin::_ok = QStringLiteral("ok");
-QString AprinterPlugin::_wait = QStringLiteral("wait");
QString AprinterPlugin::_extruderTemp = QStringLiteral("T:");
QString AprinterPlugin::_bedTemp = QStringLiteral("B:");
@@ -37,11 +36,6 @@ QString AprinterPlugin::name() const
return QStringLiteral("Aprinter");
}
-bool AprinterPlugin::idleWait() const
-{
- return false;
-}
-
AprinterPlugin::AprinterPlugin()
{
qCDebug(APRINTER_PLUGIN) << name() << " plugin loaded!";
@@ -65,7 +59,8 @@ void AprinterPlugin::validateCommand(const QString &lastMessage)
{
if (lastMessage.contains(_extruderTemp) || lastMessage.contains(_bedTemp)) {
extractTemp(lastMessage);
- } else if (lastMessage.contains(_ok) || lastMessage.contains(_wait)) {
+ }
+ if (lastMessage.contains(_ok)) {
emit readyForCommand();
}
}
diff --git a/src/plugins/aprinterplugin.h b/src/plugins/aprinterplugin.h
index 419dbac..709f349 100644
--- a/src/plugins/aprinterplugin.h
+++ b/src/plugins/aprinterplugin.h
@@ -30,13 +30,11 @@ class AprinterPlugin : public IFirmware
Q_INTERFACES(IFirmware)
private:
static QString _ok;
- static QString _wait;
static QString _extruderTemp;
static QString _bedTemp;
public:
AprinterPlugin();
QString name() const override;
- bool idleWait() const override;
void extractTemp(const QString &lastMessage);
void validateCommand(const QString &lastMessage);
QByteArray translate(const QString &command);
diff --git a/src/plugins/grblplugin.cpp b/src/plugins/grblplugin.cpp
index c50499f..5d3466e 100644
--- a/src/plugins/grblplugin.cpp
+++ b/src/plugins/grblplugin.cpp
@@ -26,11 +26,6 @@ QString GrblPlugin::name() const
return QStringLiteral("Grbl");
}
-bool GrblPlugin::idleWait() const
-{
- return false;
-}
-
GrblPlugin::GrblPlugin()
{
diff --git a/src/plugins/grblplugin.h b/src/plugins/grblplugin.h
index a48721a..ab1d1d1 100644
--- a/src/plugins/grblplugin.h
+++ b/src/plugins/grblplugin.h
@@ -31,7 +31,6 @@ class GrblPlugin : public IFirmware
public:
GrblPlugin();
QString name() const override;
- bool idleWait() const override;
QByteArray translate(const QString &command);
void validateCommand(const QString &lastMessage);
};
diff --git a/src/plugins/marlinplugin.cpp b/src/plugins/marlinplugin.cpp
index a4f1a36..e94ced2 100644
--- a/src/plugins/marlinplugin.cpp
+++ b/src/plugins/marlinplugin.cpp
@@ -25,7 +25,6 @@
#include "atcore.h"
QString MarlinPlugin::_ok = QStringLiteral("ok");
-QString MarlinPlugin::_wait = QStringLiteral("wait");
QString MarlinPlugin::_extruderTemp = QStringLiteral("T:");
QString MarlinPlugin::_bedTemp = QStringLiteral("B:");
@@ -41,11 +40,6 @@ 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
@@ -71,7 +65,8 @@ void MarlinPlugin::validateCommand(const QString &lastMessage)
{
if (lastMessage.contains(_extruderTemp) || lastMessage.contains(_bedTemp)) {
extractTemp(lastMessage);
- } else if (lastMessage.contains(_ok) || lastMessage.contains(_wait)) {
+ }
+ if (lastMessage.contains(_ok)) {
emit readyForCommand();
}
}
diff --git a/src/plugins/marlinplugin.h b/src/plugins/marlinplugin.h
index f0f35e5..765e164 100644
--- a/src/plugins/marlinplugin.h
+++ b/src/plugins/marlinplugin.h
@@ -30,13 +30,11 @@ class MarlinPlugin : public IFirmware
Q_INTERFACES(IFirmware)
private:
static QString _ok;
- static QString _wait;
static QString _extruderTemp;
static QString _bedTemp;
public:
MarlinPlugin();
QString name() const override;
- bool idleWait() const override;
void extractTemp(const QString &lastMessage);
void validateCommand(const QString &lastMessage);
QByteArray translate(const QString &command) override;
diff --git a/src/plugins/repetierplugin.cpp b/src/plugins/repetierplugin.cpp
index 0e47b0f..aad2513 100644
--- a/src/plugins/repetierplugin.cpp
+++ b/src/plugins/repetierplugin.cpp
@@ -26,7 +26,6 @@
#include <QString>
QString RepetierPlugin::_ok = QStringLiteral("ok");
-QString RepetierPlugin::_wait = QStringLiteral("wait");
QString RepetierPlugin::_extruderTemp = QStringLiteral("T:");
QString RepetierPlugin::_bedTemp = QStringLiteral("B:");
@@ -37,10 +36,6 @@ QString RepetierPlugin::name() const
return QStringLiteral("Repetier");
}
-bool RepetierPlugin::idleWait() const
-{
- return true;
-}
RepetierPlugin::RepetierPlugin()
{
qCDebug(REPETIER_PLUGIN) << name() << " plugin loaded!";
@@ -64,7 +59,8 @@ void RepetierPlugin::validateCommand(const QString &lastMessage)
{
if (lastMessage.contains(_extruderTemp) || lastMessage.contains(_bedTemp)) {
extractTemp(lastMessage);
- } else if (lastMessage.contains(_ok) || lastMessage.contains(_wait)) {
+ }
+ if (lastMessage.contains(_ok)) {
emit readyForCommand();
}
}
diff --git a/src/plugins/repetierplugin.h b/src/plugins/repetierplugin.h
index 0b8cab3..a46b9ce 100644
--- a/src/plugins/repetierplugin.h
+++ b/src/plugins/repetierplugin.h
@@ -30,13 +30,11 @@ class RepetierPlugin : public IFirmware
Q_INTERFACES(IFirmware)
private:
static QString _ok;
- static QString _wait;
static QString _extruderTemp;
static QString _bedTemp;
public:
RepetierPlugin();
QString name() const override;
- bool idleWait() const override;
void validateCommand(const QString &lastMessage);
void extractTemp(const QString &lastMessage);
QByteArray translate(const QString &command);
diff --git a/src/plugins/sprinterplugin.cpp b/src/plugins/sprinterplugin.cpp
index b53d545..c7adfb1 100644
--- a/src/plugins/sprinterplugin.cpp
+++ b/src/plugins/sprinterplugin.cpp
@@ -26,7 +26,6 @@
#include <QString>
QString SprinterPlugin::_ok = QStringLiteral("ok");
-QString SprinterPlugin::_wait = QStringLiteral("wait");
QString SprinterPlugin::_extruderTemp = QStringLiteral("T:");
QString SprinterPlugin::_bedTemp = QStringLiteral("B:");
@@ -37,11 +36,6 @@ QString SprinterPlugin::name() const
return QStringLiteral("Sprinter");
}
-bool SprinterPlugin::idleWait() const
-{
- return false;
-}
-
SprinterPlugin::SprinterPlugin()
{
qCDebug(SPRINTER_PLUGIN) << name() << " plugin loaded!";
@@ -66,7 +60,8 @@ void SprinterPlugin::validateCommand(const QString &lastMessage)
{
if (lastMessage.contains(_extruderTemp) || lastMessage.contains(_bedTemp)) {
extractTemp(lastMessage);
- } else if (lastMessage.contains(_ok) || lastMessage.contains(_wait)) {
+ }
+ if (lastMessage.contains(_ok)) {
emit readyForCommand();
}
}
diff --git a/src/plugins/sprinterplugin.h b/src/plugins/sprinterplugin.h
index f265dd3..151527d 100644
--- a/src/plugins/sprinterplugin.h
+++ b/src/plugins/sprinterplugin.h
@@ -30,13 +30,11 @@ class SprinterPlugin : public IFirmware
Q_INTERFACES(IFirmware)
private:
static QString _ok;
- static QString _wait;
static QString _extruderTemp;
static QString _bedTemp;
public:
SprinterPlugin();
QString name() const override;
- bool idleWait() const override;
void extractTemp(const QString &lastMessage);
void validateCommand(const QString &lastMessage);
QByteArray translate(const QString &command);
diff --git a/src/plugins/teacupplugin.cpp b/src/plugins/teacupplugin.cpp
index 6e38c26..2fa4935 100644
--- a/src/plugins/teacupplugin.cpp
+++ b/src/plugins/teacupplugin.cpp
@@ -27,7 +27,6 @@
#include "atcore.h"
QString TeacupPlugin::_ok = QStringLiteral("ok");
-QString TeacupPlugin::_wait = QStringLiteral("wait");
QString TeacupPlugin::_extruderTemp = QStringLiteral("T:");
QString TeacupPlugin::_bedTemp = QStringLiteral("B:");
@@ -38,11 +37,6 @@ QString TeacupPlugin::name() const
return QStringLiteral("Teacup");
}
-bool TeacupPlugin::idleWait() const
-{
- return false;
-}
-
TeacupPlugin::TeacupPlugin()
{
qCDebug(TEACUP_PLUGIN) << name() << " plugin loaded!";
@@ -66,7 +60,8 @@ void TeacupPlugin::validateCommand(const QString &lastMessage)
{
if (lastMessage.contains(_extruderTemp) || lastMessage.contains(_bedTemp)) {
extractTemp(lastMessage);
- } else if (lastMessage.contains(_ok) || lastMessage.contains(_wait)) {
+ }
+ if (lastMessage.contains(_ok)) {
emit readyForCommand();
}
}
diff --git a/src/plugins/teacupplugin.h b/src/plugins/teacupplugin.h
index ef4c18d..516df10 100644
--- a/src/plugins/teacupplugin.h
+++ b/src/plugins/teacupplugin.h
@@ -30,13 +30,11 @@ class TeacupPlugin : public IFirmware
Q_INTERFACES(IFirmware)
private:
static QString _ok;
- static QString _wait;
static QString _extruderTemp;
static QString _bedTemp;
public:
TeacupPlugin();
QString name() const override;
- bool idleWait() const override;
void extractTemp(const QString &lastMessage);
void validateCommand(const QString &lastMessage);
QByteArray translate(const QString &command);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic