Compare commits
	
		
			27 Commits
		
	
	
		
			master
			...
			gerhard-en
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 4cc964e8c2 | |||
| f910b7d057 | |||
| 5dd90e9597 | |||
| 47f09067ea | |||
| 65163354bd | |||
| 5f88c8f856 | |||
| 4efbbcbb5a | |||
| 1155b83ca9 | |||
| 631550b55e | |||
| 9e5c379e8a | |||
| 6b9e795206 | |||
| b7ff6dcdbe | |||
| 2025a75d56 | |||
| 6176285b89 | |||
| 0344150950 | |||
| 68813a49c5 | |||
| 8e287e3163 | |||
| fd58f41c87 | |||
| ece75887e2 | |||
| cee4caf77d | |||
| 6b2830ee83 | |||
| cd4bddd169 | |||
| 8a380c9845 | |||
| 23619543b2 | |||
| be16fe4981 | |||
| cf621c02bd | |||
| ee26eef50f | 
@@ -93,7 +93,9 @@ HEADERS += \
 | 
			
		||||
    $${PWD}/include/sendWRcmd.h \
 | 
			
		||||
    $${PWD}/include/storeINdata.h \
 | 
			
		||||
    $${PWD}/include/tslib.h \
 | 
			
		||||
    $${PWD}/include/shared_mem_buffer.h
 | 
			
		||||
    $${PWD}/include/shared_mem_buffer.h \
 | 
			
		||||
    $${PWD}/include/download_thread.h \
 | 
			
		||||
    $${PWD}/include/reporting_thread.h
 | 
			
		||||
 | 
			
		||||
SOURCES += \
 | 
			
		||||
    $${PWD}/src/com.cpp \
 | 
			
		||||
@@ -107,7 +109,9 @@ SOURCES += \
 | 
			
		||||
    $${PWD}/src/sendWRcmd.cpp \
 | 
			
		||||
    $${PWD}/src/storeINdata.cpp \
 | 
			
		||||
    $${PWD}/src/tslib.cpp \
 | 
			
		||||
    $${PWD}/src/shared_mem_buffer.cpp
 | 
			
		||||
    $${PWD}/src/shared_mem_buffer.cpp \
 | 
			
		||||
    $${PWD}/src/download_thread.cpp \
 | 
			
		||||
    $${PWD}/src/reporting_thread.cpp
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# INTERFACE = DeviceController
 | 
			
		||||
 
 | 
			
		||||
@@ -133,8 +133,8 @@
 | 
			
		||||
#define SENDCOMBINED            0
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class hwinf;
 | 
			
		||||
class DownloadThread;
 | 
			
		||||
class T_datif : public QObject
 | 
			
		||||
{
 | 
			
		||||
    Q_OBJECT    
 | 
			
		||||
@@ -165,13 +165,15 @@ class T_datif : public QObject
 | 
			
		||||
    T_prot *myDCIF;
 | 
			
		||||
    QTimer *datif_trigger;
 | 
			
		||||
    uint8_t selectedSlaveAddr;
 | 
			
		||||
    DownloadThread *m_downloadThread;
 | 
			
		||||
    hwinf *m_hw;
 | 
			
		||||
 | 
			
		||||
private slots:
 | 
			
		||||
    char datif_cycleSend();
 | 
			
		||||
    void StoredRecData();
 | 
			
		||||
 | 
			
		||||
public:
 | 
			
		||||
    T_datif(QObject *parent = nullptr);
 | 
			
		||||
    T_datif(hwinf *hw, QObject *parent = nullptr);
 | 
			
		||||
 | 
			
		||||
    void resetChain(void);
 | 
			
		||||
    char isPortOpen(void);
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										37
									
								
								include/download_thread.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										37
									
								
								include/download_thread.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,37 @@
 | 
			
		||||
#ifndef DOWNLOAD_THREAD_H_INCLUDED
 | 
			
		||||
#define DOWNLOAD_THREAD_H_INCLUDED
 | 
			
		||||
 | 
			
		||||
#include <QThread>
 | 
			
		||||
#include <QString>
 | 
			
		||||
#include <QByteArray>
 | 
			
		||||
 | 
			
		||||
class hwinf;
 | 
			
		||||
class DownloadThread : public QThread {
 | 
			
		||||
    Q_OBJECT
 | 
			
		||||
 | 
			
		||||
public:
 | 
			
		||||
    enum class DownloadResult {OK, ERROR, TIMEOUT, NOP};
 | 
			
		||||
 | 
			
		||||
    DownloadThread(hwinf *hw);
 | 
			
		||||
    ~DownloadThread();
 | 
			
		||||
 | 
			
		||||
protected:
 | 
			
		||||
    // download thread does not have a running event queue, and therefore
 | 
			
		||||
    // no slots. signals work the usual way.
 | 
			
		||||
    void run() override;
 | 
			
		||||
 | 
			
		||||
private:
 | 
			
		||||
    DownloadResult sendStatus(int ret) const;
 | 
			
		||||
    DownloadResult sendNextAddress(int bNum) const;
 | 
			
		||||
    DownloadResult sendNextDataBlock(QByteArray const &binary, int bNum) const;
 | 
			
		||||
    bool startBootloader() const;
 | 
			
		||||
    bool stopBootloader() const;
 | 
			
		||||
    QByteArray loadBinaryDCFile(QString dcFileName) const;
 | 
			
		||||
    bool resetDeviceController() const;
 | 
			
		||||
    DownloadResult dcDownloadBinary(QByteArray const &b) const;
 | 
			
		||||
 | 
			
		||||
    hwinf *m_hw;
 | 
			
		||||
    QString m_fileToDownload;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#endif // DOWNLOAD_THREAD_H_INCLUDED
 | 
			
		||||
@@ -40,7 +40,8 @@ V4.0  6.9.2023: activating DC-Bootloader in slve-lib (SM)
 | 
			
		||||
#include "interfaces.h"
 | 
			
		||||
#include "shared_mem_buffer.h"
 | 
			
		||||
#include "runProc.h"
 | 
			
		||||
 | 
			
		||||
#include "download_thread.h"
 | 
			
		||||
#include "reporting_thread.h"
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * select Plugin Type here
 | 
			
		||||
@@ -74,7 +75,8 @@ V4.0  6.9.2023: activating DC-Bootloader in slve-lib (SM)
 | 
			
		||||
//for CAmaster:	
 | 
			
		||||
 | 
			
		||||
class QSharedMemory;
 | 
			
		||||
 | 
			
		||||
class ReportingThread;
 | 
			
		||||
class DownloadThread;
 | 
			
		||||
class hwapi :   public QObject,
 | 
			
		||||
                public hwinf
 | 
			
		||||
{
 | 
			
		||||
@@ -86,7 +88,8 @@ private:
 | 
			
		||||
    void sub_storeSendingText(QByteArray *buf) const;
 | 
			
		||||
    QTimer *hwapi_TimerPayment;
 | 
			
		||||
    QSharedMemory *m_sharedMem;
 | 
			
		||||
    //QTimer *hwapi_triggerBL;
 | 
			
		||||
    ReportingThread *m_reportingThread;
 | 
			
		||||
    DownloadThread *m_downloadThread;
 | 
			
		||||
 | 
			
		||||
public:
 | 
			
		||||
    explicit hwapi(QWidget *parent = nullptr);
 | 
			
		||||
@@ -1304,8 +1307,47 @@ public:
 | 
			
		||||
        //                                          countOfBills[1] for 10€   and so on
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    // download device controller
 | 
			
		||||
    bool dcDownloadRequest(QString const &fileToDownload) const override;
 | 
			
		||||
    bool dcDownloadRequested() const override;
 | 
			
		||||
    bool dcDownloadResetRequest() const override;
 | 
			
		||||
    bool dcDownloadRequestAck() const override;
 | 
			
		||||
    bool dcDownloadRunning() const override;
 | 
			
		||||
    bool dcDownloadFinished() override;
 | 
			
		||||
 | 
			
		||||
signals:
 | 
			
		||||
    bool dcDownloadReportStart() const override;
 | 
			
		||||
    bool dcDownloadReportRunning() const override;
 | 
			
		||||
    bool dcDownloadReportFinished() override;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    bool dcDownloadThreadStart() override;
 | 
			
		||||
    bool dcDownloadThreadRunning() const override;
 | 
			
		||||
    void dcDownloadThreadFinalize(DownloadThread *) override;
 | 
			
		||||
    bool dcDownloadThreadFinished() const override;
 | 
			
		||||
    bool dcDownloadReportThreadStart() override;
 | 
			
		||||
    bool dcDownloadReportThreadRunning() const override;
 | 
			
		||||
    void dcDownloadReportThreadFinalize() override;
 | 
			
		||||
    void dcDownloadReportThreadQuit() override;
 | 
			
		||||
    bool dcDownloadReportThreadFinished() const override;
 | 
			
		||||
 | 
			
		||||
    QString dcDownloadFileName() const override;
 | 
			
		||||
    bool dcDownloadSetRequested(bool) override;
 | 
			
		||||
    bool dcDownloadSetRunning(bool) override;
 | 
			
		||||
    bool dcDownloadSetFinished(bool) override;
 | 
			
		||||
    void dcDownloadSetTotalBlockNumber(uint16_t totalBlockNumber) override;
 | 
			
		||||
    void dcDownloadSetCurrentBlockNumber(uint16_t currentBlockNumber) override;
 | 
			
		||||
    bool dcDownloadGetRequested() const override;
 | 
			
		||||
    bool dcDownloadGetRunning() const override;
 | 
			
		||||
    bool dcDownloadGetFinished() const override;
 | 
			
		||||
    uint16_t dcDownloadGetTotalBlockNumber() const override;
 | 
			
		||||
    uint16_t dcDownloadGetCurrentBlockNumber() const override;
 | 
			
		||||
 | 
			
		||||
    virtual QObject const *getAPI() override;
 | 
			
		||||
 | 
			
		||||
signals:    // for download
 | 
			
		||||
    void hwapi_reportDCDownloadStatus(QString const&) const;
 | 
			
		||||
    void hwapi_reportDCDownloadSuccess(QString const&) const;
 | 
			
		||||
    void hwapi_reportDCDownloadFailure(QString const&) const;
 | 
			
		||||
    // already declared in interfaces.h
 | 
			
		||||
    void hwapi_templatePrintFinished_OK(void) const;
 | 
			
		||||
    void hwapi_templatePrintFinished_Err(void) const;
 | 
			
		||||
 
 | 
			
		||||
@@ -2,6 +2,7 @@
 | 
			
		||||
#define INTERFACE_H
 | 
			
		||||
 | 
			
		||||
#include <QtPlugin>
 | 
			
		||||
#include <QString>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -397,6 +398,8 @@ struct T_bna
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
class hwapi;
 | 
			
		||||
class DownloadThread;
 | 
			
		||||
class hwinf
 | 
			
		||||
{
 | 
			
		||||
 | 
			
		||||
@@ -2273,9 +2276,61 @@ 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; }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
signals:
 | 
			
		||||
    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:    // for download
 | 
			
		||||
    void hwapi_reportDCDownloadStatus(QString const&) const;
 | 
			
		||||
    void hwapi_reportDCDownloadSuccess(QString const&) const;
 | 
			
		||||
    void hwapi_reportDCDownloadFailure(QString const&) const;
 | 
			
		||||
 | 
			
		||||
    // NOTE: declaring a "pure virtual" "signal" should be an error and thus not valid.
 | 
			
		||||
    void hwapi_templatePrintFinished_OK() const;
 | 
			
		||||
    void hwapi_templatePrintFinished_Err() const;
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										25
									
								
								include/reporting_thread.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								include/reporting_thread.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,25 @@
 | 
			
		||||
#ifndef REPORTING_THREAD_H_INCLUDED
 | 
			
		||||
#define REPORTING_THREAD_H_INCLUDED
 | 
			
		||||
 | 
			
		||||
#include <QThread>
 | 
			
		||||
#include <QString>
 | 
			
		||||
 | 
			
		||||
class hwapi;
 | 
			
		||||
class ReportingThread : public QThread {
 | 
			
		||||
    Q_OBJECT
 | 
			
		||||
 | 
			
		||||
public:
 | 
			
		||||
    ReportingThread(hwapi *hw);
 | 
			
		||||
    ~ReportingThread();
 | 
			
		||||
 | 
			
		||||
protected:
 | 
			
		||||
    // reporting thread does not have a running event queue, and therefore
 | 
			
		||||
    // no slots. signals work the usual way.
 | 
			
		||||
    void run() override;
 | 
			
		||||
 | 
			
		||||
private:
 | 
			
		||||
    hwapi *m_hw;
 | 
			
		||||
    QString m_fileToDownload;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#endif // REPORTING_THREAD_H_INCLUDED
 | 
			
		||||
@@ -301,9 +301,26 @@ struct SharedMem
 | 
			
		||||
    uint8_t  p_nextFDcmdsInQueue;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    // download of device controller and json files
 | 
			
		||||
    struct DCDownload {
 | 
			
		||||
        enum class FILE_INDEX {
 | 
			
		||||
            DC_BINARY = 0, DC2C_CASH = 1, DC2C_CONF = 2, DC2C_SERIAL=3,
 | 
			
		||||
            DC2C_PRINT_01, DC2C_PRINT_02, DC2C_PRINT_03, DC2C_PRINT_04, 
 | 
			
		||||
            DC2C_PRINT_05, DC2C_PRINT_06, DC2C_PRINT_07, DC2C_PRINT_08, 
 | 
			
		||||
            DC2C_PRINT_09, DC2C_PRINT_10, DC2C_PRINT_11, DC2C_PRINT_12, 
 | 
			
		||||
            DC2C_PRINT_13, DC2C_PRINT_14, DC2C_PRINT_15, DC2C_PRINT_16, 
 | 
			
		||||
            DC2C_PRINT_17, DC2C_PRINT_18, DC2C_PRINT_19, DC2C_PRINT_20, 
 | 
			
		||||
            DC2C_PRINT_21, DC2C_PRINT_22, DC2C_PRINT_23, DC2C_PRINT_24, 
 | 
			
		||||
            DC2C_PRINT_25, DC2C_PRINT_26, DC2C_PRINT_27, DC2C_PRINT_28, 
 | 
			
		||||
            DC2C_PRINT_29, DC2C_PRINT_30, DC2C_PRINT_31, DC2C_PRINT_32
 | 
			
		||||
        };
 | 
			
		||||
        char m_filename[(int)FILE_INDEX::DC2C_PRINT_32][512];
 | 
			
		||||
        std::atomic_ushort m_totalBlocks;
 | 
			
		||||
        std::atomic_ushort m_currentblockNumber;
 | 
			
		||||
        std::atomic_bool m_requested{false};
 | 
			
		||||
        std::atomic_bool m_running{false};
 | 
			
		||||
        std::atomic_bool m_finished{false};
 | 
			
		||||
    } m_downLoadDC;
 | 
			
		||||
 | 
			
		||||
    static QSharedMemory *getShm(std::size_t s = 0);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -5,6 +5,7 @@ VERSION="1.0.0"
 | 
			
		||||
include(../DCLibraries.pri)
 | 
			
		||||
 | 
			
		||||
DEFINES+=THIS_IS_CA_MASTER
 | 
			
		||||
DEFINES-=THIS_IS_CA_SLAVE
 | 
			
		||||
DESTDIR=$${_PRO_FILE_PWD_}/../build
 | 
			
		||||
 | 
			
		||||
unix {
 | 
			
		||||
 
 | 
			
		||||
@@ -5,6 +5,8 @@ VERSION="1.0.0"
 | 
			
		||||
include(../DCLibraries.pri)
 | 
			
		||||
 | 
			
		||||
DEFINES+=THIS_IS_CA_SLAVE
 | 
			
		||||
DEFINES-=THIS_IS_CA_MASTER
 | 
			
		||||
 | 
			
		||||
DESTDIR=$${_PRO_FILE_PWD_}/../build
 | 
			
		||||
 | 
			
		||||
unix {
 | 
			
		||||
 
 | 
			
		||||
@@ -2,6 +2,9 @@
 | 
			
		||||
#include "sendWRcmd.h"
 | 
			
		||||
#include "controlBus.h"
 | 
			
		||||
#include "storeINdata.h"
 | 
			
		||||
#include "download_thread.h"
 | 
			
		||||
#include "hwapi.h"
 | 
			
		||||
 | 
			
		||||
#include <QDebug>
 | 
			
		||||
#include <datei.h>
 | 
			
		||||
#include <QDir>
 | 
			
		||||
@@ -47,8 +50,10 @@ static uint8_t datif_pNextCmd, datif_sendSlowCmd;
 | 
			
		||||
//#define     DATIF_CTR_GOTRESPVAL        100
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
T_datif::T_datif(QObject *parent) : QObject(parent)
 | 
			
		||||
T_datif::T_datif(hwinf *hw, QObject *parent) : QObject(parent)
 | 
			
		||||
{
 | 
			
		||||
    m_hw = hw;
 | 
			
		||||
 | 
			
		||||
    QByteArray myBA;
 | 
			
		||||
    QDir myDir("../dmd");
 | 
			
		||||
 | 
			
		||||
@@ -198,8 +203,21 @@ char T_datif::datif_cycleSend()
 | 
			
		||||
        return 0;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (m_hw->dcDownloadRequested()) { // only happens in ca-master
 | 
			
		||||
        m_hw->dcDownloadResetRequest();
 | 
			
		||||
 | 
			
		||||
        // start download-thread.
 | 
			
		||||
        m_downloadThread = new DownloadThread(m_hw);
 | 
			
		||||
        m_downloadThread->start();
 | 
			
		||||
 | 
			
		||||
        int cnt = 10;
 | 
			
		||||
        while (--cnt > 0 && !m_downloadThread->isRunning()) {
 | 
			
		||||
            QThread::msleep(100);
 | 
			
		||||
        }
 | 
			
		||||
        if (cnt <= 0) {
 | 
			
		||||
            qCritical() << "DOWNLOAD-THREAD NOT RUNNING WITHIN 1000ms";
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // 17.7.2023: repeat commands if result was !=OK  -------------------------------------------------------------------
 | 
			
		||||
    if (datif_cmdWasPerformed==2 && doRepeat)       // Cmd was not or false performed und Wiederholen erwuenscht
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										320
									
								
								src/download_thread.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										320
									
								
								src/download_thread.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,320 @@
 | 
			
		||||
#include "download_thread.h"
 | 
			
		||||
#include "shared_mem_buffer.h"
 | 
			
		||||
#include "hwapi.h"
 | 
			
		||||
 | 
			
		||||
#include <QDebug>
 | 
			
		||||
#include <QDateTime>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
DownloadThread::DownloadThread(hwinf *hw)
 | 
			
		||||
  : m_hw(hw)
 | 
			
		||||
  , m_fileToDownload(m_hw->dcDownloadFileName()) {
 | 
			
		||||
    // connect(this, &QThread::finished,
 | 
			
		||||
    //        dynamic_cast<QObject const *>(m_hw), &QThread::deleteLater);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
DownloadThread::~DownloadThread() {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 ///////////////////////////////////////////////////////////////////////////////
 | 
			
		||||
 //
 | 
			
		||||
 //                        USING THE DC BOOTLOADER
 | 
			
		||||
 //
 | 
			
		||||
 ///////////////////////////////////////////////////////////////////////////////
 | 
			
		||||
 | 
			
		||||
 1  :   bl_reboot()     // send to application, want DC2 to reset (in order to
 | 
			
		||||
                        // start the bootloader)
 | 
			
		||||
                        //
 | 
			
		||||
                        // NOTE: this function is NOT reliable !!! Sometimes it
 | 
			
		||||
                        // simply does not work, in which case bl_startBL,
 | 
			
		||||
                        // bl_checkBL and bl_isUp do not work as well.
 | 
			
		||||
                        // Alas, there is no feedback if bl_reboot worked!
 | 
			
		||||
                        //
 | 
			
		||||
                        // NOTE: this function can be called only once per
 | 
			
		||||
                        // minute, because once called again, the controller
 | 
			
		||||
                        // performs some self-checks consuming some time.
 | 
			
		||||
                        //
 | 
			
		||||
                        // NOTE: after a successful bl_reboot(), the device is
 | 
			
		||||
                        // waiting about 4 seconds in the bootloader. To stay in
 | 
			
		||||
                        // the bootloader, we have to send the command
 | 
			
		||||
                        // bl_startBL(), which is kind of a misnomer, as it
 | 
			
		||||
                        // should be bl_doNotLeaveBL().
 | 
			
		||||
                        //
 | 
			
		||||
 2  :   bl_startBL():   // send within 4s after DC power-on, otherwise
 | 
			
		||||
                        // bootloader is left.
 | 
			
		||||
                        //
 | 
			
		||||
                        // NOTE: a running bootloader is a MUST for the download
 | 
			
		||||
                        // process of a device controller firmware as it does
 | 
			
		||||
                        // the actual writing of the memory (the bl_reboot()
 | 
			
		||||
                        // from above erases the available memory).
 | 
			
		||||
                        //
 | 
			
		||||
 3  :   bl_check():     // send command to verify if bl is up
 | 
			
		||||
                        //
 | 
			
		||||
                        // NOTE: this command is kind of a request that we want
 | 
			
		||||
                        // to check if the bootloader is up. The device
 | 
			
		||||
                        // (actually the bootloader) responds with its version.
 | 
			
		||||
                        //
 | 
			
		||||
 4  :   bl_isUp():      // returns true if bl is up and running
 | 
			
		||||
                        //
 | 
			
		||||
                        // NOTE: we know what the bootloader version actually is
 | 
			
		||||
                        // as the bootloader does not change. By comparing the
 | 
			
		||||
                        // string received in the previous step with this known
 | 
			
		||||
                        // version string we know if the bootloader is up.
 | 
			
		||||
                        //
 | 
			
		||||
                        // NOTE FOR ALL PREVIOUS STEPS: execute them in their
 | 
			
		||||
                        // own slots each to be sure to receive any possible
 | 
			
		||||
                        // responds from the device.
 | 
			
		||||
                        //
 | 
			
		||||
 5  :   bl_sendAddress(blockNumber)
 | 
			
		||||
                        // send start address, nr of 64-byte block, start with 0
 | 
			
		||||
                        // will be sent only for following block-numbers:
 | 
			
		||||
                        // 0, 1024, 2048, 3072 and 4096, so basically every
 | 
			
		||||
                        // 64kByte.
 | 
			
		||||
                        // for other addresses nothing happens
 | 
			
		||||
 | 
			
		||||
 6  :   bl_wasSendingAddOK()
 | 
			
		||||
                        // return val:  0: no response by now
 | 
			
		||||
                        //              1: error
 | 
			
		||||
                        //             10: OK
 | 
			
		||||
 | 
			
		||||
 7  :   bl_sendDataBlock()
 | 
			
		||||
                        // send 64 byte from bin file
 | 
			
		||||
 | 
			
		||||
 8  :   bl_sendLastBlock()
 | 
			
		||||
                        // send this command after all data are transferred
 | 
			
		||||
 | 
			
		||||
 9  :   bl_wasSendingDataOK()
 | 
			
		||||
                        // return val:  0: no response by now
 | 
			
		||||
                        //              1: error
 | 
			
		||||
                        //             10: OK
 | 
			
		||||
 | 
			
		||||
 10 :   bl_stopBL()     // leave bl and start (the new) application
 | 
			
		||||
                        //
 | 
			
		||||
                        // NOTE: this function MUST work under all conditions.
 | 
			
		||||
                        // Alas, there is no direct result for this command, so
 | 
			
		||||
                        // the only way of knowing it was successful is to ask
 | 
			
		||||
                        // the device if the bootloader is still running.
 | 
			
		||||
                        // There is no problem to repeat this command until the
 | 
			
		||||
                        // bootloader is really not running anymore.
 | 
			
		||||
 */
 | 
			
		||||
void DownloadThread::run() {
 | 
			
		||||
    // download thread running in ca-master sends the dc-file down to firmware
 | 
			
		||||
    // TODO: send the json files as well
 | 
			
		||||
 | 
			
		||||
    m_hw->dcDownloadRequestAck();
 | 
			
		||||
 | 
			
		||||
    qCritical() << "DownloadThread::run(): DOWNLOAD THREAD STARTED";
 | 
			
		||||
 | 
			
		||||
    // load binary device controller file into memory
 | 
			
		||||
    QByteArray ba = loadBinaryDCFile(m_hw->dcDownloadFileName());
 | 
			
		||||
    if (ba.size() > 0) {
 | 
			
		||||
        uint16_t const totalBlocks = (((ba.size())%64)==0) ? (ba.size()/64) : (ba.size()/64)+1;
 | 
			
		||||
        m_hw->dcDownloadSetTotalBlockNumber(totalBlocks);
 | 
			
		||||
 | 
			
		||||
        // fill last block of data to be sent with 0xFF
 | 
			
		||||
        ba = ba.leftJustified(totalBlocks*64, (char)(0xFF));
 | 
			
		||||
 | 
			
		||||
        resetDeviceController();
 | 
			
		||||
        if (startBootloader()) {
 | 
			
		||||
 | 
			
		||||
            qCritical() << "DownloadThread::run(): TOTAL NUMBER OF BYTES TO SEND TO DC" << ba.size();
 | 
			
		||||
            qCritical() << "DownloadThread::run(): TOTAL NUMBER OF BLOCKS" << totalBlocks;
 | 
			
		||||
 | 
			
		||||
            int currentBlock = 0;
 | 
			
		||||
            DownloadResult res = DownloadResult::OK;
 | 
			
		||||
            qCritical() << "64-byte block " << currentBlock;
 | 
			
		||||
            while (res != DownloadResult::ERROR &&  currentBlock < totalBlocks) {
 | 
			
		||||
                if ((res = sendNextAddress(currentBlock)) != DownloadResult::ERROR) {
 | 
			
		||||
                    if ((res = sendNextDataBlock(ba, currentBlock)) != DownloadResult::ERROR) {
 | 
			
		||||
                        m_hw->dcDownloadSetCurrentBlockNumber(currentBlock);
 | 
			
		||||
                        currentBlock += 1;
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            qCritical() << "DownloadThread::run(): last 64-byte block %04d" << currentBlock;
 | 
			
		||||
 | 
			
		||||
            int const rest = ba.size() % 64;
 | 
			
		||||
            int const offset = ba.size() - rest;
 | 
			
		||||
            char const *startAddress = ba.constData() + offset;
 | 
			
		||||
 | 
			
		||||
            if (rest > 0) {
 | 
			
		||||
                // SHOULD NEVER HAPPEN !!!
 | 
			
		||||
                uint8_t local[66];
 | 
			
		||||
                memset(local, 0xFF, sizeof(local));
 | 
			
		||||
                memcpy(local, startAddress, rest);
 | 
			
		||||
                qCritical() << "DownloadThread::run(): ERROR SEND REMAINING" << rest << "BYTES";
 | 
			
		||||
                m_hw->bl_sendDataBlock(64, local);
 | 
			
		||||
            } else {
 | 
			
		||||
                m_hw->bl_sendLastBlock();
 | 
			
		||||
                m_hw->dcDownloadSetCurrentBlockNumber(currentBlock);
 | 
			
		||||
            }
 | 
			
		||||
            qCritical() << "DownloadThread::run(): last result" << (int)sendStatus(m_hw->bl_wasSendingDataOK());
 | 
			
		||||
        }
 | 
			
		||||
        stopBootloader();   // there is no harm in stopping the bootloader even
 | 
			
		||||
    }                       // if it was not started at all
 | 
			
		||||
 | 
			
		||||
#if 0
 | 
			
		||||
    // test code:
 | 
			
		||||
    uint16_t const totalBlocks = 100;
 | 
			
		||||
    m_hw->dcDownloadSetTotalBlockNumber(totalBlocks);
 | 
			
		||||
 | 
			
		||||
    for (uint16_t currentBlock = 0; currentBlock <= totalBlocks; ++currentBlock) {
 | 
			
		||||
        m_hw->dcDownloadSetCurrentBlockNumber(currentBlock);
 | 
			
		||||
        QThread::msleep(100);
 | 
			
		||||
    }
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
    m_hw->dcDownloadSetRunning(false);
 | 
			
		||||
    m_hw->dcDownloadSetFinished(true);
 | 
			
		||||
 | 
			
		||||
    qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate) + "DOWNLOAD THREAD FINISHED";
 | 
			
		||||
 | 
			
		||||
    // the object deletes itself ! This is the last line in run().
 | 
			
		||||
    // Never touch the object after this statement
 | 
			
		||||
    // m_hw->dcDownloadThreadFinalize(this);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
DownloadThread::DownloadResult DownloadThread::sendStatus(int ret) const {
 | 
			
		||||
    switch (ret) {                  // return values of dc are:
 | 
			
		||||
    case 0:                         // 0: no answer by now
 | 
			
		||||
        return DownloadResult::NOP; // 1: error
 | 
			
		||||
    case 10:                        // 10: success
 | 
			
		||||
        return DownloadResult::OK;
 | 
			
		||||
    default:;
 | 
			
		||||
    }
 | 
			
		||||
    return DownloadResult::ERROR;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
DownloadThread::DownloadResult
 | 
			
		||||
DownloadThread::sendNextAddress(int bNum) const {
 | 
			
		||||
    // sends address only if blockNumber is one of 0, 1024, 2048, 3072, 4096
 | 
			
		||||
    int noAnswerCount = 0;
 | 
			
		||||
    int errorCount = 0;
 | 
			
		||||
    if ( bNum==0 || bNum==1024 || bNum==2048 || bNum==3072 || bNum==4096 ) {
 | 
			
		||||
        // qDebug() << "addr-block" << bNum << "...";
 | 
			
		||||
        while (noAnswerCount <= 250) {
 | 
			
		||||
            m_hw->bl_sendAddress(bNum);
 | 
			
		||||
            QThread::msleep(100);
 | 
			
		||||
            DownloadResult const res = sendStatus(m_hw->bl_wasSendingAddOK());
 | 
			
		||||
            if (res != DownloadResult::NOP) {
 | 
			
		||||
                if (res == DownloadResult::ERROR) {
 | 
			
		||||
                    if (++errorCount >= 10) {
 | 
			
		||||
                        qCritical() << "addr-block" << bNum << "...FAILED";
 | 
			
		||||
                        return res;
 | 
			
		||||
                    }
 | 
			
		||||
                } else { // res == DownloadResult::OK
 | 
			
		||||
                    // qInfo() << "addr-block" << bNum << "...OK";
 | 
			
		||||
 | 
			
		||||
                        // TODO: hier ins shared-mem schreiben
 | 
			
		||||
 | 
			
		||||
                    return res;
 | 
			
		||||
                }
 | 
			
		||||
            } else {
 | 
			
		||||
                noAnswerCount += 1; // no answer by now
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        // wait max. about 3 seconds
 | 
			
		||||
        return DownloadResult::TIMEOUT;
 | 
			
		||||
    }
 | 
			
		||||
    // blockNumber is not one of 0, 1024, 2048, 3072, 4096 -> do nothing
 | 
			
		||||
    return DownloadResult::NOP;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
DownloadThread::DownloadResult
 | 
			
		||||
DownloadThread::sendNextDataBlock(QByteArray const &binary, int bNum) const {
 | 
			
		||||
    uint8_t local[66];
 | 
			
		||||
    int const bAddr = bNum * 64;
 | 
			
		||||
    int noAnswerCount = 0;
 | 
			
		||||
    int errorCount = 0;
 | 
			
		||||
 | 
			
		||||
    memcpy(local, binary.constData() + bAddr, 64);
 | 
			
		||||
    local[64] = local[65] = 0x00;
 | 
			
		||||
 | 
			
		||||
    // QByteArray b((const char *)(&local[0]), 64);
 | 
			
		||||
    // qCritical() << "SNDB" << bNum << b.size() << b.toHex();
 | 
			
		||||
 | 
			
		||||
    while (noAnswerCount <= 250) {
 | 
			
		||||
        m_hw->bl_sendDataBlock(64, local);
 | 
			
		||||
        QThread::msleep(10);
 | 
			
		||||
        DownloadResult const res = sendStatus(m_hw->bl_wasSendingDataOK());
 | 
			
		||||
        if (res != DownloadResult::NOP) {
 | 
			
		||||
            if (res == DownloadResult::ERROR) {
 | 
			
		||||
                if (++errorCount >= 10) {
 | 
			
		||||
                    qCritical() << "data for block" << bNum << "...FAILED";
 | 
			
		||||
                    return res;
 | 
			
		||||
                }
 | 
			
		||||
            } else {
 | 
			
		||||
                // qInfo() << "data for block" << bNum << "OK";
 | 
			
		||||
 | 
			
		||||
                    // TODO: hier ins shared mem schreiben
 | 
			
		||||
 | 
			
		||||
                return res;
 | 
			
		||||
            }
 | 
			
		||||
        } else {
 | 
			
		||||
            noAnswerCount += 1; // no answer by now
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    // wait max. about 3 seconds
 | 
			
		||||
    return DownloadResult::TIMEOUT;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool DownloadThread::startBootloader() const {
 | 
			
		||||
    qDebug() << "starting bootloader...";
 | 
			
		||||
    int nTry = 5;
 | 
			
		||||
    while (--nTry >= 0) {
 | 
			
		||||
        m_hw->bl_startBL();
 | 
			
		||||
        QThread::msleep(5000);
 | 
			
		||||
        m_hw->bl_checkBL();
 | 
			
		||||
        if (m_hw->bl_isUp()) {
 | 
			
		||||
            qInfo() << "starting bootloader...OK";
 | 
			
		||||
            QThread::msleep(5000);
 | 
			
		||||
            return true;
 | 
			
		||||
        } else {
 | 
			
		||||
            qCritical() << "bootloader not up (" << nTry << ")";
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    qCritical() << "starting bootloader...FAILED";
 | 
			
		||||
    return false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool DownloadThread::stopBootloader() const {
 | 
			
		||||
    qDebug() << "stopping bootloader...";
 | 
			
		||||
    int nTry = 5;
 | 
			
		||||
    while (--nTry >= 0) {
 | 
			
		||||
        m_hw->bl_stopBL();
 | 
			
		||||
        QThread::msleep(500);
 | 
			
		||||
        if (!m_hw->bl_isUp()) {
 | 
			
		||||
            qInfo() << "stopping bootloader...OK";
 | 
			
		||||
            return true;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    qCritical() << "stopping bootloader...FAILED";
 | 
			
		||||
    return false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool DownloadThread::resetDeviceController() const {
 | 
			
		||||
    qDebug() << "resetting device controller...";
 | 
			
		||||
    m_hw->bl_rebootDC();
 | 
			
		||||
    // wait maximally 3 seconds, before starting bootloader
 | 
			
		||||
    QThread::sleep(1);
 | 
			
		||||
    qInfo() << "resetting device controller...OK";
 | 
			
		||||
    return true;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QByteArray DownloadThread::loadBinaryDCFile(QString filename) const {
 | 
			
		||||
    qDebug() << "loading dc binary" << filename << "...";
 | 
			
		||||
 | 
			
		||||
    QFile file(filename); // closed in destructor call
 | 
			
		||||
    if (!file.exists()) {
 | 
			
		||||
        qCritical() << file.fileName() << "does not exist";
 | 
			
		||||
        return QByteArray();
 | 
			
		||||
    }
 | 
			
		||||
    if (!file.open(QIODevice::ReadOnly)) {
 | 
			
		||||
        qCritical() << "cannot open file" << file.fileName();
 | 
			
		||||
        return QByteArray();
 | 
			
		||||
    }
 | 
			
		||||
    qInfo() << "loading dc binary" << filename << "...OK";
 | 
			
		||||
    return file.readAll();
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										267
									
								
								src/hwapi.cpp
									
									
									
									
									
								
							
							
						
						
									
										267
									
								
								src/hwapi.cpp
									
									
									
									
									
								
							@@ -20,6 +20,12 @@
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
#include "hwapi.h"
 | 
			
		||||
#include "reporting_thread.h"
 | 
			
		||||
#include "download_thread.h"
 | 
			
		||||
 | 
			
		||||
#include <algorithm>
 | 
			
		||||
#include <cstring>
 | 
			
		||||
#include <atomic>
 | 
			
		||||
 | 
			
		||||
static uint32_t hwapi_lastStartAmount;
 | 
			
		||||
static uint32_t hwapi_lastTotalAmount;
 | 
			
		||||
@@ -49,7 +55,7 @@ hwapi::hwapi(QWidget *parent) : QObject(parent)
 | 
			
		||||
//    {
 | 
			
		||||
 | 
			
		||||
#ifdef THIS_IS_CA_MASTER
 | 
			
		||||
        myDatif = new T_datif();    // für die  CAslave-Lib auskommentieren!
 | 
			
		||||
        myDatif = new T_datif(this);    // für die  CAslave-Lib auskommentieren!
 | 
			
		||||
#else
 | 
			
		||||
    qCritical()<<"hwapi: error CAslave cannot include T_datif";
 | 
			
		||||
#endif
 | 
			
		||||
@@ -4371,4 +4377,263 @@ uint16_t hwapi::bna_getStackerLevel(uint32_t *amountInStacker, uint16_t *countOf
 | 
			
		||||
    return anzahl;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QObject const *hwapi::getAPI() {
 | 
			
		||||
    return this;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadRequest(QString const &dcFileToDownload) const {
 | 
			
		||||
    SharedMem *data = SharedMem::getData();
 | 
			
		||||
    if (!data) {
 | 
			
		||||
        return false;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    char *fNameBuffer = data->m_downLoadDC.m_filename[(int)SharedMem::DCDownload::FILE_INDEX::DC_BINARY];
 | 
			
		||||
    size_t const size = sizeof(data->m_downLoadDC.m_filename);
 | 
			
		||||
 | 
			
		||||
    std::memset(fNameBuffer, 0x00, size);
 | 
			
		||||
    std::memcpy(fNameBuffer, dcFileToDownload.toStdString().c_str(),
 | 
			
		||||
                std::min(size, strlen(fNameBuffer)-1));
 | 
			
		||||
 | 
			
		||||
    data->m_downLoadDC.m_totalBlocks = 0;
 | 
			
		||||
    data->m_downLoadDC.m_currentblockNumber = 0;
 | 
			
		||||
 | 
			
		||||
    data->m_downLoadDC.m_requested = true;
 | 
			
		||||
    data->m_downLoadDC.m_running = false;   // download thread is not running
 | 
			
		||||
    data->m_downLoadDC.m_finished = true;
 | 
			
		||||
 | 
			
		||||
    return true;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadRequested() const {
 | 
			
		||||
    SharedMem const *data = SharedMem::getData();
 | 
			
		||||
    // should be false at entry
 | 
			
		||||
    return data ? data->m_downLoadDC.m_requested.load() : false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadResetRequest() const {
 | 
			
		||||
    SharedMem *data = SharedMem::getData();
 | 
			
		||||
    if (data) {
 | 
			
		||||
        data->m_downLoadDC.m_requested = false;
 | 
			
		||||
    }
 | 
			
		||||
    return true;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadRequestAck() const {
 | 
			
		||||
    SharedMem *data = SharedMem::getData();
 | 
			
		||||
    if (data) {
 | 
			
		||||
        if (data->m_downLoadDC.m_requested) {
 | 
			
		||||
            data->m_downLoadDC.m_requested = false;
 | 
			
		||||
            data->m_downLoadDC.m_running = true;
 | 
			
		||||
            data->m_downLoadDC.m_finished = false;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    return false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadRunning() const {
 | 
			
		||||
    SharedMem const *data = SharedMem::getDataConst();
 | 
			
		||||
    if (data) {
 | 
			
		||||
        int cnt = 10;
 | 
			
		||||
        while (--cnt > 0) {
 | 
			
		||||
            bool running = data->m_downLoadDC.m_running.load();
 | 
			
		||||
            bool finished = data->m_downLoadDC.m_finished.load();
 | 
			
		||||
            if (!running || finished) {
 | 
			
		||||
                if (cnt < 3) {
 | 
			
		||||
                    qCritical() << "DOWNLOAD THREAD NOT RUNNING" << running << finished;
 | 
			
		||||
                }
 | 
			
		||||
                QThread::msleep(500);
 | 
			
		||||
            } else break;
 | 
			
		||||
        }
 | 
			
		||||
        // qCritical() << "DOWNLOAD RUNNING" << cnt << (cnt > 0);
 | 
			
		||||
        return (cnt > 0);
 | 
			
		||||
    }
 | 
			
		||||
    return false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void hwapi::dcDownloadThreadFinalize(DownloadThread *dthread) {
 | 
			
		||||
    delete dthread;
 | 
			
		||||
    m_downloadThread = nullptr;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadFinished() {
 | 
			
		||||
    SharedMem const *data = SharedMem::getDataConst();
 | 
			
		||||
    if (data) {
 | 
			
		||||
        int cnt = 10;
 | 
			
		||||
        while ((--cnt > 0) &&
 | 
			
		||||
               ((data->m_downLoadDC.m_running.load() == true) &&
 | 
			
		||||
                (data->m_downLoadDC.m_finished.load() == false))) {
 | 
			
		||||
            QThread::sleep(1);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        //if (cnt > 0) {
 | 
			
		||||
        //    delete m_downloadThread;
 | 
			
		||||
        //    m_downloadThread = nullptr;
 | 
			
		||||
        //    return true;
 | 
			
		||||
        //}
 | 
			
		||||
    }
 | 
			
		||||
    return false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// download thread
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadThreadStart() {
 | 
			
		||||
    m_downloadThread = new DownloadThread(this);
 | 
			
		||||
    if (m_downloadThread) {
 | 
			
		||||
        m_downloadThread->start();
 | 
			
		||||
        int cnt  = 10;
 | 
			
		||||
        while (--cnt > 0 && !dcDownloadThreadRunning()) {
 | 
			
		||||
            QThread::msleep(200);
 | 
			
		||||
        }
 | 
			
		||||
        return (cnt > 0);
 | 
			
		||||
    }
 | 
			
		||||
    return false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadThreadRunning() const {
 | 
			
		||||
    return (dcDownloadGetRunning() == true)
 | 
			
		||||
        && (dcDownloadGetFinished() == false);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadThreadFinished() const {
 | 
			
		||||
    return (dcDownloadThreadRunning() == false);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
// report thread
 | 
			
		||||
bool hwapi::dcDownloadReportThreadStart() { // only start reporting thread
 | 
			
		||||
    int cnt = 10;                           // if download thread is running
 | 
			
		||||
    while (--cnt > 0 && !dcDownloadRunning()) {
 | 
			
		||||
        QThread::msleep(500);
 | 
			
		||||
    }
 | 
			
		||||
    if (cnt > 0) {
 | 
			
		||||
        m_reportingThread = new ReportingThread(this);
 | 
			
		||||
        if (m_reportingThread) {
 | 
			
		||||
            m_reportingThread->start();
 | 
			
		||||
            cnt  = 10;
 | 
			
		||||
            while (--cnt > 0 && !dcDownloadReportThreadRunning()) {
 | 
			
		||||
                QThread::msleep(200);
 | 
			
		||||
            }
 | 
			
		||||
            return (cnt > 0);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    return false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadReportThreadRunning() const {
 | 
			
		||||
    return m_reportingThread ? m_reportingThread->isRunning() : false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void hwapi::dcDownloadReportThreadFinalize() {
 | 
			
		||||
    if (m_reportingThread) {
 | 
			
		||||
        if (m_reportingThread->isFinished()) {
 | 
			
		||||
            delete m_reportingThread;
 | 
			
		||||
            m_reportingThread = nullptr;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void hwapi::dcDownloadReportThreadQuit() {
 | 
			
		||||
    if (m_reportingThread) {
 | 
			
		||||
        m_reportingThread->quit();
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadReportThreadFinished() const {
 | 
			
		||||
    return m_reportingThread ? m_reportingThread->isFinished() : false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadReportStart() const {
 | 
			
		||||
    int cnt = 10;
 | 
			
		||||
    while (--cnt > 0 && !dcDownloadRunning()) {
 | 
			
		||||
        QThread::msleep(200);
 | 
			
		||||
    }
 | 
			
		||||
    return (cnt == 0);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadReportRunning() const {
 | 
			
		||||
    return dcDownloadReportThreadRunning();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadReportFinished() {
 | 
			
		||||
    int cnt = 10;
 | 
			
		||||
    while (--cnt > 0 && !dcDownloadReportThreadFinished()) {
 | 
			
		||||
        QThread::sleep(1);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (cnt == 0 && !dcDownloadReportThreadFinished()) {
 | 
			
		||||
        return false;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (dcDownloadReportThreadFinished()) {
 | 
			
		||||
        delete m_reportingThread;
 | 
			
		||||
        m_reportingThread = nullptr;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    return true;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
QString hwapi::dcDownloadFileName() const {
 | 
			
		||||
    SharedMem const *data = SharedMem::getDataConst();
 | 
			
		||||
    return data ? data->m_downLoadDC.m_filename[(int)SharedMem::DCDownload::FILE_INDEX::DC_BINARY] : "";
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadSetRequested(bool requested) {
 | 
			
		||||
    SharedMem *data = SharedMem::getData();
 | 
			
		||||
    if (data) {
 | 
			
		||||
        data->m_downLoadDC.m_requested = requested;
 | 
			
		||||
        return true;
 | 
			
		||||
    }
 | 
			
		||||
    return false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadSetRunning(bool running) {
 | 
			
		||||
    SharedMem *data = SharedMem::getData();
 | 
			
		||||
    if (data) {
 | 
			
		||||
        data->m_downLoadDC.m_running = running;
 | 
			
		||||
        return true;
 | 
			
		||||
    }
 | 
			
		||||
    return false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadSetFinished(bool finished) {
 | 
			
		||||
    SharedMem *data = SharedMem::getData();
 | 
			
		||||
    if (data) {
 | 
			
		||||
        data->m_downLoadDC.m_finished = finished;
 | 
			
		||||
        return true;
 | 
			
		||||
    }
 | 
			
		||||
    return false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void hwapi::dcDownloadSetTotalBlockNumber(uint16_t totalBlockNumber) {
 | 
			
		||||
    SharedMem::getData()->m_downLoadDC.m_totalBlocks = totalBlockNumber;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void hwapi::dcDownloadSetCurrentBlockNumber(uint16_t currentBlockNumber) {
 | 
			
		||||
    SharedMem::getData()->m_downLoadDC.m_currentblockNumber = currentBlockNumber;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
uint16_t hwapi::dcDownloadGetTotalBlockNumber() const {
 | 
			
		||||
    SharedMem const *data = SharedMem::getDataConst();
 | 
			
		||||
    return data ? data->m_downLoadDC.m_totalBlocks.load() : 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
uint16_t hwapi::dcDownloadGetCurrentBlockNumber() const {
 | 
			
		||||
    SharedMem const *data = SharedMem::getDataConst();
 | 
			
		||||
    return data ? data->m_downLoadDC.m_currentblockNumber.load() : 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadGetRequested() const {
 | 
			
		||||
    SharedMem const *data = SharedMem::getDataConst();
 | 
			
		||||
    return data ? data->m_downLoadDC.m_requested.load() : 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadGetRunning() const {
 | 
			
		||||
    SharedMem const *data = SharedMem::getDataConst();
 | 
			
		||||
    return data ? data->m_downLoadDC.m_running.load() : 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool hwapi::dcDownloadGetFinished() const {
 | 
			
		||||
    SharedMem const *data = SharedMem::getDataConst();
 | 
			
		||||
    return data ? data->m_downLoadDC.m_running.load() : 0;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										155
									
								
								src/reporting_thread.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										155
									
								
								src/reporting_thread.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,155 @@
 | 
			
		||||
#include "reporting_thread.h"
 | 
			
		||||
#include "shared_mem_buffer.h"
 | 
			
		||||
#include "hwapi.h"
 | 
			
		||||
 | 
			
		||||
#include <QDateTime>
 | 
			
		||||
#include <QDebug>
 | 
			
		||||
 | 
			
		||||
ReportingThread::ReportingThread(hwapi *hw)
 | 
			
		||||
  : m_hw(hw)
 | 
			
		||||
  , m_fileToDownload(m_hw->dcDownloadFileName()) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
ReportingThread::~ReportingThread() {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// download thread running in ca-slave sends reports of download process to
 | 
			
		||||
// each component which has connects for the corresponding signals.
 | 
			
		||||
void ReportingThread::run() {
 | 
			
		||||
 | 
			
		||||
    qCritical() << QDateTime::currentDateTime() << "START DOWNLOAD THREAD";
 | 
			
		||||
 | 
			
		||||
    static QString report("");
 | 
			
		||||
 | 
			
		||||
    int cnt = 5;
 | 
			
		||||
    while (!m_hw->dcDownloadGetRunning()) {
 | 
			
		||||
        if (--cnt > 0) {
 | 
			
		||||
            report =  QString("%1 waiting for download to start %2")
 | 
			
		||||
                            .arg(QDateTime::currentDateTime().toString(Qt::ISODate))
 | 
			
		||||
                            .arg(cnt);
 | 
			
		||||
            qCritical() << __LINE__ << "STATUS" << report;
 | 
			
		||||
            emit m_hw->hwapi_reportDCDownloadStatus(report);
 | 
			
		||||
            QThread::sleep(1);
 | 
			
		||||
        } else break;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
#if 0
 | 
			
		||||
    if (cnt == 0) {
 | 
			
		||||
        m_hw->dcDownloadResetRequest();
 | 
			
		||||
        status = QString("%1 reset download request")
 | 
			
		||||
                        .arg(QDateTime::currentDateTime().toString(Qt::ISODate));
 | 
			
		||||
        qCritical() << __LINE__ << "STATUS" << status;
 | 
			
		||||
        emit m_hw->hwapi_reportDCDownloadStatus(status);
 | 
			
		||||
 | 
			
		||||
        cnt = 5;
 | 
			
		||||
        while (!m_hw->dcDownloadRunning()) {
 | 
			
		||||
            if (--cnt > 0) {
 | 
			
		||||
                QThread::sleep(1);
 | 
			
		||||
            } else break;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (cnt == 0) {
 | 
			
		||||
            status = QString("%1 download request failure")
 | 
			
		||||
                            .arg(QDateTime::currentDateTime().toString(Qt::ISODate));
 | 
			
		||||
            qCritical() << __LINE__ << "STATUS" << status;
 | 
			
		||||
            emit m_hw->hwapi_reportDCDownloadFailure(status);
 | 
			
		||||
            return;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    uint16_t const tnr = 1750;
 | 
			
		||||
    uint16_t cnr = 0;
 | 
			
		||||
 | 
			
		||||
    while (cnr <= tnr) {
 | 
			
		||||
        QThread::msleep(100);
 | 
			
		||||
        QString report("");
 | 
			
		||||
 | 
			
		||||
        if (cnr > 0) {
 | 
			
		||||
            double percent = ((double)cnr / (double)tnr) * 100.0;
 | 
			
		||||
            report = QString(": total blocks %1, current block %2 [%3]")
 | 
			
		||||
                    .arg(tnr).arg(cnr).arg(percent, 0, 'f', 2);
 | 
			
		||||
        } else {
 | 
			
		||||
            report = QString(": total blocks %1, current block %2 [0]")
 | 
			
		||||
                    .arg(tnr).arg(cnr);
 | 
			
		||||
        }
 | 
			
		||||
        status = QDateTime::currentDateTime().toString(Qt::ISODate) + report;
 | 
			
		||||
 | 
			
		||||
        qCritical() << "STATUS" << status;
 | 
			
		||||
 | 
			
		||||
        emit m_hw->hwapi_reportDCDownloadStatus(status);
 | 
			
		||||
        cnr += 1;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (tnr == cnr) {
 | 
			
		||||
        m_hw->hwapi_reportDCDownloadSuccess(
 | 
			
		||||
            QString("SUCCESS DOWNLOADING") + m_fileToDownload);
 | 
			
		||||
    } else {
 | 
			
		||||
        m_hw->hwapi_reportDCDownloadFailure(
 | 
			
		||||
            QString("ERROR DOWNLOADING %1 (total blocks=%2, sent blocks=%3)")
 | 
			
		||||
                .arg(m_fileToDownload).arg(tnr).arg(cnr));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
    uint16_t const totalBlocks = m_hw->dcDownloadGetTotalBlockNumber();
 | 
			
		||||
 | 
			
		||||
    qCritical() << QDateTime::currentDateTime() << "TOTAL BLOCKS" << totalBlocks;
 | 
			
		||||
 | 
			
		||||
    if (totalBlocks) {
 | 
			
		||||
        qint64 const start = QDateTime::currentMSecsSinceEpoch();
 | 
			
		||||
        double durationMillis = 0;
 | 
			
		||||
        uint16_t currentBlockNumber = 0;
 | 
			
		||||
 | 
			
		||||
        while (m_hw->dcDownloadGetRunning()) {
 | 
			
		||||
            currentBlockNumber = m_hw->dcDownloadGetCurrentBlockNumber();
 | 
			
		||||
 | 
			
		||||
            durationMillis += QDateTime::currentMSecsSinceEpoch() - start;
 | 
			
		||||
 | 
			
		||||
            double const timeAveragePerBlock = (currentBlockNumber > 0) ? (durationMillis / currentBlockNumber) : durationMillis;
 | 
			
		||||
            double const estimatedSecondsLeft = (timeAveragePerBlock * (totalBlocks - currentBlockNumber)) / 1000.0;
 | 
			
		||||
 | 
			
		||||
            double percent = ((double)currentBlockNumber / (double)totalBlocks) * 100.0;
 | 
			
		||||
            report = QString(": total blocks %1, current block %2 [%3] (est. time left: %4s)")
 | 
			
		||||
                        .arg(totalBlocks)
 | 
			
		||||
                        .arg(currentBlockNumber)
 | 
			
		||||
                        .arg(percent, 0, 'f', 2)
 | 
			
		||||
                        .arg(estimatedSecondsLeft, 0, 'f', 2);
 | 
			
		||||
 | 
			
		||||
            qCritical() << "RT report" << report;
 | 
			
		||||
 | 
			
		||||
            emit m_hw->hwapi_reportDCDownloadStatus(report);
 | 
			
		||||
            QThread::msleep(100);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        QThread::msleep(100);
 | 
			
		||||
 | 
			
		||||
        if (totalBlocks == currentBlockNumber) {
 | 
			
		||||
            m_hw->hwapi_reportDCDownloadSuccess(
 | 
			
		||||
                QString("SUCCESS DOWNLOADING") + m_fileToDownload);
 | 
			
		||||
        } else {
 | 
			
		||||
            m_hw->hwapi_reportDCDownloadFailure(
 | 
			
		||||
                QString("ERROR DOWNLOADING %1 (total blocks=%2, sent blocks=%3)")
 | 
			
		||||
                    .arg(m_fileToDownload).arg(totalBlocks).arg(currentBlockNumber));
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    qCritical() << QDateTime::currentDateTime() << __PRETTY_FUNCTION__
 | 
			
		||||
                << QString("line=%1 REPORT THREAD ABOUT TO FINISH").arg(__LINE__);
 | 
			
		||||
 | 
			
		||||
    cnt = 10;
 | 
			
		||||
 | 
			
		||||
    bool running = m_hw->dcDownloadGetRunning();
 | 
			
		||||
    bool finished = m_hw->dcDownloadGetFinished();
 | 
			
		||||
 | 
			
		||||
    while (--cnt > 0 && (running && !finished)) {
 | 
			
		||||
        qCritical() << QDateTime::currentDateTime() << __PRETTY_FUNCTION__
 | 
			
		||||
                    << QString("line=%1 REPORT THREAD: WAIT FOR END OF DOWNLOAD THREAD %2 %3 (%4)")
 | 
			
		||||
            .arg(__LINE__).arg(running).arg(finished).arg(cnt);
 | 
			
		||||
        QThread::sleep(1);
 | 
			
		||||
        running = m_hw->dcDownloadGetRunning();
 | 
			
		||||
        finished = m_hw->dcDownloadGetFinished();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    qCritical() << QDateTime::currentDateTime() << __PRETTY_FUNCTION__
 | 
			
		||||
                << QString("line=%1 FINISH REPORT THREAD").arg(__LINE__);
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user