firmware/hdl updated, fix initialization issue and improve stability

DSView/pv/device/devinst.cpp

@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-
-
 #include <cassert>
 
 #include <QDebug>

DSView/pv/mainwindow.cpp

@@ -523,8 +523,8 @@ void MainWindow::show_error()
             ch_status += (i > 9 ? " " : "");
             error_pattern >>= 1;
         }
-        details = tr("the received data are not consist with pre-defined test data!\n") +
-                  tr("0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15\n") + ch_status;
+        details = tr("the received data are not consist with pre-defined test data!") + "\n" +
+                  tr("0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15")+ "\n" + ch_status;
         break;
     case SigSession::Pkt_data_err:
         title = tr("Packet Error");
@@ -723,6 +723,13 @@ bool MainWindow::load_session(QString name)
         return false;
     }
 
+    // clear decoders
+    #ifdef ENABLE_DECODE
+    if (sdi->mode == LOGIC) {
+        _protocol_widget->del_all_protocol();
+    }
+    #endif
+
     // load device settings
     GVariant *gvar_opts;
     gsize num_opts;

DSView/pv/sigsession.cpp

@@ -445,7 +445,6 @@ bool SigSession::get_capture_status(bool &triggered, int &progress)
     sr_status status;
     if (sr_status_get(_dev_inst->dev_inst(), &status, SR_STATUS_TRIG_BEGIN, SR_STATUS_TRIG_END) == SR_OK){
         triggered = status.trig_hit & 0x01;
-        const bool  captured_cnt_dec = status.trig_hit & 0x02;
         uint64_t captured_cnt = status.trig_hit >> 2;
         captured_cnt = ((uint64_t)status.captured_cnt0 +
                        ((uint64_t)status.captured_cnt1 << 8) +
@@ -454,7 +453,7 @@ bool SigSession::get_capture_status(bool &triggered, int &progress)
                        (captured_cnt << 32));
         if (_dev_inst->dev_inst()->mode == DSO)
             captured_cnt = captured_cnt * _signals.size() / get_ch_num(SR_CHANNEL_DSO);
-        if (captured_cnt_dec)
+        if (triggered)
             progress = (sample_limits - captured_cnt) * 100.0 / sample_limits;
         else
             progress = captured_cnt * 100.0 / sample_limits;
@@ -1057,8 +1056,10 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 
     case SR_DF_OVERFLOW:
     {
-        _error = Data_overflow;
-        session_error();
+        if (_error == No_err) {
+            _error = Data_overflow;
+            session_error();
+        }
         break;
     }
 	case SR_DF_END: