diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-09-15 14:50:08 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-09-15 14:50:08 -0700 |
| commit | e5e1b0f5b64073632a27d711c06a75728596670e (patch) | |
| tree | e2bb450e1bc1c4e492763adb284b5e9c9dd6d6d9 /gr-analog/grc | |
| parent | 222fd4391a39873b5e114f3d30d47608a658b090 (diff) | |
| parent | 95ccf0b099f88d0e3b97f7025743091c42cb90d3 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-analog/grc')
| -rw-r--r-- | gr-analog/grc/analog_block_tree.xml | 1 | ||||
| -rw-r--r-- | gr-analog/grc/analog_cpfsk_bc.xml | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/gr-analog/grc/analog_block_tree.xml b/gr-analog/grc/analog_block_tree.xml index 64ccbdd85..7337c34c3 100644 --- a/gr-analog/grc/analog_block_tree.xml +++ b/gr-analog/grc/analog_block_tree.xml @@ -42,7 +42,6 @@ </cat> <cat> <name>Modulators</name> - <block>analog_cpfsk_bc</block> <block>analog_frequency_modulator_fc</block> <block>analog_phase_modulator_fc</block> <block>analog_quadrature_demod_cf</block> diff --git a/gr-analog/grc/analog_cpfsk_bc.xml b/gr-analog/grc/analog_cpfsk_bc.xml index 7eb85a2ec..5108ff61f 100644 --- a/gr-analog/grc/analog_cpfsk_bc.xml +++ b/gr-analog/grc/analog_cpfsk_bc.xml @@ -7,6 +7,7 @@ <block> <name>CPFSK</name> <key>analog_cpfsk_bc</key> + <category>[Core]/Deprecated</category> <import>from gnuradio import analog</import> <make>analog.cpfsk_bc($k, $amplitude, $samples_per_symbol)</make> <callback>set_amplitude($amplitude)</callback> |