Hardware AM Simulation kleine Anpassungen vorgenomen

5 files changed, 111 insertions, 57 deletions

diff --git a/tests/Simulation Hardware/Sinus/AM_Hardware_Simulation.grc b/tests/Simulation Hardware/AM/AM_Hardware_Simulation.grc
index 02261f0..02261f0 100644
--- a/tests/Simulation Hardware/Sinus/AM_Hardware_Simulation.grc
+++ b/tests/Simulation Hardware/AM/AM_Hardware_Simulation.grc
diff --git a/tests/Simulation Hardware/Sinus/AM_Hardware_Simulation_v2_TX.grc b/tests/Simulation Hardware/AM/AM_Hardware_Simulation_v1.grc
index fc9986f..ca05787 100644
--- a/tests/Simulation Hardware/Sinus/AM_Hardware_Simulation_v2_TX.grc
+++ b/tests/Simulation Hardware/AM/AM_Hardware_Simulation_v1.grc
@@ -10,7 +10,7 @@ options:
     gen_linking: dynamic
     generate_options: qt_gui
     hier_block_src_path: '.:'
-    id: AM_Simulation
+    id: AM_Simulation_v1
     max_nouts: '0'
     output_language: python
     placement: (0,0)
@@ -21,7 +21,7 @@ options:
     run_options: prompt
     sizing_mode: fixed
     thread_safe_setters: ''
-    title: AM_Simulation v2
+    title: AM_Simulation_v1
     window_size: ''
   states:
     bus_sink: false
@@ -79,7 +79,7 @@ blocks:
     affinity: ''
     alias: ''
     comment: ''
-    const: '1'
+    const: '0'
     maxoutbuf: '0'
     minoutbuf: '0'
     type: float
@@ -104,7 +104,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [872, 332.0]
+    coordinate: [880, 332.0]
     rotation: 0
     state: true
 - name: analog_sig_source_x_0
@@ -151,6 +151,31 @@ blocks:
     coordinate: [456, 420.0]
     rotation: 0
     state: true
+- name: band_pass_filter_0
+  id: band_pass_filter
+  parameters:
+    affinity: ''
+    alias: ''
+    beta: '6.76'
+    comment: ''
+    decim: '1'
+    gain: '1'
+    high_cutoff_freq: 6e3
+    interp: '1'
+    low_cutoff_freq: '500'
+    maxoutbuf: '0'
+    minoutbuf: '0'
+    samp_rate: samp_rate
+    type: fir_filter_ccf
+    width: 6e3
+    win: firdes.WIN_HAMMING
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [1792, 604.0]
+    rotation: 0
+    state: true
 - name: blocks_add_xx_1
   id: blocks_add_xx
   parameters:
@@ -169,6 +194,22 @@ blocks:
     coordinate: [520, 272.0]
     rotation: 0
     state: true
+- name: blocks_complex_to_real_0
+  id: blocks_complex_to_real
+  parameters:
+    affinity: ''
+    alias: ''
+    comment: ''
+    maxoutbuf: '0'
+    minoutbuf: '0'
+    vlen: '1'
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [2088, 616.0]
+    rotation: 0
+    state: true
 - name: blocks_float_to_complex_0
   id: blocks_float_to_complex
   parameters:
@@ -256,7 +297,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1632, 640.0]
+    coordinate: [1504, 636.0]
     rotation: 0
     state: true
 - name: qtgui_freq_sink_x_0
@@ -416,7 +457,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1952, 760.0]
+    coordinate: [2136, 752.0]
     rotation: 0
     state: true
 - name: qtgui_time_sink_x_0_0
@@ -516,7 +557,7 @@ blocks:
     coordinate: [688, 132.0]
     rotation: 0
     state: true
-- name: qtgui_time_sink_x_0_0_0
+- name: qtgui_time_sink_x_0_0_0_0
   id: qtgui_time_sink_x
   parameters:
     affinity: ''
@@ -531,7 +572,7 @@ blocks:
     alpha7: '1.0'
     alpha8: '1.0'
     alpha9: '1.0'
-    autoscale: 'False'
+    autoscale: 'True'
     axislabels: 'True'
     color1: blue
     color10: dark blue
@@ -548,7 +589,7 @@ blocks:
     entags: 'True'
     grid: 'False'
     gui_hint: 0,1,1,1
-    label1: Orginal
+    label1: Demoduliert
     label10: Signal 10
     label2: Signal 2
     label3: Signal 3
@@ -590,7 +631,7 @@ blocks:
     tr_mode: qtgui.TRIG_MODE_FREE
     tr_slope: qtgui.TRIG_SLOPE_POS
     tr_tag: '""'
-    type: complex
+    type: float
     update_time: '0.10'
     width1: '1'
     width10: '1'
@@ -610,7 +651,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1936, 640.0]
+    coordinate: [2288, 588.0]
     rotation: 0
     state: true
 - name: rational_resampler_xxx_0
@@ -893,7 +934,7 @@ blocks:
     start_time: '-1.0'
     stream_args: ''
     stream_chans: '[]'
-    sync: pc_clock
+    sync: sync
     time_source0: ''
     time_source1: ''
     time_source2: ''
@@ -1055,7 +1096,7 @@ blocks:
     dc_offs_enb9: '""'
     dev_addr: '"serial=309AF6A"'
     dev_args: '""'
-    gain0: '.5'
+    gain0: '0.5'
     gain1: '0'
     gain10: '0'
     gain11: '0'
@@ -1265,7 +1306,7 @@ blocks:
     start_time: '-1.0'
     stream_args: ''
     stream_chans: '[]'
-    sync: pc_clock
+    sync: sync
     time_source0: ''
     time_source1: ''
     time_source2: ''
@@ -1279,7 +1320,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1320, 572.0]
+    coordinate: [1200, 572.0]
     rotation: 0
     state: true
 
@@ -1289,15 +1330,17 @@ connections:
 - [analog_const_source_x_1, '0', blocks_float_to_complex_0, '1']
 - [analog_sig_source_x_0, '0', blocks_multiply_xx_0_0, '1']
 - [analog_sig_source_x_0_0, '0', blocks_multiply_xx_0_1, '1']
+- [band_pass_filter_0, '0', blocks_complex_to_real_0, '0']
+- [band_pass_filter_0, '0', qtgui_freq_sink_x_0_0, '0']
 - [blocks_add_xx_1, '0', blocks_multiply_xx_0_1, '0']
 - [blocks_add_xx_1, '0', qtgui_time_sink_x_0_0, '0']
+- [blocks_complex_to_real_0, '0', qtgui_time_sink_x_0_0_0_0, '0']
 - [blocks_float_to_complex_0, '0', rational_resampler_xxx_0, '0']
 - [blocks_multiply_xx_0_0, '0', blocks_add_xx_1, '0']
 - [blocks_multiply_xx_0_1, '0', blocks_float_to_complex_0, '0']
 - [blocks_multiply_xx_0_1, '0', qtgui_freq_sink_x_0, '0']
 - [blocks_repeat_0, '0', uhd_usrp_sink_0, '0']
-- [freq_xlating_fir_filter_xxx_0, '0', qtgui_freq_sink_x_0_0, '0']
-- [freq_xlating_fir_filter_xxx_0, '0', qtgui_time_sink_x_0_0_0, '0']
+- [freq_xlating_fir_filter_xxx_0, '0', band_pass_filter_0, '0']
 - [rational_resampler_xxx_0, '0', blocks_repeat_0, '0']
 - [uhd_usrp_source_0, '0', freq_xlating_fir_filter_xxx_0, '0']
 
diff --git a/tests/Simulation Hardware/Sinus/AM_Simulation.py b/tests/Simulation Hardware/AM/AM_Simulation_v1.py
index f2c521b..087a882 100755
--- a/tests/Simulation Hardware/Sinus/AM_Simulation.py
+++ b/tests/Simulation Hardware/AM/AM_Simulation_v1.py
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: GPL-3.0
 #
 # GNU Radio Python Flow Graph
-# Title: AM_Simulation v2
+# Title: AM_Simulation_v1
 # Author: sara
 # GNU Radio version: 3.8.2.0
 
@@ -39,12 +39,12 @@ import time
 
 from gnuradio import qtgui
 
-class AM_Simulation(gr.top_block, Qt.QWidget):
+class AM_Simulation_v1(gr.top_block, Qt.QWidget):
 
     def __init__(self):
-        gr.top_block.__init__(self, "AM_Simulation v2")
+        gr.top_block.__init__(self, "AM_Simulation_v1")
         Qt.QWidget.__init__(self)
-        self.setWindowTitle("AM_Simulation v2")
+        self.setWindowTitle("AM_Simulation_v1")
         qtgui.util.check_set_qss()
         try:
             self.setWindowIcon(Qt.QIcon.fromTheme('gnuradio-grc'))
@@ -62,7 +62,7 @@ class AM_Simulation(gr.top_block, Qt.QWidget):
         self.top_grid_layout = Qt.QGridLayout()
         self.top_layout.addLayout(self.top_grid_layout)
 
-        self.settings = Qt.QSettings("GNU Radio", "AM_Simulation")
+        self.settings = Qt.QSettings("GNU Radio", "AM_Simulation_v1")
 
         try:
             if StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"):
@@ -91,11 +91,11 @@ class AM_Simulation(gr.top_block, Qt.QWidget):
         )
         self.uhd_usrp_source_0.set_clock_source('external', 0)
         self.uhd_usrp_source_0.set_center_freq(223e6, 0)
-        self.uhd_usrp_source_0.set_normalized_gain(.5, 0)
+        self.uhd_usrp_source_0.set_normalized_gain(0.5, 0)
         self.uhd_usrp_source_0.set_antenna('RX2', 0)
         self.uhd_usrp_source_0.set_bandwidth(400e3, 0)
         self.uhd_usrp_source_0.set_samp_rate(samp_rate)
-        self.uhd_usrp_source_0.set_time_now(uhd.time_spec(time.time()), uhd.ALL_MBOARDS)
+        self.uhd_usrp_source_0.set_time_unknown_pps(uhd.time_spec())
         self.uhd_usrp_sink_0 = uhd.usrp_sink(
             ",".join(("serial=309AF59  ", "")),
             uhd.stream_args(
@@ -111,33 +111,33 @@ class AM_Simulation(gr.top_block, Qt.QWidget):
         self.uhd_usrp_sink_0.set_antenna('TX/RX', 0)
         self.uhd_usrp_sink_0.set_bandwidth(400e3, 0)
         self.uhd_usrp_sink_0.set_samp_rate(samp_rate)
-        self.uhd_usrp_sink_0.set_time_now(uhd.time_spec(time.time()), uhd.ALL_MBOARDS)
+        self.uhd_usrp_sink_0.set_time_unknown_pps(uhd.time_spec())
         self.rational_resampler_xxx_0 = filter.rational_resampler_ccc(
                 interpolation=5,
                 decimation=4,
                 taps=None,
                 fractional_bw=None)
-        self.qtgui_time_sink_x_0_0_0 = qtgui.time_sink_c(
+        self.qtgui_time_sink_x_0_0_0_0 = qtgui.time_sink_f(
             1024, #size
             samp_rate, #samp_rate
             "Demodul", #name
             1 #number of inputs
         )
-        self.qtgui_time_sink_x_0_0_0.set_update_time(0.10)
-        self.qtgui_time_sink_x_0_0_0.set_y_axis(-1, 1)
+        self.qtgui_time_sink_x_0_0_0_0.set_update_time(0.10)
+        self.qtgui_time_sink_x_0_0_0_0.set_y_axis(-1, 1)
 
-        self.qtgui_time_sink_x_0_0_0.set_y_label('Amplitude', "")
+        self.qtgui_time_sink_x_0_0_0_0.set_y_label('Amplitude', "")
 
-        self.qtgui_time_sink_x_0_0_0.enable_tags(True)
-        self.qtgui_time_sink_x_0_0_0.set_trigger_mode(qtgui.TRIG_MODE_FREE, qtgui.TRIG_SLOPE_POS, 0.0, 0, 0, "")
-        self.qtgui_time_sink_x_0_0_0.enable_autoscale(False)
-        self.qtgui_time_sink_x_0_0_0.enable_grid(False)
-        self.qtgui_time_sink_x_0_0_0.enable_axis_labels(True)
-        self.qtgui_time_sink_x_0_0_0.enable_control_panel(False)
-        self.qtgui_time_sink_x_0_0_0.enable_stem_plot(False)
+        self.qtgui_time_sink_x_0_0_0_0.enable_tags(True)
+        self.qtgui_time_sink_x_0_0_0_0.set_trigger_mode(qtgui.TRIG_MODE_FREE, qtgui.TRIG_SLOPE_POS, 0.0, 0, 0, "")
+        self.qtgui_time_sink_x_0_0_0_0.enable_autoscale(True)
+        self.qtgui_time_sink_x_0_0_0_0.enable_grid(False)
+        self.qtgui_time_sink_x_0_0_0_0.enable_axis_labels(True)
+        self.qtgui_time_sink_x_0_0_0_0.enable_control_panel(False)
+        self.qtgui_time_sink_x_0_0_0_0.enable_stem_plot(False)
 
 
-        labels = ['Orginal', 'Signal 2', 'Signal 3', 'Signal 4', 'Signal 5',
+        labels = ['Demoduliert', 'Signal 2', 'Signal 3', 'Signal 4', 'Signal 5',
             'Signal 6', 'Signal 7', 'Signal 8', 'Signal 9', 'Signal 10']
         widths = [1, 1, 1, 1, 1,
             1, 1, 1, 1, 1]
@@ -151,22 +151,19 @@ class AM_Simulation(gr.top_block, Qt.QWidget):
             -1, -1, -1, -1, -1]
 
 
-        for i in range(2):
+        for i in range(1):
             if len(labels[i]) == 0:
-                if (i % 2 == 0):
-                    self.qtgui_time_sink_x_0_0_0.set_line_label(i, "Re{{Data {0}}}".format(i/2))
-                else:
-                    self.qtgui_time_sink_x_0_0_0.set_line_label(i, "Im{{Data {0}}}".format(i/2))
+                self.qtgui_time_sink_x_0_0_0_0.set_line_label(i, "Data {0}".format(i))
             else:
-                self.qtgui_time_sink_x_0_0_0.set_line_label(i, labels[i])
-            self.qtgui_time_sink_x_0_0_0.set_line_width(i, widths[i])
-            self.qtgui_time_sink_x_0_0_0.set_line_color(i, colors[i])
-            self.qtgui_time_sink_x_0_0_0.set_line_style(i, styles[i])
-            self.qtgui_time_sink_x_0_0_0.set_line_marker(i, markers[i])
-            self.qtgui_time_sink_x_0_0_0.set_line_alpha(i, alphas[i])
-
-        self._qtgui_time_sink_x_0_0_0_win = sip.wrapinstance(self.qtgui_time_sink_x_0_0_0.pyqwidget(), Qt.QWidget)
-        self.top_grid_layout.addWidget(self._qtgui_time_sink_x_0_0_0_win, 0, 1, 1, 1)
+                self.qtgui_time_sink_x_0_0_0_0.set_line_label(i, labels[i])
+            self.qtgui_time_sink_x_0_0_0_0.set_line_width(i, widths[i])
+            self.qtgui_time_sink_x_0_0_0_0.set_line_color(i, colors[i])
+            self.qtgui_time_sink_x_0_0_0_0.set_line_style(i, styles[i])
+            self.qtgui_time_sink_x_0_0_0_0.set_line_marker(i, markers[i])
+            self.qtgui_time_sink_x_0_0_0_0.set_line_alpha(i, alphas[i])
+
+        self._qtgui_time_sink_x_0_0_0_0_win = sip.wrapinstance(self.qtgui_time_sink_x_0_0_0_0.pyqwidget(), Qt.QWidget)
+        self.top_grid_layout.addWidget(self._qtgui_time_sink_x_0_0_0_0_win, 0, 1, 1, 1)
         for r in range(0, 1):
             self.top_grid_layout.setRowStretch(r, 1)
         for c in range(1, 2):
@@ -316,11 +313,22 @@ class AM_Simulation(gr.top_block, Qt.QWidget):
         self.blocks_multiply_xx_0_1 = blocks.multiply_vff(1)
         self.blocks_multiply_xx_0_0 = blocks.multiply_vff(1)
         self.blocks_float_to_complex_0 = blocks.float_to_complex(1)
+        self.blocks_complex_to_real_0 = blocks.complex_to_real(1)
         self.blocks_add_xx_1 = blocks.add_vff(1)
+        self.band_pass_filter_0 = filter.fir_filter_ccf(
+            1,
+            firdes.band_pass(
+                1,
+                samp_rate,
+                500,
+                6e3,
+                6e3,
+                firdes.WIN_HAMMING,
+                6.76))
         self.analog_sig_source_x_0_0 = analog.sig_source_f(samp_rate, analog.GR_COS_WAVE, 100E3, 10, 0, 0)
         self.analog_sig_source_x_0 = analog.sig_source_f(samp_rate, analog.GR_COS_WAVE, 5e3, 1, 0, 0)
         self.analog_const_source_x_1 = analog.sig_source_f(0, analog.GR_CONST_WAVE, 0, 0, 0)
-        self.analog_const_source_x_0_0 = analog.sig_source_f(0, analog.GR_CONST_WAVE, 0, 0, 1)
+        self.analog_const_source_x_0_0 = analog.sig_source_f(0, analog.GR_CONST_WAVE, 0, 0, 0)
         self.analog_const_source_x_0 = analog.sig_source_f(0, analog.GR_CONST_WAVE, 0, 0, 700e-3)
 
 
@@ -333,21 +341,23 @@ class AM_Simulation(gr.top_block, Qt.QWidget):
         self.connect((self.analog_const_source_x_1, 0), (self.blocks_float_to_complex_0, 1))
         self.connect((self.analog_sig_source_x_0, 0), (self.blocks_multiply_xx_0_0, 1))
         self.connect((self.analog_sig_source_x_0_0, 0), (self.blocks_multiply_xx_0_1, 1))
+        self.connect((self.band_pass_filter_0, 0), (self.blocks_complex_to_real_0, 0))
+        self.connect((self.band_pass_filter_0, 0), (self.qtgui_freq_sink_x_0_0, 0))
         self.connect((self.blocks_add_xx_1, 0), (self.blocks_multiply_xx_0_1, 0))
         self.connect((self.blocks_add_xx_1, 0), (self.qtgui_time_sink_x_0_0, 0))
+        self.connect((self.blocks_complex_to_real_0, 0), (self.qtgui_time_sink_x_0_0_0_0, 0))
         self.connect((self.blocks_float_to_complex_0, 0), (self.rational_resampler_xxx_0, 0))
         self.connect((self.blocks_multiply_xx_0_0, 0), (self.blocks_add_xx_1, 0))
         self.connect((self.blocks_multiply_xx_0_1, 0), (self.blocks_float_to_complex_0, 0))
         self.connect((self.blocks_multiply_xx_0_1, 0), (self.qtgui_freq_sink_x_0, 0))
         self.connect((self.blocks_repeat_0, 0), (self.uhd_usrp_sink_0, 0))
-        self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.qtgui_freq_sink_x_0_0, 0))
-        self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.qtgui_time_sink_x_0_0_0, 0))
+        self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.band_pass_filter_0, 0))
         self.connect((self.rational_resampler_xxx_0, 0), (self.blocks_repeat_0, 0))
         self.connect((self.uhd_usrp_source_0, 0), (self.freq_xlating_fir_filter_xxx_0, 0))
 
 
     def closeEvent(self, event):
-        self.settings = Qt.QSettings("GNU Radio", "AM_Simulation")
+        self.settings = Qt.QSettings("GNU Radio", "AM_Simulation_v1")
         self.settings.setValue("geometry", self.saveGeometry())
         event.accept()
 
@@ -358,11 +368,12 @@ class AM_Simulation(gr.top_block, Qt.QWidget):
         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, 500, 6e3, 6e3, firdes.WIN_HAMMING, 6.76))
         self.freq_xlating_fir_filter_xxx_0.set_taps(firdes.low_pass(1,self.samp_rate,6e3, 2000))
         self.qtgui_freq_sink_x_0.set_frequency_range(0, self.samp_rate)
         self.qtgui_freq_sink_x_0_0.set_frequency_range(0, self.samp_rate)
         self.qtgui_time_sink_x_0_0.set_samp_rate(self.samp_rate)
-        self.qtgui_time_sink_x_0_0_0.set_samp_rate(self.samp_rate)
+        self.qtgui_time_sink_x_0_0_0_0.set_samp_rate(self.samp_rate)
         self.uhd_usrp_sink_0.set_samp_rate(self.samp_rate)
         self.uhd_usrp_source_0.set_samp_rate(self.samp_rate)
 
@@ -376,7 +387,7 @@ class AM_Simulation(gr.top_block, Qt.QWidget):
 
 
 
-def main(top_block_cls=AM_Simulation, options=None):
+def main(top_block_cls=AM_Simulation_v1, options=None):
 
     if StrictVersion("4.5.0") <= StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"):
         style = gr.prefs().get_string('qtgui', 'style', 'raster')
diff --git a/tests/Simulation Hardware/Sinus/Sinus_TX.grc b/tests/Simulation Hardware/AM/Sinus_TX.grc
index 667ab1d..667ab1d 100644
--- a/tests/Simulation Hardware/Sinus/Sinus_TX.grc
+++ b/tests/Simulation Hardware/AM/Sinus_TX.grc
diff --git a/tests/Simulation Hardware/Sinus/Sinus_TX.py b/tests/Simulation Hardware/AM/Sinus_TX.py
index 78c72e4..78c72e4 100755
--- a/tests/Simulation Hardware/Sinus/Sinus_TX.py
+++ b/tests/Simulation Hardware/AM/Sinus_TX.py