[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4307 - in gnuradio/branches/developers/n4hy/ofdm2/gnu
From: |
n4hy |
Subject: |
[Commit-gnuradio] r4307 - in gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib: general io |
Date: |
Sun, 28 Jan 2007 11:23:05 -0700 (MST) |
Author: n4hy
Date: 2007-01-28 11:23:05 -0700 (Sun, 28 Jan 2007)
New Revision: 4307
Added:
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/io/gr_frame.h
Modified:
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/general/general.i
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/general/gr_fft_vcc.cc
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/general/gr_fft_vcc.h
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/general/gr_fft_vcc.i
Log:
adding capabilities to current trunk that were in ofdm but never added to trunk
Modified:
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/general/general.i
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/general/general.i
2007-01-28 17:41:58 UTC (rev 4306)
+++
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/general/general.i
2007-01-28 18:23:05 UTC (rev 4307)
@@ -87,6 +87,10 @@
#include <gr_probe_avg_mag_sqrd_c.h>
#include <gr_probe_avg_mag_sqrd_f.h>
#include <gr_probe_signal_f.h>
+#include <gr_ofdm_cyclic_prefixer.h>
+#include <gr_ofdm_bpsk_demapper.h>
+#include <gr_ofdm_bpsk_mapper.h>
+#include <gr_ofdm_sampler.h>
#include <gr_costas_loop_cc.h>
#include <gr_pa_2x2_phase_combiner.h>
#include <gr_kludge_copy.h>
@@ -176,6 +180,10 @@
%include "gr_probe_avg_mag_sqrd_c.i"
%include "gr_probe_avg_mag_sqrd_f.i"
%include "gr_probe_signal_f.i"
+%include "gr_probe_signal_f.i"
+%include "gr_ofdm_cyclic_prefixer.i"
+%include "gr_ofdm_bpsk_demapper.i"
+%include "gr_ofdm_bpsk_mapper.i"
%include "gr_costas_loop_cc.i"
%include "gr_pa_2x2_phase_combiner.i"
%include "gr_kludge_copy.i"
Modified:
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/general/gr_fft_vcc.cc
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/general/gr_fft_vcc.cc
2007-01-28 17:41:58 UTC (rev 4306)
+++
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/general/gr_fft_vcc.cc
2007-01-28 18:23:05 UTC (rev 4307)
@@ -30,16 +30,16 @@
#include <math.h>
gr_fft_vcc_sptr
-gr_make_fft_vcc (int fft_size, bool forward,const std::vector<float> window)
+gr_make_fft_vcc (int fft_size, bool forward,const std::vector<float> window,
bool shift)
{
- return gr_fft_vcc_sptr (new gr_fft_vcc (fft_size, forward, window));
+ return gr_fft_vcc_sptr (new gr_fft_vcc (fft_size, forward, window, shift));
}
-gr_fft_vcc::gr_fft_vcc (int fft_size, bool forward, const std::vector<float>
window)
+gr_fft_vcc::gr_fft_vcc (int fft_size, bool forward, const std::vector<float>
window, bool shift)
: gr_sync_block ("fft_vcc",
gr_make_io_signature (1, 1, fft_size * sizeof (gr_complex)),
gr_make_io_signature (1, 1, fft_size * sizeof (gr_complex))),
- d_fft_size(fft_size)
+ d_fft_size(fft_size), d_forward(forward), d_shift(shift)
{
d_fft = new gri_fft_complex (d_fft_size, forward);
@@ -66,27 +66,43 @@
int count = 0;
while (count++ < noutput_items){
-
+
// copy input into optimally aligned buffer
-
+
if (d_window.size()){
gr_complex *dst = d_fft->get_inbuf();
for (unsigned int i = 0; i < d_fft_size; i++) // apply window
dst[i] = in[i] * d_window[i];
}
- else
- memcpy (d_fft->get_inbuf(), in, input_data_size);
-
+ else {
+ if(!d_forward && d_shift) { // apply an ifft shift on the data
+ gr_complex *dst = d_fft->get_inbuf();
+ unsigned int len = (unsigned int)(floor(d_fft_size/2.0)); // half
length of complex array
+ memcpy(&dst[0], &in[len], sizeof(gr_complex)*(d_fft_size - len));
+ memcpy(&dst[d_fft_size - len], &in[0], sizeof(gr_complex)*len);
+ }
+ else {
+ memcpy (d_fft->get_inbuf(), in, input_data_size);
+ }
+ }
+
// compute the fft
d_fft->execute ();
-
- // cpoy result to our output
- memcpy (out, d_fft->get_outbuf (), output_data_size);
-
+
+ // copy result to our output
+ if(d_forward && d_shift) { // apply a fft shift on the data
+ unsigned int len = (unsigned int)(ceil(d_fft_size/2.0));
+ memcpy(&out[0], &d_fft->get_outbuf()[len],
sizeof(gr_complex)*(d_fft_size - len));
+ memcpy(&out[d_fft_size - len], &d_fft->get_outbuf()[0],
sizeof(gr_complex)*len);
+ }
+ else {
+ memcpy (out, d_fft->get_outbuf (), output_data_size);
+ }
+
in += d_fft_size;
out += d_fft_size;
}
-
+
return noutput_items;
}
@@ -100,3 +116,18 @@
else
return false;
}
+
+/*
+fftshift
+
+ for(i=0; i < ceil(d_occupied_carriers/2.0); i++) {
+ unsigned int k=ceil(d_occupied_carriers/2.0);
+ out[i] = gr_complex(-1+2*in[i+k],0);
+ }
+ for(; i < d_vlen - ceil(d_occupied_carriers/2.0); i++) {
+ out[i]=gr_complex(0,0);
+ }
+ for(unsigned int j=0;i<d_vlen;i++,j++) {
+ out[i]= gr_complex((-1+2*in[j]),0);
+ }
+*/
Modified:
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/general/gr_fft_vcc.h
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/general/gr_fft_vcc.h
2007-01-28 17:41:58 UTC (rev 4306)
+++
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/general/gr_fft_vcc.h
2007-01-28 18:23:05 UTC (rev 4307)
@@ -31,7 +31,7 @@
typedef boost::shared_ptr<gr_fft_vcc> gr_fft_vcc_sptr;
gr_fft_vcc_sptr
-gr_make_fft_vcc (int fft_size, bool forward, const std::vector<float> window);
+gr_make_fft_vcc (int fft_size, bool forward, const std::vector<float> window,
bool shift=false);
/*!
* \brief Compute forward or reverse FFT. complex vector in / complex vector
out.
@@ -41,13 +41,15 @@
class gr_fft_vcc : public gr_sync_block
{
friend gr_fft_vcc_sptr
- gr_make_fft_vcc (int fft_size, bool forward, const std::vector<float>
window);
+ gr_make_fft_vcc (int fft_size, bool forward, const std::vector<float>
window, bool shift);
unsigned int d_fft_size;
std::vector<float> d_window;
gri_fft_complex *d_fft;
+ bool d_forward;
+ bool d_shift;
- gr_fft_vcc (int fft_size, bool forward, const std::vector<float> window);
+ gr_fft_vcc (int fft_size, bool forward, const std::vector<float> window,
bool shift);
public:
~gr_fft_vcc ();
Modified:
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/general/gr_fft_vcc.i
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/general/gr_fft_vcc.i
2007-01-28 17:41:58 UTC (rev 4306)
+++
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/general/gr_fft_vcc.i
2007-01-28 18:23:05 UTC (rev 4307)
@@ -23,12 +23,12 @@
GR_SWIG_BLOCK_MAGIC(gr, fft_vcc)
gr_fft_vcc_sptr
-gr_make_fft_vcc (int fft_size, bool forward, const std::vector<float> window);
+gr_make_fft_vcc (int fft_size, bool forward, const std::vector<float> window,
bool shift=false);
class gr_fft_vcc : public gr_sync_block
{
protected:
- gr_fft_vcc (int fft_size, bool forward, const std::vector<float> window);
+ gr_fft_vcc (int fft_size, bool forward, const std::vector<float> window,
bool shift);
public:
bool set_window(const std::vector<float> window);
Added:
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/io/gr_frame.h
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/io/gr_frame.h
(rev 0)
+++ gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/io/gr_frame.h
2007-01-28 18:23:05 UTC (rev 4307)
@@ -0,0 +1,41 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_FRAME_H
+#define INCLUDED_GR_FRAME_H
+
+#include <vector>
+
+class gr_frame
+{
+ public:
+ gr_frame(unsigned int mtu)
+ : mtu(mtu), length(0)
+ { }
+
+ unsigned int mtu;
+ unsigned int length;
+ unsigned char data[];
+};
+
+#endif
+
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4307 - in gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib: general io,
n4hy <=