From ac84735f295555c9050f21ea420023cfd71e6749 Mon Sep 17 00:00:00 2001 From: Wojciech Kaczmarski Date: Sat, 6 Jan 2024 15:29:07 +0100 Subject: [PATCH] M17 loopback flowgraph update --- .../{m17_streamer.grc => m17_loopback.grc} | 252 +++++------------- 1 file changed, 62 insertions(+), 190 deletions(-) rename examples/{m17_streamer.grc => m17_loopback.grc} (53%) diff --git a/examples/m17_streamer.grc b/examples/m17_loopback.grc similarity index 53% rename from examples/m17_streamer.grc rename to examples/m17_loopback.grc index b5347ab..63efb72 100644 --- a/examples/m17_streamer.grc +++ b/examples/m17_loopback.grc @@ -1,11 +1,11 @@ options: parameters: - author: SP5WWP + author: Wojciech SP5WWP catch_exceptions: 'True' category: '[GRC Hier Blocks]' cmake_opt: '' comment: '' - copyright: M17 Project, Dec 2022 + copyright: M17 Project, Jan 2024 description: '' gen_cmake: 'On' gen_linking: dynamic @@ -22,60 +22,45 @@ options: run_options: prompt sizing_mode: fixed thread_safe_setters: '' - title: M17 data streamer + title: M17 loopback demo window_size: (1000,1000) states: bus_sink: false bus_source: false bus_structure: null - coordinate: [112, 40.0] + coordinate: [8, 4.0] rotation: 0 state: enabled blocks: -- name: dst_id +- name: dst_str id: variable_qtgui_entry parameters: comment: '' gui_hint: '' - label: '' + label: DST type: string - value: RECEIV + value: ALL states: bus_sink: false bus_source: false bus_structure: null - coordinate: [664, 288.0] + coordinate: [568, 12.0] rotation: 0 state: true -- name: meta +- name: meta_str id: variable_qtgui_entry parameters: comment: '' gui_hint: '' - label: '' + label: META type: string - value: metastring + value: Hello! states: bus_sink: false bus_source: false bus_structure: null - coordinate: [376, 288.0] - rotation: 0 - state: true -- name: mtype - id: variable_qtgui_entry - parameters: - comment: '' - gui_hint: '' - label: '' - type: int - value: '5' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [792, 288.0] + coordinate: [288, 12.0] rotation: 0 state: true - name: samp_rate @@ -87,22 +72,37 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [280, 40.0] + coordinate: [192, 12.0] rotation: 0 state: true -- name: src_id +- name: src_str id: variable_qtgui_entry parameters: comment: '' gui_hint: '' - label: '' + label: SRC type: string - value: EMITTER + value: AB1CDE states: bus_sink: false bus_source: false bus_structure: null - coordinate: [528, 288.0] + coordinate: [424, 12.0] + rotation: 0 + state: true +- name: type_val + id: variable_qtgui_entry + parameters: + comment: '' + gui_hint: '' + label: TYPE + type: int + value: '5' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [688, 12.0] rotation: 0 state: true - name: blocks_file_sink_0 @@ -120,9 +120,26 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [512, 88.0] + coordinate: [208, 172.0] rotation: 180 - state: true + state: enabled +- name: blocks_null_sink_0 + id: blocks_null_sink + parameters: + affinity: '' + alias: '' + bus_structure_sink: '[[0,],]' + comment: '' + num_inputs: '1' + type: byte + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [272, 256.0] + rotation: 180 + state: disabled - name: blocks_throttle2_0 id: blocks_throttle2 parameters: @@ -141,7 +158,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [560, 176.0] + coordinate: [448, 348.0] rotation: 0 state: true - name: blocks_vector_source_x_0_2 @@ -162,7 +179,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [168, 168.0] + coordinate: [16, 340.0] rotation: 0 state: true - name: m17_m17_coder_0 @@ -172,17 +189,17 @@ blocks: alias: '' comment: '' debug: 'False' - dst_id: ALL + dst_id: dst_str maxoutbuf: '0' - meta: meta + meta: meta_str minoutbuf: '0' - src_id: EMITTER1 - type: mtype + src_id: src_str + type: type_val states: bus_sink: false bus_source: false bus_structure: null - coordinate: [376, 152.0] + coordinate: [224, 324.0] rotation: 0 state: true - name: m17_m17_decoder_0 @@ -195,12 +212,12 @@ blocks: debug_data: 'False' maxoutbuf: '0' minoutbuf: '0' - threshold: '0.9' + threshold: '2.0' states: bus_sink: false bus_source: false bus_structure: null - coordinate: [680, 16.0] + coordinate: [440, 172.0] rotation: 180 state: true - name: note_0_2 @@ -213,161 +230,16 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [208, 256.0] + coordinate: [64, 292.0] rotation: 0 state: true -- name: qtgui_freq_sink_x_0 - id: qtgui_freq_sink_x - parameters: - affinity: '' - alias: '' - alpha1: '1.0' - alpha10: '1.0' - alpha2: '1.0' - alpha3: '1.0' - alpha4: '1.0' - alpha5: '1.0' - alpha6: '1.0' - alpha7: '1.0' - alpha8: '1.0' - alpha9: '1.0' - autoscale: 'False' - average: '1.0' - axislabels: 'True' - bw: samp_rate - color1: '"blue"' - color10: '"dark blue"' - color2: '"red"' - color3: '"green"' - color4: '"black"' - color5: '"cyan"' - color6: '"magenta"' - color7: '"yellow"' - color8: '"dark red"' - color9: '"dark green"' - comment: '' - ctrlpanel: 'False' - fc: '0' - fftsize: '1024' - freqhalf: 'True' - grid: 'False' - gui_hint: '' - label: Relative Gain - label1: '' - label10: '''''' - label2: '''''' - label3: '''''' - label4: '''''' - label5: '''''' - label6: '''''' - label7: '''''' - label8: '''''' - label9: '''''' - legend: 'True' - maxoutbuf: '0' - minoutbuf: '0' - name: '""' - nconnections: '1' - norm_window: 'False' - showports: 'False' - tr_chan: '0' - tr_level: '0.0' - tr_mode: qtgui.TRIG_MODE_FREE - tr_tag: '""' - type: float - units: dB - update_time: '0.10' - width1: '1' - width10: '1' - width2: '1' - width3: '1' - width4: '1' - width5: '1' - width6: '1' - width7: '1' - width8: '1' - width9: '1' - wintype: window.WIN_BLACKMAN_hARRIS - ymax: '10' - ymin: '-140' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [760, 168.0] - rotation: 0 - state: true -- name: qtgui_number_sink_0 - id: qtgui_number_sink - parameters: - affinity: '' - alias: '' - autoscale: 'False' - avg: '0' - color1: ("black", "black") - color10: ("black", "black") - color2: ("black", "black") - color3: ("black", "black") - color4: ("black", "black") - color5: ("black", "black") - color6: ("black", "black") - color7: ("black", "black") - color8: ("black", "black") - color9: ("black", "black") - comment: '' - factor1: '1' - factor10: '1' - factor2: '1' - factor3: '1' - factor4: '1' - factor5: '1' - factor6: '1' - factor7: '1' - factor8: '1' - factor9: '1' - graph_type: qtgui.NUM_GRAPH_NONE - gui_hint: '' - label1: '' - label10: '' - label2: '' - label3: '' - label4: '' - label5: '' - label6: '' - label7: '' - label8: '' - label9: '' - max: '1' - min: '-1' - name: '""' - nconnections: '1' - type: byte - unit1: '' - unit10: '' - unit2: '' - unit3: '' - unit4: '' - unit5: '' - unit6: '' - unit7: '' - unit8: '' - unit9: '' - update_time: '0.10' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [368, 8.0] - rotation: 180 - state: true connections: - [blocks_throttle2_0, '0', m17_m17_decoder_0, '0'] -- [blocks_throttle2_0, '0', qtgui_freq_sink_x_0, '0'] - [blocks_vector_source_x_0_2, '0', m17_m17_coder_0, '0'] - [m17_m17_coder_0, '0', blocks_throttle2_0, '0'] - [m17_m17_decoder_0, '0', blocks_file_sink_0, '0'] -- [m17_m17_decoder_0, '0', qtgui_number_sink_0, '0'] +- [m17_m17_decoder_0, '0', blocks_null_sink_0, '0'] metadata: file_format: 1