Compare commits
	
		
			19 Commits
		
	
	
		
			1.4.9
			...
			ptu-config
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 25bf905a79 | |||
| 
						
						
							
						
						5d141b7234
	
				 | 
					
					
						|||
| ebb170123e | |||
| 
						
						
							
						
						96bb70cfe9
	
				 | 
					
					
						|||
| 
						
						
							
						
						8c1da92ff4
	
				 | 
					
					
						|||
| 3e1a4ab09c | |||
| ee203e7672 | |||
| 55c82eb509 | |||
| f60cd9e4ef | |||
| a9fb7a3630 | |||
| db82f2af0d | |||
| 8b2e2d2086 | |||
| 5870f61395 | |||
| aaa0f1e76c | |||
| 0d9a224977 | |||
| d191020caa | |||
| 2b68242d04 | |||
| bd785e7df1 | |||
| f2534c7763 | 
@@ -1,5 +1,5 @@
 | 
			
		||||
[REPOSITORY_URL]
 | 
			
		||||
repository-url="https://git.mimbach49.de/GerhardHoffmann"
 | 
			
		||||
repository-url="https://ptu-config.atb-comm.de/ATB"
 | 
			
		||||
 | 
			
		||||
[DIRECTORIES]
 | 
			
		||||
plugin-directory="/usr/lib/"
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,7 @@
 | 
			
		||||
#include "dc_download.h"
 | 
			
		||||
#include "hwapi.h"
 | 
			
		||||
#include <DeviceController/interfaces.h>
 | 
			
		||||
 | 
			
		||||
#include <QFile>
 | 
			
		||||
#include <QDebug>
 | 
			
		||||
#include <QDateTime>
 | 
			
		||||
#include <QThread>
 | 
			
		||||
 
 | 
			
		||||
@@ -55,7 +55,7 @@ int main(int argc, char **argv) {
 | 
			
		||||
    openlog("ATB-UPDATE-DC-FIRMWARE", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
 | 
			
		||||
 | 
			
		||||
    QApplication a(argc, argv);
 | 
			
		||||
    QApplication::setApplicationName("ATBUpdateTool");
 | 
			
		||||
    QApplication::setApplicationName("ATBDownloadDCFirmware");
 | 
			
		||||
    QApplication::setApplicationVersion(APP_VERSION);
 | 
			
		||||
 | 
			
		||||
    if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
 | 
			
		||||
@@ -124,11 +124,12 @@ int main(int argc, char **argv) {
 | 
			
		||||
    MainWindow mw;
 | 
			
		||||
 | 
			
		||||
    mw.setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
 | 
			
		||||
    //mw.showFullScreen();
 | 
			
		||||
    // mw.showFullScreen();
 | 
			
		||||
 | 
			
		||||
    qCritical() << "SHOW";
 | 
			
		||||
    // qCritical() << "SHOW";
 | 
			
		||||
 | 
			
		||||
    mw.show();
 | 
			
		||||
    // mw.show();
 | 
			
		||||
 | 
			
		||||
    return a.exec();
 | 
			
		||||
    return 0;
 | 
			
		||||
    // return a.exec();
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -127,6 +127,11 @@ DEFINES += QT_DEPRECATED_WARNINGS
 | 
			
		||||
# 1.4.8   : Improve reading Json-file versions of Json-files actually loaded
 | 
			
		||||
#           in DC. If available, show version info instead of blob-info of
 | 
			
		||||
#           Json file.
 | 
			
		||||
# 1.4.9   : Improve ISMAS output: add messages for JSON downloads.
 | 
			
		||||
#           Do not send CHECK_ISMAS_TRIGGER_SUCCESS to ISMAS for an automatic
 | 
			
		||||
#           update.
 | 
			
		||||
#           In case there is an automatic update (00:00-04:00) use M0100 instead
 | 
			
		||||
#           of U0002.
 | 
			
		||||
VERSION="1.4.9"
 | 
			
		||||
# PLANNED TODOS:
 | 
			
		||||
#   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
 | 
			
		||||
 
 | 
			
		||||
@@ -363,7 +363,19 @@ QString IsmasClient::updateNewsToIsmas(char const *event,
 | 
			
		||||
    char buf[1024];
 | 
			
		||||
    memset(buf, 0, sizeof(buf));
 | 
			
		||||
 | 
			
		||||
    QString const ts = QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
 | 
			
		||||
    QDateTime const local(QDateTime::currentDateTime());
 | 
			
		||||
 | 
			
		||||
    QDateTime utc(local);
 | 
			
		||||
    utc.setTimeSpec(Qt::UTC);
 | 
			
		||||
 | 
			
		||||
    int const diff = (int)local.secsTo(utc); // diff between UTC and local time
 | 
			
		||||
 | 
			
		||||
    QTime t(0, 0, 0);
 | 
			
		||||
    t = t.addSecs((uint)diff);
 | 
			
		||||
 | 
			
		||||
    QString const st(QString("%1%2").arg(diff < 0 ? "-" : "+").arg(t.toString("hh:mm")));
 | 
			
		||||
    QString const ts(local.toString(Qt::ISODateWithMs) + st);
 | 
			
		||||
 | 
			
		||||
    snprintf(buf, sizeof(buf)-1,
 | 
			
		||||
        "{"
 | 
			
		||||
            "\"REASON\":\"SW_UP\","
 | 
			
		||||
 
 | 
			
		||||
@@ -410,7 +410,7 @@ bool Update::downloadJson(enum FileTypeJson type,
 | 
			
		||||
                lst << msg;
 | 
			
		||||
 | 
			
		||||
                if (m_worker) {
 | 
			
		||||
                    m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
 | 
			
		||||
                    m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE));
 | 
			
		||||
                }
 | 
			
		||||
                break;
 | 
			
		||||
            }
 | 
			
		||||
@@ -463,22 +463,20 @@ bool Update::downloadJson(enum FileTypeJson type,
 | 
			
		||||
                            */
 | 
			
		||||
 | 
			
		||||
                            if (m_worker) {
 | 
			
		||||
                                if (templateIdx >= 1 && templateIdx <= 32) {
 | 
			
		||||
                                    msg = QString("SUCCESSFULLY LOADED %1 (INDEX=%2) TO DC").arg(file.fileName()).arg(templateIdx);
 | 
			
		||||
                                } else {
 | 
			
		||||
                                    msg = QString("SUCCESSFULLY LOADED %1 (KIND=%2) TO DC").arg(file.fileName()).arg((uint8_t)type);
 | 
			
		||||
                                }
 | 
			
		||||
                                lst.clear();
 | 
			
		||||
                                lst << msg;
 | 
			
		||||
                                m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
 | 
			
		||||
                                if (templateIdx >= 1 && templateIdx <= 32) {
 | 
			
		||||
                                    lst << QString("LOADED %1 (%2) TO DC").arg(fi.fileName()).arg(templateIdx);
 | 
			
		||||
                                } else {
 | 
			
		||||
                                    lst << QString("LOADED %1 (%2) TO DC").arg(fi.fileName()).arg((uint8_t)type);
 | 
			
		||||
                                }
 | 
			
		||||
                                m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE));
 | 
			
		||||
                            }
 | 
			
		||||
                        } else {
 | 
			
		||||
                            msg = QString("ERROR SEND JSON-FILE %1 TO DC").arg(file.fileName());
 | 
			
		||||
                            Utils::printCriticalErrorMsg(msg);
 | 
			
		||||
                            lst << msg;
 | 
			
		||||
                            if (m_worker) {
 | 
			
		||||
                                m_worker->ISMAS(lst) <<  (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
 | 
			
		||||
                                                     << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
 | 
			
		||||
                                m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE);
 | 
			
		||||
                            }
 | 
			
		||||
                        }
 | 
			
		||||
                    } else {
 | 
			
		||||
@@ -486,8 +484,7 @@ bool Update::downloadJson(enum FileTypeJson type,
 | 
			
		||||
                        Utils::printCriticalErrorMsg(msg);
 | 
			
		||||
                        lst << msg;
 | 
			
		||||
                        if (m_worker) {
 | 
			
		||||
                            m_worker->ISMAS(lst) <<  (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
 | 
			
		||||
                                                 << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
 | 
			
		||||
                            m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE);
 | 
			
		||||
                        }
 | 
			
		||||
                    }
 | 
			
		||||
                } else {
 | 
			
		||||
@@ -496,8 +493,7 @@ bool Update::downloadJson(enum FileTypeJson type,
 | 
			
		||||
                    lst << msg;
 | 
			
		||||
 | 
			
		||||
                    if (m_worker) {
 | 
			
		||||
                        m_worker->ISMAS(lst) <<  (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
 | 
			
		||||
                                             << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
 | 
			
		||||
                        m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            } else {
 | 
			
		||||
@@ -506,8 +502,7 @@ bool Update::downloadJson(enum FileTypeJson type,
 | 
			
		||||
                lst << msg;
 | 
			
		||||
 | 
			
		||||
                if (m_worker) {
 | 
			
		||||
                    m_worker->ISMAS(lst) <<  (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
 | 
			
		||||
                                         << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
 | 
			
		||||
                    m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE);
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
@@ -956,46 +951,59 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
 | 
			
		||||
                res = false;
 | 
			
		||||
            } else {
 | 
			
		||||
                if ((res = updatePrinterTemplate(templateIdx, fToWorkOn))) {
 | 
			
		||||
                    Utils::printInfoMsg(
 | 
			
		||||
                        QString("DOWNLOADED PRINTER TEMPLATE %1 WITH INDEX=%2")
 | 
			
		||||
                            .arg(fToWorkOn)
 | 
			
		||||
                            .arg(templateIdx));
 | 
			
		||||
                    if (m_worker) {
 | 
			
		||||
                        QStringList lst(QString("DL:%1 (%2)").arg(QFileInfo(fToWorkOn).fileName()).arg(templateIdx));
 | 
			
		||||
                        m_worker->ISMAS(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS);
 | 
			
		||||
 | 
			
		||||
                        ++displayIndex;
 | 
			
		||||
                        emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
 | 
			
		||||
                              + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
 | 
			
		||||
                                Worker::UPDATE_STEP_DONE);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        } else if (fToWorkOn.contains("DC2C_cash", Qt::CaseInsensitive)
 | 
			
		||||
                && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
 | 
			
		||||
            res = true;
 | 
			
		||||
            if ((res = updateCashConf(fToWorkOn))) {
 | 
			
		||||
                Utils::printInfoMsg(QString("DOWNLOADED CASH TEMPLATE %1").arg(fToWorkOn));
 | 
			
		||||
                if (m_worker) {
 | 
			
		||||
                    QStringList lst(QString("DL:%1").arg(QFileInfo(fToWorkOn).fileName()));
 | 
			
		||||
                    m_worker->ISMAS(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS);
 | 
			
		||||
 | 
			
		||||
                    ++displayIndex;
 | 
			
		||||
                    emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
 | 
			
		||||
                          + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
 | 
			
		||||
                            Worker::UPDATE_STEP_DONE);
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        } else if (fToWorkOn.contains("DC2C_conf", Qt::CaseInsensitive)
 | 
			
		||||
                && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
 | 
			
		||||
            res = true;
 | 
			
		||||
            if ((res= updateConfig(fToWorkOn))) {
 | 
			
		||||
                Utils::printInfoMsg(QString("DOWNLOADED CONFIG TEMPLATE %1").arg(fToWorkOn));
 | 
			
		||||
                if (m_worker) {
 | 
			
		||||
                    QStringList lst(QString("DL:%1").arg(QFileInfo(fToWorkOn).fileName()));
 | 
			
		||||
                    m_worker->ISMAS(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS);
 | 
			
		||||
 | 
			
		||||
                    ++displayIndex;
 | 
			
		||||
                    emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
 | 
			
		||||
                          + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
 | 
			
		||||
                            Worker::UPDATE_STEP_DONE);
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        } else if (fToWorkOn.contains("DC2C_device", Qt::CaseInsensitive)
 | 
			
		||||
                && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
 | 
			
		||||
            res = true;
 | 
			
		||||
            if ((res = updateDeviceConf(fToWorkOn))) {
 | 
			
		||||
                Utils::printInfoMsg(QString("DOWNLOADED DEVICE TEMPLATE %1").arg(fToWorkOn));
 | 
			
		||||
                if (m_worker) {
 | 
			
		||||
                    QStringList lst(QString("DL:%1").arg(QFileInfo(fToWorkOn).fileName()));
 | 
			
		||||
                    m_worker->ISMAS(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS);
 | 
			
		||||
 | 
			
		||||
                    ++displayIndex;
 | 
			
		||||
                    emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
 | 
			
		||||
                          + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
 | 
			
		||||
                            Worker::UPDATE_STEP_DONE);
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        } else {
 | 
			
		||||
            qCritical() << "UNKNOWN JSON FILE NAME" << fToWorkOn;
 | 
			
		||||
            res = false;
 | 
			
		||||
 
 | 
			
		||||
@@ -293,7 +293,7 @@ bool Utils::sameFilesInDirs(QDir const &dir1, QDir const &dir2,
 | 
			
		||||
    }
 | 
			
		||||
    if (fileNameLst1 != fileNameLst2) {
 | 
			
		||||
        printCriticalErrorMsg(dirPath1 + " AND " + dirPath2
 | 
			
		||||
                            + " DIFFER: [" + fileNameLst1.join(',') + "],["
 | 
			
		||||
                            + " HAVE DIFFERENT FILES: [" + fileNameLst1.join(',') + "],["
 | 
			
		||||
                            + fileNameLst2.join(',') + "]");
 | 
			
		||||
        return false;
 | 
			
		||||
    } else {
 | 
			
		||||
@@ -323,7 +323,7 @@ bool Utils::sameFilesInDirs(QDir const &dir1, QDir const &dir2,
 | 
			
		||||
 | 
			
		||||
    if (gitBlobLst1 != gitBlobLst2) {
 | 
			
		||||
        printCriticalErrorMsg(dirPath1 + " AND " + dirPath2
 | 
			
		||||
                            + " DIFFER: [" + gitBlobLst1.join(',') + "],["
 | 
			
		||||
                            + " HAVE DIFFERENT BLOBS: [" + gitBlobLst1.join(',') + "],["
 | 
			
		||||
                            + gitBlobLst2.join(',') + "]");
 | 
			
		||||
        return false;
 | 
			
		||||
    } else {
 | 
			
		||||
 
 | 
			
		||||
@@ -89,6 +89,15 @@ const QMap<UPDATE_STEP, const char*> Worker::smap (
 | 
			
		||||
        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CONFIG_FILE),
 | 
			
		||||
        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS),
 | 
			
		||||
        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE),
 | 
			
		||||
        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CASH_FILE),
 | 
			
		||||
        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE),
 | 
			
		||||
        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS),
 | 
			
		||||
        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_FILE),
 | 
			
		||||
        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_FILE_FAILURE),
 | 
			
		||||
        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS),
 | 
			
		||||
        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_JSON_FILE),
 | 
			
		||||
        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE),
 | 
			
		||||
        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS),
 | 
			
		||||
        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER),
 | 
			
		||||
        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER_SUCCESS),
 | 
			
		||||
        INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER_FAILURE),
 | 
			
		||||
@@ -316,7 +325,7 @@ void Worker::privateUpdate() {
 | 
			
		||||
 | 
			
		||||
                QStringList lst = m_ismasTriggerStatusMessage;
 | 
			
		||||
                // trigger message to ISMAS and CONSOLE
 | 
			
		||||
                ISMAS(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS));
 | 
			
		||||
                CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS);
 | 
			
		||||
                // overwrite m_lastFailedUpdateStep
 | 
			
		||||
                m_lastFailedUpdateStep = UPDATE_STEP::NONE;
 | 
			
		||||
                return;
 | 
			
		||||
@@ -502,9 +511,8 @@ void Worker::privateUpdate() {
 | 
			
		||||
    if ((continueUpdate = downloadFilesToPSAHardware()) == false) {
 | 
			
		||||
        return;
 | 
			
		||||
    }
 | 
			
		||||
    lst = QStringList(QString(smap[UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS]));
 | 
			
		||||
    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
 | 
			
		||||
    setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS);
 | 
			
		||||
    lst = QStringList(QString("DONE"));
 | 
			
		||||
    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS));
 | 
			
		||||
 | 
			
		||||
    ////////////////////////////////////////////////////////////////////////////
 | 
			
		||||
    //
 | 
			
		||||
@@ -954,13 +962,16 @@ bool Worker::execOpkgCommands() {
 | 
			
		||||
 | 
			
		||||
bool Worker::downloadFilesToPSAHardware() {
 | 
			
		||||
    m_displayIndex = 0;
 | 
			
		||||
    QStringList lst(QString("START"));
 | 
			
		||||
 | 
			
		||||
    GUI(m_filesToDownload) << (CONSOLE(m_filesToDownload) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE);
 | 
			
		||||
    setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE);
 | 
			
		||||
    ISMAS(lst) << (GUI(m_filesToDownload) << (CONSOLE(m_filesToDownload) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
 | 
			
		||||
 | 
			
		||||
    if (m_noUpdatePsaHardware == false) {
 | 
			
		||||
        if (computeFilesToDownload() > 0) {
 | 
			
		||||
            QStringList lst = m_filesToDownload;
 | 
			
		||||
            lst.clear();
 | 
			
		||||
            for (int i = 0; i < m_filesToDownload.size(); ++i) {
 | 
			
		||||
                lst << QFileInfo(m_filesToDownload.at(i)).fileName();
 | 
			
		||||
            }
 | 
			
		||||
            ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::FILES_TO_DOWNLOAD);
 | 
			
		||||
 | 
			
		||||
            if (m_update && m_update->doUpdate(m_displayIndex, m_filesToDownload)) {
 | 
			
		||||
@@ -973,7 +984,7 @@ bool Worker::downloadFilesToPSAHardware() {
 | 
			
		||||
                return true;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
 | 
			
		||||
            ISMAS(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE));
 | 
			
		||||
            setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
 | 
			
		||||
 | 
			
		||||
            return false;
 | 
			
		||||
@@ -984,14 +995,20 @@ bool Worker::downloadFilesToPSAHardware() {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool Worker::syncCustomerRepositoryAndFS() {
 | 
			
		||||
    ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY));
 | 
			
		||||
    QString msg("START");
 | 
			
		||||
    QStringList lst(msg);
 | 
			
		||||
    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY));
 | 
			
		||||
    lst.clear();
 | 
			
		||||
 | 
			
		||||
    if (QDir(m_customerRepository).exists()) {
 | 
			
		||||
        if (QDir::setCurrent(m_customerRepository)) {
 | 
			
		||||
            Command md("bash");
 | 
			
		||||
            if (!md.execute(m_customerRepository,
 | 
			
		||||
                            QStringList() << "-c" << "mkdir -p /etc/psa_config /etc/dc /etc/psa_tariff")) {
 | 
			
		||||
                qCritical() << "COULD NOT EXECUTE '" << md.command() << "' exitCode=(" << md.exitCode() << ")";
 | 
			
		||||
                msg = QString("COULD NOT EXECUTE '%1', exitCode=%2").arg(md.command()).arg(md.exitCode());
 | 
			
		||||
                qCritical() << msg;
 | 
			
		||||
                QStringList lst2(msg);
 | 
			
		||||
                ISMAS(lst2) << (CONSOLE(lst2) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY);
 | 
			
		||||
            }
 | 
			
		||||
            QString const params("-v                      "
 | 
			
		||||
                                 "--recursive             "
 | 
			
		||||
@@ -1050,12 +1067,22 @@ bool Worker::syncCustomerRepositoryAndFS() {
 | 
			
		||||
                        error = true;
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
                if (!error) {
 | 
			
		||||
                    lst.clear();
 | 
			
		||||
                    lst << QString("SUCCESS %1").arg(cmd);
 | 
			
		||||
                    ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY);
 | 
			
		||||
                } else {
 | 
			
		||||
                    msg = QString("FAILURE %1").arg(cmd);
 | 
			
		||||
                    lst << msg;
 | 
			
		||||
                    QStringList lst2(msg);
 | 
			
		||||
                    ISMAS(lst2) << (CONSOLE(lst2) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY);
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
            if (!error) {
 | 
			
		||||
                // now check tariff-files in etc and /etc/psa_tariff
 | 
			
		||||
                QDir dir1(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff"));
 | 
			
		||||
                QDir dir2("/etc/psa_tariff");
 | 
			
		||||
                if (Utils::sameFilesInDirs(dir1, dir2)) {
 | 
			
		||||
                if (Utils::sameFilesInDirs(dir1, dir2) == false) {
 | 
			
		||||
                    CONSOLE() <<  QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff")
 | 
			
		||||
                              << "AND /etc/psa_tariff ARE DIFFERENT: CHANGED CUSTOMER-NUMBER?";
 | 
			
		||||
                }
 | 
			
		||||
@@ -1063,9 +1090,13 @@ bool Worker::syncCustomerRepositoryAndFS() {
 | 
			
		||||
                setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
 | 
			
		||||
                return true;
 | 
			
		||||
            }
 | 
			
		||||
        } else {
 | 
			
		||||
            lst << QString("CAN NOT CD TO CUST-REPO %1").arg(m_customerRepository);
 | 
			
		||||
        }
 | 
			
		||||
    } else {
 | 
			
		||||
        lst << QString("CUST-REPO %1 DOES NOT EXIST").arg(m_customerRepository);
 | 
			
		||||
    }
 | 
			
		||||
    ISMAS() << (GUI() << (CONSOLE() << (m_lastFailedUpdateStep = UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_FAILURE)));
 | 
			
		||||
    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_FAILURE)));
 | 
			
		||||
    setProgress(_SYNC_CUSTOMER_REPOSITORY_FAILURE);
 | 
			
		||||
    return false;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -37,6 +37,7 @@
 | 
			
		||||
 | 
			
		||||
#define _ISMAS_DONE                 "U0001" // 100%, Check: Resultcode: 0
 | 
			
		||||
#define _ISMAS_SET_WAIT_OK          "U0002" // empty WAIT-button (""), ResultCode: 0
 | 
			
		||||
#define _ISMAS_NO_UPDATE_NECESSARY  "M0100" // empty WAIT-button (""), ResultCode: 0
 | 
			
		||||
#define _ISMAS_FAILURE              "U0003" // FAIL
 | 
			
		||||
#define _ISMAS_CONTINUE             "U0010" // %-values: Update laeuft, Resultcodes entsprechend laufender Schritt
 | 
			
		||||
#define _ISMAS_RESET_WAIT           "ISMAS" // reset WAIT-button to "WAIT"
 | 
			
		||||
@@ -79,7 +80,6 @@
 | 
			
		||||
#define _SYNC_CUSTOMER_REPOSITORY_SUCCESS           (35)
 | 
			
		||||
#define _FILES_TO_UPDATE                            (36)
 | 
			
		||||
#define _CHECK_FOR_REPOSITORY_CHANGES_FAILURE       (37)
 | 
			
		||||
#define _FILES_TO_DOWNLOAD                          (38)
 | 
			
		||||
#define _EXEC_OPKG_COMMANDS                         (39)
 | 
			
		||||
#define _EXEC_OPKG_COMMAND_1                        (40)
 | 
			
		||||
#define _EXEC_OPKG_COMMAND_2                        (41)
 | 
			
		||||
@@ -93,13 +93,23 @@
 | 
			
		||||
#define _EXEC_OPKG_COMMAND_LAST                     (49)
 | 
			
		||||
#define _EXEC_OPKG_COMMAND_FAILURE                  (50)
 | 
			
		||||
#define _EXEC_OPKG_COMMAND_SUCCESS                  (51)
 | 
			
		||||
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE             (60)
 | 
			
		||||
#define _DOWNLOAD_CONFIG_FILE                       (61)
 | 
			
		||||
#define _DOWNLOAD_CONFIG_FILE_SUCCESS               (62)
 | 
			
		||||
#define _DOWNLOAD_CONFIG_FILE_FAILURE               (63)
 | 
			
		||||
#define _DOWNLOAD_DEVICE_CONTROLLER                 (64)
 | 
			
		||||
#define _DOWNLOAD_DEVICE_CONTROLLER_SUCCESS         (85)
 | 
			
		||||
#define _DOWNLOAD_DEVICE_CONTROLLER_FAILURE         (86)
 | 
			
		||||
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE             (59)
 | 
			
		||||
#define _FILES_TO_DOWNLOAD                          (60)
 | 
			
		||||
#define _DOWNLOAD_CASH_FILE                         (61)
 | 
			
		||||
#define _DOWNLOAD_CASH_FILE_FAILURE                 (62)
 | 
			
		||||
#define _DOWNLOAD_CASH_FILE_SUCCESS                 (63)
 | 
			
		||||
#define _DOWNLOAD_CONFIG_FILE                       (64)
 | 
			
		||||
#define _DOWNLOAD_CONFIG_FILE_FAILURE               (65)
 | 
			
		||||
#define _DOWNLOAD_CONFIG_FILE_SUCCESS               (66)
 | 
			
		||||
#define _DOWNLOAD_DEVICE_FILE                       (67)
 | 
			
		||||
#define _DOWNLOAD_DEVICE_FILE_FAILURE               (68)
 | 
			
		||||
#define _DOWNLOAD_DEVICE_FILE_SUCCESS               (69)
 | 
			
		||||
#define _DOWNLOAD_JSON_FILE                         (70)
 | 
			
		||||
#define _DOWNLOAD_JSON_FILE_FAILURE                 (71)
 | 
			
		||||
#define _DOWNLOAD_JSON_FILE_SUCCESS                 (72)
 | 
			
		||||
#define _DOWNLOAD_DEVICE_CONTROLLER                 (84)
 | 
			
		||||
#define _DOWNLOAD_DEVICE_CONTROLLER_FAILURE         (85)
 | 
			
		||||
#define _DOWNLOAD_DEVICE_CONTROLLER_SUCCESS         (86)
 | 
			
		||||
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE     (87)
 | 
			
		||||
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS     (88)
 | 
			
		||||
#define _SAVE_LOGS                                  (92)
 | 
			
		||||
@@ -326,6 +336,15 @@ public:
 | 
			
		||||
        DOWNLOAD_CONFIG_FILE = _DOWNLOAD_CONFIG_FILE,
 | 
			
		||||
        DOWNLOAD_CONFIG_FILE_SUCCESS = _DOWNLOAD_CONFIG_FILE_SUCCESS,
 | 
			
		||||
        DOWNLOAD_CONFIG_FILE_FAILURE = _DOWNLOAD_CONFIG_FILE_FAILURE,
 | 
			
		||||
        DOWNLOAD_CASH_FILE = _DOWNLOAD_CASH_FILE,
 | 
			
		||||
        DOWNLOAD_CASH_FILE_FAILURE = _DOWNLOAD_CASH_FILE_FAILURE,
 | 
			
		||||
        DOWNLOAD_CASH_FILE_SUCCESS = _DOWNLOAD_CASH_FILE_SUCCESS,
 | 
			
		||||
        DOWNLOAD_DEVICE_FILE = _DOWNLOAD_DEVICE_FILE,
 | 
			
		||||
        DOWNLOAD_DEVICE_FILE_FAILURE = _DOWNLOAD_DEVICE_FILE_FAILURE,
 | 
			
		||||
        DOWNLOAD_DEVICE_FILE_SUCCESS = _DOWNLOAD_DEVICE_FILE_SUCCESS,
 | 
			
		||||
        DOWNLOAD_JSON_FILE = _DOWNLOAD_JSON_FILE,
 | 
			
		||||
        DOWNLOAD_JSON_FILE_FAILURE = _DOWNLOAD_JSON_FILE_FAILURE,
 | 
			
		||||
        DOWNLOAD_JSON_FILE_SUCCESS = _DOWNLOAD_JSON_FILE_SUCCESS,
 | 
			
		||||
        DOWNLOAD_DEVICE_CONTROLLER = _DOWNLOAD_DEVICE_CONTROLLER,
 | 
			
		||||
        DOWNLOAD_DEVICE_CONTROLLER_SUCCESS = _DOWNLOAD_DEVICE_CONTROLLER_SUCCESS,
 | 
			
		||||
        DOWNLOAD_DEVICE_CONTROLLER_FAILURE = _DOWNLOAD_DEVICE_CONTROLLER_FAILURE,
 | 
			
		||||
@@ -655,6 +674,24 @@ private:
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE:
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_CASH_FILE: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_FAILURE: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_JSON_FILE: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER:
 | 
			
		||||
            lst << instance->m_debugMsg;
 | 
			
		||||
            Utils::printUpdateStatusMsg(debug, lst);
 | 
			
		||||
@@ -1088,12 +1125,34 @@ private:
 | 
			
		||||
        case UPDATE_STEP::FILES_TO_UPDATE:
 | 
			
		||||
            ismasClient.setProgressInPercent(_FILES_TO_UPDATE);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE:
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE: {
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_FILES_TO_PSA_HARDWARE);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::FILES_TO_DOWNLOAD:
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::SUCCESS,
 | 
			
		||||
                        smap[UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::FILES_TO_DOWNLOAD: {
 | 
			
		||||
            ismasClient.setProgressInPercent(_FILES_TO_DOWNLOAD);
 | 
			
		||||
        break;
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::SUCCESS,
 | 
			
		||||
                        smap[UPDATE_STEP::DOWNLOAD_JSON_FILE],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::EXEC_OPKG_COMMANDS:
 | 
			
		||||
            ismasClient.setProgressInPercent(_EXEC_OPKG_COMMANDS);
 | 
			
		||||
        break;
 | 
			
		||||
@@ -1229,15 +1288,180 @@ private:
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_CONFIG_FILE:
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_CONFIG_FILE);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS:
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_CONFIG_FILE_SUCCESS);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE:
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_CONFIG_FILE: {
 | 
			
		||||
            //ismasClient.setProgressInPercent(_DOWNLOAD_CONFIG_FILE);
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::SUCCESS,
 | 
			
		||||
                        smap[UPDATE_STEP::DOWNLOAD_CONFIG_FILE],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS: {
 | 
			
		||||
            //ismasClient.setProgressInPercent(_DOWNLOAD_CONFIG_FILE_SUCCESS);
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::SUCCESS,
 | 
			
		||||
                        smap[UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE: {
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_CONFIG_FILE_FAILURE);
 | 
			
		||||
        break;
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::JSON_FILES_DOWNLOAD_ERROR,
 | 
			
		||||
                        smap[UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_CASH_FILE: {
 | 
			
		||||
            //ismasClient.setProgressInPercent(_DOWNLOAD_CASH_FILE);
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::SUCCESS,
 | 
			
		||||
                        smap[UPDATE_STEP::DOWNLOAD_CASH_FILE],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE: {
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_CASH_FILE_FAILURE);
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::JSON_FILES_DOWNLOAD_ERROR,
 | 
			
		||||
                        smap[UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS: {
 | 
			
		||||
            //ismasClient.setProgressInPercent(_DOWNLOAD_CASH_FILE_SUCCESS);
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::SUCCESS,
 | 
			
		||||
                        smap[UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE: {
 | 
			
		||||
            //ismasClient.setProgressInPercent(_DOWNLOAD_DEVICE_FILE);
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::SUCCESS,
 | 
			
		||||
                        smap[UPDATE_STEP::DOWNLOAD_DEVICE_FILE],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_FAILURE: {
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_DEVICE_FILE_FAILURE);
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::JSON_FILES_DOWNLOAD_ERROR,
 | 
			
		||||
                        smap[UPDATE_STEP::DOWNLOAD_DEVICE_FILE_FAILURE],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS: {
 | 
			
		||||
            //ismasClient.setProgressInPercent(_DOWNLOAD_DEVICE_FILE_SUCCESS);
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::SUCCESS,
 | 
			
		||||
                        smap[UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_JSON_FILE: {
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::SUCCESS,
 | 
			
		||||
                        smap[UPDATE_STEP::DOWNLOAD_JSON_FILE],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE: {
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE_FAILURE);
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::JSON_FILES_DOWNLOAD_ERROR,
 | 
			
		||||
                        smap[UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS: {
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::SUCCESS,
 | 
			
		||||
                        smap[UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER:
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_DEVICE_CONTROLLER);
 | 
			
		||||
        break;
 | 
			
		||||
@@ -1275,9 +1499,20 @@ private:
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE:
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY:
 | 
			
		||||
        case UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY: {
 | 
			
		||||
            ismasClient.setProgressInPercent(_SYNC_CUSTOMER_REPOSITORY);
 | 
			
		||||
        break;
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::SUCCESS,
 | 
			
		||||
                        smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS: {
 | 
			
		||||
            ismasClient.setProgressInPercent(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
@@ -1286,7 +1521,7 @@ private:
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::SUCCESS,
 | 
			
		||||
                        smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY],
 | 
			
		||||
                        smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
@@ -1326,6 +1561,7 @@ private:
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::UPDATE_SUCCEEDED: {
 | 
			
		||||
            ismasClient.setProgressInPercent(_UPDATE_SUCCEEDED + _UPDATE_SUCCEEDED_CORRECTION);
 | 
			
		||||
            if (instance->m_automaticUpdate == false) {
 | 
			
		||||
                QString const &ismasUpdateNews =
 | 
			
		||||
                    QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                        ismasClient.updateNewsToIsmas(
 | 
			
		||||
@@ -1337,13 +1573,14 @@ private:
 | 
			
		||||
                            instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
 | 
			
		||||
                ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                    IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
            }
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::UPDATE_ACTIVATED: {
 | 
			
		||||
            ismasClient.setProgressInPercent(_UPDATE_ACTIVATED + _UPDATE_ACTIVATED_CORRECTION);
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_SET_WAIT_OK, // U0002
 | 
			
		||||
                        (instance->m_automaticUpdate ? _ISMAS_NO_UPDATE_NECESSARY : _ISMAS_SET_WAIT_OK), // U0002 or M0100
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::SUCCESS,
 | 
			
		||||
                        smap[UPDATE_STEP::UPDATE_FINALIZE],
 | 
			
		||||
@@ -1357,7 +1594,7 @@ private:
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_SET_WAIT_OK, // U0002
 | 
			
		||||
                        (instance->m_automaticUpdate ? _ISMAS_NO_UPDATE_NECESSARY : _ISMAS_SET_WAIT_OK), // U0002 or M0100
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::NO_UPDATE_NECESSARY,
 | 
			
		||||
                        smap[UPDATE_STEP::UPDATE_FINALIZE],
 | 
			
		||||
@@ -1552,6 +1789,24 @@ private:
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE:
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_CASH_FILE: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_FAILURE: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_JSON_FILE: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS: {
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER:
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER_SUCCESS:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user