Cleaned up lots of blocks

author: Håkon Vågsether <haakonsv@gmail.com> 2018-07-26 23:58:01 +0200
committer: Marcus Müller <marcus@hostalia.de> 2018-08-25 14:18:01 +0200
commit: d7ed6a6f76ca9fbc77f15354af58b1110c446cf9 (patch)
tree: 9ee40bb7098703da6d00d15cc6705df2199e4010 /gr-digital/grc
parent: 35f76a9c487e1dabe74b03e874c90349b816aeff (diff)
16 files changed, 159 insertions, 108 deletions
diff --git a/gr-digital/grc/digital_constellation.block.yml b/gr-digital/grc/digital_constellation.block.yml
index b604140888..fb409062f5 100644
--- a/gr-digital/grc/digital_constellation.block.yml
+++ b/gr-digital/grc/digital_constellation.block.yml
@@ -42,31 +42,17 @@ value: ${ digital.constellation_calcdist(const_points, sym_map, rot_sym, dims) i
 
 templates:
     imports: from gnuradio import digital
-    var_make: '
-
+    var_make: |-
         % if str(type) == "calcdist":
-
         self.${id} = ${id} = digital.constellation_calcdist(${const_points}, ${sym_map},
         ${rot_sym}, ${dims}).base()
-
         % else:
-
         self.${id} = ${id} = digital.constellation_${type}().base()
-
         % endif
-
-
-        % if str(soft_dec_lut).lower() == ''"auto"'' or str(soft_dec_lut).lower()
-        == "''auto''":
-
+        % if str(soft_dec_lut).lower() == ''"auto"'' or str(soft_dec_lut).lower() == "''auto''":
         self.${id}.gen_soft_dec_lut(${precision})
-
         % elif str(soft_dec_lut) != ''None'':
-
         self.${id}.set_soft_dec_lut(${soft_dec_lut}, ${precision})
-
         % endif
 
-        '
-
 file_format: 1
diff --git a/gr-digital/grc/digital_constellation_modulator.block.yml b/gr-digital/grc/digital_constellation_modulator.block.yml
index 8be84449ad..a451d5c0b9 100644
--- a/gr-digital/grc/digital_constellation_modulator.block.yml
+++ b/gr-digital/grc/digital_constellation_modulator.block.yml
@@ -46,13 +46,12 @@ templates:
     imports: from gnuradio import digital
     make: |-
         digital.generic_mod(
-          constellation=${constellation},
-          differential=${differential},
-          samples_per_symbol=${samples_per_symbol},
-          pre_diff_code=True,
-          excess_bw=${excess_bw},
-          verbose=${verbose},
-          log=${log},
-          )
+            constellation=${constellation},
+            differential=${differential},
+            samples_per_symbol=${samples_per_symbol},
+            pre_diff_code=True,
+            excess_bw=${excess_bw},
+            verbose=${verbose},
+            log=${log})
 
 file_format: 1
diff --git a/gr-digital/grc/digital_constellation_rect.block.yml b/gr-digital/grc/digital_constellation_rect.block.yml
index e9e58001c2..17d1e5b786 100644
--- a/gr-digital/grc/digital_constellation_rect.block.yml
+++ b/gr-digital/grc/digital_constellation_rect.block.yml
@@ -46,20 +46,13 @@ value: ${ digital.constellation_rect(const_points, sym_map, rot_sym, real_sect,
 
 templates:
     imports: from gnuradio import digital
-    var_make: 'self.${id} = ${id} = digital.constellation_rect(${const_points}, ${sym_map},
+    var_make: |-
+        self.${id} = ${id} = digital.constellation_rect(${const_points}, ${sym_map},
         ${rot_sym}, ${real_sect}, ${imag_sect}, ${w_real_sect}, ${w_imag_sect}).base()
-
-        % if str(soft_dec_lut).lower() == ''"auto"'' or str(soft_dec_lut).lower()
-        == "''auto''":
-
+        % if str(soft_dec_lut).lower() == ''"auto"'' or str(soft_dec_lut).lower() == "''auto''":
         self.${id}.gen_soft_dec_lut(${precision})
-
         % elif str(soft_dec_lut) != ''None'':
-
         self.${id}.set_soft_dec_lut(${soft_dec_lut}, ${precision})
-
         % endif
 
-        '
-
 file_format: 1
diff --git a/gr-digital/grc/digital_gfsk_demod.block.yml b/gr-digital/grc/digital_gfsk_demod.block.yml
index 9f6b33c6af..2d0196fde3 100644
--- a/gr-digital/grc/digital_gfsk_demod.block.yml
+++ b/gr-digital/grc/digital_gfsk_demod.block.yml
@@ -51,8 +51,15 @@ outputs:
 
 templates:
     imports: from gnuradio import digital
-    make: "digital.gfsk_demod(\n\tsamples_per_symbol=${samples_per_symbol},\n\tsensitivity=${sensitivity},\n\
-        \tgain_mu=${gain_mu},\n\tmu=${mu},\n\tomega_relative_limit=${omega_relative_limit},\n\
-        \tfreq_error=${freq_error},\n\tverbose=${verbose},\n\tlog=${log},\n)"
+    make: |-
+        digital.gfsk_demod(
+            samples_per_symbol=${samples_per_symbol},
+            sensitivity=${sensitivity},
+            gain_mu=${gain_mu},
+            mu=${mu},
+            omega_relative_limit=${omega_relative_limit},
+            freq_error=${freq_error},
+            verbose=${verbose},
+            log=${log})
 
 file_format: 1
diff --git a/gr-digital/grc/digital_gfsk_mod.block.yml b/gr-digital/grc/digital_gfsk_mod.block.yml
index 3dda769a4c..feaac95288 100644
--- a/gr-digital/grc/digital_gfsk_mod.block.yml
+++ b/gr-digital/grc/digital_gfsk_mod.block.yml
@@ -39,7 +39,12 @@ outputs:
 
 templates:
     imports: from gnuradio import digital
-    make: "digital.gfsk_mod(\n\tsamples_per_symbol=${samples_per_symbol},\n\tsensitivity=${sensitivity},\n\
-        \tbt=${bt},\n\tverbose=${verbose},\n\tlog=${log},\n)"
+    make: |-
+        digital.gfsk_mod(
+            samples_per_symbol=${samples_per_symbol},
+            sensitivity=${sensitivity},
+            bt=${bt},
+            verbose=${verbose},
+            log=${log})
 
 file_format: 1
diff --git a/gr-digital/grc/digital_gmsk_demod.block.yml b/gr-digital/grc/digital_gmsk_demod.block.yml
index bbd3b4148a..500f47eaf4 100644
--- a/gr-digital/grc/digital_gmsk_demod.block.yml
+++ b/gr-digital/grc/digital_gmsk_demod.block.yml
@@ -47,8 +47,13 @@ outputs:
 
 templates:
     imports: from gnuradio import digital
-    make: "digital.gmsk_demod(\n\tsamples_per_symbol=${samples_per_symbol},\n\tgain_mu=${gain_mu},\n\
-        \tmu=${mu},\n\tomega_relative_limit=${omega_relative_limit},\n\tfreq_error=${freq_error},\n\
-        \tverbose=${verbose},\n\tlog=${log},\n)"
+    make: |-
+        digital.gmsk_demod(
+            samples_per_symbol=${samples_per_symbol},
+            gain_mu=${gain_mu},
+            mu=${mu},
+            omega_relative_limit=${omega_relative_limit},
+            freq_error=${freq_error},
+            verbose=${verbose},log=${log})
 
 file_format: 1
diff --git a/gr-digital/grc/digital_gmsk_mod.block.yml b/gr-digital/grc/digital_gmsk_mod.block.yml
index 0b0941bae0..d169488770 100644
--- a/gr-digital/grc/digital_gmsk_mod.block.yml
+++ b/gr-digital/grc/digital_gmsk_mod.block.yml
@@ -35,7 +35,11 @@ outputs:
 
 templates:
     imports: from gnuradio import digital
-    make: "digital.gmsk_mod(\n\tsamples_per_symbol=${samples_per_symbol},\n\tbt=${bt},\n\
-        \tverbose=${verbose},\n\tlog=${log},\n)"
+    make: |-
+        digital.gmsk_mod(
+            samples_per_symbol=${samples_per_symbol},
+            bt=${bt},
+            verbose=${verbose},
+            log=${log})
 
 file_format: 1
diff --git a/gr-digital/grc/digital_header_payload_demux.block.yml b/gr-digital/grc/digital_header_payload_demux.block.yml
index 4f69a08f29..8cccb65862 100644
--- a/gr-digital/grc/digital_header_payload_demux.block.yml
+++ b/gr-digital/grc/digital_header_payload_demux.block.yml
@@ -76,10 +76,18 @@ outputs:
 
 templates:
     imports: from gnuradio import digital
-    make: "digital.header_payload_demux(\n\t  ${header_len},\n\t  ${items_per_symbol},\n\
-        \t  ${guard_interval},\n\t  ${length_tag_key},\n\t  ${trigger_tag_key},\n\t\
-        \  ${output_symbols},\n\t  ${type.itemsize},\n\t  ${timing_tag_key},\n   \
-        \       ${samp_rate},\n          ${special_tags},\n          ${header_padding},\n\
-        \    )"
+    make: |-
+        digital.header_payload_demux(
+            ${header_len},
+            ${items_per_symbol},
+            ${guard_interval},
+            ${length_tag_key},
+            ${trigger_tag_key},
+            ${output_symbols},
+            ${type.itemsize},
+            ${timing_tag_key},
+            ${samp_rate},
+            ${special_tags},
+            ${header_padding})
 
 file_format: 1
diff --git a/gr-digital/grc/digital_ofdm_rx.block.yml b/gr-digital/grc/digital_ofdm_rx.block.yml
index 2a3928020b..429aacd3f8 100644
--- a/gr-digital/grc/digital_ofdm_rx.block.yml
+++ b/gr-digital/grc/digital_ofdm_rx.block.yml
@@ -83,13 +83,29 @@ asserts:
 
 templates:
     imports: from gnuradio import digital
-    make: "digital.ofdm_rx(\n\t  fft_len=${fft_len}, cp_len=${cp_len},\n\t  frame_length_tag_key='frame_'+${packet_len_key},\n\
-        \t  packet_length_tag_key=${packet_len_key},\n\t  % if occupied_carriers:\n\
-        \t  occupied_carriers=${occupied_carriers},\n\t  % endif\n\t  % if pilot_carriers:\n\
-        \t  pilot_carriers=${pilot_carriers},\n\t  % endif\n\t  % if pilot_symbols:\n\
-        \t  pilot_symbols=${pilot_symbols},\n\t  % endif\n\t  % if sync_word1:\n\t\
-        \  sync_word1=${sync_word1},\n\t  % endif\n\t  % if sync_word2:\n\t  sync_word2=${sync_word2},\n\
-        \t  % endif\n\t  bps_header=${header_mod.bps},\n\t  bps_payload=${payload_mod.bps},\n\
-        \t  debug_log=${log},\n\t  scramble_bits=${scramble_bits}\n\t )"
+    make: |-
+        digital.ofdm_rx(
+            fft_len=${fft_len}, cp_len=${cp_len},
+            frame_length_tag_key='frame_'+${packet_len_key},
+            packet_length_tag_key=${packet_len_key},
+            % if occupied_carriers:
+            occupied_carriers=${occupied_carriers},
+            % endif
+            % if pilot_carriers:
+            pilot_carriers=${pilot_carriers},
+            % endif
+            % if pilot_symbols:
+            pilot_symbols=${pilot_symbols},
+            % endif
+            % if sync_word1:
+            sync_word1=${sync_word1},
+            % endif
+            % if sync_word2:
+            sync_word2=${sync_word2},
+            % endif
+            bps_header=${header_mod.bps},
+            bps_payload=${payload_mod.bps},
+            debug_log=${log},
+            scramble_bits=${scramble_bits})
 
 file_format: 1
diff --git a/gr-digital/grc/digital_ofdm_tx.block.yml b/gr-digital/grc/digital_ofdm_tx.block.yml
index c81da0d27f..1aafe2e244 100644
--- a/gr-digital/grc/digital_ofdm_tx.block.yml
+++ b/gr-digital/grc/digital_ofdm_tx.block.yml
@@ -88,13 +88,30 @@ asserts:
 
 templates:
     imports: from gnuradio import digital
-    make: "digital.ofdm_tx(\n\t  fft_len=${fft_len}, cp_len=${cp_len},\n\t  packet_length_tag_key=${packet_len_key},\n\
-        \t  % if occupied_carriers:\n\t  occupied_carriers=${occupied_carriers},\n\
-        \t  % endif\n\t  % if pilot_carriers:\n\t  pilot_carriers=${pilot_carriers},\n\
-        \t  % endif\n\t  % if pilot_carriers:\n\t  pilot_symbols=${pilot_symbols},\n\
-        \t  % endif\n\t  % if sync_word1:\n\t  sync_word1=${sync_word1},\n\t  % endif\n\
-        \t  % if sync_word2:\n\t  sync_word2=${sync_word2},\n\t  % endif\n\t  bps_header=${header_mod.bps},\n\
-        \t  bps_payload=${payload_mod.bps},\n\t  rolloff=${rolloff},\n\t  debug_log=${log},\n\
-        \t  scramble_bits=${scramble_bits}\n\t )"
+    make: |-
+        digital.ofdm_tx(
+            fft_len=${fft_len}, 
+            cp_len=${cp_len},
+            packet_length_tag_key=${packet_len_key},
+            % if occupied_carriers:
+            occupied_carriers=${occupied_carriers},
+            % endif
+            % if pilot_carriers:
+            pilot_carriers=${pilot_carriers},
+            % endif
+            % if pilot_carriers:
+            pilot_symbols=${pilot_symbols},
+            % endif
+            % if sync_word1:
+            sync_word1=${sync_word1},
+            % endif
+            % if sync_word2:
+            sync_word2=${sync_word2},
+            % endif
+            bps_header=${header_mod.bps},
+            bps_payload=${payload_mod.bps},
+            rolloff=${rolloff}, 
+            debug_log=${log},
+            scramble_bits=${scramble_bits})
 
 file_format: 1
diff --git a/gr-digital/grc/digital_psk_demod.block.yml b/gr-digital/grc/digital_psk_demod.block.yml
index fbb5d60005..cf547691c7 100644
--- a/gr-digital/grc/digital_psk_demod.block.yml
+++ b/gr-digital/grc/digital_psk_demod.block.yml
@@ -65,15 +65,14 @@ templates:
     imports: from gnuradio import digital
     make: |-
         digital.psk.psk_demod(
-          constellation_points=${constellation_points},
-          differential=${differential},
-          samples_per_symbol=${samples_per_symbol},
-          excess_bw=${excess_bw},
-          phase_bw=${phase_bw},
-          timing_bw=${timing_bw},
-          mod_code=${mod_code},
-          verbose=${verbose},
-          log=${log},
-          )
+            constellation_points=${constellation_points},
+            differential=${differential},
+            samples_per_symbol=${samples_per_symbol},
+            excess_bw=${excess_bw},
+            phase_bw=${phase_bw},
+            timing_bw=${timing_bw},
+            mod_code=${mod_code},
+            verbose=${verbose},
+            log=${log})
 
 file_format: 1
diff --git a/gr-digital/grc/digital_psk_mod.block.yml b/gr-digital/grc/digital_psk_mod.block.yml
index 9145718fa7..3af4998bc7 100644
--- a/gr-digital/grc/digital_psk_mod.block.yml
+++ b/gr-digital/grc/digital_psk_mod.block.yml
@@ -53,13 +53,12 @@ templates:
     imports: from gnuradio import digital
     make: |-
         digital.psk.psk_mod(
-          constellation_points=${constellation_points},
-          mod_code=${mod_code},
-          differential=${differential},
-          samples_per_symbol=${samples_per_symbol},
-          excess_bw=${excess_bw},
-          verbose=${verbose},
-          log=${log},
-          )
+            constellation_points=${constellation_points},
+            mod_code=${mod_code},
+            differential=${differential},
+            samples_per_symbol=${samples_per_symbol},
+            excess_bw=${excess_bw},
+            verbose=${verbose},
+            log=${log})
 
 file_format: 1
diff --git a/gr-digital/grc/digital_qam_demod.block.yml b/gr-digital/grc/digital_qam_demod.block.yml
index 5ed8f4dd1d..aeb809a11d 100644
--- a/gr-digital/grc/digital_qam_demod.block.yml
+++ b/gr-digital/grc/digital_qam_demod.block.yml
@@ -65,16 +65,15 @@ templates:
     imports: from gnuradio import digital
     make: |-
         digital.qam.qam_demod(
-          constellation_points=${constellation_points},
-          differential=${differential},
-          samples_per_symbol=${samples_per_symbol},
-          excess_bw=${excess_bw},
-          freq_bw=${freq_bw},
-          timing_bw=${timing_bw},
-          phase_bw=${phase_bw},
-          mod_code=${mod_code},
-          verbose=${verbose},
-          log=${log},
-          )
+            constellation_points=${constellation_points},
+            differential=${differential},
+            samples_per_symbol=${samples_per_symbol},
+            excess_bw=${excess_bw},
+            freq_bw=${freq_bw},
+            timing_bw=${timing_bw},
+            phase_bw=${phase_bw},
+            mod_code=${mod_code},
+            verbose=${verbose},
+            log=${log})
 
 file_format: 1
diff --git a/gr-digital/grc/digital_qam_mod.block.yml b/gr-digital/grc/digital_qam_mod.block.yml
index 6cfcc2966e..35715a91b2 100644
--- a/gr-digital/grc/digital_qam_mod.block.yml
+++ b/gr-digital/grc/digital_qam_mod.block.yml
@@ -53,13 +53,12 @@ templates:
     imports: from gnuradio import digital
     make: |-
         digital.qam.qam_mod(
-          constellation_points=${constellation_points},
-          mod_code=${mod_code},
-          differential=${differential},
-          samples_per_symbol=${samples_per_symbol},
-          excess_bw=${excess_bw},
-          verbose=${verbose},
-          log=${log},
-          )
+            constellation_points=${constellation_points},
+            mod_code=${mod_code},
+            differential=${differential},
+            samples_per_symbol=${samples_per_symbol},
+            excess_bw=${excess_bw},
+            verbose=${verbose},
+            log=${log})
 
 file_format: 1
diff --git a/gr-digital/grc/digital_symbol_sync_xx.block.yml b/gr-digital/grc/digital_symbol_sync_xx.block.yml
index ec63825127..4d84e5ec47 100644
--- a/gr-digital/grc/digital_symbol_sync_xx.block.yml
+++ b/gr-digital/grc/digital_symbol_sync_xx.block.yml
@@ -97,9 +97,19 @@ templates:
     imports: |-
         from gnuradio import digital
         from gnuradio import filter
-    make: digital.symbol_sync_${type}(${ted_type}, ${sps}, ${loop_bw}, ${damping},
-        ${ted_gain}, ${max_dev}, ${osps}, ${constellation}, ${resamp_type}, ${nfilters},
-        ${pfb_mf_taps})
+    make: |-
+        digital.symbol_sync_${type}(
+            ${ted_type}, 
+            ${sps}, 
+            ${loop_bw}, 
+            ${damping},
+            ${ted_gain}, 
+            ${max_dev}, 
+            ${osps}, 
+            ${constellation}, 
+            ${resamp_type}, 
+            ${nfilters},
+            ${pfb_mf_taps})
     callbacks:
     - set_loop_bandwidth(${loop_bw})
     - set_damping_factor(${damping})
diff --git a/gr-digital/grc/variable_header_format_default.block.yml b/gr-digital/grc/variable_header_format_default.block.yml
index d326eb2e86..8845292e1a 100644
--- a/gr-digital/grc/variable_header_format_default.block.yml
+++ b/gr-digital/grc/variable_header_format_default.block.yml
@@ -18,8 +18,13 @@ value: ${ digital.header_format_default(access_code, threshold, bps) }
 
 templates:
     imports: from gnuradio import digital
-    var_make: "\n% if int(access_code)==0 #:\nself.${id} = ${id} = digital.header_format_default(digital.packet_utils.default_access_code,\
-        \ ${threshold}, ${bps})\n% else:\nself.${id} = ${id} = digital.header_format_default(${access_code},\
-        \ ${threshold}, ${bps})\n% endif\n  "
+    var_make: |-
+        % if int(access_code)==0:
+        self.${id} = ${id} = digital.header_format_default(digital.packet_utils.default_access_code,\
+        ${threshold}, ${bps})
+        % else:
+        self.${id} = ${id} = digital.header_format_default(${access_code},\
+        ${threshold}, ${bps})
+        % endif
 
 file_format: 1
author	Håkon Vågsether <haakonsv@gmail.com>	2018-07-26 23:58:01 +0200
committer	Marcus Müller <marcus@hostalia.de>	2018-08-25 14:18:01 +0200
commit	d7ed6a6f76ca9fbc77f15354af58b1110c446cf9 (patch)
tree	9ee40bb7098703da6d00d15cc6705df2199e4010 /gr-digital/grc
parent	35f76a9c487e1dabe74b03e874c90349b816aeff (diff)