Merge branch 'master' of github.com:NaoPross/Fading

3 files changed, 38 insertions, 31 deletions

diff --git a/src/gr-fadingui/grc/CMakeLists.txt b/src/gr-fadingui/grc/CMakeLists.txt
index 2394de4..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_xor_frame_sync.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
+    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_ber.block.yml
index dbe6198..3070311 100644
--- a/src/gr-fadingui/grc/fadingui_dearpygui_sink.block.yml
+++ b/src/gr-fadingui/grc/fadingui_ber.block.yml
@@ -1,10 +1,10 @@
-id: fadingui_dearpygui_sink
-label: UI Sink
+id: fadingui_ber
+label: BER
 category: '[fadingui]'
 
 templates:
   imports: import fadingui
-  make: fadingui.dearpygui_sink(sock_addr=${sock_addr}, ui_element_id=${ui_element_id})
+  make: fadingui.ber(vgl=${vgl}, vlen=${vlen})
 
 #  Make one 'parameters' list entry for every parameter you want settable from the GUI.
 #     Keys include:
@@ -12,15 +12,12 @@ templates:
 #     * 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
+- 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:
@@ -31,7 +28,9 @@ parameters:
 #      * optional (optional - set to 1 for optional inputs. Default is 0)
 inputs:
 - label: in
-  dtype: complex
+  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.
diff --git a/src/gr-fadingui/grc/fadingui_xor_frame_sync.block.yml b/src/gr-fadingui/grc/fadingui_netsink.block.yml
index 1a8640d..3cd8ae7 100644
--- a/src/gr-fadingui/grc/fadingui_xor_frame_sync.block.yml
+++ b/src/gr-fadingui/grc/fadingui_netsink.block.yml
@@ -1,11 +1,13 @@
-id: fadingui_xor_frame_sync
-label: XOR Correlation Synchronizer
+id: fadingui_netsink
+label: Network Sink
 category: '[fadingui]'
 flags: [ python ]
 
 templates:
-  imports: import fadingui
-  make: fadingui.xor_frame_sync(sync_pattern=${pattern}, buffer_size=${buffer_size})
+  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,12 +15,22 @@ templates:
 #     * 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
+- id: type
+  label: Type
+  dtype: enum
+  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
+- id: veclen
+  label: Vec Length
+  dtype: int
+  default: '1'
+  hide: ${ 'part' if veclen == 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:
@@ -30,12 +42,8 @@ parameters:
 inputs:
 - label: in
   domain: stream
-  dtype: byte
-
-outputs:
-- label: out
-  domain: stream
-  dtype: byte
+  dtype: ${type}
+  vlen: ${veclen}
 
 #  'file_format' specifies the version of the GRC yml format used in the file
 #  and should usually not be changed.