[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4110 - gnuradio/branches/developers/n4hy/ofdm/gnuradi
From: |
n4hy |
Subject: |
[Commit-gnuradio] r4110 - gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general |
Date: |
Sat, 16 Dec 2006 22:51:55 -0700 (MST) |
Author: n4hy
Date: 2006-12-16 22:51:54 -0700 (Sat, 16 Dec 2006)
New Revision: 4110
Modified:
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.h
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.i
Log:
progress, nearly works now
Modified:
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc
2006-12-17 01:40:33 UTC (rev 4109)
+++
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc
2006-12-17 05:51:54 UTC (rev 4110)
@@ -31,20 +31,22 @@
gr_ofdm_sampler_sptr
gr_make_ofdm_sampler (unsigned int fft_length,
unsigned int symbol_length,
- unsigned int delay)
+ int delay)
{
return gr_ofdm_sampler_sptr (new gr_ofdm_sampler (fft_length, symbol_length,
delay));
}
gr_ofdm_sampler::gr_ofdm_sampler (unsigned int fft_length,
unsigned int symbol_length,
- unsigned int delay)
+ int delay)
: gr_block ("ofdm_sampler",
gr_make_io_signature (3, 3, sizeof (gr_complex)),
gr_make_io_signature (1, 1, sizeof (gr_complex)*fft_length)),
d_fft_length(fft_length), d_symbol_length(symbol_length), d_delay(delay),
d_phase(0), d_freq(0), d_avg(0)
{
+ glb_i = 0;
+ i_now = 0;
}
void
@@ -54,12 +56,15 @@
if(d_delay >= 0) {
nreqd = d_symbol_length * noutput_items + d_delay;
+ //fprintf(stderr, "forecast delay>=0\n");
}
else if((unsigned)abs(d_delay) > d_symbol_length) {
nreqd = d_symbol_length * noutput_items + (abs(d_delay) - noutput_items);
+ //fprintf(stderr, "forecast |delay|>symbol_length\n");
}
else {
nreqd = d_symbol_length * noutput_items;
+ // fprintf(stderr, "forecast else\n");
}
unsigned ninputs = ninput_items_required.size ();
@@ -83,53 +88,63 @@
unsigned int nproduced=0;
unsigned int i = 0;
- while(i < -(std::min((unsigned)1, d_delay))) {
- increment_loop((*theta++).real());
+ fprintf(stderr, "enter\n");
+ /*
+ while(i < -(std::min(0, d_delay))) {
+ increment_loop((theta[i]).real());
i++;
+ glb_i++;
}
-
- unsigned int lastindex = ninput_items[0] - std::max((unsigned)0, d_delay -
d_symbol_length);
+ */
+ unsigned int lastindex = ninput_items[0] - std::max(0, d_delay) -
d_symbol_length;
+
while(i < lastindex) {
found = false;
-
- // detect the peak of theta
- if(theta[i].real() > d_avg*0.25) {
+
+ if(theta[i].real() > d_avg*0.10) {
while((i < lastindex) && (!found)) {
- if(theta[i].real() < theta[i-1].real()) {
+ if(theta[i+1].real() < theta[i].real()) {
peak_index = i-1;
- d_freq = epsilon[peak_index].real();
+ d_freq = 0; //epsilon[peak_index].real();
found = true;
-
+ fprintf(stderr, "peak hit: %d \t theta: %f avg: %f freq: %f\n",
+ glb_i-i_now, theta[peak_index].real(), d_avg, d_freq);
+ i_now = glb_i;
//memcpy(&optr[nproduced*d_fft_size], &iptr[peak_index],
d_fft_size*sizeof(gr_complex));
nproduced++;
while(i < peak_index + d_symbol_length-1) {
gr_complex nco_out = gr_expj(-d_phase);
*optr++ = nco_out * iptr[i];
-
- increment_loop((*theta++).real());
+ increment_loop((theta[i]).real());
i++;
+ glb_i++;
}
}
else {
- increment_loop((*theta++).real());
+ increment_loop((theta[i]).real());
i++;
+ glb_i++;
}
}
}
else {
- increment_loop((*theta++).real());
+ increment_loop((theta[i]).real());
i++;
+ glb_i++;
}
}
+ fprintf(stderr, "exit\n");
+
consume_each(i);
return nproduced;
}
void gr_ofdm_sampler::increment_loop(float theta)
{
- float alpha = 0.001;
+ float alpha = 0.01;
d_phase += d_freq * (1.0/(2.0*M_PI));
d_avg = (alpha)*theta + (1-alpha)*d_avg;
+ // fprintf(stderr, "avg: %f\t theta: %f\n", d_avg, theta);
}
Modified:
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.h
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.h
2006-12-17 01:40:33 UTC (rev 4109)
+++
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.h
2006-12-17 05:51:54 UTC (rev 4110)
@@ -30,7 +30,7 @@
gr_ofdm_sampler_sptr gr_make_ofdm_sampler (unsigned int fft_length,
unsigned int symbol_length,
- unsigned int delay);
+ int delay);
/*!
* \brief does the rest of the OFDM stuff (fixme)
@@ -40,20 +40,23 @@
{
friend gr_ofdm_sampler_sptr gr_make_ofdm_sampler (unsigned int fft_length,
unsigned int symbol_length,
- unsigned int delay);
+ int delay);
gr_ofdm_sampler (unsigned int fft_length,
unsigned int symbol_length,
- unsigned int delay);
+ int delay);
private:
unsigned int d_fft_length;
unsigned int d_symbol_length;
- unsigned int d_delay;
+ int d_delay;
float d_phase;
float d_freq;
float d_avg;
+ unsigned int glb_i;
+ unsigned int i_now;
+
void increment_loop(float theta);
public:
Modified:
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.i
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.i
2006-12-17 01:40:33 UTC (rev 4109)
+++
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_sampler.i
2006-12-17 05:51:54 UTC (rev 4110)
@@ -22,10 +22,10 @@
GR_SWIG_BLOCK_MAGIC(gr,ofdm_sampler)
-gr_ofdm_sampler_sptr gr_make_ofdm_sampler (unsigned int fft_length, unsigned
int symbol_length, unsigned int delay);
+gr_ofdm_sampler_sptr gr_make_ofdm_sampler (unsigned int fft_length, unsigned
int symbol_length, int delay);
class gr_ofdm_sampler : public gr_sync_block
{
private:
- gr_ofdm_sampler (unsigned int fft_length, unsigned int symbol_length,
unsigned int delay);
+ gr_ofdm_sampler (unsigned int fft_length, unsigned int symbol_length, int
delay);
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4110 - gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general,
n4hy <=