From c75983e3e9eb37e70c4d71ce143e1b33d3151898 Mon Sep 17 00:00:00 2001 From: sara Date: Wed, 17 Nov 2021 17:57:41 +0100 Subject: Fading angepasst --- simulation/QAM/qam_nogui.grc | 42 +++++++++++----------- simulation/QAM_Fading/qam_fading.py | 3 ++ simulation/QAM_Fading/qam_fading_FIR_Filter_v1.grc | 4 +-- simulation/QAM_Fading/qam_fading_V2.grc | 21 ++++++++++- .../qam_fading_frequency_selectiv_copy.grc | 25 +++++++------ 5 files changed, 59 insertions(+), 36 deletions(-) (limited to 'simulation') diff --git a/simulation/QAM/qam_nogui.grc b/simulation/QAM/qam_nogui.grc index cfbed6d..037c20f 100644 --- a/simulation/QAM/qam_nogui.grc +++ b/simulation/QAM/qam_nogui.grc @@ -59,7 +59,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [224, 604.0] + coordinate: [224, 436.0] rotation: 0 state: true - name: eq_gain @@ -194,27 +194,6 @@ blocks: coordinate: [1640, 428.0] rotation: 0 state: true -- name: qam_const - id: variable_constellation_rect - parameters: - comment: '' - const_points: '[(-3-3j), (-1-3j), (1-3j), (3-3j), (-3-1j), (-1-1j), (1-1j), (3-1j), - (-3+1j), (-1+1j), (1+1j), (3+1j), (-3+3j), (-1+3j), (1+3j), (3+3j)]' - imag_sect: '1' - precision: '4' - real_sect: '1' - rot_sym: '4' - soft_dec_lut: None - sym_map: '[0, 4, 12, 8, 1, 5, 13, 9, 3, 7, 15, 11, 2, 6, 14, 10]' - w_imag_sect: '1' - w_real_sect: '1' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [224, 436.0] - rotation: 0 - state: true - name: rrc_taps id: variable parameters: @@ -366,6 +345,24 @@ blocks: coordinate: [2264, 844.0] rotation: 0 state: true +- name: blocks_file_sink_0 + id: blocks_file_sink + parameters: + affinity: '' + alias: '' + append: 'False' + comment: '' + file: /home/sara/Documents/Fading/doc/thesis/figures/data/SImulation + type: float + unbuffered: 'False' + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [2432, 108.0] + rotation: 0 + state: disabled - name: blocks_throttle_0 id: blocks_throttle parameters: @@ -1184,6 +1181,7 @@ blocks: connections: - [analog_random_source_x_0, '0', blocks_unpack_k_bits_bb_0_0, '0'] - [analog_random_source_x_0, '0', digital_constellation_modulator_0, '0'] +- [blocks_char_to_float_0, '0', blocks_file_sink_0, '0'] - [blocks_char_to_float_0, '0', qtgui_time_sink_x_0, '0'] - [blocks_char_to_float_0_0, '0', blocks_delay_0, '0'] - [blocks_delay_0, '0', qtgui_time_sink_x_0, '1'] diff --git a/simulation/QAM_Fading/qam_fading.py b/simulation/QAM_Fading/qam_fading.py index a921443..01685a1 100755 --- a/simulation/QAM_Fading/qam_fading.py +++ b/simulation/QAM_Fading/qam_fading.py @@ -545,6 +545,8 @@ class qam_fading(gr.top_block, Qt.QWidget): self.blocks_unpack_k_bits_bb_0_0 = blocks.unpack_k_bits_bb(2) self.blocks_unpack_k_bits_bb_0 = blocks.unpack_k_bits_bb(2) self.blocks_throttle_0 = blocks.throttle(gr.sizeof_gr_complex*1, samp_rate,True) + self.blocks_file_sink_0 = blocks.file_sink(gr.sizeof_float*1, '/home/sara/Documents/Fading/simulation/QAM_Fading/qam_fading_V2_output.grc', False) + self.blocks_file_sink_0.set_unbuffered(False) self.blocks_delay_0 = blocks.delay(gr.sizeof_float*1, 50) self.blocks_char_to_float_0_1 = blocks.char_to_float(1, 1) self.blocks_char_to_float_0_0 = blocks.char_to_float(1, 1) @@ -558,6 +560,7 @@ class qam_fading(gr.top_block, Qt.QWidget): ################################################## self.connect((self.analog_random_source_x_0, 0), (self.blocks_unpack_k_bits_bb_0_0, 0)) self.connect((self.analog_random_source_x_0, 0), (self.digital_constellation_modulator_0, 0)) + self.connect((self.blocks_char_to_float_0, 0), (self.blocks_file_sink_0, 0)) self.connect((self.blocks_char_to_float_0, 0), (self.qtgui_freq_sink_x_2_1, 0)) self.connect((self.blocks_char_to_float_0, 0), (self.qtgui_time_sink_x_0, 0)) self.connect((self.blocks_char_to_float_0_0, 0), (self.blocks_delay_0, 0)) diff --git a/simulation/QAM_Fading/qam_fading_FIR_Filter_v1.grc b/simulation/QAM_Fading/qam_fading_FIR_Filter_v1.grc index 082e688..ffc47f6 100644 --- a/simulation/QAM_Fading/qam_fading_FIR_Filter_v1.grc +++ b/simulation/QAM_Fading/qam_fading_FIR_Filter_v1.grc @@ -459,7 +459,7 @@ blocks: affinity: '' alias: '' comment: '' - fDTs: 10.0/samp_rate + fDTs: '0' maxoutbuf: '0' minoutbuf: '0' seed: '0' @@ -467,7 +467,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [960, 332.0] + coordinate: [952, 332.0] rotation: 0 state: true - name: digital_cma_equalizer_cc_0 diff --git a/simulation/QAM_Fading/qam_fading_V2.grc b/simulation/QAM_Fading/qam_fading_V2.grc index 7f2014b..2f61a71 100644 --- a/simulation/QAM_Fading/qam_fading_V2.grc +++ b/simulation/QAM_Fading/qam_fading_V2.grc @@ -425,6 +425,24 @@ blocks: coordinate: [2736, 1360.0] rotation: 0 state: true +- name: blocks_file_sink_0 + id: blocks_file_sink + parameters: + affinity: '' + alias: '' + append: 'False' + comment: '' + file: /home/sara/Documents/Fading/simulation/QAM_Fading/qam_fading_V2_output.grc + type: float + unbuffered: 'False' + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [2880, 84.0] + rotation: 0 + state: disabled - name: blocks_throttle_0 id: blocks_throttle parameters: @@ -779,7 +797,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1032, 348.0] + coordinate: [1024, 340.0] rotation: 0 state: enabled - name: params @@ -1479,6 +1497,7 @@ blocks: connections: - [analog_random_source_x_0, '0', blocks_unpack_k_bits_bb_0_0, '0'] - [analog_random_source_x_0, '0', digital_constellation_modulator_0, '0'] +- [blocks_char_to_float_0, '0', blocks_file_sink_0, '0'] - [blocks_char_to_float_0, '0', qtgui_freq_sink_x_2_1, '0'] - [blocks_char_to_float_0, '0', qtgui_time_sink_x_0, '0'] - [blocks_char_to_float_0_0, '0', blocks_delay_0, '0'] diff --git a/simulation/QAM_Fading/qam_fading_frequency_selectiv_copy.grc b/simulation/QAM_Fading/qam_fading_frequency_selectiv_copy.grc index 2a5bafb..18f7893 100644 --- a/simulation/QAM_Fading/qam_fading_frequency_selectiv_copy.grc +++ b/simulation/QAM_Fading/qam_fading_frequency_selectiv_copy.grc @@ -54,7 +54,7 @@ blocks: rot_sym: '4' soft_dec_lut: None sym_map: '[0, 1, 3, 2]' - type: qpsk + type: 16qam states: bus_sink: false bus_source: false @@ -453,24 +453,24 @@ blocks: - name: channels_selective_fading_model_0 id: channels_selective_fading_model parameters: - K: '4.0' + K: '1.0' LOS: 'False' N: '8' affinity: '' alias: '' comment: '' - delays: (0.0,0.1,1.3) - fDTs: 10.0/samp_rate - mags: (1,0.99,0.97) + delays: (0,7) + fDTs: '0' + mags: (1,0.2) maxoutbuf: '0' minoutbuf: '0' - ntaps: '8' + ntaps: '1' seed: '0' states: bus_sink: false bus_source: false bus_structure: null - coordinate: [912, 308.0] + coordinate: [960, 308.0] rotation: 0 state: true - name: digital_cma_equalizer_cc_0 @@ -700,7 +700,7 @@ blocks: maxoutbuf: '0' minoutbuf: '0' osps: '1' - sps: sps * 1.001 + sps: 'sps ' taps: rrc_taps type: ccf states: @@ -867,7 +867,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1044.0, -48] + coordinate: [1036.0, -64] rotation: 90 state: enabled - name: qtgui_const_sink_x_0_0 @@ -1223,7 +1223,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1144.0, 568] + coordinate: [1080.0, 656] rotation: 270 state: true - name: qtgui_freq_sink_x_2_1 @@ -1305,7 +1305,7 @@ blocks: bus_structure: null coordinate: [2848, 488.0] rotation: 0 - state: true + state: disabled - name: qtgui_time_sink_x_0 id: qtgui_time_sink_x parameters: @@ -1421,6 +1421,9 @@ connections: - [channels_channel_model_0, '0', digital_pfb_clock_sync_xxx_0_0, '0'] - [channels_channel_model_0, '0', qtgui_const_sink_x_0, '1'] - [channels_channel_model_0, '0', qtgui_freq_sink_x_0, '1'] +- [channels_selective_fading_model_0, '0', digital_pfb_clock_sync_xxx_0, '0'] +- [channels_selective_fading_model_0, '0', qtgui_const_sink_x_0, '0'] +- [channels_selective_fading_model_0, '0', qtgui_freq_sink_x_0, '0'] - [digital_cma_equalizer_cc_0, '0', digital_costas_loop_cc_0, '0'] - [digital_cma_equalizer_cc_0, '0', qtgui_const_sink_x_1, '0'] - [digital_cma_equalizer_cc_0_0, '0', digital_costas_loop_cc_0_0, '0'] -- cgit v1.2.1