diff options
| author | Tim O'Shea <tim.oshea753@gmail.com> | 2013-02-15 15:16:32 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-17 18:33:50 -0500 |
| commit | a06d57f67ff9c8a7c1f4007fef7ee81c39efe7b6 (patch) | |
| tree | 037741facae8352ebb219f5197ee8dfcf5618d67 /gr-channels/lib/fading_model_impl.cc | |
| parent | 3fc871fe9d85c75b84b25cbcf3c8e38650ba772c (diff) | |
channels: fix for phase imbalance/alias in the specular component for Rician channels, switch phase accumulator to double precision, exporting step size to grcp
Diffstat (limited to 'gr-channels/lib/fading_model_impl.cc')
| -rw-r--r-- | gr-channels/lib/fading_model_impl.cc | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/gr-channels/lib/fading_model_impl.cc b/gr-channels/lib/fading_model_impl.cc index 12cd424cce..709c1c5713 100644 --- a/gr-channels/lib/fading_model_impl.cc +++ b/gr-channels/lib/fading_model_impl.cc @@ -121,14 +121,28 @@ namespace gr { "Ratio", "Rician factor (ratio of the specular power to the scattered power)", RPC_PRIVLVL_MIN, DISPTIMESERIESF))); - // do exports + add_rpc_variable( + rpcbasic_sptr(new rpcbasic_register_get<fading_model, float >( + alias(), "step", + &fading_model::step, + pmt::mp(0), pmt::mp(8), pmt::mp(4), + "radians", "Maximum step size for random walk angle per sample", + RPC_PRIVLVL_MIN, DISPTIMESERIESF))); + add_rpc_variable( + rpcbasic_sptr(new rpcbasic_register_set<fading_model, float >( + alias(), "step", + &fading_model::set_step, + pmt::mp(0), pmt::mp(1), pmt::mp(0.00001), + "radians", "Maximum step size for random walk angle per sample", + RPC_PRIVLVL_MIN, DISPTIMESERIESF))); + #endif /* GR_CTRLPORT */ } void fading_model_impl::update_theta() { - d_theta = d_theta + (d_step*rv_2()); + d_theta += (d_step*rv_2()); if(d_theta > M_PI){ d_theta = M_PI; d_step = -d_step; } else if(d_theta < -M_PI){ @@ -167,13 +181,13 @@ namespace gr { if(d_LOS){ #if FASTSINCOS == 1 float los_i = gr_fxpt::cos(gr_fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr_fxpt::cos(gr_fxpt::float_to_fixed(d_theta_los)) + d_psi[0])); - float los_q = gr_fxpt::sin(gr_fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr_fxpt::cos(gr_fxpt::float_to_fixed(d_theta_los)) + d_phi[0])); + float los_q = gr_fxpt::sin(gr_fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr_fxpt::cos(gr_fxpt::float_to_fixed(d_theta_los)) + d_psi[0])); #elif FASTSINCOS == 2 float los_i = d_table.cos(2*M_PI*d_fDTs*d_m*d_table.cos(d_theta_los) + d_psi[0]); - float los_q = d_table.sin(2*M_PI*d_fDTs*d_m*d_table.cos(d_theta_los) + d_phi[0]); + float los_q = d_table.sin(2*M_PI*d_fDTs*d_m*d_table.cos(d_theta_los) + d_psi[0]); #else float los_i = cos(2*M_PI*d_fDTs*d_m*cos(d_theta_los) + d_psi[0]); - float los_q = sin(2*M_PI*d_fDTs*d_m*cos(d_theta_los) + d_phi[0]); + float los_q = sin(2*M_PI*d_fDTs*d_m*cos(d_theta_los) + d_psi[0]); #endif H = H*scale_nlos + gr_complex(los_i,los_q)*scale_los; |