From 285ea24f3f033e97a907c01c6b135ca8662d8a8f Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Mon, 27 Aug 2012 22:12:39 -0400
Subject: digital: fixed remaining GRC blocks.
Also fixed some issues with OFDM mod/demod with other new components.
---
gr-digital/include/digital/constellation.h | 22 +++++++++++-----------
gr-digital/include/digital/ofdm_frame_sink.h | 4 ++--
2 files changed, 13 insertions(+), 13 deletions(-)
(limited to 'gr-digital/include/digital')
diff --git a/gr-digital/include/digital/constellation.h b/gr-digital/include/digital/constellation.h
index 1acc6bdc8b..4e0bff2fb3 100644
--- a/gr-digital/include/digital/constellation.h
+++ b/gr-digital/include/digital/constellation.h
@@ -61,7 +61,7 @@ namespace gr {
{
public:
constellation(std::vector<gr_complex> constell,
- std::vector<unsigned int> pre_diff_code,
+ std::vector<int> pre_diff_code,
unsigned int rotational_symmetry,
unsigned int dimensionality);
constellation();
@@ -98,7 +98,7 @@ namespace gr {
//! Whether to apply an encoding before doing differential encoding. (e.g. gray coding)
void set_pre_diff_code(bool a) { d_apply_pre_diff_code = a;}
//! Returns the encoding to apply before differential encoding.
- std::vector<unsigned int> pre_diff_code() { return d_pre_diff_code;}
+ std::vector<int> pre_diff_code() { return d_pre_diff_code;}
//! Returns the order of rotational symmetry.
unsigned int rotational_symmetry() { return d_rotational_symmetry;}
//! Returns the number of complex numbers in a single symbol.
@@ -121,7 +121,7 @@ namespace gr {
protected:
std::vector<gr_complex> d_constellation;
- std::vector<unsigned int> d_pre_diff_code;
+ std::vector<int> d_pre_diff_code;
bool d_apply_pre_diff_code;
unsigned int d_rotational_symmetry;
unsigned int d_dimensionality;
@@ -152,7 +152,7 @@ namespace gr {
// public constructor
static sptr make(std::vector<gr_complex> constell,
- std::vector<unsigned int> pre_diff_code,
+ std::vector<int> pre_diff_code,
unsigned int rotational_symmetry,
unsigned int dimensionality);
@@ -163,7 +163,7 @@ namespace gr {
private:
constellation_calcdist(std::vector<gr_complex> constell,
- std::vector<unsigned int> pre_diff_code,
+ std::vector<int> pre_diff_code,
unsigned int rotational_symmetry,
unsigned int dimensionality);
};
@@ -186,7 +186,7 @@ namespace gr {
public:
constellation_sector(std::vector<gr_complex> constell,
- std::vector<unsigned int> pre_diff_code,
+ std::vector<int> pre_diff_code,
unsigned int rotational_symmetry,
unsigned int dimensionality,
unsigned int n_sectors);
@@ -203,7 +203,7 @@ namespace gr {
unsigned int n_sectors;
private:
- std::vector<unsigned int> sector_values;
+ std::vector<int> sector_values;
};
/************************************************************/
@@ -234,7 +234,7 @@ namespace gr {
// public constructor
static constellation_rect::sptr make(std::vector<gr_complex> constell,
- std::vector<unsigned int> pre_diff_code,
+ std::vector<int> pre_diff_code,
unsigned int rotational_symmetry,
unsigned int real_sectors,
unsigned int imag_sectors,
@@ -254,7 +254,7 @@ namespace gr {
float d_width_imag_sectors;
constellation_rect(std::vector<gr_complex> constell,
- std::vector<unsigned int> pre_diff_code,
+ std::vector<int> pre_diff_code,
unsigned int rotational_symmetry,
unsigned int real_sectors,
unsigned int imag_sectors,
@@ -286,7 +286,7 @@ namespace gr {
// public constructor
static sptr make(std::vector<gr_complex> constell,
- std::vector<unsigned int> pre_diff_code,
+ std::vector<int> pre_diff_code,
unsigned int n_sectors);
~constellation_psk();
@@ -298,7 +298,7 @@ namespace gr {
private:
constellation_psk(std::vector<gr_complex> constell,
- std::vector<unsigned int> pre_diff_code,
+ std::vector<int> pre_diff_code,
unsigned int n_sectors);
};
diff --git a/gr-digital/include/digital/ofdm_frame_sink.h b/gr-digital/include/digital/ofdm_frame_sink.h
index 71f986dc7c..2b4bbe6480 100644
--- a/gr-digital/include/digital/ofdm_frame_sink.h
+++ b/gr-digital/include/digital/ofdm_frame_sink.h
@@ -59,9 +59,9 @@ namespace gr {
* \param freq_gain gain of the frequency tracking loop
*/
static sptr make(const std::vector<gr_complex> &sym_position,
- const std::vector<unsigned char> &sym_value_out,
+ const std::vector<char> &sym_value_out,
gr_msg_queue_sptr target_queue,
- unsigned int occupied_tones,
+ int occupied_tones,
float phase_gain=0.25, float freq_gain=0.25*0.25/4);
};
--
cgit v1.2.3