Compare commits
No commits in common. "master" and "korneuburg-improvements" have entirely different histories.
master
...
korneuburg
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +0,0 @@
|
||||
tags
|
||||
*.tags
|
||||
@ -6,7 +6,7 @@ plugin-directory="/usr/lib/"
|
||||
working-directory="/opt/app/tools/atbupdate/"
|
||||
|
||||
[PLUGINS]
|
||||
plugin-name="libCAmaster.so"
|
||||
plugin-name="libCAslave.so"
|
||||
|
||||
[FLAGS]
|
||||
no-psa-hardware-update=false
|
||||
|
||||
@ -103,9 +103,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
||||
# Move final processing to subclass UpdateProcessRunning.
|
||||
# Disable EXIT-button for the whole update-process, except for the
|
||||
# checking of the ISMAS-trigger-button (aka WAIT-button).
|
||||
# 1.4.1 : Sync files in the customer repository (under ./etc) as the very
|
||||
# first step
|
||||
VERSION="1.4.1"
|
||||
VERSION="1.4.0"
|
||||
|
||||
# PLANNED TODOS:
|
||||
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
||||
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
||||
@ -119,6 +118,7 @@ VERSION="1.4.1"
|
||||
# ISMAS eine entsprechende Meldung anzeigen als Teil von SEND-LAST-VERSION.
|
||||
# Wenn der WAIT-button aktiv ist, dann werden zumindest die opkg-commands
|
||||
# ausgefuehrt.
|
||||
# 4: rsync: immer alle Dateien soiegeln (bis auf opkg-commands)
|
||||
# 5: Falls das Tool mal abstuerzt, dann einen Signal-Handler (fuer TERM)
|
||||
# installieren, sodass zumnidest SEND-LAST-VERSION mit rausgeht.
|
||||
# 6: rsync: explizites Binary, nicht das in busybox enthaltene.
|
||||
@ -134,6 +134,9 @@ VERSION="1.4.1"
|
||||
# Stellung des WAIT-Button. Grund: es koennte sein, dass andernfalls ein
|
||||
# PSA weit hiter anderen steht, und dann ploetzlich einmal alle vorher-
|
||||
# gehenden Aenderungen anzieht, die gar nicht fuer ihn gemeint waren.
|
||||
# 10: Bei einer Neuinstallation (Neuhauser) immer JSON files runterladen,
|
||||
# Tariff-Files syncen (d.h. nur wenn noch kein Repo vorhanden ist), und
|
||||
# zwar auch ohne WAIT-Button.
|
||||
# 11: Das Edit-Fenster teilen um die Anzeige zu verbessern.
|
||||
# 12: Bei einem Update muss immer ersichtlich sein, warum es ueberhaupt
|
||||
# angestossen wurde. Steht kein "WAIT" im ISMAS-Trigger, dann kann man
|
||||
@ -247,7 +250,6 @@ HEADERS += \
|
||||
process/command.h \
|
||||
message_handler.h \
|
||||
worker.h \
|
||||
interfaces.h \
|
||||
commandline_parser.h \
|
||||
plugins/interfaces.h
|
||||
|
||||
|
||||
Binary file not shown.
101
interfaces.h
Normal file → Executable file
101
interfaces.h
Normal file → Executable file
@ -24,8 +24,7 @@ struct T_emp
|
||||
|
||||
// dynamic:
|
||||
uint8_t state; // step counter of EMP (electronic coin checker) FSM (finite state machine):
|
||||
/*
|
||||
// 0=start command
|
||||
// 0=start command
|
||||
// 1=powered, do emp ini, send reset
|
||||
// 2=delay
|
||||
// 3=wait for response, requesting status after response
|
||||
@ -40,7 +39,7 @@ struct T_emp
|
||||
// 90: stop all, 1s delay
|
||||
// 99: off, all stopped
|
||||
|
||||
*/
|
||||
|
||||
uint8_t pollingRunning;
|
||||
uint8_t paymentRunning;
|
||||
|
||||
@ -239,7 +238,6 @@ struct T_dynamicCondition
|
||||
uint8_t lastVDoorState;
|
||||
uint8_t lastCBstate;
|
||||
char paymentInProgress;
|
||||
// Version Szeged: aug2023
|
||||
// 0: stopped by timeout
|
||||
// 1: running 2: wait4lastCoin
|
||||
// 3: payment stopped manually, coins in Escrow
|
||||
@ -248,21 +246,6 @@ struct T_dynamicCondition
|
||||
// 6: coins encashed 7:coins returned
|
||||
// 8: CoinChecker or MDB on Error
|
||||
|
||||
// since Schoenau with bill and changer, nov2023
|
||||
//0 = no payment
|
||||
//will be set to 1 by cash_startCollection()
|
||||
//neu 1: wait for devices getting ready for payment
|
||||
//2 = payment,
|
||||
//3 = wait for last coin/bill
|
||||
//4 = Bezahlvorgang manuell beendet
|
||||
//5 = payment stopped autom, amount collected, coins in Escrow
|
||||
//6 = Bezahlvorgang beendet weil ZK voll
|
||||
//4,5,6: payment done, keep on polling, wait for cash or return command
|
||||
//7 = encash collected money from coin escrow into cash box
|
||||
//8 = return "amountToReturn", can be complete inserted amount or only overpayment
|
||||
//9 = wait for changer result
|
||||
//10= print refund receipt with "amountToReturn"
|
||||
|
||||
|
||||
char res1;
|
||||
uint16_t U_Batt;
|
||||
@ -414,7 +397,6 @@ struct T_bna
|
||||
|
||||
};
|
||||
|
||||
class DownloadThread;
|
||||
class hwinf
|
||||
{
|
||||
|
||||
@ -2270,23 +2252,14 @@ public:
|
||||
virtual void bna_requestCurrentNotes() const {}
|
||||
// send command to DC in order to get transaction data
|
||||
|
||||
virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const
|
||||
{
|
||||
virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const {
|
||||
Q_UNUSED(latestBill);
|
||||
Q_UNUSED(currentNotes);
|
||||
return 0;
|
||||
}
|
||||
// returns number of collected bank notes since start-command (current transaction)
|
||||
// return value: numbers of bills or 99 in case of error
|
||||
// latestBill: not used
|
||||
// in case of error: currentNotes[0,1,2,3] = 1..4 error number(s)
|
||||
// in normal case:
|
||||
// currentNotes[0]: last bill in cent (e.g. 1000 = 10€)
|
||||
// currentNotes[1]: bin 1 = bill is still in escrow else bill is stacked
|
||||
// note: by now (dec2023) escrow is not used, bills always go to stacker (box)
|
||||
// currentNotes[2]: total sum of bills in cent, low word (16bit)
|
||||
// currentNotes[3]: total sum of bills in cent, high word (16bit)
|
||||
|
||||
// latestBill: last accepted bank note, value in cent
|
||||
// currentNotes an array with up to 16 (further) notes collected
|
||||
|
||||
virtual void bna_requestStackerLevel() const {}
|
||||
|
||||
@ -2300,73 +2273,9 @@ public:
|
||||
// countOfBills[1] for 10€ and so on
|
||||
|
||||
|
||||
// download device controller
|
||||
virtual bool dcDownloadRequest(QString const &fileToDownload) const {
|
||||
Q_UNUSED(fileToDownload);
|
||||
return false;
|
||||
}
|
||||
virtual bool dcDownloadRequested() const { return false; }
|
||||
virtual bool dcDownloadResetRequest() const { return false; }
|
||||
virtual bool dcDownloadRequestAck() const { return false; }
|
||||
virtual bool dcDownloadRunning() const { return false; }
|
||||
virtual bool dcDownloadFinished() { return false; }
|
||||
|
||||
virtual bool dcDownloadReportStart() const { return false; }
|
||||
virtual bool dcDownloadReportRunning() const { return true; }
|
||||
virtual bool dcDownloadReportFinished() { return true; }
|
||||
|
||||
virtual bool dcDownloadThreadStart() { return false; }
|
||||
virtual bool dcDownloadThreadRunning() const { return true; }
|
||||
virtual void dcDownloadThreadFinalize(DownloadThread *) {}
|
||||
virtual bool dcDownloadThreadFinished() const { return true; }
|
||||
virtual bool dcDownloadReportThreadStart() { return false; }
|
||||
virtual bool dcDownloadReportThreadRunning() const { return true; }
|
||||
virtual void dcDownloadReportThreadFinalize() {}
|
||||
virtual void dcDownloadReportThreadQuit() {}
|
||||
virtual bool dcDownloadReportThreadFinished() const { return true; }
|
||||
|
||||
|
||||
virtual QString dcDownloadFileName() const { return ""; }
|
||||
virtual bool dcDownloadSetRequested(bool requested) {
|
||||
Q_UNUSED(requested); return false;
|
||||
}
|
||||
virtual bool dcDownloadSetRunning(bool running) {
|
||||
Q_UNUSED(running); return false;
|
||||
}
|
||||
virtual bool dcDownloadSetFinished(bool finished) {
|
||||
Q_UNUSED(finished); return false;
|
||||
}
|
||||
virtual void dcDownloadSetTotalBlockNumber(uint16_t totalBlockNumber) {
|
||||
Q_UNUSED(totalBlockNumber);
|
||||
}
|
||||
virtual void dcDownloadSetCurrentBlockNumber(uint16_t currentBlockNumber) {
|
||||
Q_UNUSED(currentBlockNumber);
|
||||
}
|
||||
virtual bool dcDownloadGetRequested() const { return false; }
|
||||
virtual bool dcDownloadGetRunning() const { return false; }
|
||||
virtual bool dcDownloadGetFinished() const { return false; }
|
||||
virtual uint16_t dcDownloadGetTotalBlockNumber() const { return 0; }
|
||||
virtual uint16_t dcDownloadGetCurrentBlockNumber() const { return 0; }
|
||||
|
||||
virtual QObject const *getAPI() { return nullptr; }
|
||||
|
||||
|
||||
signals:
|
||||
/*
|
||||
NOTE: the difference between a virtual Qt signal and a normal Qt signal:
|
||||
A Qt virtual signal is a connection that is established using a pointer
|
||||
or reference and is not connected to an object or data. It is therefore
|
||||
not bound to a particular object, but to a specific class (object type).
|
||||
Qt virtual signals are useful because they allow you to create
|
||||
connections without worrying about whether an object or a specific data
|
||||
element has been destroyed.
|
||||
https://www.youtube.com/watch?v=HTH3VFfqsXw
|
||||
|
||||
*/
|
||||
virtual void hwapi_reportDCDownloadStatus(QString const&) const {}
|
||||
virtual void hwapi_reportDCDownloadSuccess(QString const&) const {}
|
||||
virtual void hwapi_reportDCDownloadFailure(QString const&) const {}
|
||||
|
||||
virtual void hwapi_templatePrintFinished_OK(void) const=0;
|
||||
virtual void hwapi_templatePrintFinished_Err(void) const=0;
|
||||
|
||||
|
||||
@ -24,8 +24,7 @@ struct T_emp
|
||||
|
||||
// dynamic:
|
||||
uint8_t state; // step counter of EMP (electronic coin checker) FSM (finite state machine):
|
||||
/*
|
||||
// 0=start command
|
||||
// 0=start command
|
||||
// 1=powered, do emp ini, send reset
|
||||
// 2=delay
|
||||
// 3=wait for response, requesting status after response
|
||||
@ -40,7 +39,7 @@ struct T_emp
|
||||
// 90: stop all, 1s delay
|
||||
// 99: off, all stopped
|
||||
|
||||
*/
|
||||
|
||||
uint8_t pollingRunning;
|
||||
uint8_t paymentRunning;
|
||||
|
||||
@ -239,7 +238,6 @@ struct T_dynamicCondition
|
||||
uint8_t lastVDoorState;
|
||||
uint8_t lastCBstate;
|
||||
char paymentInProgress;
|
||||
// Version Szeged: aug2023
|
||||
// 0: stopped by timeout
|
||||
// 1: running 2: wait4lastCoin
|
||||
// 3: payment stopped manually, coins in Escrow
|
||||
@ -248,21 +246,6 @@ struct T_dynamicCondition
|
||||
// 6: coins encashed 7:coins returned
|
||||
// 8: CoinChecker or MDB on Error
|
||||
|
||||
// since Schoenau with bill and changer, nov2023
|
||||
//0 = no payment
|
||||
//will be set to 1 by cash_startCollection()
|
||||
//neu 1: wait for devices getting ready for payment
|
||||
//2 = payment,
|
||||
//3 = wait for last coin/bill
|
||||
//4 = Bezahlvorgang manuell beendet
|
||||
//5 = payment stopped autom, amount collected, coins in Escrow
|
||||
//6 = Bezahlvorgang beendet weil ZK voll
|
||||
//4,5,6: payment done, keep on polling, wait for cash or return command
|
||||
//7 = encash collected money from coin escrow into cash box
|
||||
//8 = return "amountToReturn", can be complete inserted amount or only overpayment
|
||||
//9 = wait for changer result
|
||||
//10= print refund receipt with "amountToReturn"
|
||||
|
||||
|
||||
char res1;
|
||||
uint16_t U_Batt;
|
||||
@ -414,7 +397,6 @@ struct T_bna
|
||||
|
||||
};
|
||||
|
||||
class DownloadThread;
|
||||
class hwinf
|
||||
{
|
||||
|
||||
@ -1852,9 +1834,6 @@ public:
|
||||
virtual uint8_t prn_getPrintResult() const {
|
||||
return 0;
|
||||
}
|
||||
// return: 0: just printing, wait
|
||||
// 1: OK - last print was succesful
|
||||
// 2: error - not printed
|
||||
|
||||
|
||||
|
||||
@ -2270,23 +2249,14 @@ public:
|
||||
virtual void bna_requestCurrentNotes() const {}
|
||||
// send command to DC in order to get transaction data
|
||||
|
||||
virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const
|
||||
{
|
||||
virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const {
|
||||
Q_UNUSED(latestBill);
|
||||
Q_UNUSED(currentNotes);
|
||||
return 0;
|
||||
}
|
||||
// returns number of collected bank notes since start-command (current transaction)
|
||||
// return value: numbers of bills or 99 in case of error
|
||||
// latestBill: not used
|
||||
// in case of error: currentNotes[0,1,2,3] = 1..4 error number(s)
|
||||
// in normal case:
|
||||
// currentNotes[0]: last bill in cent (e.g. 1000 = 10€)
|
||||
// currentNotes[1]: bin 1 = bill is still in escrow else bill is stacked
|
||||
// note: by now (dec2023) escrow is not used, bills always go to stacker (box)
|
||||
// currentNotes[2]: total sum of bills in cent, low word (16bit)
|
||||
// currentNotes[3]: total sum of bills in cent, high word (16bit)
|
||||
|
||||
// latestBill: last accepted bank note, value in cent
|
||||
// currentNotes an array with up to 16 (further) notes collected
|
||||
|
||||
virtual void bna_requestStackerLevel() const {}
|
||||
|
||||
@ -2300,99 +2270,10 @@ public:
|
||||
// countOfBills[1] for 10€ and so on
|
||||
|
||||
|
||||
// download device controller
|
||||
virtual bool dcDownloadRequest(QString const &fileToDownload) const {
|
||||
Q_UNUSED(fileToDownload);
|
||||
return false;
|
||||
}
|
||||
virtual bool dcDownloadRequested() const { return false; }
|
||||
virtual bool dcDownloadResetRequest() const { return false; }
|
||||
virtual bool dcDownloadRequestAck() const { return false; }
|
||||
virtual bool dcDownloadRunning() const { return false; }
|
||||
virtual bool dcDownloadFinished() { return false; }
|
||||
|
||||
virtual bool dcDownloadReportStart() const { return false; }
|
||||
virtual bool dcDownloadReportRunning() const { return true; }
|
||||
virtual bool dcDownloadReportFinished() { return true; }
|
||||
|
||||
virtual bool dcDownloadThreadStart() { return false; }
|
||||
virtual bool dcDownloadThreadRunning() const { return true; }
|
||||
virtual void dcDownloadThreadFinalize(DownloadThread *) {}
|
||||
virtual bool dcDownloadThreadFinished() const { return true; }
|
||||
virtual bool dcDownloadReportThreadStart() { return false; }
|
||||
virtual bool dcDownloadReportThreadRunning() const { return true; }
|
||||
virtual void dcDownloadReportThreadFinalize() {}
|
||||
virtual void dcDownloadReportThreadQuit() {}
|
||||
virtual bool dcDownloadReportThreadFinished() const { return true; }
|
||||
|
||||
|
||||
virtual QString dcDownloadFileName() const { return ""; }
|
||||
virtual bool dcDownloadSetRequested(bool requested) {
|
||||
Q_UNUSED(requested); return false;
|
||||
}
|
||||
virtual bool dcDownloadSetRunning(bool running) {
|
||||
Q_UNUSED(running); return false;
|
||||
}
|
||||
virtual bool dcDownloadSetFinished(bool finished) {
|
||||
Q_UNUSED(finished); return false;
|
||||
}
|
||||
virtual void dcDownloadSetTotalBlockNumber(uint16_t totalBlockNumber) {
|
||||
Q_UNUSED(totalBlockNumber);
|
||||
}
|
||||
virtual void dcDownloadSetCurrentBlockNumber(uint16_t currentBlockNumber) {
|
||||
Q_UNUSED(currentBlockNumber);
|
||||
}
|
||||
virtual bool dcDownloadGetRequested() const { return false; }
|
||||
virtual bool dcDownloadGetRunning() const { return false; }
|
||||
virtual bool dcDownloadGetFinished() const { return false; }
|
||||
virtual uint16_t dcDownloadGetTotalBlockNumber() const { return 0; }
|
||||
virtual uint16_t dcDownloadGetCurrentBlockNumber() const { return 0; }
|
||||
|
||||
virtual QObject const *getAPI() { return nullptr; }
|
||||
|
||||
|
||||
signals:
|
||||
/*
|
||||
NOTE: the difference between a virtual Qt signal and a normal Qt signal:
|
||||
A Qt virtual signal is a connection that is established using a pointer
|
||||
or reference and is not connected to an object or data. It is therefore
|
||||
not bound to a particular object, but to a specific class (object type).
|
||||
Qt virtual signals are useful because they allow you to create
|
||||
connections without worrying about whether an object or a specific data
|
||||
element has been destroyed.
|
||||
https://www.youtube.com/watch?v=HTH3VFfqsXw
|
||||
|
||||
*/
|
||||
virtual void hwapi_reportDCDownloadStatus(QString const&) const {}
|
||||
virtual void hwapi_reportDCDownloadSuccess(QString const&) const {}
|
||||
virtual void hwapi_reportDCDownloadFailure(QString const&) const {}
|
||||
|
||||
virtual void hwapi_templatePrintFinished_OK(void) const=0;
|
||||
virtual void hwapi_templatePrintFinished_Err(void) const=0;
|
||||
|
||||
virtual void hwapi_coinCollectionJustStarted(void) const=0;
|
||||
virtual void hwapi_coinCollectionAborted(void) const=0;
|
||||
|
||||
virtual void hwapi_gotNewCoin(void) const=0;
|
||||
virtual void hwapi_payStopByMax(void) const=0;
|
||||
virtual void hwapi_payStopByPushbutton(void) const=0;
|
||||
|
||||
virtual void hwapi_payStopByEscrow(void) const=0;
|
||||
virtual void hwapi_payStopByError(void) const=0;
|
||||
virtual void hwapi_payStopByTimeout(void) const=0;
|
||||
virtual void hwapi_payCancelled(void) const=0;
|
||||
virtual void hwapi_coinProcessJustStopped(void) const=0;
|
||||
|
||||
virtual void hwapi_doorServiceDoorOpened(void) const=0;
|
||||
virtual void hwapi_doorVaultDoorOpened(void) const=0;
|
||||
virtual void hwapi_doorCoinBoxRemoved(void) const=0;
|
||||
virtual void hwapi_doorCoinBoxInserted(void) const=0;
|
||||
virtual void hwapi_doorCBinAndAllDoorsClosed(void) const=0;
|
||||
virtual void hwapi_doorAllDoorsClosed(void) const=0;
|
||||
|
||||
|
||||
// NOTE: declaring a "pure virtual" "signal" should be an error and thus not valid.
|
||||
/* GH Version, bringt Fehler
|
||||
void hwapi_templatePrintFinished_OK() const;
|
||||
void hwapi_templatePrintFinished_Err() const;
|
||||
|
||||
@ -2415,7 +2296,6 @@ signals:
|
||||
void hwapi_doorCoinBoxInserted() const;
|
||||
void hwapi_doorCBinAndAllDoorsClosed() const;
|
||||
void hwapi_doorAllDoorsClosed() const;
|
||||
*/
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -266,7 +266,6 @@ bool Update::updateBinary(QString const &fileToSendToDC) {
|
||||
|
||||
return false;
|
||||
|
||||
#if 0
|
||||
QFile fn(fileToSendToDC);
|
||||
if (!fn.exists()) {
|
||||
// output via CONSOLE() etc
|
||||
@ -335,7 +334,6 @@ bool Update::updateBinary(QString const &fileToSendToDC) {
|
||||
}
|
||||
|
||||
return true;
|
||||
#endif
|
||||
}
|
||||
|
||||
QString Update::jsonType(enum FileTypeJson type) {
|
||||
@ -563,7 +561,7 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
|
||||
}
|
||||
|
||||
if (jsonNr != 0) {
|
||||
#if 0
|
||||
|
||||
m_hw->sys_requestJsonVersions(jsonNr);
|
||||
QThread::msleep(500);
|
||||
|
||||
@ -581,8 +579,6 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
|
||||
if (installedVersion == fileVersion) {
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
} else {
|
||||
qCritical() << "CANNOT FIND JSON-NR FOR" << jsonFileNames[i];
|
||||
}
|
||||
|
||||
42
worker.cpp
42
worker.cpp
@ -358,7 +358,9 @@ void Worker::privateUpdate() {
|
||||
setProgress(i); // and switch to branch
|
||||
if (m_gc.gitCloneAndCheckoutBranch()) {
|
||||
if (!isRepositoryCorrupted()) {
|
||||
m_versionInfo = m_gc.gitShowReason(m_branchName);
|
||||
if (m_versionInfo.size() == 0) {
|
||||
m_versionInfo = m_gc.gitShowReason(m_branchName);
|
||||
}
|
||||
GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CLONE_REPOSITORY_SUCCESS));
|
||||
continueUpdate = true;
|
||||
m_clone = true;
|
||||
@ -388,7 +390,10 @@ void Worker::privateUpdate() {
|
||||
}
|
||||
}
|
||||
}
|
||||
m_versionInfo = m_gc.gitShowReason(m_branchName);
|
||||
|
||||
if (m_versionInfo.size() == 0) {
|
||||
m_versionInfo = m_gc.gitShowReason(m_branchName);
|
||||
}
|
||||
|
||||
CONSOLE() << UPDATE_STEP::CHECK_REPOSITORY_SUCCESS;
|
||||
setProgress(_CHECKOUT_REPOSITORY_SUCCESS);
|
||||
@ -406,6 +411,9 @@ void Worker::privateUpdate() {
|
||||
}
|
||||
}
|
||||
|
||||
qCritical() << "**** m_ismasTriggerActive:" << m_ismasTriggerActive;
|
||||
qCritical() << "**** m_clone:" << m_clone;
|
||||
|
||||
if (m_ismasTriggerActive == false) {// make it explicit again: only if the
|
||||
// ismas trigger is active ('WAIT'),
|
||||
// then proceed
|
||||
@ -424,22 +432,10 @@ void Worker::privateUpdate() {
|
||||
if ((continueUpdate = customerEnvironment()) == false) {
|
||||
return;
|
||||
}
|
||||
m_versionInfo = m_gc.gitShowReason(m_branchName);
|
||||
lst = QStringList(QString(smap[UPDATE_STEP::CHECKOUT_BRANCH_SUCCESS]));
|
||||
ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECKOUT_BRANCH);
|
||||
setProgress(_CHECKOUT_BRANCH_SUCCESS);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// (R)SYNC THE REPOSITORY WITH THE LOCAL FILEYSTEM
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
if ((continueUpdate = syncCustomerRepositoryAndFS()) == false) {
|
||||
return;
|
||||
}
|
||||
lst = QStringList(QString(smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS]));
|
||||
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS));
|
||||
setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
@ -449,7 +445,6 @@ void Worker::privateUpdate() {
|
||||
if ((continueUpdate = filesToUpdate()) == false) {
|
||||
return;
|
||||
}
|
||||
m_versionInfo = m_gc.gitShowReason(m_branchName);
|
||||
lst = QStringList(QString(smap[UPDATE_STEP::UPDATE_REPOSITORY_SUCCESS]));
|
||||
ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::UPDATE_REPOSITORY));
|
||||
setProgress(_UPDATE_REPOSITORY_SUCCESS);
|
||||
@ -480,6 +475,19 @@ void Worker::privateUpdate() {
|
||||
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
||||
setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS);
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// (R)SYNC THE REPOSITORY WITH THE LOCAL FILEYSTEM
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
if ((continueUpdate = syncCustomerRepositoryAndFS()) == false) {
|
||||
return;
|
||||
}
|
||||
lst = QStringList(QString(smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS]));
|
||||
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS));
|
||||
setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// FUTURE: SAVE LOG FILES
|
||||
@ -1029,7 +1037,7 @@ QString Worker::getATBUpdateToolYoctoVersion() {
|
||||
|
||||
QString Worker::getAPISMYoctoVersion() {
|
||||
if (QFile::exists("/var/lib/opkg/status")) {
|
||||
QString const cmd = QString("echo -n $(cat /var/lib/opkg/status | grep -A1 -e apism[[:space:]]*$ | tail -n 1 | cut -d':' -f2 | cut -d' ' -f2)");
|
||||
QString const cmd = QString("echo -n $(cat /var/lib/opkg/status | grep -A1 apism | tail -n 1 | cut -d':' -f2 | cut -d' ' -f2)");
|
||||
Command c("bash");
|
||||
if (c.execute("/tmp", QStringList() << "-c" << cmd)) {
|
||||
return c.getCommandResult(); // 1.4.1.0-r4
|
||||
@ -1182,8 +1190,6 @@ PSAInstalled Worker::getPSAInstalled() {
|
||||
psaInstalled.versionInfo.created = "N/A";
|
||||
|
||||
if (m_versionInfo.size() == 3) {
|
||||
qCritical() << QString("***** %1:%2").arg(__func__).arg(__LINE__)
|
||||
<< "m_versionInfo" << m_versionInfo << "*****";
|
||||
psaInstalled.versionInfo.lastCommit = m_versionInfo.at(0);
|
||||
psaInstalled.versionInfo.reason = m_versionInfo.at(1);
|
||||
psaInstalled.versionInfo.created = m_versionInfo.at(2);
|
||||
|
||||
12
worker.h
12
worker.h
@ -61,12 +61,9 @@
|
||||
#define _UPDATE_REPOSITORY_SUCCESS (27)
|
||||
#define _CHECK_FOR_REPOSITORY_CHANGES (28)
|
||||
#define _CHECK_FOR_REPOSITORY_CHANGES_SUCCESS (29)
|
||||
#define _SYNC_CUSTOMER_REPOSITORY (30)
|
||||
#define _SYNC_CUSTOMER_REPOSITORY_FAILURE (31)
|
||||
#define _SYNC_CUSTOMER_REPOSITORY_SUCCESS (32)
|
||||
#define _FILES_TO_UPDATE (33)
|
||||
#define _CHECK_FOR_REPOSITORY_CHANGES_FAILURE (34)
|
||||
#define _FILES_TO_DOWNLOAD (35)
|
||||
#define _FILES_TO_UPDATE (30)
|
||||
#define _CHECK_FOR_REPOSITORY_CHANGES_FAILURE (31)
|
||||
#define _FILES_TO_DOWNLOAD (32)
|
||||
#define _EXEC_OPKG_COMMANDS (41)
|
||||
#define _EXEC_OPKG_COMMAND_1 (42)
|
||||
#define _EXEC_OPKG_COMMAND_2 (43)
|
||||
@ -89,6 +86,9 @@
|
||||
#define _DOWNLOAD_DEVICE_CONTROLLER_FAILURE (86)
|
||||
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE (87)
|
||||
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS (88)
|
||||
#define _SYNC_CUSTOMER_REPOSITORY (89)
|
||||
#define _SYNC_CUSTOMER_REPOSITORY_FAILURE (90)
|
||||
#define _SYNC_CUSTOMER_REPOSITORY_SUCCESS (91)
|
||||
#define _SAVE_LOGS (92)
|
||||
#define _SAVE_LOGS_FAILURE (93)
|
||||
#define _SAVE_LOGS_SUCCESS (94)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user