diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-01 14:44:07 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-01 14:44:07 -0700 |
| commit | edbcd297b252c3ee9fc5544cbe12115f45c727a7 (patch) | |
| tree | 1a03284df8b93a85d89cdb81a4631f66a2379cdb /gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc | |
| parent | 85012bb73b8ad452262d5bd6e4af08fcb137144a (diff) | |
| parent | 457186838d12607bcf9f5e61eaf937ff5fa090e0 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc')
| -rw-r--r-- | gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc b/gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc index 844359333d..ca4c6a6099 100644 --- a/gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc +++ b/gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc @@ -1732,6 +1732,16 @@ namespace gr { m_64apsk[62] = gr_complex( 7.0, -7.0); m_64apsk[63] = gr_complex( 7.0, 7.0); break; + case MOD_8VSB: + m_8psk[0] = gr_complex(-7.0 + 1.25, 0.0); + m_8psk[1] = gr_complex(-5.0 + 1.25, 0.0); + m_8psk[2] = gr_complex(-3.0 + 1.25, 0.0); + m_8psk[3] = gr_complex(-1.0 + 1.25, 0.0); + m_8psk[4] = gr_complex( 1.0 + 1.25, 0.0); + m_8psk[5] = gr_complex( 3.0 + 1.25, 0.0); + m_8psk[6] = gr_complex( 5.0 + 1.25, 0.0); + m_8psk[7] = gr_complex( 7.0 + 1.25, 0.0); + break; default: m_qpsk[0] = gr_complex((r1 * cos(M_PI / 4.0)), (r1 * sin(M_PI / 4.0))); m_qpsk[1] = gr_complex((r1 * cos(7 * M_PI / 4.0)), (r1 * sin(7 * M_PI / 4.0))); @@ -1791,6 +1801,7 @@ namespace gr { } break; case MOD_8PSK: + case MOD_8VSB: case MOD_8APSK: for (int i = 0; i < noutput_items; i++) { index = *in++; |