Kaynağa Gözat

added additioanl buttons for tx trig jesd delay

meghana-soleil-pc 3 yıl önce
ebeveyn
işleme
b8bb04bcfa
1 değiştirilmiş dosya ile 122 ekleme ve 56 silme
  1. 122 56
      GUI.py

+ 122 - 56
GUI.py

@@ -214,30 +214,7 @@ class Ui_MainWindow(object):
         self.verticalLayout_2.addWidget(self.pushButton_init_board_ex_rf)
 
 ######################################################################################################
-##############################tx_trig_left##########################################################
-        self.pushButton_tx_left = QtGui.QPushButton(self.centralwidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.pushButton_tx_left.sizePolicy().hasHeightForWidth())
-        self.pushButton_tx_left.setSizePolicy(sizePolicy)
-        self.pushButton_tx_left.setMaximumSize(QtCore.QSize(800, 16777215))
-        self.pushButton_tx_left.setObjectName(_fromUtf8("pushButton_tx_left"))
-        self.verticalLayout_2.addWidget(self.pushButton_tx_left)
-
-######################################################################################################
-##############################tx_trig_adcs_right ##########################################################
-        self.pushButton_tx_right = QtGui.QPushButton(self.centralwidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.pushButton_tx_right.sizePolicy().hasHeightForWidth())
-        self.pushButton_tx_right.setSizePolicy(sizePolicy)
-        self.pushButton_tx_right.setMaximumSize(QtCore.QSize(800, 16777215))
-        self.pushButton_tx_right.setObjectName(_fromUtf8("pushButton_tx_right"))
-        self.verticalLayout_2.addWidget(self.pushButton_tx_right)
 
-######################################################################################################
 
 
 
@@ -449,7 +426,7 @@ class Ui_MainWindow(object):
         self.spinBox_int_trig.setMaximumSize(QtCore.QSize(300, 16777215))
         self.spinBox_int_trig.setObjectName(_fromUtf8("spinBox_int_trig"))
         self.spinBox_int_trig.setMaximum(4096)
-        self.gridLayout.addWidget(self.spinBox_int_trig, 8, 1, 1, 1)
+        self.gridLayout.addWidget(self.spinBox_int_trig, 7, 1, 1, 1)
         self.label_int_trig = QtGui.QLabel(self.centralwidget)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -457,8 +434,73 @@ class Ui_MainWindow(object):
         sizePolicy.setHeightForWidth(self.label_int_trig.sizePolicy().hasHeightForWidth())
         self.label_int_trig.setSizePolicy(sizePolicy)
         self.label_int_trig.setObjectName(_fromUtf8("label_int_trig"))
-        self.gridLayout.addWidget(self.label_int_trig, 8, 0, 1, 1)
+        self.gridLayout.addWidget(self.label_int_trig, 7, 0, 1, 1)
 
+#########################------ADC SETTINGS-----------------################################################
+        self.line_0 = QtGui.QFrame(self.centralwidget)
+        self.line_0.setFrameShape(QtGui.QFrame.HLine)
+        self.line_0.setFrameShadow(QtGui.QFrame.Sunken)
+        self.line_0.setObjectName(_fromUtf8("line_0"))
+        self.gridLayout.addWidget(self.line_0, 8, 0, 1, 1)
+        self.line_1 = QtGui.QFrame(self.centralwidget)
+        self.line_1.setFrameShape(QtGui.QFrame.HLine)
+        self.line_1.setFrameShadow(QtGui.QFrame.Sunken)
+        self.line_1.setObjectName(_fromUtf8("line_1"))
+        self.gridLayout.addWidget(self.line_1, 8, 1, 1, 1)
+
+        self.adc_label_settings = QtGui.QLabel(self.centralwidget)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.adc_label_settings.sizePolicy().hasHeightForWidth())
+        self.adc_label_settings.setSizePolicy(sizePolicy)
+        self.adc_label_settings.setObjectName(_fromUtf8("label_settings"))
+        self.gridLayout.addWidget(self.adc_label_settings, 9, 0, 1, 1)
+
+        self.spinBox_jesd_delay= QtGui.QSpinBox(self.centralwidget)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.spinBox_jesd_delay.sizePolicy().hasHeightForWidth())
+        self.spinBox_jesd_delay.setSizePolicy(sizePolicy)
+        self.spinBox_jesd_delay.setMaximumSize(QtCore.QSize(300, 16777215))
+        self.spinBox_jesd_delay.setObjectName(_fromUtf8("spinBox_jesd_delay"))
+        self.spinBox_jesd_delay.setMaximum(61)
+        self.gridLayout.addWidget(self.spinBox_jesd_delay, 10, 1, 1, 1)
+        self.label_jesd_delay = QtGui.QLabel(self.centralwidget)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label_jesd_delay.sizePolicy().hasHeightForWidth())
+        self.label_jesd_delay.setSizePolicy(sizePolicy)
+        self.label_jesd_delay.setObjectName(_fromUtf8("label_jesd_delay"))
+        self.gridLayout.addWidget(self.label_jesd_delay, 10, 0, 1, 1)
+
+
+##############################----------tx_trig-------##########################################################
+        self.pushButton_tx_trig = QtGui.QPushButton(self.centralwidget)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.pushButton_tx_trig.sizePolicy().hasHeightForWidth())
+        self.pushButton_tx_trig.setSizePolicy(sizePolicy)
+        self.pushButton_tx_trig.setMaximumSize(QtCore.QSize(800, 16777215))
+        self.pushButton_tx_trig.setObjectName(_fromUtf8("pushButton_tx_trig"))
+        self.gridLayout.addWidget(self.pushButton_tx_trig, 11, 0, 1, 1)
+
+######################################################################################################
+##############################-------phase shifter------##########################################################
+        self.pushButton_phase_swap = QtGui.QPushButton(self.centralwidget)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.pushButton_phase_swap.sizePolicy().hasHeightForWidth())
+        self.pushButton_phase_swap.setSizePolicy(sizePolicy)
+        self.pushButton_phase_swap.setMaximumSize(QtCore.QSize(800, 16777215))
+        self.pushButton_phase_swap.setObjectName(_fromUtf8("pushButton_phase_swap"))
+        self.gridLayout.addWidget(self.pushButton_phase_swap, 12, 0, 1, 1)
+
+######################################################################################################
 
 
 
@@ -477,13 +519,13 @@ class Ui_MainWindow(object):
         self.gridLayout_acq.setObjectName(_fromUtf8("gridLayout_acq"))
 
         self.label_acq = QtGui.QLabel(self.centralwidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Preferred)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_pix_min.sizePolicy().hasHeightForWidth())
         self.label_acq.setSizePolicy(sizePolicy)
         self.label_acq.setObjectName(_fromUtf8("label_acq"))
-        self.gridLayout_acq.addWidget(self.label_acq, 1, 0, 1, 1)
+        self.gridLayout_acq.addWidget(self.label_acq, 0, 0, 1, 1)
 
         self.pushButton_background = QtGui.QPushButton(self.centralwidget)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
@@ -493,7 +535,7 @@ class Ui_MainWindow(object):
         self.pushButton_background.setSizePolicy(sizePolicy)
         self.pushButton_background.setMaximumSize(QtCore.QSize(800, 16777215))
         self.pushButton_background.setObjectName(_fromUtf8("pushButton_background"))
-        self.gridLayout_acq.addWidget(self.pushButton_background, 2, 0, 1, 1)
+        self.gridLayout_acq.addWidget(self.pushButton_background, 1, 0, 1, 1)
 
         self.checkBox_remove_back = QtGui.QCheckBox(self.centralwidget)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
@@ -502,7 +544,7 @@ class Ui_MainWindow(object):
         sizePolicy.setHeightForWidth(self.checkBox_remove_back.sizePolicy().hasHeightForWidth())
         self.checkBox_remove_back.setSizePolicy(sizePolicy)
         self.checkBox_remove_back.setObjectName(_fromUtf8("checkBox_remove_back"))
-        self.gridLayout_acq.addWidget(self.checkBox_remove_back, 2, 1, 1, 1)
+        self.gridLayout_acq.addWidget(self.checkBox_remove_back, 1, 1, 1, 1)
 
 
         self.pushButton_unmodulated = QtGui.QPushButton(self.centralwidget)
@@ -513,7 +555,7 @@ class Ui_MainWindow(object):
         self.pushButton_unmodulated.setSizePolicy(sizePolicy)
         self.pushButton_unmodulated.setMaximumSize(QtCore.QSize(800, 16777215))
         self.pushButton_unmodulated.setObjectName(_fromUtf8("pushButton_unmodulated"))
-        self.gridLayout_acq.addWidget(self.pushButton_unmodulated, 3, 0, 1, 1)
+        self.gridLayout_acq.addWidget(self.pushButton_unmodulated, 2, 0, 1, 1)
 
         self.checkBox_average = QtGui.QCheckBox(self.centralwidget)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
@@ -522,7 +564,7 @@ class Ui_MainWindow(object):
         sizePolicy.setHeightForWidth(self.checkBox_average.sizePolicy().hasHeightForWidth())
         self.checkBox_average.setSizePolicy(sizePolicy)
         self.checkBox_average.setObjectName(_fromUtf8("checkBox_average"))
-        self.gridLayout_acq.addWidget(self.checkBox_average, 3, 1, 1, 1)
+        self.gridLayout_acq.addWidget(self.checkBox_average, 2, 1, 1, 1)
 
 
         self.pushButton_modulated = QtGui.QPushButton(self.centralwidget)
@@ -533,7 +575,7 @@ class Ui_MainWindow(object):
         self.pushButton_modulated.setSizePolicy(sizePolicy)
         self.pushButton_modulated.setMaximumSize(QtCore.QSize(800, 16777215))
         self.pushButton_modulated.setObjectName(_fromUtf8("pushButton_modulated"))
-        self.gridLayout_acq.addWidget(self.pushButton_modulated, 4, 0, 1, 1)
+        self.gridLayout_acq.addWidget(self.pushButton_modulated, 3, 0, 1, 1)
 
         self.checkBox_calc_modul = QtGui.QCheckBox(self.centralwidget)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
@@ -542,7 +584,7 @@ class Ui_MainWindow(object):
         sizePolicy.setHeightForWidth(self.checkBox_calc_modul.sizePolicy().hasHeightForWidth())
         self.checkBox_calc_modul.setSizePolicy(sizePolicy)
         self.checkBox_calc_modul.setObjectName(_fromUtf8("checkBox_calc_modul"))
-        self.gridLayout_acq.addWidget(self.checkBox_calc_modul, 4, 1, 1, 1)
+        self.gridLayout_acq.addWidget(self.checkBox_calc_modul, 3, 1, 1, 1)
 
 
         self.checkBox_savefile = QtGui.QCheckBox(self.centralwidget)
@@ -552,7 +594,7 @@ class Ui_MainWindow(object):
         sizePolicy.setHeightForWidth(self.checkBox_savefile.sizePolicy().hasHeightForWidth())
         self.checkBox_savefile.setSizePolicy(sizePolicy)
         self.checkBox_savefile.setObjectName(_fromUtf8("checkBox_savefile"))
-        self.gridLayout_acq.addWidget(self.checkBox_savefile, 5, 0, 1, 1)
+        self.gridLayout_acq.addWidget(self.checkBox_savefile, 4, 0, 1, 1)
 
         # self.checkBox_ELOG = QtGui.QCheckBox(self.centralwidget)
         # sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
@@ -571,7 +613,7 @@ class Ui_MainWindow(object):
         self.pushButton_file_path.setSizePolicy(sizePolicy)
         self.pushButton_file_path.setMaximumSize(QtCore.QSize(800, 16777215))
         self.pushButton_file_path.setObjectName(_fromUtf8("pushButton_file_path"))
-        self.gridLayout_acq.addWidget(self.pushButton_file_path, 6, 0, 1, 1)
+        self.gridLayout_acq.addWidget(self.pushButton_file_path, 5, 0, 1, 1)
 
         self.lineEdit_file_path = QtGui.QLineEdit(self.centralwidget)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
@@ -581,7 +623,7 @@ class Ui_MainWindow(object):
         self.lineEdit_file_path.setSizePolicy(sizePolicy)
         self.lineEdit_file_path.setMaximumSize(QtCore.QSize(800, 16777215))
         self.lineEdit_file_path.setObjectName(_fromUtf8("lineEdit_file_path"))
-        self.gridLayout_acq.addWidget(self.lineEdit_file_path, 6, 1, 1, 1)
+        self.gridLayout_acq.addWidget(self.lineEdit_file_path, 5, 1, 1, 1)
 
 
         self.fillnum_bar = QtGui.QStatusBar(self.centralwidget)
@@ -589,7 +631,7 @@ class Ui_MainWindow(object):
         self.fillnum_bar.setSizeGripEnabled(0)
         self.fillnum_bar.setMaximumSize(QtCore.QSize(900, 100))
         self.fillnum_bar.setObjectName(_fromUtf8("detector_bar"))
-        self.gridLayout_acq.addWidget(self.fillnum_bar, 7, 0, 1, 1)
+        self.gridLayout_acq.addWidget(self.fillnum_bar, 6, 0, 1, 1)
 
         self.lineEdit_fillnum = QtGui.QLineEdit(self.centralwidget)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
@@ -602,7 +644,7 @@ class Ui_MainWindow(object):
         self.lineEdit_fillnum.setInputMask("99999")
         self.lineEdit_fillnum.setText("12345")
 
-        self.gridLayout_acq.addWidget(self.lineEdit_fillnum, 7, 1, 1, 1)
+        self.gridLayout_acq.addWidget(self.lineEdit_fillnum, 6, 1, 1, 1)
 
 
         self.detector_bar = QtGui.QStatusBar(self.centralwidget)
@@ -610,7 +652,7 @@ class Ui_MainWindow(object):
         self.detector_bar.setSizeGripEnabled(0)
         self.detector_bar.setMaximumSize(QtCore.QSize(900, 100))
         self.detector_bar.setObjectName(_fromUtf8("detector_bar"))
-        self.gridLayout_acq.addWidget(self.detector_bar, 8, 0, 1, 1)
+        self.gridLayout_acq.addWidget(self.detector_bar, 7, 0, 1, 1)
 
         self.lineEdit_detector = QtGui.QLineEdit(self.centralwidget)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
@@ -622,14 +664,14 @@ class Ui_MainWindow(object):
         self.lineEdit_detector.setObjectName(_fromUtf8("lineEdit_detector"))
         self.lineEdit_detector.setInputMask("NNNN")
         self.lineEdit_detector.setText("Si01")
-        self.gridLayout_acq.addWidget(self.lineEdit_detector, 8, 1, 1, 1)
+        self.gridLayout_acq.addWidget(self.lineEdit_detector, 7, 1, 1, 1)
 
         self.comments_bar = QtGui.QStatusBar(self.centralwidget)
         self.comments_bar.showMessage("Comments:")
         self.comments_bar.setSizeGripEnabled(0)
         self.comments_bar.setMaximumSize(QtCore.QSize(900, 100))
         self.comments_bar.setObjectName(_fromUtf8("comments_bar"))
-        self.gridLayout_acq.addWidget(self.comments_bar, 9, 0, 1, 1)
+        self.gridLayout_acq.addWidget(self.comments_bar, 8, 0, 1, 1)
 
         self.lineEdit_comments = QtGui.QLineEdit(self.centralwidget)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
@@ -639,7 +681,7 @@ class Ui_MainWindow(object):
         self.lineEdit_comments.setSizePolicy(sizePolicy)
         self.lineEdit_comments.setMaximumSize(QtCore.QSize(800, 16777215))
         self.lineEdit_comments.setObjectName(_fromUtf8("lineEdit_comments"))
-        self.gridLayout_acq.addWidget(self.lineEdit_comments, 9, 1, 1, 1)
+        self.gridLayout_acq.addWidget(self.lineEdit_comments, 8, 1, 1, 1)
 
         self.horizontalLayout_2.addLayout(self.gridLayout_acq)
 
@@ -1114,10 +1156,8 @@ class Ui_MainWindow(object):
             else:
                 self.pushButton_run.setStyleSheet("background-color : green")
                 self.pushButton_run.setText(_translate("MainWindow", "RUN", None))
-
-
-
-
+            check_status()
+            led_update()
 
 
 
@@ -1130,6 +1170,8 @@ class Ui_MainWindow(object):
             if (read_register("PCIE_RESET",hex=True) != "14021700"):
                 self.status_bar.showMessage('Error!', 1000)
                 self.textEdit.insertPlainText(u'\u26A0' + ' Communication failed with FPGA board... Check FPGA, the PCI-Express connection and reboot')
+                #check_status()
+                led_update()
             else:
                 self.status_bar.showMessage('Initializing board...', 5000)
                 subprocess.call(['./full_sequence.sh'])
@@ -1139,6 +1181,7 @@ class Ui_MainWindow(object):
                 self.spinBox_total_samples.setValue(1024)
                 self.spinBox_skip_samples.setValue(0)
                 self.spinBox_int_trig.setValue(126)
+                self.spinBox_jesd_delay.setValue(45)
                 rst_slow_trigger_samples()
                 self.status_bar.showMessage('Board initialized', 1000)
                 self.textEdit.insertPlainText(subprocess.check_output(['./status.sh']))
@@ -1151,6 +1194,8 @@ class Ui_MainWindow(object):
             if (read_register("PCIE_RESET",hex=True) != "14021700"):
                 self.status_bar.showMessage('Error!', 1000)
                 self.textEdit.insertPlainText(u'\u26A0' + ' Communication failed with FPGA board... Check FPGA, the PCI-Express connection and reboot')
+               #check_status()
+                led_update()
             else:
                 self.status_bar.showMessage('Initializing board...', 5000)
                 subprocess.call(['./full_sequence_ex_rf.sh'])
@@ -1160,6 +1205,7 @@ class Ui_MainWindow(object):
                 self.spinBox_total_samples.setValue(1024)
                 self.spinBox_skip_samples.setValue(0)
                 self.spinBox_int_trig.setValue(126)
+                self.spinBox_jesd_delay.setValue(45)
                 rst_slow_trigger_samples()
                 self.status_bar.showMessage('Board initialized with external RF parameters', 1000)
                 self.textEdit.insertPlainText(subprocess.check_output(['./status.sh']))
@@ -1206,13 +1252,20 @@ class Ui_MainWindow(object):
             write_reg("INTEG_DELAY",integration_delay_w)
             return integration_delay_w
 
-        def tx_trig_left():
+        def tx_trig():
             self.pushButton_run.setFlat(0)
-            subprocess.call(['./tx_trig_adcs_left.sh'])
+            subprocess.call(['./tx_trig_adcs.sh'])
 
-        def tx_trig_right():
+        def phase_swap():
             self.pushButton_run.setFlat(0)
-            subprocess.call(['./tx_trig_adcs_right.sh'])
+            phase0 = 8
+            phase180 = 12296 #3008
+            phase_set = read_register("PHASE_SWAP", hex = False)
+            if (str(phase_set) == str(phase0)):
+                write_reg("PHASE_SWAP", str(phase180)) #3008
+            else:
+                write_reg("PHASE_SWAP", str(phase0))  #008
+
 
 ########################################################################################################################
         def timescan():
@@ -1428,6 +1481,8 @@ class Ui_MainWindow(object):
                     self.spinBox_total_samples.setValue(read_register("FT_TO_ACQ"))
                     self.spinBox_skip_samples.setValue(read_register("FT_SKIP"))
                     self.spinBox_int_trig.setValue(read_register("CLK_DIV"))
+                    self.spinBox_jesd_delay.setValue(read_register("JESD_DELAY"))
+
             except:
                 self.status_bar.showMessage('Error!', 1000)
                 self.textEdit.insertPlainText(u'\u26A0' + ' Communication failed with FPGA board... Check FPGA, the PCI-Express connection and reboot')
@@ -1566,6 +1621,10 @@ class Ui_MainWindow(object):
         self.spinBox_total_samples.valueChanged.connect(lambda: write_reg("FT_TO_ACQ",self.spinBox_total_samples.text()))
         self.spinBox_skip_samples.valueChanged.connect(lambda: write_reg("FT_SKIP",self.spinBox_skip_samples.text()))
         self.spinBox_int_trig.valueChanged.connect(lambda: write_reg("CLK_DIV",self.spinBox_int_trig.text()))
+        self.spinBox_jesd_delay.valueChanged.connect(lambda: write_reg("JESD_DELAY",self.spinBox_jesd_delay.text()))
+
+
+
 
         self.pushButton_file_path.clicked.connect(getDir)
         self.pushButton_background_file.clicked.connect(get_background)
@@ -1574,8 +1633,9 @@ class Ui_MainWindow(object):
         self.pushButton_readsettings.clicked.connect(readback_settings)
         self.pushButton_init_board.clicked.connect(init_board)
         self.pushButton_init_board_ex_rf.clicked.connect(init_board_ex_rf)
-        self.pushButton_tx_left.clicked.connect(tx_trig_left)
-        self.pushButton_tx_right.clicked.connect(tx_trig_right)
+        self.pushButton_tx_trig.clicked.connect(tx_trig)
+        self.pushButton_phase_swap.clicked.connect(phase_swap)
+
         self.pushButton_timescan.clicked.connect(timescan)
         self.pushButton_poweroff.clicked.connect(poweroff)
         self.pushButton_modulated.clicked.connect(readout_modulated)
@@ -1617,6 +1677,9 @@ class Ui_MainWindow(object):
         self.label_settings.setText(_translate("MainWindow", "KALYPSO settings", None))
         self.pushButton_readsettings.setText(_translate("MainWindow", "Read-back", None))
         self.label_settings.setFont(boldFont)
+        self.adc_label_settings.setText(_translate("MainWindow", "ADC settings", None))
+        self.adc_label_settings.setFont(boldFont)
+
         self.label_int_time.setText(_translate("MainWindow", "Integration Time (ns)", None))
         self.label_int_delay.setText(_translate("MainWindow", "Integration Delay", None))
         self.label_gott_gain.setText(_translate("MainWindow", "GOTTHARD Gain", None))
@@ -1630,12 +1693,15 @@ class Ui_MainWindow(object):
         # self.label_int_trig_text.setText(_translate("MainWindow", "Internal trigger (0 = external trigger)", None))
         # self.label_int_trig_text.setFont(boldFont)
         self.label_int_trig.setText(_translate("MainWindow", "Internal trig. DIV (0 = ext)", None))
+        self.label_jesd_delay.setText(_translate("MainWindow", "JESD delay", None))
+        self.pushButton_tx_trig.setText(_translate("MainWindow", "ALIGN ADCs", None))
+        self.pushButton_phase_swap.setText(_translate("MainWindow", "Phase swap", None))
         self.label_controls.setText(_translate("MainWindow", "KALYPSO operation", None))
         self.label_controls.setFont(boldFont)
-        self.pushButton_init_board.setText(_translate("MainWindow", "Init Board", None))
-        self.pushButton_init_board_ex_rf.setText(_translate("MainWindow", "Init Board (EX_RF)", None))
-        self.pushButton_tx_left.setText(_translate("MainWindow", "ALIGN LEFT", None))
-        self.pushButton_tx_right.setText(_translate("MainWindow", "ALIGN RIGHT", None))
+        self.pushButton_init_board.setText(_translate("MainWindow", "Internal CLK", None))
+        self.pushButton_init_board_ex_rf.setText(_translate("MainWindow", "External CLK", None))
+        #self.pushButton_tx_left.setText(_translate("MainWindow", "ALIGN LEFT", None))
+        #self.pushButton_tx_right.setText(_translate("MainWindow", "ALIGN RIGHT", None))
 
         self.pushButton_timescan.setText(_translate("MainWindow", "Timescan", None))
         self.pushButton_poweroff.setText(_translate("MainWindow", "Poweroff", None))