GerhardHoffmann/UpdatePTUDevCtrl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed rauc/opkg-members. Added m_apismVersion member.

Browse Source
This commit is contained in:
Gerhard Hoffmann 2023-08-30 11:46:55 +02:00
parent 507586f9dc
commit 01d8312aa8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
worker.h
View File

@ -9,6 +9,8 @@
#include <QJsonObject> #include <QJsonObject>
#include <QHash> #include <QHash>
#include <optional>
#include "worker_thread.h" #include "worker_thread.h"
#include "update.h" #include "update.h"
#include "git/git_client.h" #include "git/git_client.h"
@ -88,8 +90,6 @@ class Worker : public QObject {
QString const m_osVersion; QString const m_osVersion;
QString const m_atbqtVersion; QString const m_atbqtVersion;
QString const m_cpuSerial; QString const m_cpuSerial;
QString const m_raucVersion;
QString const m_opkgVersion;
QString const m_pluginVersionATBDeciceController; QString const m_pluginVersionATBDeciceController;
QString const m_pluginVersionIngenicoISelf; QString const m_pluginVersionIngenicoISelf;
QString const m_pluginVersionMobilisisCalc; QString const m_pluginVersionMobilisisCalc;
@ -111,6 +111,7 @@ class Worker : public QObject {
MainWindow *m_mainWindow; MainWindow *m_mainWindow;
int m_progressValue; int m_progressValue;
bool m_withoutIsmasDirectPort; bool m_withoutIsmasDirectPort;
QString m_apismVersion;
bool executeOpkgCommand(QString opkgCommand); bool executeOpkgCommand(QString opkgCommand);
QString getOsVersion() const; QString getOsVersion() const;
@ -155,6 +156,7 @@ public:
int machineNr() const { return m_machineNr; } int machineNr() const { return m_machineNr; }
int customerNr() const { return m_customerNr; } int customerNr() const { return m_customerNr; }
int zoneNr() const { return m_zoneNr; } int zoneNr() const { return m_zoneNr; }
QString apismVersion() const { return m_apismVersion; }
//friend QDebug operator<<(QDebug debug, Worker const &w) { //friend QDebug operator<<(QDebug debug, Worker const &w) {
// Q_UNUSED(w); // Q_UNUSED(w);
@ -179,7 +181,6 @@ public slots:
void update(); void update();
private slots: private slots:
bool backendConnected();
bool updateTriggerSet(); bool updateTriggerSet();
bool customerEnvironment(); bool customerEnvironment();
bool filesToUpdate(); bool filesToUpdate();
@ -191,6 +192,7 @@ private slots:
private: private:
PSAInstalled getPSAInstalled(); PSAInstalled getPSAInstalled();
void privateUpdate(); void privateUpdate();
std::optional<QString> getApismVersion();
}; };
#endif // WORKER_H_INCLUDED #endif // WORKER_H_INCLUDED