From 6d56e1b35b061ffe4f677d0d6e7867f366068e82 Mon Sep 17 00:00:00 2001
From: Nao Pross <np@0hm.ch>
Date: Thu, 2 Dec 2021 21:27:17 +0100
Subject: Remove custom blocks from correlator test

---
 tests/correlator/correlator.grc | 21 ++-------------------
 tests/correlator/correlator.py  |  5 +----
 2 files changed, 3 insertions(+), 23 deletions(-)

(limited to 'tests')

diff --git a/tests/correlator/correlator.grc b/tests/correlator/correlator.grc
index 58cf3b4..f54430c 100644
--- a/tests/correlator/correlator.grc
+++ b/tests/correlator/correlator.grc
@@ -357,7 +357,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [840, 1392.0]
+    coordinate: [536, 1392.0]
     rotation: 0
     state: true
 - name: blocks_vector_source_x_0
@@ -583,22 +583,6 @@ blocks:
     coordinate: [1088, 1040.0]
     rotation: 0
     state: enabled
-- name: fadingui_deframer_0
-  id: fadingui_deframer
-  parameters:
-    affinity: ''
-    alias: ''
-    comment: ''
-    frame_obj: ''
-    maxoutbuf: '0'
-    minoutbuf: '0'
-  states:
-    bus_sink: false
-    bus_source: false
-    bus_structure: null
-    coordinate: [552, 1388.0]
-    rotation: 0
-    state: bypassed
 - name: fir_filter_xxx_1
   id: fir_filter_xxx
   parameters:
@@ -1668,7 +1652,7 @@ connections:
 - [digital_cma_equalizer_cc_0, '0', fir_filter_xxx_1, '0']
 - [digital_cma_equalizer_cc_0, '0', qtgui_const_sink_x_0, '0']
 - [digital_cma_equalizer_cc_0, '0', qtgui_time_sink_x_1_1, '0']
-- [digital_constellation_decoder_cb_0, '0', fadingui_deframer_0, '0']
+- [digital_constellation_decoder_cb_0, '0', blocks_vector_sink_x_0, '0']
 - [digital_constellation_modulator_0, '0', blocks_stream_mux_1, '1']
 - [digital_constellation_modulator_0, '0', channels_channel_model_0, '0']
 - [digital_constellation_modulator_0, '0', qtgui_time_sink_x_1_0, '0']
@@ -1678,7 +1662,6 @@ connections:
 - [digital_pfb_clock_sync_xxx_0, '0', digital_cma_equalizer_cc_0, '0']
 - [epy_block_0, '0', qtgui_const_sink_x_0_0, '0']
 - [epy_block_0, '0', virtual_sink_3, '0']
-- [fadingui_deframer_0, '0', blocks_vector_sink_x_0, '0']
 - [fir_filter_xxx_1, '0', blocks_complex_to_magphase_0, '0']
 - [fir_filter_xxx_1, '0', qtgui_const_sink_x_1, '0']
 - [root_raised_cosine_filter_0, '0', blocks_stream_mux_1, '0']
diff --git a/tests/correlator/correlator.py b/tests/correlator/correlator.py
index 93ee8bb..e080dbc 100755
--- a/tests/correlator/correlator.py
+++ b/tests/correlator/correlator.py
@@ -35,7 +35,6 @@ from argparse import ArgumentParser
 from gnuradio.eng_arg import eng_float, intx
 from gnuradio import eng_notation
 import epy_block_0
-import fadingui
 
 from gnuradio import qtgui
 
@@ -329,7 +328,6 @@ class correlator(gr.top_block, Qt.QWidget):
             self.top_grid_layout.setRowStretch(r, 1)
         for c in range(1, 2):
             self.top_grid_layout.setColumnStretch(c, 1)
-        self.fadingui_deframer_0 = fadingui.deframer(frame_obj=)
         self.epy_block_0 = epy_block_0.blk()
         self.digital_pfb_clock_sync_xxx_0 = digital.pfb_clock_sync_ccf(sps, timing_loop_bw, rrc_taps, nfilts, 16, 1.5, 1)
         self.digital_corr_est_cc_0 = digital.corr_est_cc(access_code_symbols, 1, 0, .8, digital.THRESHOLD_DYNAMIC)
@@ -372,7 +370,7 @@ class correlator(gr.top_block, Qt.QWidget):
         self.connect((self.channels_channel_model_0, 0), (self.blocks_throttle_0, 0))
         self.connect((self.digital_cma_equalizer_cc_0, 0), (self.digital_corr_est_cc_0, 0))
         self.connect((self.digital_cma_equalizer_cc_0, 0), (self.qtgui_const_sink_x_0, 0))
-        self.connect((self.digital_constellation_decoder_cb_0, 0), (self.fadingui_deframer_0, 0))
+        self.connect((self.digital_constellation_decoder_cb_0, 0), (self.blocks_vector_sink_x_0, 0))
         self.connect((self.digital_constellation_modulator_0, 0), (self.channels_channel_model_0, 0))
         self.connect((self.digital_constellation_modulator_0, 0), (self.qtgui_time_sink_x_1_0, 0))
         self.connect((self.digital_corr_est_cc_0, 1), (self.blocks_complex_to_magphase_0_0, 0))
@@ -381,7 +379,6 @@ class correlator(gr.top_block, Qt.QWidget):
         self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.digital_cma_equalizer_cc_0, 0))
         self.connect((self.epy_block_0, 0), (self.digital_constellation_decoder_cb_0, 0))
         self.connect((self.epy_block_0, 0), (self.qtgui_const_sink_x_0_0, 0))
-        self.connect((self.fadingui_deframer_0, 0), (self.blocks_vector_sink_x_0, 0))
 
 
     def closeEvent(self, event):
-- 
cgit v1.2.1