diff options
| author | Ben Reynwar <ben@reynwar.net> | 2012-09-30 20:48:42 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2012-09-30 20:48:42 -0700 |
| commit | d4c91c146f50059eca1ccab9bb5a9f96fbe31c42 (patch) | |
| tree | 44da34e670354e3e8d4d9e5778e383a91213b27b /gr-digital/include/digital | |
| parent | 35e508c6e9462191491ac2c2eae62e60b244d99c (diff) | |
| parent | 33d9cf8800d3b4c0bbbff09b7588c21ed35e3220 (diff) | |
digital: merge in QAM bug fix from master
Diffstat (limited to 'gr-digital/include/digital')
| -rw-r--r-- | gr-digital/include/digital/constellation.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gr-digital/include/digital/constellation.h b/gr-digital/include/digital/constellation.h index 4e0bff2fb3..330ed03131 100644 --- a/gr-digital/include/digital/constellation.h +++ b/gr-digital/include/digital/constellation.h @@ -126,6 +126,9 @@ namespace gr { unsigned int d_rotational_symmetry; unsigned int d_dimensionality; unsigned int d_arity; + //! The factor by which the user given constellation points were + //! scaled by to achieve an average amplitude of 1. + float d_scalefactor; float get_distance(unsigned int index, const gr_complex *sample); unsigned int get_closest_point(const gr_complex *sample); |