Implemented progress indication for read command

Author: bbogush

qt/main_window.cpp

@@ -299,9 +299,13 @@ void MainWindow::slotProgErase()
 
 void MainWindow::slotProgReadCompleted(int status)
 {
+    disconnect(prog, SIGNAL(readChipProgress(unsigned int)), this,
+        SLOT(slotProgReadProgress(unsigned int)));
     disconnect(prog, SIGNAL(readChipCompleted(int)), this,
         SLOT(slotProgReadCompleted(int)));
 
+    setProgress(100);
+
     if (status)
     {
         buffer.clear();
@@ -313,6 +317,16 @@ void MainWindow::slotProgReadCompleted(int status)
         static_cast<uint32_t>(buffer.size()));
 }
 
+void MainWindow::slotProgReadProgress(unsigned int progress)
+{
+    uint32_t progressPercent;
+    int index = ui->chipSelectComboBox->currentIndex();
+    uint32_t readSize = chipDb.sizeGetById(CHIP_INDEX2ID(index));
+
+    progressPercent = progress * 100ULL / readSize;
+    setProgress(progressPercent);
+}
+
 void MainWindow::slotProgRead()
 {
     int index = ui->chipSelectComboBox->currentIndex();
@@ -329,9 +343,12 @@ void MainWindow::slotProgRead()
     buffer.resize(static_cast<int>(readSize));
 
     qInfo() << "Reading data ...";
+    setProgress(0);
 
     connect(prog, SIGNAL(readChipCompleted(int)), this,
         SLOT(slotProgReadCompleted(int)));
+    connect(prog, SIGNAL(readChipProgress(unsigned int)), this,
+        SLOT(slotProgReadProgress(unsigned int)));
 
     prog->readChip(buffer.data(), START_ADDRESS, readSize, true);
 }

qt/main_window.h

@@ -42,6 +42,7 @@ private slots:
     void slotProgConnectCompleted(int status);
     void slotProgReadDeviceIdCompleted(int status);
     void slotProgReadCompleted(int status);
+    void slotProgReadProgress(unsigned int progress);
     void slotProgWriteCompleted(int status);
     void slotProgEraseCompleted(int status);
     void slotProgEraseProgress(unsigned int progress);

qt/programmer.cpp

@@ -192,16 +192,25 @@ void Programmer::eraseChip(uint32_t addr, uint32_t len)
 
 void Programmer::readCb(int ret)
 {
+    QObject::disconnect(&reader, SIGNAL(progress(unsigned int)), this,
+        SLOT(readProgressCb(unsigned int)));
     QObject::disconnect(&reader, SIGNAL(result(int)), this, SLOT(readCb(int)));
     emit readChipCompleted(ret);
 }
 
+void Programmer::readProgressCb(unsigned int progress)
+{
+    emit readChipProgress(progress);
+}
+
 void Programmer::readChip(uint8_t *buf, uint32_t addr, uint32_t len,
     bool isReadLess)
 {
     ReadCmd readCmd;
 
     QObject::connect(&reader, SIGNAL(result(int)), this, SLOT(readCb(int)));
+    QObject::connect(&reader, SIGNAL(progress(unsigned int)), this,
+        SLOT(readProgressCb(unsigned int)));
 
     readCmd.cmd.code = CMD_NAND_READ;
     readCmd.addr = addr;

qt/programmer.h

@@ -58,6 +58,7 @@ class Programmer : public QObject
     void readChipIdCompleted(int ret);
     void writeChipCompleted(int ret);
     void readChipCompleted(int ret);
+    void readChipProgress(unsigned int ret);
     void eraseChipCompleted(int ret);
     void eraseChipProgress(unsigned int progress);
     void readChipBadBlocksCompleted(int ret);
@@ -67,6 +68,7 @@ private slots:
     void readChipIdCb(int ret);
     void writeCb(int ret);
     void readCb(int ret);
+    void readProgressCb(unsigned int progress);
     void eraseChipCb(int ret);
     void eraseProgressChipCb(unsigned int progress);
     void readChipBadBlocksCb(int ret);

qt/reader.cpp

@@ -12,6 +12,7 @@
 
 #define READ_TIMEOUT 5000
 #define BUF_SIZE 4096
+#define NOTIFY_LIMIT 131072 // 128KB
 
 Q_DECLARE_METATYPE(QtMsgType)
 
@@ -29,6 +30,7 @@ void Reader::init(const QString &portName, qint32 baudRate, uint8_t *rbuf,
     this->isReadLess = isReadLess;
     readOffset = 0;
     bytesRead = 0;
+    bytesReadNotified = 0;
 }
 
 int Reader::write(const uint8_t *data, uint32_t len)
@@ -241,6 +243,12 @@ int Reader::readData()
 
         if ((offset = handlePackets(pbuf, static_cast<uint32_t>(len))) < 0)
             return -1;
+
+        if (bytesRead >= bytesReadNotified + NOTIFY_LIMIT)
+        {
+            emit progress(bytesRead);
+            bytesReadNotified = bytesRead;
+        }
     }
     while (!bytesRead || (rlen && rlen != bytesRead));
 

qt/reader.h

@@ -22,6 +22,7 @@ class Reader : public QThread
     uint32_t wlen;
     uint32_t readOffset;
     uint32_t bytesRead;
+    uint32_t bytesReadNotified;
     bool isSkipBB;
     bool isReadLess;