fix new ethminer output

orkblutt · Aug 20, 2017 · d43275e · d43275e
1 parent 70c21d0
commit d43275e
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 27 deletions.
diff --git a/MiningLigth.pro b/MiningLigth.pro
@@ -10,7 +10,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 TARGET = MinerLamp
 TEMPLATE = app
-VERSION = 0.1.0.550
+VERSION = 0.1.0.620
 
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which as been marked as deprecated (the exact warnings

diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -111,7 +111,7 @@ MainWindow::MainWindow(QWidget *parent) :
     int pos = ui->lineEditArgs->text().indexOf("-O ");
     if(pos > 0)
         ui->lineEditAccount->setText(ui->lineEditArgs->text().mid(pos + 3
-                                                                  , ui->lineEditArgs->text().indexOf(" 0x") > 0 ? 43 : 41));
+                                                                  , ui->lineEditArgs->text().indexOf(" 0x") > 0 ? 42 : 40));
 }
 
 MainWindow::~MainWindow()

diff --git a/minerprocess.cpp b/minerprocess.cpp
@@ -61,6 +61,9 @@ MinerProcess::MinerProcess():
   , _ledActivated(false)
   , _ledHash(50)
   , _ledShare(100)
+  , _acceptedShare(0)
+  , _staleShare(0)
+  , _shareNumber("")
   #ifdef DONATE
   , _donate(Q_NULLPTR)
   #endif
@@ -121,9 +124,47 @@ void MinerProcess::onReadyToReadStdout()
 void MinerProcess::onReadyToReadStderr()
 {
     QString line(_miner.readAllStandardError());
-
     if(line.length() > 1)
     {
+        int mhsPos = line.indexOf(QRegExp("[0-9]{1,5}.[0-9]{1,2}MH/s"));
+        if(mhsPos != -1)
+        {
+            int endPos = line.indexOf(" (", mhsPos);
+            QString hashRate = line.mid(mhsPos, endPos - mhsPos);
+
+            qDebug() << hashRate;
+
+
+            if(_readyToMonitor)
+            {
+                if(hashRate == "0.00MH/s")
+                    _0mhs++;
+                else
+                    _0mhs = 0;
+
+                if(_0mhs > _max0mhs)
+                {
+                    restart();
+                }
+            }
+
+            hashRate += " ";
+            hashRate += _shareNumber;
+
+            emit emitHashRate(hashRate);
+
+            _hashrateCount++;
+        }
+
+        int miningOnPos = line.indexOf("Mining on #");
+        if(miningOnPos != -1)
+        {
+            miningOnPos = line.indexOf("[", miningOnPos);
+            int endPos = line.indexOf("]", miningOnPos) + 1;
+            _shareNumber = line.mid(miningOnPos, endPos - miningOnPos);
+        }
+
+
         QStringList list = line.split(QRegExp("\r\n"), QString::SkipEmptyParts);
         qDebug() << list;
         for(int i = 0; i < list.size(); i++)
@@ -135,7 +176,6 @@ void MinerProcess::onReadyToReadStderr()
                         || list.at(i).indexOf("Submitted") != -1)
                 {
                     _log->append(list.at(i).simplified());
-
                 }
             }
             else
@@ -151,29 +191,6 @@ void MinerProcess::onReadyToReadStderr()
             return;
         }
 
-        if(line.indexOf("MH/s") != -1)
-        {
-            QRegExp regex("[, ]");
-            QStringList list = line.split(regex, QString::SkipEmptyParts);
-            QString hasrate(list.at(6) + " " + list.at(7));
-
-            emit emitHashRate(hasrate);
-
-            if(_readyToMonitor)
-            {
-                if(list.at(7) == "0.00MH/s")
-                    _0mhs++;
-                else
-                    _0mhs = 0;
-
-                if(_0mhs > _max0mhs)
-                {
-                    restart();
-                }
-            }
-            _hashrateCount++;
-        }
-
         if(_ledActivated)
         {
             if(line.indexOf("B-) Submitted and accepted.") != -1)
@@ -207,6 +224,7 @@ void MinerProcess::onStarted()
     _log->append("ethminer start");
     _isRunning = true;
     _0mhs = 0;
+    _shareNumber = "";
     emit emitStarted();
 }
 

diff --git a/minerprocess.h b/minerprocess.h
@@ -123,6 +123,11 @@ class MinerProcess : public QObject
 
     unsigned int _hashrateCount;
 
+    unsigned int _acceptedShare;
+    unsigned int _staleShare;
+
+    QString _shareNumber;
+
     unsigned short _ledHash;
     unsigned short _ledShare;
 

diff --git a/nanopoolapi.cpp b/nanopoolapi.cpp
@@ -75,6 +75,8 @@ void nanopoolAPI::replyFinished(QNetworkReply *reply)
             _userBalance = jsonData.value("balance").toString().toDouble();
             _currentCalcultatedHashRate = jsonData.value("hashrate").toString().toDouble();
 
+
+
             QJsonObject jsonHR = jsonData.value("avgHashrate").toObject();
 
             _averageHashRate1H = jsonHR["h1"].toString().toDouble();