Merge remote-tracking branch 'origin/master'

3 files changed, 48 insertions, 5 deletions

diff --git a/src/gr-fadingui/grc/CMakeLists.txt b/src/gr-fadingui/grc/CMakeLists.txt
index e4b2ee9..98713e8 100644
--- a/src/gr-fadingui/grc/CMakeLists.txt
+++ b/src/gr-fadingui/grc/CMakeLists.txt
@@ -19,5 +19,5 @@
 # Boston, MA 02110-1301, USA.
 install(FILES
     fadingui_datasource.block.yml
-    DESTINATION share/gnuradio/grc/blocks
+    fadingui_dearpygui_sink.block.yml DESTINATION share/gnuradio/grc/blocks
 )
diff --git a/src/gr-fadingui/grc/fadingui_datasource.block.yml b/src/gr-fadingui/grc/fadingui_datasource.block.yml
index 67f0275..5f34591 100644
--- a/src/gr-fadingui/grc/fadingui_datasource.block.yml
+++ b/src/gr-fadingui/grc/fadingui_datasource.block.yml
@@ -1,10 +1,10 @@
 id: fadingui_datasource
-label: UI Data Source 
+label: UI Framed Data Source 
 category: '[fadingui]'
 
 templates:
   imports: import fadingui
-  make: fadingui.datasource(vec_len=${vec_len}, sock_addr=${sock_addr}, file_list=${file_list})
+  make: fadingui.datasource(vec_len=${vec_len}, header_len=${header_len}, sock_addr=${sock_addr}, file_list=${file_list})
 
 #  Make one 'parameters' list entry for every parameter you want settable from the GUI.
 #     Keys include:
@@ -15,7 +15,12 @@ parameters:
 - id: vec_len
   label: Vector length
   dtype: int
-  default: 512
+  default: 501
+
+- id: header_len
+  label: Header length
+  dtype: int
+  default: 11
 
 - id: sock_addr
   label: Socket Address
@@ -40,7 +45,7 @@ outputs:
 - label: out
   domain: stream
   dtype: byte
-  vlen: ${vec_len}
+  vlen: ${ vec_len + header_len }
 
 #  '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_dearpygui_sink.block.yml b/src/gr-fadingui/grc/fadingui_dearpygui_sink.block.yml
new file mode 100644
index 0000000..3712be4
--- /dev/null
+++ b/src/gr-fadingui/grc/fadingui_dearpygui_sink.block.yml
@@ -0,0 +1,38 @@
+id: fadingui_dearpygui_sink
+label: UI Sink
+category: '[fadingui]'
+
+templates:
+  imports: import fadingui
+  make: fadingui.dearpygui_sink()
+
+#  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