diff --git a/README.md b/README.md index 22eaa10..560b644 100644 --- a/README.md +++ b/README.md @@ -31,24 +31,32 @@ When running the flowgraph found in ``examples`` the output should be ``` -Generating: '.../M17_Implementations/SP5WWP/gr-m17v3.8/examples/m17_streamer.py' +Generating: '.../gr-m17/examples/m17_streamer.py' -Executing: /usr/bin/python3 -u .../M17_Implementations/SP5WWP/gr-m17v3.8/examples/m17_streamer.py +Executing: /usr/bin/python3 -u .../gr-m17/examples/m17_streamer.py +new meta: helloworld +new SRC ID: 0 0 31 36 93 81 +new DST ID: 255 255 255 255 0 0 +New sampling rate: 192000,000000 +new type: 0 5 +got_lsf=1 LSF DST: GAA RTXTT SRC: S0-P7JBRI TYPE: 8EE0 META: CEF0BE521FF9BA43577F6F7A9AA1 LSF_CRC_ERR LSF -DST: GAA RTXTT SRC: S0-P7JBRI TYPE: 0000 META: 0000000000000000000000000000 LSF_CRC_OK -LSF -DST: GAA RTXTT SRC: S0-P7JBRI TYPE: 0000 META: 0000000000000000000000000000 LSF_CRC_OK -LSF -DST: GAA RTXTT SRC: S0-P7JBRI TYPE: 0000 META: 0000000000000000000000000000 LSF_CRC_OK -LSF -DST: GAA RTXTT SRC: S0-P7JBRI TYPE: 0000 META: 0000000000000000000000000000 LSF_CRC_OK -LSF -DST: GAA RTXTT SRC: S0-P7JBRI TYPE: 0000 META: 0000000000000000000000000000 LSF_CRC_OK -LSF -DST: GAA RTXTT SRC: S0-P7JBRI TYPE: 0000 META: 0000000000000000000000000000 LSF_CRC_OK - ->>> Done +DST: SRC: AB1CDEBRI TYPE: 0500 META: 68656C6C6F776F726C6400000000 LSF_CRC_OK +FN: 0000 PLD: 00000000000000000000000000000000 +FN: 003D PLD: 00000000000000000000000000000000 +FN: 003E PLD: 00000000000000000000000000000000 +FN: 003F PLD: 00000000000000000000000000000000 +FN: 0040 PLD: 00000000000000000000000000000000 +DST: SRC: AB1CDEBRI TYPE: 0500 META: 68656C6C6F776F726C6400000000 LSF_CRC_OK +FN: 0041 PLD: 00000000000000000000000000000000 +FN: 0042 PLD: 00000000000000000000000000000000 +FN: 0043 PLD: 00000000000000000000000000000000 +FN: 009A PLD: 00000000000000000000000000000000 +FN: 009B PLD: 00000000000000000000000000000000 +FN: 009C PLD: 00000000000000000000000000000000 +FN: 009D PLD: 00000000000000000000000000000000 +FN: 009E PLD: 00000000000000000000000000000000 ``` diff --git a/examples/m17_streamer.grc b/examples/m17_streamer.grc index 336e6eb..7db2535 100644 --- a/examples/m17_streamer.grc +++ b/examples/m17_streamer.grc @@ -27,11 +27,23 @@ options: bus_sink: false bus_source: false bus_structure: null - coordinate: [48, 44.0] + coordinate: [48, 36.0] rotation: 0 state: enabled blocks: +- name: META + id: variable + parameters: + comment: '' + value: '"helloworld"' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [320, 44.0] + rotation: 0 + state: true - name: samp_rate id: variable parameters: @@ -41,7 +53,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [240, 52.0] + coordinate: [232, 44.0] rotation: 0 state: true - name: blocks_null_sink_0 @@ -58,8 +70,8 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [912, 184.0] - rotation: 0 + coordinate: [464, 80.0] + rotation: 180 state: true - name: blocks_throttle_0 id: blocks_throttle @@ -109,7 +121,7 @@ blocks: comment: '' dst_ip: 255.255.255.255 maxoutbuf: '0' - meta: helloworld + meta: META minoutbuf: '0' samp_rate: samp_rate src_ip: 0.0.31.36.93.81 @@ -133,8 +145,8 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [760, 184.0] - rotation: 0 + coordinate: [608, 80.0] + rotation: 180 state: true - name: note_0_2 id: note diff --git a/examples/m17_streamer.png b/examples/m17_streamer.png index 8ba86c7..1f5e7a0 100644 Binary files a/examples/m17_streamer.png and b/examples/m17_streamer.png differ diff --git a/grc/m17_m17_coder.block.yml b/grc/m17_m17_coder.block.yml index c214804..34d90b4 100644 --- a/grc/m17_m17_coder.block.yml +++ b/grc/m17_m17_coder.block.yml @@ -17,7 +17,7 @@ parameters: default: '255.255.255.255.255.255' - id: type label: Type - dtype: short + dtype: int default: 0 - id: meta label: Meta