Implement Frame Object

4 files changed, 20 insertions, 42 deletions

diff --git a/src/gr-fadingui/grc/fadingui_datasource.block.yml b/src/gr-fadingui/grc/fadingui_datasource.block.yml
index 5f34591..6c31995 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 Framed Data Source 
+label: Framed Data Source 
 category: '[fadingui]'
 
 templates:
   imports: import fadingui
-  make: fadingui.datasource(vec_len=${vec_len}, header_len=${header_len}, sock_addr=${sock_addr}, file_list=${file_list})
+  make: fadingui.datasource(frame_obj=${frame_obj}, filename=${fname})
 
 #  Make one 'parameters' list entry for every parameter you want settable from the GUI.
 #     Keys include:
@@ -12,25 +12,12 @@ templates:
 #     * label (label shown in the GUI)
 #     * dtype (e.g. int, float, complex, byte, short, xxx_vector, ...)
 parameters:
-- id: vec_len
-  label: Vector length
-  dtype: int
-  default: 501
-
-- id: header_len
-  label: Header length
-  dtype: int
-  default: 11
-
-- id: sock_addr
-  label: Socket Address
-  dtype: string
-  default: "udp://"
-
-- id: file_list
+- id: frame_obj
+  label: Frame Object
+  type: raw
+- id: fname 
   label: List of files
-  dtype: raw
-  default: "[]"
+  dtype: file_open
 
 #  Make one 'inputs' list entry per input and one 'outputs' list entry per output.
 #  Keys include:
@@ -45,7 +32,6 @@ outputs:
 - label: out
   domain: stream
   dtype: byte
-  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_deframer.block.yml b/src/gr-fadingui/grc/fadingui_deframer.block.yml
index b5d6cfe..02db246 100644
--- a/src/gr-fadingui/grc/fadingui_deframer.block.yml
+++ b/src/gr-fadingui/grc/fadingui_deframer.block.yml
@@ -1,6 +1,7 @@
 id: fadingui_deframer
 label: Deframer
 category: '[fadingui]'
+labels: [ python ]
 
 templates:
   imports: import fadingui
diff --git a/src/gr-fadingui/grc/fadingui_frame_obj.block.yml b/src/gr-fadingui/grc/fadingui_frame_obj.block.yml
index 8fee3a3..c655306 100644
--- a/src/gr-fadingui/grc/fadingui_frame_obj.block.yml
+++ b/src/gr-fadingui/grc/fadingui_frame_obj.block.yml
@@ -1,10 +1,7 @@
 id: fadingui_frame_obj
 label: Frame Object
 category: '[fadingui]'
-
-templates:
-  imports: import fadingui
-  make: fadingui.frame_obj()
+flags: [ show_id, python ]
 
 #  Make one 'parameters' list entry for every parameter you want settable from the GUI.
 #     Keys include:
@@ -14,22 +11,20 @@ templates:
 parameters:
 - id: preamble
   label: Preamble
-  dtype: raw
-  default: [0xbe, 0xef]
+  dtype: int_vector
+  default: '[0xbe, 0xef]'
 - id: payload_len
   label: Payload length
   dtype: int
   default: 4096
 
-#  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:
-outputs:
+value: ${ fadingui.frame_obj }
+
+
+templates:
+  imports: import fadingui
+  var_make: |-
+      self.${id} = ${id} = fadingui.frame_obj(preamble=${preamble}, payload_len=${payload_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_xor_frame_sync.block.yml b/src/gr-fadingui/grc/fadingui_xor_frame_sync.block.yml
index 35eb132..1a8640d 100644
--- a/src/gr-fadingui/grc/fadingui_xor_frame_sync.block.yml
+++ b/src/gr-fadingui/grc/fadingui_xor_frame_sync.block.yml
@@ -1,6 +1,7 @@
 id: fadingui_xor_frame_sync
 label: XOR Correlation Synchronizer
 category: '[fadingui]'
+flags: [ python ]
 
 templates:
   imports: import fadingui
@@ -15,14 +16,9 @@ parameters:
 - id: pattern
   label: Bit pattern
   dtype: raw
-
-- id: pattern_len
-  label: Pattern length
-  dtype: raw
-
 - id: buffer_size
   label: Delay buffer size
-  dtype: int
+  dtype: raw
 
 #  Make one 'inputs' list entry per input and one 'outputs' list entry per output.
 #  Keys include: