Merge branch 'add_serial_trig' into develop

DSView/pv/dock/triggerdock.h

@@ -78,6 +78,9 @@ private slots:
 
     void pos_changed(int pos);
 
+    void adv_tog(int index);
+    void serial_channel_changed(int index);
+
 private:
 
 private:
@@ -104,6 +107,19 @@ private:
     QVector <QLineEdit *> _value1_lineEdit_list;
     QVector <QSpinBox *> _count1_spinBox_list;
     QVector <QComboBox *> _inv1_comboBox_list;
+
+    QTabWidget *_adv_tabWidget;
+    QGroupBox *_serial_groupBox;
+    QLabel *_serial_start_label;
+    QLineEdit *_serial_start_lineEdit;
+    QLabel *_serial_stop_label;
+    QLineEdit *_serial_stop_lineEdit;
+    QLabel *_serial_edge_label;
+    QLineEdit *_serial_edge_lineEdit;
+    QLabel *_serial_data_lable;
+    QComboBox *_serial_data_comboBox;
+    QLabel *_serial_value_lable;
+    QLineEdit *_serial_value_lineEdit;
 };
 
 } // namespace dock

DSView/stylesheet.qss

@@ -170,43 +170,18 @@ QDockWidget > QWidget > QTabWidget::pane{
     margin: 0px;
     background-color: rgb(17, 133, 209,  255);
     border: 1px solid rgb(255, 255, 255);
-    border-right-color: rgb(17, 133, 209,  255); /* same as the pane color */
     padding: 0px;
 }
 
 QDockWidget > QWidget > QTabWidget::pane:disabled{
     border: 1px solid rgb(200, 200, 200, 255);
-    border-right-color: rgb(17, 133, 209,  255); /* same as the pane color */
 }
 
-QDockWidget > QWidget >  QTabWidget > QTabBar::tab
-{
-    background: transparent;
-    color: white;
-    border: 2px solid rgb(238, 178, 17, 255);
-    border-left-color: rgb(17, 133, 209,  255); /* same as the pane color */
-    border-bottom-right-radius: 4px;
-    border-top-right-radius: 4px;
-    min-height: 8ex;
-    padding: 2px;
-}
-QDockWidget > QWidget > QTabWidget > QTabBar::tab:hover
-{
-    border: 3px solid rgb(238, 178, 17, 255);
-    border-left-color: rgb(17, 133, 209,  255); /* same as the pane color */
-}
-QDockWidget > QWidget > QTabWidget > QTabBar::tab:selected
-{
-    color: white;
-    background: rgb(238, 178, 17, 255);
-    border-left-color: rgb(17, 133, 209,  255); /* same as the pane color */
-}
-QDockWidget > QWidget > QTabWidget > QTabBar::tab:disabled
-{
-    color: rgb(200, 200, 200, 50);
-    border: 1px solid rgb(232, 232, 230, 255);
-    background: transparent;
-    border-left-color: rgb(17, 133, 209,  255); /* same as the pane color */
+QTabWidget::pane{
+    margin: 0px;
+    background-color: rgb(17, 133, 209,  255);
+    border: 0px solid rgb(255, 255, 255);
+    padding: 0px;
 }
 
 QCheckBox,

libsigrok4DSL/hardware/DSL/dslogic.c

@@ -280,6 +280,7 @@ static int fpga_setting(const struct sr_dev_inst *sdi)
                    ((devc->op_mode == SR_OP_EXTERNAL_TEST) << 14) +
                    ((devc->op_mode == SR_OP_LOOPBACK_TEST) << 13) +
                    ((devc->stream) << 12) +
+                   ((trigger->trigger_mode == SERIAL_TRIGGER) << 11) +
                    trigger->trigger_en +
                    ((sdi->mode > 0) << 4) + (devc->clock_type << 1) + (devc->clock_edge << 1) +
                    (((channel_cnt == 8 && sdi->mode != DSO) || (sdi->mode == ANALOG)) << 5) +

libsigrok4DSL/libsigrok.h

@@ -1020,6 +1020,7 @@ struct sr_session {
 enum {
     SIMPLE_TRIGGER = 0,
     ADV_TRIGGER,
+    SERIAL_TRIGGER,
 };
 
 enum {