4 커밋 ce7568735b ... fedeaaab41

작성자 SHA1 메시지 날짜
  meghana fedeaaab41 temp data 3 년 전
  meghana 914c65c11d tried different mask values 3 년 전
  meghana a1ca9ecc18 now executes from external rf 3 년 전
  meghana 36e3e9d999 fixed the phase swap values 3 년 전
5개의 변경된 파일29개의 추가작업 그리고 5개의 파일을 삭제
  1. 26 2
      GUI.py
  2. 1 1
      KALYPSO.sh
  3. 2 2
      kalypso_registers.json
  4. BIN
      temp.bin
  5. BIN
      temp_bg.bin

+ 26 - 2
GUI.py

@@ -489,6 +489,19 @@ class Ui_MainWindow(object):
         self.gridLayout.addWidget(self.pushButton_tx_trig, 11, 0, 1, 1)
 
 ######################################################################################################
+##############################----------tx_trig-left------##########################################################
+        self.pushButton_tx_trig_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_trig_left.sizePolicy().hasHeightForWidth())
+        self.pushButton_tx_trig_left.setSizePolicy(sizePolicy)
+        self.pushButton_tx_trig_left.setMaximumSize(QtCore.QSize(800, 16777215))
+        self.pushButton_tx_trig_left.setObjectName(_fromUtf8("pushButton_tx_trig"))
+        self.gridLayout.addWidget(self.pushButton_tx_trig_left, 11, 1, 1, 1)
+
+######################################################################################################
+
 ##############################-------phase shifter------##########################################################
         self.pushButton_phase_swap = QtGui.QPushButton(self.centralwidget)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
@@ -1256,10 +1269,18 @@ class Ui_MainWindow(object):
             self.pushButton_run.setFlat(0)
             subprocess.call(['./tx_trig_adcs.sh'])
 
+        def tx_trig_left():
+            self.pushButton_run.setFlat(0)
+            subprocess.call(['./tx_trig_adcs_left.sh'])
+
+
+
         def phase_swap():
             self.pushButton_run.setFlat(0)
-            phase0 = 8
-            phase180 = 12296 #3008
+            phase0 = 1 #0001
+            phase180 = 12289 #3001
+            #phase0 = 0
+            #phase180 = 12288 #3000
             phase_set = read_register("PHASE_SWAP", hex = False)
             if (str(phase_set) == str(phase0)):
                 write_reg("PHASE_SWAP", str(phase180)) #3008
@@ -1634,6 +1655,7 @@ class Ui_MainWindow(object):
         self.pushButton_init_board.clicked.connect(init_board)
         self.pushButton_init_board_ex_rf.clicked.connect(init_board_ex_rf)
         self.pushButton_tx_trig.clicked.connect(tx_trig)
+        self.pushButton_tx_trig_left.clicked.connect(tx_trig_left)
         self.pushButton_phase_swap.clicked.connect(phase_swap)
 
         self.pushButton_timescan.clicked.connect(timescan)
@@ -1695,6 +1717,8 @@ class Ui_MainWindow(object):
         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_tx_trig_left.setText(_translate("MainWindow", "ALIGN ADCs (L)", 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)

+ 1 - 1
KALYPSO.sh

@@ -8,7 +8,7 @@ echo " ################################################################## "
 
 
 
-./full_sequence.sh
+./full_sequence_ex_rf.sh
 
 
 echo " ################################################################## "

+ 2 - 2
kalypso_registers.json

@@ -73,8 +73,8 @@
     "PHASE_SWAP" : {
         "name" : "180 deg phase shift",
         "address" : "0x904C",
-        "mask" : "0x0000FFFF",
-        "notes": "MAX 3F"
+        "mask" : "0x0000ffff",
+        "notes": "max is 3"
       },
 
   "FRAME_RATE" : {

BIN
temp.bin


BIN
temp_bg.bin