bump to v1.2.2

DSView/pv/mainwindow.cpp

@@ -248,8 +248,8 @@ void MainWindow::setup_ui()
     connect(&_event, SIGNAL(show_error(QString)), this, SLOT(on_show_error(QString)));
     connect(&_event, SIGNAL(signals_changed()), this, SLOT(on_signals_changed()));
     connect(&_event, SIGNAL(receive_trigger(quint64)), this, SLOT(on_receive_trigger(quint64)));
-    connect(&_event, SIGNAL(frame_ended()), this, SLOT(on_frame_ended()));
-    connect(&_event, SIGNAL(frame_began()), this, SLOT(on_frame_began()));
+    connect(&_event, SIGNAL(frame_ended()), this, SLOT(on_frame_ended()), Qt::DirectConnection);
+    connect(&_event, SIGNAL(frame_began()), this, SLOT(on_frame_began()), Qt::DirectConnection);
     connect(&_event, SIGNAL(decode_done()), this, SLOT(on_decode_done()));
     connect(&_event, SIGNAL(data_updated()), this, SLOT(on_data_updated()));
     connect(&_event, SIGNAL(cur_snap_samplerate_changed()), this, SLOT(on_cur_snap_samplerate_changed()));
@@ -674,24 +674,6 @@ void MainWindow::on_session_error()
         title = tr("Malloc Error");
         details = tr("Memory is not enough for this sample!\nPlease reduce the sample depth!");
         break;
-    case SigSession::Test_data_err:
-        _session->set_repeating(false);
-        _session->stop_capture();
-        _sampling_bar->set_sampling(false);
-        _session->capture_state_changed(SigSession::Stopped);
-        title = tr("Data Error");
-        error_pattern = _session->get_error_pattern();
-        for(int i = 0; i < 16; i++) {
-            if (error_pattern & 0x01)
-                ch_status += "X ";
-            else
-                ch_status += "  ";
-            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;
-        break;
     case SigSession::Pkt_data_err:
         title = tr("Packet Error");
         details = tr("the content of received packet are not expected!");

DSView/pv/sigsession.cpp

@@ -981,12 +981,6 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
         return;
     }
 
-    if (logic.data_error == 1) {
-        _error = Test_data_err;
-        _error_pattern = logic.error_pattern;
-        _callback->session_error();
-    }
-
     if (_logic_data->snapshot()->last_ended()) {
         _logic_data->snapshot()->first_payload(logic, _dev_inst->get_sample_limit(), _dev_inst->dev_inst()->channels);
         // @todo Putting this here means that only listeners querying

NEWS25

@@ -1,3 +1,23 @@
+v1.2.2 -- (2023-01-11)
+----------
+  （通用）
+  *增加快捷键对ctrl/shift/alt的识别
+  *修复保存文件过程中多次点击崩溃的问题
+  *修复macOS下截图崩溃的问题
+  *改进CSV文件的保存精度
+
+  （逻辑分析仪）
+  *支持新的硬件和固件版本
+  *清理0:UART协议的outputs申明
+  *增加CAN解码器对CANFD的支持
+  *修复某些解码器的wait错误
+  *修复QI解码器的错误
+  *修复SPDIF解码器对不完整帧的解码
+  *增加USB PD协议的消息类型支持
+
+  （示波器）
+  *修复不同通道数的dsl文件载入后测量值显示问题
+
 1.2.1 -- (2022-08-27)
 ----------
   （通用）

NEWS31

@@ -1,3 +1,23 @@
+v1.2.2 -- (2023-01-11)
+----------
+  --common
+  * Add shortcut key recognition of ctrl/shift/alt
+  * Fix multiple clicks crash during file saving
+  * Fix screenshot crash under macOS
+  * Improve accuracy of CSV file
+
+  --for logic analyzer
+  * Support new hardware and firmware versions
+  * Clean up 0: UART protocol outputs statement
+  * Add CAN decoder support for CANFD
+  * Fix wait error for some decoders
+  * Fix QI decoder bugs
+  * Fix SPDIF decoder error for incomplete frames
+  * Add message type support for USB PD decoder
+
+  --for oscilloscope
+  * Fix measure error of DSL files with different channel number
+
 1.2.1 -- (2022-08-27)
 -----------------
   --common

libsigrok4DSL/hardware/DSL/dsl.c

@@ -29,8 +29,6 @@
 
 extern struct ds_trigger *trigger;
 
-SR_PRIV int dsl_secuCheck(const struct sr_dev_inst *sdi, uint16_t* encryption, int steps);
-
 static const int32_t probeOptions[] = {
     SR_CONF_PROBE_COUPLING,
     SR_CONF_PROBE_VDIV,

libsigrok4DSL/hardware/DSL/dsl.h

@@ -1421,4 +1421,6 @@ SR_PRIV unsigned int dsl_get_timeout(const struct sr_dev_inst *sdi);
 SR_PRIV int dsl_start_transfers(const struct sr_dev_inst *sdi);
 SR_PRIV int dsl_header_size(const struct DSL_context *devc);
 
+SR_PRIV int dsl_secuCheck(const struct sr_dev_inst *sdi, uint16_t* encryption, int steps);
+
 #endif

libsigrok4DSL/hardware/DSL/dslogic.c

@@ -1014,7 +1014,10 @@ static int config_set(int id, GVariant *data, struct sr_dev_inst *sdi,
         }
     } else if (id == SR_CONF_VTH) {
         devc->vth = g_variant_get_double(data);
-        ret = dsl_wr_reg(sdi, VTH_ADDR, (uint8_t)(devc->vth/5.0*255));
+        if (devc->profile->dev_caps.feature_caps & CAPS_FEATURE_MAX25_VTH)
+            ret = dsl_wr_reg(sdi, VTH_ADDR, (uint8_t)(devc->vth/5.0*(2.5/3.3)*255));
+        else
+            ret = dsl_wr_reg(sdi, VTH_ADDR, (uint8_t)(devc->vth/5.0*255));
     } else if (id == SR_CONF_MAX_HEIGHT) {
         stropt = g_variant_get_string(data, NULL);
         for (i = 0; i < ARRAY_SIZE(maxHeights); i++) {
@@ -1157,7 +1160,10 @@ static int dev_open(struct sr_dev_inst *sdi)
 
     if ((ret = dsl_dev_open(di, sdi, &fpga_done)) == SR_OK) {
         // set threshold
-        ret = dsl_wr_reg(sdi, VTH_ADDR, (uint8_t)(devc->vth/5.0*255));
+        if (devc->profile->dev_caps.feature_caps & CAPS_FEATURE_MAX25_VTH)
+            ret = dsl_wr_reg(sdi, VTH_ADDR, (uint8_t)(devc->vth/5.0*(2.5/3.3)*255));
+        else
+            ret = dsl_wr_reg(sdi, VTH_ADDR, (uint8_t)(devc->vth/5.0*255));
         if (devc->profile->dev_caps.feature_caps & CAPS_FEATURE_ADF4360) {
             dsl_config_adc(sdi, adc_clk_init_500m);
         }