[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4550 - in gnuradio/branches/developers/n4hy/ofdm/gnur
From: |
trondeau |
Subject: |
[Commit-gnuradio] r4550 - in gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib: general gengen |
Date: |
Tue, 20 Feb 2007 15:42:34 -0700 (MST) |
Author: trondeau
Date: 2007-02-20 15:42:34 -0700 (Tue, 20 Feb 2007)
New Revision: 4550
Modified:
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.h.t
Log:
fixing bug introduced in last (accidental) checkin
Modified:
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc
2007-02-20 22:24:06 UTC (rev 4549)
+++
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc
2007-02-20 22:42:34 UTC (rev 4550)
@@ -119,7 +119,7 @@
// Ran out of data to put in symbols
if(d_packet_offset == pkt_length) {
while(i < d_vlen-zeros_on_right) {
- out[i++] = gr_complex(0,0);
+ out[i++] = gr_complex(1,0);
}
d_packet_offset = 0;
Modified:
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
2007-02-20 22:24:06 UTC (rev 4549)
+++
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
2007-02-20 22:42:34 UTC (rev 4550)
@@ -39,7 +39,7 @@
: gr_sync_block ("@BASE_NAME@",
gr_make_io_signature (1, 1, sizeof (@I_TYPE@)),
gr_make_io_signature (1, 1, sizeof (@O_TYPE@))),
- d_avg(0)
+ d_avg(0), d_found(0)
{
set_history(1); // so we can look behind us
}
@@ -52,7 +52,7 @@
@I_TYPE@ *iptr = (@I_TYPE@ *) input_items[0];
@O_TYPE@ *optr = (@O_TYPE@ *) output_items[0];
- unsigned char found = 0;
+ //unsigned char found = 0;
float alpha = 0.01;
for(int i=0;i<noutput_items;i++) {
d_avg = (alpha)*iptr[i] + (1-alpha)*d_avg;
@@ -60,24 +60,27 @@
for (int i = 1; i < noutput_items; i++){
if( (iptr[i-1] > d_avg*0.25) && (iptr[i-1] > iptr[i])) {
- if(found) {
- found = 1;
+ if(d_found==0) {
+ d_found = 1;
for(int j = 0; j < 10; j++) {
if(iptr[i+j] > iptr[i]) {
- found = 0;
+ d_found = 0;
}
}
- if(found) {
+ if(d_found) {
optr[i-1] = (@O_TYPE@)1;
}
else {
optr[i-1] = (@O_TYPE@)0;
}
}
- optr[i-1] = (@O_TYPE@)0;
+ else {
+ optr[i-1] = (@O_TYPE@)0;
+ }
}
else {
+ d_found = 0;
optr[i-1] = (@O_TYPE@)0;
}
}
Modified:
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.h.t
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.h.t
2007-02-20 22:24:06 UTC (rev 4549)
+++
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.h.t
2007-02-20 22:42:34 UTC (rev 4550)
@@ -47,6 +47,7 @@
private:
float d_avg;
+ unsigned char d_found;
public:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4550 - in gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib: general gengen,
trondeau <=