From f7b154f2485b2d897db449890684928e12b1734e Mon Sep 17 00:00:00 2001 From: Nao Pross Date: Thu, 2 Dec 2021 12:54:32 +0100 Subject: Delete XOR Correlator (replaced with by phase correction) --- src/gr-fadingui/grc/CMakeLists.txt | 1 - .../grc/fadingui_xor_frame_sync.block.yml | 42 ---------------------- 2 files changed, 43 deletions(-) delete mode 100644 src/gr-fadingui/grc/fadingui_xor_frame_sync.block.yml (limited to 'src/gr-fadingui/grc') diff --git a/src/gr-fadingui/grc/CMakeLists.txt b/src/gr-fadingui/grc/CMakeLists.txt index 2394de4..d5f23a6 100644 --- a/src/gr-fadingui/grc/CMakeLists.txt +++ b/src/gr-fadingui/grc/CMakeLists.txt @@ -20,7 +20,6 @@ install(FILES fadingui_datasource.block.yml fadingui_dearpygui_sink.block.yml - fadingui_xor_frame_sync.block.yml fadingui_deframer.block.yml fadingui_frame_obj.block.yml fadingui_multipath_fading.block.yml DESTINATION share/gnuradio/grc/blocks diff --git a/src/gr-fadingui/grc/fadingui_xor_frame_sync.block.yml b/src/gr-fadingui/grc/fadingui_xor_frame_sync.block.yml deleted file mode 100644 index 1a8640d..0000000 --- a/src/gr-fadingui/grc/fadingui_xor_frame_sync.block.yml +++ /dev/null @@ -1,42 +0,0 @@ -id: fadingui_xor_frame_sync -label: XOR Correlation Synchronizer -category: '[fadingui]' -flags: [ python ] - -templates: - imports: import fadingui - make: fadingui.xor_frame_sync(sync_pattern=${pattern}, buffer_size=${buffer_size}) - -# Make one 'parameters' list entry for every parameter you want settable from the GUI. -# Keys include: -# * id (makes the value accessible as \$keyname, e.g. in the make entry) -# * label (label shown in the GUI) -# * dtype (e.g. int, float, complex, byte, short, xxx_vector, ...) -parameters: -- id: pattern - label: Bit pattern - dtype: raw -- id: buffer_size - label: Delay buffer size - dtype: raw - -# Make one 'inputs' list entry per input and one 'outputs' list entry per output. -# Keys include: -# * label (an identifier for the GUI) -# * domain (optional - stream or message. Default is stream) -# * dtype (e.g. int, float, complex, byte, short, xxx_vector, ...) -# * vlen (optional - data stream vector length. Default is 1) -# * optional (optional - set to 1 for optional inputs. Default is 0) -inputs: -- label: in - domain: stream - dtype: byte - -outputs: -- label: out - domain: stream - dtype: byte - -# 'file_format' specifies the version of the GRC yml format used in the file -# and should usually not be changed. -file_format: 1 -- cgit v1.2.1 From 834febb9aa0dac463f43914cb028be931f85de73 Mon Sep 17 00:00:00 2001 From: sara Date: Thu, 2 Dec 2021 20:02:16 +0100 Subject: =?UTF-8?q?BER=20Block=20erstellt,=20l=C3=A4uft=20noch=20nichtwie?= =?UTF-8?q?=20gew=C3=BCnscht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gr-fadingui/grc/CMakeLists.txt | 3 ++- src/gr-fadingui/grc/fadingui_ber.block.yml | 37 ++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 src/gr-fadingui/grc/fadingui_ber.block.yml (limited to 'src/gr-fadingui/grc') diff --git a/src/gr-fadingui/grc/CMakeLists.txt b/src/gr-fadingui/grc/CMakeLists.txt index d5f23a6..297ae8d 100644 --- a/src/gr-fadingui/grc/CMakeLists.txt +++ b/src/gr-fadingui/grc/CMakeLists.txt @@ -22,5 +22,6 @@ install(FILES fadingui_dearpygui_sink.block.yml fadingui_deframer.block.yml fadingui_frame_obj.block.yml - fadingui_multipath_fading.block.yml DESTINATION share/gnuradio/grc/blocks + fadingui_multipath_fading.block.yml + fadingui_ber.block.yml DESTINATION share/gnuradio/grc/blocks ) diff --git a/src/gr-fadingui/grc/fadingui_ber.block.yml b/src/gr-fadingui/grc/fadingui_ber.block.yml new file mode 100644 index 0000000..3383df5 --- /dev/null +++ b/src/gr-fadingui/grc/fadingui_ber.block.yml @@ -0,0 +1,37 @@ +id: fadingui_ber +label: BER +category: '[fadingui]' + +templates: + imports: import fadingui + make: fadingui.ber(vgl=${vgl}) + +# Make one 'parameters' list entry for every parameter you want settable from the GUI. +# Keys include: +# * id (makes the value accessible as \$keyname, e.g. in the make entry) +# * label (label shown in the GUI) +# * dtype (e.g. int, float, complex, byte, short, xxx_vector, ...) +parameters: + - id: vgl + label: Vergleichsparameter + dtype: raw +# - id: ... +# label: ... +# dtype: ... + +# Make one 'inputs' list entry per input and one 'outputs' list entry per output. +# Keys include: +# * label (an identifier for the GUI) +# * domain (optional - stream or message. Default is stream) +# * dtype (e.g. int, float, complex, byte, short, xxx_vector, ...) +# * vlen (optional - data stream vector length. Default is 1) +# * optional (optional - set to 1 for optional inputs. Default is 0) +inputs: +- label: in + domain: stream + dtype: byte + + +# 'file_format' specifies the version of the GRC yml format used in the file +# and should usually not be changed. +file_format: 1 -- cgit v1.2.1 From cafce753722ec8d396cadfdf991b5c6f5a18dc12 Mon Sep 17 00:00:00 2001 From: sara Date: Fri, 3 Dec 2021 20:46:20 +0100 Subject: BER Block Fertig gestellt --- src/gr-fadingui/grc/fadingui_ber.block.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/gr-fadingui/grc') diff --git a/src/gr-fadingui/grc/fadingui_ber.block.yml b/src/gr-fadingui/grc/fadingui_ber.block.yml index 3383df5..3070311 100644 --- a/src/gr-fadingui/grc/fadingui_ber.block.yml +++ b/src/gr-fadingui/grc/fadingui_ber.block.yml @@ -4,7 +4,7 @@ category: '[fadingui]' templates: imports: import fadingui - make: fadingui.ber(vgl=${vgl}) + make: fadingui.ber(vgl=${vgl}, vlen=${vlen}) # Make one 'parameters' list entry for every parameter you want settable from the GUI. # Keys include: @@ -12,12 +12,12 @@ templates: # * label (label shown in the GUI) # * dtype (e.g. int, float, complex, byte, short, xxx_vector, ...) parameters: - - id: vgl - label: Vergleichsparameter - dtype: raw -# - id: ... -# label: ... -# dtype: ... +- id: vgl + label: Vergleichsparameter + dtype: raw +- id: vlen + label: Vec Length + dtype: int # Make one 'inputs' list entry per input and one 'outputs' list entry per output. # Keys include: @@ -30,7 +30,7 @@ inputs: - label: in domain: stream dtype: byte - + vlen: ${vlen} # 'file_format' specifies the version of the GRC yml format used in the file # and should usually not be changed. -- cgit v1.2.1 From 2d02a9787d3bbd7320f23a3c65ee8e8ed0369c1e Mon Sep 17 00:00:00 2001 From: Nao Pross Date: Fri, 3 Dec 2021 22:19:57 +0100 Subject: Replace DearPyGui Sink with Network Sink --- src/gr-fadingui/grc/CMakeLists.txt | 4 +- .../grc/fadingui_dearpygui_sink.block.yml | 38 ----------------- src/gr-fadingui/grc/fadingui_netsink.block.yml | 48 ++++++++++++++++++++++ 3 files changed, 50 insertions(+), 40 deletions(-) delete mode 100644 src/gr-fadingui/grc/fadingui_dearpygui_sink.block.yml create mode 100644 src/gr-fadingui/grc/fadingui_netsink.block.yml (limited to 'src/gr-fadingui/grc') diff --git a/src/gr-fadingui/grc/CMakeLists.txt b/src/gr-fadingui/grc/CMakeLists.txt index 297ae8d..79c1a31 100644 --- a/src/gr-fadingui/grc/CMakeLists.txt +++ b/src/gr-fadingui/grc/CMakeLists.txt @@ -19,9 +19,9 @@ # Boston, MA 02110-1301, USA. install(FILES fadingui_datasource.block.yml - fadingui_dearpygui_sink.block.yml fadingui_deframer.block.yml fadingui_frame_obj.block.yml fadingui_multipath_fading.block.yml - fadingui_ber.block.yml DESTINATION share/gnuradio/grc/blocks + fadingui_ber.block.yml + fadingui_netsink.block.yml DESTINATION share/gnuradio/grc/blocks ) diff --git a/src/gr-fadingui/grc/fadingui_dearpygui_sink.block.yml b/src/gr-fadingui/grc/fadingui_dearpygui_sink.block.yml deleted file mode 100644 index dbe6198..0000000 --- a/src/gr-fadingui/grc/fadingui_dearpygui_sink.block.yml +++ /dev/null @@ -1,38 +0,0 @@ -id: fadingui_dearpygui_sink -label: UI Sink -category: '[fadingui]' - -templates: - imports: import fadingui - make: fadingui.dearpygui_sink(sock_addr=${sock_addr}, ui_element_id=${ui_element_id}) - -# Make one 'parameters' list entry for every parameter you want settable from the GUI. -# Keys include: -# * id (makes the value accessible as \$keyname, e.g. in the make entry) -# * label (label shown in the GUI) -# * dtype (e.g. int, float, complex, byte, short, xxx_vector, ...) -parameters: -- id: sock_addr - label: Socket address - dtype: string - default: udp:// - -- id: ui_element_id - label: UI element ID - dtype: raw - - -# Make one 'inputs' list entry per input and one 'outputs' list entry per output. -# Keys include: -# * label (an identifier for the GUI) -# * domain (optional - stream or message. Default is stream) -# * dtype (e.g. int, float, complex, byte, short, xxx_vector, ...) -# * vlen (optional - data stream vector length. Default is 1) -# * optional (optional - set to 1 for optional inputs. Default is 0) -inputs: -- label: in - dtype: complex - -# 'file_format' specifies the version of the GRC yml format used in the file -# and should usually not be changed. -file_format: 1 diff --git a/src/gr-fadingui/grc/fadingui_netsink.block.yml b/src/gr-fadingui/grc/fadingui_netsink.block.yml new file mode 100644 index 0000000..4e5b01b --- /dev/null +++ b/src/gr-fadingui/grc/fadingui_netsink.block.yml @@ -0,0 +1,48 @@ +id: fadingui_netsink +label: Network Sink +category: '[fadingui]' +flags: [ python ] + +templates: + imports: import fadingui + make: fadingui.netsink(${address}, ${dtype}, ${vlen}) + +# Make one 'parameters' list entry for every parameter you want settable from the GUI. +# Keys include: +# * id (makes the value accessible as \$keyname, e.g. in the make entry) +# * label (label shown in the GUI) +# * dtype (e.g. int, float, complex, byte, short, xxx_vector, ...) +parameters: +- id: dtype + label: Type + dtype: enum + options: [complex, float, int, short, byte] + option_attributes: + size: [gr.sizeof_gr_complex, gr.sizeof_floar, gr.sizeof_int, gr.sizeof_short, gr.sizeof_char ] + hide: part +- id: vlen + label: Vec Length + dtype: int + default: 1 + hide: ${ 'part' if vlen == 1 else 'none' } +- id: address + label: Address + dtype: string + default: "udp://localhost:31415" + +# Make one 'inputs' list entry per input and one 'outputs' list entry per output. +# Keys include: +# * label (an identifier for the GUI) +# * domain (optional - stream or message. Default is stream) +# * dtype (e.g. int, float, complex, byte, short, xxx_vector, ...) +# * vlen (optional - data stream vector length. Default is 1) +# * optional (optional - set to 1 for optional inputs. Default is 0) +inputs: +- label: in + domain: stream + dtype: ${dtype} + vlen: ${vlen} + +# 'file_format' specifies the version of the GRC yml format used in the file +# and should usually not be changed. +file_format: 1 -- cgit v1.2.1 From 97217d7eb3d0dbd07ea7deea1ec13620b8676e2d Mon Sep 17 00:00:00 2001 From: Nao Pross Date: Fri, 3 Dec 2021 22:57:16 +0100 Subject: Fix network sink block The block can be tested with: $ netcat -l4kuv localhost 31415 | hexdump -C --- src/gr-fadingui/grc/fadingui_netsink.block.yml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'src/gr-fadingui/grc') diff --git a/src/gr-fadingui/grc/fadingui_netsink.block.yml b/src/gr-fadingui/grc/fadingui_netsink.block.yml index 4e5b01b..a23dc52 100644 --- a/src/gr-fadingui/grc/fadingui_netsink.block.yml +++ b/src/gr-fadingui/grc/fadingui_netsink.block.yml @@ -4,8 +4,10 @@ category: '[fadingui]' flags: [ python ] templates: - imports: import fadingui - make: fadingui.netsink(${address}, ${dtype}, ${vlen}) + imports: |- + import fadingui + import numpy as np + make: fadingui.netsink(address=${address}, dtype=${type}, vlen=${veclen}) # Make one 'parameters' list entry for every parameter you want settable from the GUI. # Keys include: @@ -13,18 +15,19 @@ templates: # * label (label shown in the GUI) # * dtype (e.g. int, float, complex, byte, short, xxx_vector, ...) parameters: -- id: dtype +- id: type label: Type dtype: enum - options: [complex, float, int, short, byte] + options: [complex, float, int, np.short, np.byte] + option_labels: [complex, float, int, short, byte] option_attributes: - size: [gr.sizeof_gr_complex, gr.sizeof_floar, gr.sizeof_int, gr.sizeof_short, gr.sizeof_char ] + size: [gr.sizeof_gr_complex, gr.sizeof_float, gr.sizeof_int, gr.sizeof_short, gr.sizeof_char] hide: part -- id: vlen +- id: veclen label: Vec Length dtype: int - default: 1 - hide: ${ 'part' if vlen == 1 else 'none' } + default: '1' + hide: ${ 'part' if veclen == 1 else 'none' } - id: address label: Address dtype: string @@ -40,8 +43,8 @@ parameters: inputs: - label: in domain: stream - dtype: ${dtype} - vlen: ${vlen} + dtype: ${type} + vlen: ${veclen} # 'file_format' specifies the version of the GRC yml format used in the file # and should usually not be changed. -- cgit v1.2.1 From eca32bbd53d4fc51095700621525ac479f06c06c Mon Sep 17 00:00:00 2001 From: sara Date: Sat, 4 Dec 2021 15:19:24 +0100 Subject: Fix network sink block (again) --- src/gr-fadingui/grc/fadingui_netsink.block.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/gr-fadingui/grc') diff --git a/src/gr-fadingui/grc/fadingui_netsink.block.yml b/src/gr-fadingui/grc/fadingui_netsink.block.yml index a23dc52..3cd8ae7 100644 --- a/src/gr-fadingui/grc/fadingui_netsink.block.yml +++ b/src/gr-fadingui/grc/fadingui_netsink.block.yml @@ -7,7 +7,7 @@ templates: imports: |- import fadingui import numpy as np - make: fadingui.netsink(address=${address}, dtype=${type}, vlen=${veclen}) + make: fadingui.netsink(address=${address}, dtype="${type}", vlen=${veclen}) # Make one 'parameters' list entry for every parameter you want settable from the GUI. # Keys include: @@ -18,8 +18,7 @@ parameters: - id: type label: Type dtype: enum - options: [complex, float, int, np.short, np.byte] - option_labels: [complex, float, int, short, byte] + options: [complex, float, int, short, byte] option_attributes: size: [gr.sizeof_gr_complex, gr.sizeof_float, gr.sizeof_int, gr.sizeof_short, gr.sizeof_char] hide: part -- cgit v1.2.1