adding bandpass filters to full-duplex test flows

Author: EliBlattner

tdo_rup.grc

@@ -65,7 +65,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [600, 752.0]
+    coordinate: [480, 792.0]
     rotation: 0
     state: true
 - name: analog_sig_source_x_0_0
@@ -88,7 +88,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [360, 136.0]
+    coordinate: [352, 152.0]
     rotation: 0
     state: true
 - name: audio_sink_0
@@ -124,7 +124,32 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [232, 696.0]
+    coordinate: [144, 720.0]
+    rotation: 0
+    state: enabled
+- name: band_pass_filter_0
+  id: band_pass_filter
+  parameters:
+    affinity: ''
+    alias: ''
+    beta: '6.76'
+    comment: ''
+    decim: '1'
+    gain: '1'
+    high_cutoff_freq: tx_rx_mix_freq + (tx_rx_bw /2) + 1000
+    interp: '1'
+    low_cutoff_freq: tx_rx_mix_freq - (tx_rx_bw /2) - 1000
+    maxoutbuf: '0'
+    minoutbuf: '0'
+    samp_rate: samp_rate
+    type: fir_filter_ccf
+    width: '1000'
+    win: window.WIN_HAMMING
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [592, 564.0]
     rotation: 0
     state: enabled
 - name: blocks_complex_to_float_0
@@ -187,7 +212,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [488, 664.0]
+    coordinate: [400, 664.0]
     rotation: 0
     state: enabled
 - name: blocks_message_strobe_0
@@ -240,7 +265,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [840, 648.0]
+    coordinate: [808, 664.0]
     rotation: 0
     state: true
 - name: blocks_multiply_xx_0_0
@@ -490,10 +515,11 @@ connections:
 - [analog_sig_source_x_0, '0', blocks_multiply_xx_0, '1']
 - [analog_sig_source_x_0_0, '0', blocks_multiply_xx_0_0, '0']
 - [audio_source_0, '0', blocks_float_to_complex_0, '0']
+- [band_pass_filter_0, '0', blocks_multiply_xx_0, '0']
 - [blocks_complex_to_float_0, '0', audio_sink_0, '0']
 - [blocks_complex_to_float_1, '0', blocks_wavfile_sink_0, '0']
 - [blocks_conjugate_cc_0, '0', blocks_complex_to_float_0, '0']
-- [blocks_float_to_complex_0, '0', blocks_multiply_xx_0, '0']
+- [blocks_float_to_complex_0, '0', band_pass_filter_0, '0']
 - [blocks_message_strobe_0, strobe, lora_sdr_payload_id_inc_0, msg_in]
 - [blocks_message_strobe_0, strobe, lora_tx_0, in]
 - [blocks_multiply_const_vxx_0, '0', blocks_conjugate_cc_0, '0']

tdo_rup.py

@@ -13,8 +13,9 @@
 from gnuradio import audio
 from gnuradio import blocks
 import pmt
-from gnuradio import gr
+from gnuradio import filter
 from gnuradio.filter import firdes
+from gnuradio import gr
 from gnuradio.fft import window
 import sys
 import signal
@@ -77,6 +78,16 @@ def __init__(self, message_str='TEST', mult_amp=0.5, tx_cr=1, tx_rx_bw=8000, tx_
         self.blocks_conjugate_cc_0 = blocks.conjugate_cc()
         self.blocks_complex_to_float_1 = blocks.complex_to_float(1)
         self.blocks_complex_to_float_0 = blocks.complex_to_float(1)
+        self.band_pass_filter_0 = filter.fir_filter_ccf(
+            1,
+            firdes.band_pass(
+                1,
+                samp_rate,
+                (tx_rx_mix_freq - (tx_rx_bw /2) - 1000),
+                (tx_rx_mix_freq + (tx_rx_bw /2) + 1000),
+                1000,
+                window.WIN_HAMMING,
+                6.76))
         self.audio_source_0 = audio.source(samp_rate, 'hw:3,0', True)
         self.audio_sink_0 = audio.sink(samp_rate, 'hw:3,0', True)
         self.analog_sig_source_x_0_0 = analog.sig_source_c(samp_rate, analog.GR_COS_WAVE, tx_rx_mix_freq, 1, 0, 0)
@@ -90,10 +101,11 @@ def __init__(self, message_str='TEST', mult_amp=0.5, tx_cr=1, tx_rx_bw=8000, tx_
         self.connect((self.analog_sig_source_x_0, 0), (self.blocks_multiply_xx_0, 1))
         self.connect((self.analog_sig_source_x_0_0, 0), (self.blocks_multiply_xx_0_0, 0))
         self.connect((self.audio_source_0, 0), (self.blocks_float_to_complex_0, 0))
+        self.connect((self.band_pass_filter_0, 0), (self.blocks_multiply_xx_0, 0))
         self.connect((self.blocks_complex_to_float_0, 0), (self.audio_sink_0, 0))
         self.connect((self.blocks_complex_to_float_1, 0), (self.blocks_wavfile_sink_0, 0))
         self.connect((self.blocks_conjugate_cc_0, 0), (self.blocks_complex_to_float_0, 0))
-        self.connect((self.blocks_float_to_complex_0, 0), (self.blocks_multiply_xx_0, 0))
+        self.connect((self.blocks_float_to_complex_0, 0), (self.band_pass_filter_0, 0))
         self.connect((self.blocks_multiply_const_vxx_0, 0), (self.blocks_conjugate_cc_0, 0))
         self.connect((self.blocks_multiply_xx_0, 0), (self.blocks_complex_to_float_1, 0))
         self.connect((self.blocks_multiply_xx_0, 0), (self.lora_rx_0, 0))
@@ -126,6 +138,7 @@ def get_tx_rx_bw(self):
 
     def set_tx_rx_bw(self, tx_rx_bw):
         self.tx_rx_bw = tx_rx_bw
+        self.band_pass_filter_0.set_taps(firdes.band_pass(1, self.samp_rate, (self.tx_rx_mix_freq - (self.tx_rx_bw /2) - 1000), (self.tx_rx_mix_freq + (self.tx_rx_bw /2) + 1000), 1000, window.WIN_HAMMING, 6.76))
 
     def get_tx_rx_mix_freq(self):
         return self.tx_rx_mix_freq
@@ -134,6 +147,7 @@ def set_tx_rx_mix_freq(self, tx_rx_mix_freq):
         self.tx_rx_mix_freq = tx_rx_mix_freq
         self.analog_sig_source_x_0.set_frequency((-self.tx_rx_mix_freq))
         self.analog_sig_source_x_0_0.set_frequency(self.tx_rx_mix_freq)
+        self.band_pass_filter_0.set_taps(firdes.band_pass(1, self.samp_rate, (self.tx_rx_mix_freq - (self.tx_rx_bw /2) - 1000), (self.tx_rx_mix_freq + (self.tx_rx_bw /2) + 1000), 1000, window.WIN_HAMMING, 6.76))
 
     def get_tx_rx_sf(self):
         return self.tx_rx_sf
@@ -162,6 +176,7 @@ def set_samp_rate(self, samp_rate):
         self.samp_rate = samp_rate
         self.analog_sig_source_x_0.set_sampling_freq(self.samp_rate)
         self.analog_sig_source_x_0_0.set_sampling_freq(self.samp_rate)
+        self.band_pass_filter_0.set_taps(firdes.band_pass(1, self.samp_rate, (self.tx_rx_mix_freq - (self.tx_rx_bw /2) - 1000), (self.tx_rx_mix_freq + (self.tx_rx_bw /2) + 1000), 1000, window.WIN_HAMMING, 6.76))
 
 
 

tup_rdo.grc

@@ -88,7 +88,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [336, 176.0]
+    coordinate: [336, 192.0]
     rotation: 0
     state: true
 - name: audio_sink_0
@@ -124,7 +124,32 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [232, 696.0]
+    coordinate: [152, 696.0]
+    rotation: 0
+    state: enabled
+- name: band_pass_filter_0
+  id: band_pass_filter
+  parameters:
+    affinity: ''
+    alias: ''
+    beta: '6.76'
+    comment: ''
+    decim: '1'
+    gain: '1'
+    high_cutoff_freq: tx_rx_mix_freq + (tx_rx_bw /2) + 1000
+    interp: '1'
+    low_cutoff_freq: tx_rx_mix_freq - (tx_rx_bw /2) - 1000
+    maxoutbuf: '0'
+    minoutbuf: '0'
+    samp_rate: samp_rate
+    type: fir_filter_ccf
+    width: '1000'
+    win: window.WIN_HAMMING
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [552, 548.0]
     rotation: 0
     state: enabled
 - name: blocks_complex_to_float_0
@@ -171,7 +196,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [712, 640.0]
+    coordinate: [736, 624.0]
     rotation: 0
     state: enabled
 - name: blocks_float_to_complex_0
@@ -187,7 +212,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [488, 664.0]
+    coordinate: [392, 664.0]
     rotation: 0
     state: enabled
 - name: blocks_message_strobe_0
@@ -490,10 +515,11 @@ connections:
 - [analog_sig_source_x_0, '0', blocks_multiply_xx_0, '1']
 - [analog_sig_source_x_0_0, '0', blocks_multiply_xx_0_0, '0']
 - [audio_source_0, '0', blocks_float_to_complex_0, '0']
+- [band_pass_filter_0, '0', blocks_conjugate_cc_0, '0']
 - [blocks_complex_to_float_0, '0', audio_sink_0, '0']
 - [blocks_complex_to_float_0_0, '0', blocks_wavfile_sink_0, '0']
 - [blocks_conjugate_cc_0, '0', blocks_multiply_xx_0, '0']
-- [blocks_float_to_complex_0, '0', blocks_conjugate_cc_0, '0']
+- [blocks_float_to_complex_0, '0', band_pass_filter_0, '0']
 - [blocks_message_strobe_0, strobe, lora_sdr_payload_id_inc_0, msg_in]
 - [blocks_message_strobe_0, strobe, lora_tx_0, in]
 - [blocks_multiply_const_vxx_0, '0', blocks_complex_to_float_0, '0']

tup_rdo.py

@@ -13,8 +13,9 @@
 from gnuradio import audio
 from gnuradio import blocks
 import pmt
-from gnuradio import gr
+from gnuradio import filter
 from gnuradio.filter import firdes
+from gnuradio import gr
 from gnuradio.fft import window
 import sys
 import signal
@@ -77,6 +78,16 @@ def __init__(self, message_str='TEST', mult_amp=0.5, tx_cr=1, tx_rx_bw=8000, tx_
         self.blocks_conjugate_cc_0 = blocks.conjugate_cc()
         self.blocks_complex_to_float_0_0 = blocks.complex_to_float(1)
         self.blocks_complex_to_float_0 = blocks.complex_to_float(1)
+        self.band_pass_filter_0 = filter.fir_filter_ccf(
+            1,
+            firdes.band_pass(
+                1,
+                samp_rate,
+                (tx_rx_mix_freq - (tx_rx_bw /2) - 1000),
+                (tx_rx_mix_freq + (tx_rx_bw /2) + 1000),
+                1000,
+                window.WIN_HAMMING,
+                6.76))
         self.audio_source_0 = audio.source(samp_rate, 'hw:3,0', True)
         self.audio_sink_0 = audio.sink(samp_rate, 'hw:3,0', True)
         self.analog_sig_source_x_0_0 = analog.sig_source_c(samp_rate, analog.GR_COS_WAVE, tx_rx_mix_freq, 1, 0, 0)
@@ -90,10 +101,11 @@ def __init__(self, message_str='TEST', mult_amp=0.5, tx_cr=1, tx_rx_bw=8000, tx_
         self.connect((self.analog_sig_source_x_0, 0), (self.blocks_multiply_xx_0, 1))
         self.connect((self.analog_sig_source_x_0_0, 0), (self.blocks_multiply_xx_0_0, 0))
         self.connect((self.audio_source_0, 0), (self.blocks_float_to_complex_0, 0))
+        self.connect((self.band_pass_filter_0, 0), (self.blocks_conjugate_cc_0, 0))
         self.connect((self.blocks_complex_to_float_0, 0), (self.audio_sink_0, 0))
         self.connect((self.blocks_complex_to_float_0_0, 0), (self.blocks_wavfile_sink_0, 0))
         self.connect((self.blocks_conjugate_cc_0, 0), (self.blocks_multiply_xx_0, 0))
-        self.connect((self.blocks_float_to_complex_0, 0), (self.blocks_conjugate_cc_0, 0))
+        self.connect((self.blocks_float_to_complex_0, 0), (self.band_pass_filter_0, 0))
         self.connect((self.blocks_multiply_const_vxx_0, 0), (self.blocks_complex_to_float_0, 0))
         self.connect((self.blocks_multiply_xx_0, 0), (self.blocks_complex_to_float_0_0, 0))
         self.connect((self.blocks_multiply_xx_0, 0), (self.lora_rx_0, 0))
@@ -126,6 +138,7 @@ def get_tx_rx_bw(self):
 
     def set_tx_rx_bw(self, tx_rx_bw):
         self.tx_rx_bw = tx_rx_bw
+        self.band_pass_filter_0.set_taps(firdes.band_pass(1, self.samp_rate, (self.tx_rx_mix_freq - (self.tx_rx_bw /2) - 1000), (self.tx_rx_mix_freq + (self.tx_rx_bw /2) + 1000), 1000, window.WIN_HAMMING, 6.76))
 
     def get_tx_rx_mix_freq(self):
         return self.tx_rx_mix_freq
@@ -134,6 +147,7 @@ def set_tx_rx_mix_freq(self, tx_rx_mix_freq):
         self.tx_rx_mix_freq = tx_rx_mix_freq
         self.analog_sig_source_x_0.set_frequency((-self.tx_rx_mix_freq))
         self.analog_sig_source_x_0_0.set_frequency(self.tx_rx_mix_freq)
+        self.band_pass_filter_0.set_taps(firdes.band_pass(1, self.samp_rate, (self.tx_rx_mix_freq - (self.tx_rx_bw /2) - 1000), (self.tx_rx_mix_freq + (self.tx_rx_bw /2) + 1000), 1000, window.WIN_HAMMING, 6.76))
 
     def get_tx_rx_sf(self):
         return self.tx_rx_sf
@@ -162,6 +176,7 @@ def set_samp_rate(self, samp_rate):
         self.samp_rate = samp_rate
         self.analog_sig_source_x_0.set_sampling_freq(self.samp_rate)
         self.analog_sig_source_x_0_0.set_sampling_freq(self.samp_rate)
+        self.band_pass_filter_0.set_taps(firdes.band_pass(1, self.samp_rate, (self.tx_rx_mix_freq - (self.tx_rx_bw /2) - 1000), (self.tx_rx_mix_freq + (self.tx_rx_bw /2) + 1000), 1000, window.WIN_HAMMING, 6.76))