summaryrefslogtreecommitdiff
path: root/gr-digital
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2012-08-22 21:19:43 -0400
committerTom Rondeau <trondeau@vt.edu>2012-08-22 21:25:23 -0400
commitb4c96386b86147a175231385c0cc4eafe8e9f8b3 (patch)
tree6228ada04acff4d95a2e68febdb205432e777568 /gr-digital
parenteec6ae88e6da7fd72bc2dfc0f0f2e1dc23238db7 (diff)
digital: wip on ensuring all digital blocks work in GRC.
Diffstat (limited to 'gr-digital')
-rw-r--r--gr-digital/grc/digital_additive_scrambler_bb.xml2
-rw-r--r--gr-digital/grc/digital_binary_slicer_fb.xml2
-rw-r--r--gr-digital/grc/digital_block_tree.xml51
-rw-r--r--gr-digital/grc/digital_clock_recovery_mm_xx.xml2
-rw-r--r--gr-digital/grc/digital_cma_equalizer_cc.xml2
-rw-r--r--gr-digital/grc/digital_constellation_decoder_cb.xml2
-rw-r--r--gr-digital/grc/digital_constellation_receiver_cb.xml2
-rw-r--r--gr-digital/grc/digital_gmskmod_bc.xml2
-rw-r--r--gr-digital/grc/digital_lms_dd_equalizer_cc.xml2
-rw-r--r--gr-digital/grc/digital_pfb_clock_sync.xml2
-rw-r--r--gr-digital/include/digital/cpmmod_bc.h14
-rw-r--r--gr-digital/lib/cpmmod_bc_impl.cc18
-rw-r--r--gr-digital/lib/cpmmod_bc_impl.h16
13 files changed, 54 insertions, 63 deletions
diff --git a/gr-digital/grc/digital_additive_scrambler_bb.xml b/gr-digital/grc/digital_additive_scrambler_bb.xml
index 5ae5ba06f0..2d2fdab355 100644
--- a/gr-digital/grc/digital_additive_scrambler_bb.xml
+++ b/gr-digital/grc/digital_additive_scrambler_bb.xml
@@ -6,7 +6,7 @@
-->
<block>
<name>Additive Scrambler</name>
- <key>digital_additive_scrambler_bb</key>
+ <key>additive_scrambler_bb</key>
<import>from gnuradio import digital</import>
<make>digital.additive_scrambler_bb($mask, $seed, $len, $count)</make>
<param>
diff --git a/gr-digital/grc/digital_binary_slicer_fb.xml b/gr-digital/grc/digital_binary_slicer_fb.xml
index 3187d13f92..8190e02350 100644
--- a/gr-digital/grc/digital_binary_slicer_fb.xml
+++ b/gr-digital/grc/digital_binary_slicer_fb.xml
@@ -6,7 +6,7 @@
-->
<block>
<name>Binary Slicer</name>
- <key>digital_binary_slicer_fb</key>
+ <key>binary_slicer_fb</key>
<import>from gnuradio import digital</import>
<make>digital.binary_slicer_fb()</make>
<sink>
diff --git a/gr-digital/grc/digital_block_tree.xml b/gr-digital/grc/digital_block_tree.xml
index 9efa0d3fb5..8f5ac3bd29 100644
--- a/gr-digital/grc/digital_block_tree.xml
+++ b/gr-digital/grc/digital_block_tree.xml
@@ -29,36 +29,27 @@
<cat>
<name></name> <!-- Blank for Root Name -->
<cat>
- <name>Digital</name>
- <block>digital_additive_scrambler_bb</block>
- <block>digital_binary_slicer_fb</block>
- <block>digital_bytes_to_syms</block>
- <block>digital_chunks_to_symbols_xx</block>
- <block>digital_clock_recovery_mm_xx</block>
- <block>digital_cma_equalizer_cc</block>
- <block>digital_constellation_decoder_cb</block>
- <block>digital_constellation_receiver_cb</block>
- <block>digital_correlate_access_code_bb</block>
- <block>digital_costas_loop_cc</block>
- <block>digital_descrambler_bb</block>
- <block>digital_fll_band_edge_cc</block>
- <block>digital_glfsr_source_x</block>
- <block>digital_kurtotic_equalizer_cc</block>
- <block>digital_lms_dd_equalizer_cc</block>
- <block>digital_map_bb</block>
- <block>digital_mpsk_receiver_cc</block>
- <block>digital_mpsk_snr_est_cc</block>
- <block>digital_pfb_clock_sync_xxx</block>
- <block>digital_pn_correlator_cc</block>
- <block>digital_probe_density_b</block>
- <block>digital_probe_mpsk_snr_est_c</block>
- <block>digital_scrambler_bb</block>
- <block>digital_diff_decoder_bb</block>
- <block>digital_diff_encoder_bb</block>
- <block>digital_diff_phasor_cc</block>
- <block>digital_framer_sink_1</block>
- <block>digital_packet_sink</block>
- <block>digital_simple_framer</block>
+ <name>Coding</name>
+ <block>additive_scrambler_bb</block>
+ </cat>
+ <cat>
+ <name>Converters</name>
+ <block>binary_slicer_fb</block>
+ </cat>
+ <cat>
+ <name>Digital</name>
+ <block>constellation_decoder_cb</block>
+ <block>constellation_receiver_cb</block>
+ </cat>
+ <cat>
+ <name>Synchronizers</name>
+ <block>clock_recovery_mm_xx</block>
+ <block>pfb_clock_sync_xxx</block>
+ </cat>
+ <cat>
+ <name>Equalizers</name>
+ <block>cma_equalizer_cc</block>
+ <block>lms_dd_equalizer_cc</block>
</cat>
<cat>
<name>Digital Modulators</name>
diff --git a/gr-digital/grc/digital_clock_recovery_mm_xx.xml b/gr-digital/grc/digital_clock_recovery_mm_xx.xml
index d9c5ea4ff8..d6f0fd185a 100644
--- a/gr-digital/grc/digital_clock_recovery_mm_xx.xml
+++ b/gr-digital/grc/digital_clock_recovery_mm_xx.xml
@@ -6,7 +6,7 @@
-->
<block>
<name>Clock Recovery MM</name>
- <key>digital_clock_recovery_mm_xx</key>
+ <key>clock_recovery_mm_xx</key>
<import>from gnuradio import digital</import>
<make>digital.clock_recovery_mm_$(type.fcn)($omega, $gain_omega, $mu, $gain_mu, $omega_relative_limit)</make>
<callback>set_omega($omega)</callback>
diff --git a/gr-digital/grc/digital_cma_equalizer_cc.xml b/gr-digital/grc/digital_cma_equalizer_cc.xml
index 118c18e294..1184eb109c 100644
--- a/gr-digital/grc/digital_cma_equalizer_cc.xml
+++ b/gr-digital/grc/digital_cma_equalizer_cc.xml
@@ -6,7 +6,7 @@
-->
<block>
<name>CMA Equalizer</name>
- <key>digital_cma_equalizer_cc</key>
+ <key>cma_equalizer_cc</key>
<import>from gnuradio import digital</import>
<make>digital.cma_equalizer_cc($num_taps, $modulus, $mu, $sps)</make>
<callback>set_gain($mu)</callback>
diff --git a/gr-digital/grc/digital_constellation_decoder_cb.xml b/gr-digital/grc/digital_constellation_decoder_cb.xml
index c7353e2888..f3390c131c 100644
--- a/gr-digital/grc/digital_constellation_decoder_cb.xml
+++ b/gr-digital/grc/digital_constellation_decoder_cb.xml
@@ -6,7 +6,7 @@
-->
<block>
<name>Constellation Decoder</name>
- <key>digital_constellation_decoder_cb</key>
+ <key>constellation_decoder_cb</key>
<import>from gnuradio import digital</import>
<make>digital.constellation_decoder_cb($constellation)</make>
<param>
diff --git a/gr-digital/grc/digital_constellation_receiver_cb.xml b/gr-digital/grc/digital_constellation_receiver_cb.xml
index 36c8e1b309..fcb71ba40d 100644
--- a/gr-digital/grc/digital_constellation_receiver_cb.xml
+++ b/gr-digital/grc/digital_constellation_receiver_cb.xml
@@ -6,7 +6,7 @@
-->
<block>
<name>Constellation Receiver</name>
- <key>digital_constellation_receiver_cb</key>
+ <key>constellation_receiver_cb</key>
<import>from gnuradio import digital</import>
<make>digital.constellation_receiver_cb($constellation, $loop_bw, $fmin, $fmax)</make>
<param>
diff --git a/gr-digital/grc/digital_gmskmod_bc.xml b/gr-digital/grc/digital_gmskmod_bc.xml
index a44afe798f..6cda687f76 100644
--- a/gr-digital/grc/digital_gmskmod_bc.xml
+++ b/gr-digital/grc/digital_gmskmod_bc.xml
@@ -8,7 +8,7 @@
<name>GMSK Modulator</name>
<key>digital_gmskmod_bc</key>
<import>from gnuradio import digital</import>
- <make>digital.gmskmod_bc($samples_per_symbol, $bt, $L)</make>
+ <make>digital.gmskmod_bc($samples_per_symbol, $L, $bt)</make>
<param>
<name>Samples/Symbol</name>
<key>samples_per_symbol</key>
diff --git a/gr-digital/grc/digital_lms_dd_equalizer_cc.xml b/gr-digital/grc/digital_lms_dd_equalizer_cc.xml
index 0fd7d523b8..3332ce6c4d 100644
--- a/gr-digital/grc/digital_lms_dd_equalizer_cc.xml
+++ b/gr-digital/grc/digital_lms_dd_equalizer_cc.xml
@@ -6,7 +6,7 @@
-->
<block>
<name>LMS DD Equalizer</name>
- <key>digital_lms_dd_equalizer_cc</key>
+ <key>lms_dd_equalizer_cc</key>
<import>from gnuradio import digital</import>
<make>digital.lms_dd_equalizer_cc($num_taps, $mu, $sps, $cnst)</make>
<callback>set_gain($mu)</callback>
diff --git a/gr-digital/grc/digital_pfb_clock_sync.xml b/gr-digital/grc/digital_pfb_clock_sync.xml
index 9e2a4cd5ef..97581ad34c 100644
--- a/gr-digital/grc/digital_pfb_clock_sync.xml
+++ b/gr-digital/grc/digital_pfb_clock_sync.xml
@@ -6,7 +6,7 @@
-->
<block>
<name>Polyphase Clock Sync</name>
- <key>digital_pfb_clock_sync_xxx</key>
+ <key>pfb_clock_sync_xxx</key>
<import>from gnuradio import digital</import>
<make>digital.pfb_clock_sync_$(type)($sps, $alpha, $taps, $filter_size, $init_phase, $max_dev, $osps)
self.$(id).set_beta($beta)</make>
diff --git a/gr-digital/include/digital/cpmmod_bc.h b/gr-digital/include/digital/cpmmod_bc.h
index 3bcc1c655d..f65ca8059f 100644
--- a/gr-digital/include/digital/cpmmod_bc.h
+++ b/gr-digital/include/digital/cpmmod_bc.h
@@ -72,8 +72,8 @@ namespace gr {
* pulses, this is the 3 dB time-bandwidth product.
*/
static sptr make(gr_cpm::cpm_type type, float h,
- unsigned samples_per_sym,
- unsigned L, double beta=0.3);
+ int samples_per_sym,
+ int L, double beta=0.3);
/*!
* Make GMSK modulator block.
@@ -89,23 +89,23 @@ namespace gr {
* \param beta For LSRC, this is the rolloff factor. For Gaussian
* pulses, this is the 3 dB time-bandwidth product.
*/
- static sptr make_gmskmod_bc(unsigned samples_per_sym=2,
- unsigned L=4, double beta=0.3);
+ static sptr make_gmskmod_bc(int samples_per_sym=2,
+ int L=4, double beta=0.3);
//! Return the phase response FIR taps
virtual std::vector<float> taps() const = 0;
//! Return the type of CPM modulator
- virtual unsigned type() const = 0;
+ virtual int type() const = 0;
//! Return the modulation index of the modulator.
virtual float index() const = 0;
//! Return the number of samples per symbol
- virtual unsigned samples_per_sym() const = 0;
+ virtual int samples_per_sym() const = 0;
//! Return the length of the phase duration (in symbols)
- virtual unsigned length() const = 0;
+ virtual int length() const = 0;
//! Return the value of beta for the modulator
virtual double beta() const = 0;
diff --git a/gr-digital/lib/cpmmod_bc_impl.cc b/gr-digital/lib/cpmmod_bc_impl.cc
index 8737f2e0b6..044090d59a 100644
--- a/gr-digital/lib/cpmmod_bc_impl.cc
+++ b/gr-digital/lib/cpmmod_bc_impl.cc
@@ -30,8 +30,8 @@ namespace gr {
cpmmod_bc::sptr
cpmmod_bc::make(gr_cpm::cpm_type type, float h,
- unsigned samples_per_sym,
- unsigned L, double beta)
+ int samples_per_sym,
+ int L, double beta)
{
return gnuradio::get_initial_sptr
(new cpmmod_bc_impl("cpmmod_bc",
@@ -41,8 +41,8 @@ namespace gr {
}
cpmmod_bc::sptr
- cpmmod_bc::make_gmskmod_bc(unsigned samples_per_sym,
- unsigned L, double beta)
+ cpmmod_bc::make_gmskmod_bc(int samples_per_sym,
+ int L, double beta)
{
return gnuradio::get_initial_sptr
(new cpmmod_bc_impl("gmskmod_bc",
@@ -53,8 +53,8 @@ namespace gr {
cpmmod_bc_impl::cpmmod_bc_impl(const std::string &name,
gr_cpm::cpm_type type, float h,
- unsigned samples_per_sym,
- unsigned L, double beta)
+ int samples_per_sym,
+ int L, double beta)
: gr_hier_block2(name,
gr_make_io_signature(1, 1, sizeof(char)),
gr_make_io_signature2(1, 1, sizeof(gr_complex), sizeof(float))),
@@ -92,7 +92,7 @@ namespace gr {
return d_taps;
}
- unsigned
+ int
cpmmod_bc_impl::type() const
{
return d_type;
@@ -104,13 +104,13 @@ namespace gr {
return d_index;
}
- unsigned
+ int
cpmmod_bc_impl::samples_per_sym() const
{
return d_sps;
}
- unsigned
+ int
cpmmod_bc_impl::length() const
{
return d_length;
diff --git a/gr-digital/lib/cpmmod_bc_impl.h b/gr-digital/lib/cpmmod_bc_impl.h
index 2b052e6a3f..d27853e301 100644
--- a/gr-digital/lib/cpmmod_bc_impl.h
+++ b/gr-digital/lib/cpmmod_bc_impl.h
@@ -35,10 +35,10 @@ namespace gr {
class cpmmod_bc_impl : public cpmmod_bc
{
private:
- unsigned d_type;
+ int d_type;
float d_index;
- unsigned d_sps;
- unsigned d_length;
+ int d_sps;
+ int d_length;
double d_beta;
protected:
@@ -50,15 +50,15 @@ namespace gr {
public:
cpmmod_bc_impl(const std::string &name,
gr_cpm::cpm_type type, float h,
- unsigned samples_per_sym,
- unsigned L, double beta=0.3);
+ int samples_per_sym,
+ int L, double beta=0.3);
~cpmmod_bc_impl();
std::vector<float> taps() const;
- unsigned type() const;
+ int type() const;
float index() const;
- unsigned samples_per_sym() const;
- unsigned length() const;
+ int samples_per_sym() const;
+ int length() const;
double beta() const;
};
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-16 03:37:32 +0000