[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/08: channels: update LOS model to reflec
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 02/08: channels: update LOS model to reflect NLOS changes to long term models |
Date: |
Fri, 10 Jun 2016 20:45:11 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 096c45c89b139c3496fff3261014cd657063580f
Author: Tim O'Shea <address@hidden>
Date: Sun Mar 27 02:09:04 2016 -0400
channels: update LOS model to reflect NLOS changes to long term models
---
gr-channels/lib/flat_fader_impl.cc | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/gr-channels/lib/flat_fader_impl.cc
b/gr-channels/lib/flat_fader_impl.cc
index b749eb3..f33ca22 100644
--- a/gr-channels/lib/flat_fader_impl.cc
+++ b/gr-channels/lib/flat_fader_impl.cc
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2013 Free Software Foundation, Inc.
+ * Copyright 2016 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -79,16 +79,15 @@ namespace gr {
float s_i = scale_sin*_GRFASTCOS(d_psi[n+1]);
float s_q = scale_sin*_GRFASTSIN(d_phi[n+1]);
H += gr_complex(s_i, s_q);
- }
+ }
if(d_LOS){
- float los_i = _GRFASTCOS(2*M_PI*d_fDTs*d_m*_GRFASTCOS(d_theta_los)
+ d_psi[0]);
- float los_q = _GRFASTSIN(2*M_PI*d_fDTs*d_m*_GRFASTCOS(d_theta_los)
+ d_psi[0]);
- H = H*scale_nlos + gr_complex(los_i,los_q)*scale_los;
+ d_psi[0] = fmod(d_psi[0] + 2*M_PI*d_fDTs*_GRFASTCOS(d_theta_los),
2*M_PI);
+ float los_i = scale_los*_GRFASTCOS(d_psi[0]);
+ float los_q = scale_los*_GRFASTSIN(d_psi[0]);
+ H = H*scale_nlos + gr_complex(los_i,los_q);
}
- //out[i] = in[i]*H;
- d_m++;
update_theta();
return H;
}
- [Commit-gnuradio] [gnuradio] branch next updated (06a7c93 -> 0dc8072), git, 2016/06/10
- [Commit-gnuradio] [gnuradio] 02/08: channels: update LOS model to reflect NLOS changes to long term models,
git <=
- [Commit-gnuradio] [gnuradio] 08/08: Merge branch 'master' into next, git, 2016/06/10
- [Commit-gnuradio] [gnuradio] 07/08: Merge remote-tracking branch 'osh/flat_fader_testing_next' into next, git, 2016/06/10
- [Commit-gnuradio] [gnuradio] 05/08: channels: provide CSI via message ports optionally, git, 2016/06/10
- [Commit-gnuradio] [gnuradio] 04/08: channels: adding selective fading model 2 (PDP slowly changes without bounds as well so fades move ...), git, 2016/06/10
- [Commit-gnuradio] [gnuradio] 03/08: channels: generate fading taps in blocks for minor speedup, git, 2016/06/10
- [Commit-gnuradio] [gnuradio] 01/08: channels: ensure flat fader behaves appropriately on long runs, git, 2016/06/10
- [Commit-gnuradio] [gnuradio] 06/08: channels: clean up some of the fader normalization values and storage sizes, git, 2016/06/10