From c5606d41a63f938ba66455cf58c998a22da2a41c Mon Sep 17 00:00:00 2001 From: gjbradford <gjbradford@gjbradford-Ubuntu22.04> Date: Tue, 28 Mar 2023 15:33:22 +1100 Subject: [PATCH] fix grc import error for phy blocks --- grc/cdc_phy_rx.block.yml | 8 ++++---- grc/cdc_phy_tx.block.yml | 11 +++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/grc/cdc_phy_rx.block.yml b/grc/cdc_phy_rx.block.yml index 6a806a2..0e3ea50 100644 --- a/grc/cdc_phy_rx.block.yml +++ b/grc/cdc_phy_rx.block.yml @@ -46,11 +46,11 @@ outputs: optional: true templates: - imports: 'from phy_rx import phy_rx # grc-generated hier_block' - make: "phy_rx(\n excess_bw=${ excess_bw },\n sps=${ sps },\n)" + imports: from gnuradio import cdc + make: cdc.phy_rx(excess_bw=${excess_bw}, sps=${sps}) callbacks: - - set_excess_bw(${ excess_bw }) - - set_sps(${ sps }) + - set_excess_bw(${excess_bw}) + - set_sps(${sps}) documentation: /home/gjbradford/code/gnuradio/gr/gr-cdc/examples/phy_rx.py grc_source: /home/gjbradford/code/gnuradio/gr/gr-cdc/examples/cdc_phy_rx.grc diff --git a/grc/cdc_phy_tx.block.yml b/grc/cdc_phy_tx.block.yml index 8f58df9..6fc7bbc 100644 --- a/grc/cdc_phy_tx.block.yml +++ b/grc/cdc_phy_tx.block.yml @@ -39,13 +39,12 @@ outputs: optional: true templates: - imports: 'from phy_tx import phy_tx # grc-generated hier_block' - make: "phy_tx(\n excess_bw=${ excess_bw },\n phasing=${ phasing },\n \ - \ sps=${ sps },\n)" + imports: from gnuradio import cdc + make: cdc.phy_tx(excess_bw=${excess_bw}, phasing=${phasing}, sps=${sps}) callbacks: - - set_excess_bw(${ excess_bw }) - - set_phasing(${ phasing }) - - set_sps(${ sps }) + - set_excess_bw(${excess_bw}) + - set_phasing(${phasing}) + - set_sps(${sps}) documentation: /home/gjbradford/code/gnuradio/gr/gr-cdc/examples/phy_tx.py grc_source: /home/gjbradford/code/gnuradio/gr/gr-cdc/examples/cdc_phy_tx.grc -- GitLab