[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r7057 - in gnuradio/branches/developers/trondeau/ofdm2
|
From: |
trondeau |
|
Subject: |
[Commit-gnuradio] r7057 - in gnuradio/branches/developers/trondeau/ofdm2: gnuradio-core/src/lib/general gnuradio-core/src/lib/gengen gnuradio-core/src/python/gnuradio/blks2impl gnuradio-examples/python/ofdm |
|
Date: |
Thu, 29 Nov 2007 14:54:44 -0700 (MST) |
Author: trondeau
Date: 2007-11-29 14:54:44 -0700 (Thu, 29 Nov 2007)
New Revision: 7057
Added:
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/gr_threshold_detector_XX.cc.t
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/gr_threshold_detector_XX.h.t
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/gr_threshold_detector_XX.i.t
Modified:
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.h
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.i
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/Makefile.am
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/Makefile.gen
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/generate_common.py
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/gengen_generated.i
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-examples/python/ofdm/plot_ofdm.m
Log:
wip: changes to PLL initialization, moving towards new threshold detector.
Modified:
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
===================================================================
---
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
2007-11-29 21:47:42 UTC (rev 7056)
+++
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
2007-11-29 21:54:44 UTC (rev 7057)
@@ -103,7 +103,6 @@
gr_complex carrier;
carrier=gr_expj(d_phase);
- std::cout << "carrier " << carrier << std::endl;
gr_complex accum_error = 0.0;
while(i < d_occupied_carriers) {
@@ -154,12 +153,12 @@
//std::cerr << "accum_error " << accum_error << std::endl;
float angle = arg(accum_error);
+
d_freq = d_freq - d_freq_gain*angle;
d_phase = d_phase + d_freq - d_phase_gain*angle;
if (d_phase >= 2*M_PI) d_phase -= 2*M_PI;
if (d_phase <0) d_phase += 2*M_PI;
-
-
+
std::cerr << angle << "\t" << d_freq << "\t" << d_phase << "\t" << std::endl;
return bytes_produced;
}
@@ -168,23 +167,25 @@
gr_ofdm_frame_sink_sptr
gr_make_ofdm_frame_sink(const std::vector<gr_complex> &sym_position,
const std::vector<unsigned char> &sym_value_out,
- gr_msg_queue_sptr target_queue, unsigned int
occupied_carriers)
+ gr_msg_queue_sptr target_queue, unsigned int
occupied_carriers,
+ float phase_gain, float freq_gain)
{
return gr_ofdm_frame_sink_sptr(new gr_ofdm_frame_sink(sym_position,
sym_value_out,
- target_queue,
occupied_carriers));
+ target_queue,
occupied_carriers,
+ phase_gain, freq_gain));
}
gr_ofdm_frame_sink::gr_ofdm_frame_sink(const std::vector<gr_complex>
&sym_position,
const std::vector<unsigned char>
&sym_value_out,
- gr_msg_queue_sptr target_queue, unsigned
int occupied_carriers)
+ gr_msg_queue_sptr target_queue, unsigned
int occupied_carriers,
+ float phase_gain, float freq_gain)
: gr_sync_block ("ofdm_frame_sink",
gr_make_io_signature2 (2, 2,
sizeof(gr_complex)*occupied_carriers, sizeof(char)),
gr_make_io_signature (0, 0, 0)),
d_target_queue(target_queue), d_occupied_carriers(occupied_carriers),
d_byte_offset(0), d_partial_byte(0),
- d_resid(0), d_nresid(0),d_phase(0),d_freq(0),
- d_freq_gain(0.25*.25*.25),d_phase_gain(0.25),
+ d_resid(0),
d_nresid(0),d_phase(0),d_freq(0),d_phase_gain(phase_gain),d_freq_gain(freq_gain),
d_eq_gain(0.05)
{
d_bytes_out = new unsigned char[d_occupied_carriers];
@@ -232,7 +233,9 @@
if (VERBOSE)
fprintf(stderr,">>> Entering state machine\n");
- if(d_state != STATE_HAVE_HEADER) {
+ if(sig[0]) {
+ if (VERBOSE)
+ fprintf(stderr,"Flag Signal Triggered, reseting PLL\n");
d_freq = 0.0;
d_phase = 0.0;
}
Modified:
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.h
===================================================================
---
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.h
2007-11-29 21:47:42 UTC (rev 7056)
+++
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.h
2007-11-29 21:54:44 UTC (rev 7057)
@@ -32,7 +32,8 @@
gr_ofdm_frame_sink_sptr
gr_make_ofdm_frame_sink (const std::vector<gr_complex> &sym_position,
const std::vector<unsigned char> &sym_value_out,
- gr_msg_queue_sptr target_queue, unsigned int
occupied_tones);
+ gr_msg_queue_sptr target_queue, unsigned int
occupied_tones,
+ float phase_gain=0.25, float freq_gain=0.25*0.25/4.0);
/*!
* \brief Takes an OFDM symbol in, demaps it into bits of 0's and 1's, packs
@@ -47,7 +48,8 @@
friend gr_ofdm_frame_sink_sptr
gr_make_ofdm_frame_sink (const std::vector<gr_complex> &sym_position,
const std::vector<unsigned char> &sym_value_out,
- gr_msg_queue_sptr target_queue, unsigned int
occupied_tones);
+ gr_msg_queue_sptr target_queue, unsigned int
occupied_tones,
+ float phase_gain, float freq_gain);
private:
enum state_t {STATE_SYNC_SEARCH, STATE_HAVE_SYNC, STATE_HAVE_HEADER};
@@ -80,14 +82,15 @@
unsigned int d_nresid;
float d_phase;
float d_freq;
+ float d_phase_gain;
float d_freq_gain;
- float d_phase_gain;
float d_eq_gain;
protected:
gr_ofdm_frame_sink(const std::vector<gr_complex> &sym_position,
const std::vector<unsigned char> &sym_value_out,
- gr_msg_queue_sptr target_queue, unsigned int
occupied_tones);
+ gr_msg_queue_sptr target_queue, unsigned int
occupied_tones,
+ float phase_gain, float freq_gain);
void enter_search();
void enter_have_sync();
Modified:
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.i
===================================================================
---
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.i
2007-11-29 21:47:42 UTC (rev 7056)
+++
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.i
2007-11-29 21:54:44 UTC (rev 7057)
@@ -25,14 +25,16 @@
gr_ofdm_frame_sink_sptr
gr_make_ofdm_frame_sink(const std::vector<gr_complex> &sym_position,
const std::vector<unsigned char> &sym_value_out,
- gr_msg_queue_sptr target_queue, unsigned int
occupied_tones);
+ gr_msg_queue_sptr target_queue, unsigned int
occupied_tones,
+ float phase_gain=0.25, float freq_gain=0.25*0.25/4);
class gr_ofdm_frame_sink : public gr_sync_block
{
protected:
gr_ofdm_frame_sink(const std::vector<gr_complex> &sym_position,
const std::vector<unsigned char> &sym_value_out,
- gr_msg_queue_sptr target_queue, unsigned int
occupied_tones);
+ gr_msg_queue_sptr target_queue, unsigned int
occupied_tones,
+ float phase_gain, float freq_gain);
public:
~gr_ofdm_frame_sink();
Modified:
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
---
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/Makefile.am
2007-11-29 21:47:42 UTC (rev 7056)
+++
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/Makefile.am
2007-11-29 21:54:44 UTC (rev 7057)
@@ -86,6 +86,9 @@
gr_sub_XX.cc.t \
gr_sub_XX.h.t \
gr_sub_XX.i.t \
+ gr_threshold_detector_XX.cc.t \
+ gr_threshold_detector_XX.h.t \
+ gr_threshold_detector_XX.i.t \
gr_unpacked_to_packed_XX.cc.t \
gr_unpacked_to_packed_XX.h.t \
gr_unpacked_to_packed_XX.i.t \
Modified:
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/Makefile.gen
===================================================================
---
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/Makefile.gen
2007-11-29 21:47:42 UTC (rev 7056)
+++
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/Makefile.gen
2007-11-29 21:54:44 UTC (rev 7057)
@@ -77,6 +77,9 @@
gr_sub_ff.h \
gr_sub_ii.h \
gr_sub_ss.h \
+ gr_threshold_detector_fb.h \
+ gr_threshold_detector_ib.h \
+ gr_threshold_detector_sb.h \
gr_unpacked_to_packed_bb.h \
gr_unpacked_to_packed_ii.h \
gr_unpacked_to_packed_ss.h \
@@ -167,6 +170,9 @@
gr_sub_ff.i \
gr_sub_ii.i \
gr_sub_ss.i \
+ gr_threshold_detector_fb.i \
+ gr_threshold_detector_ib.i \
+ gr_threshold_detector_sb.i \
gr_unpacked_to_packed_bb.i \
gr_unpacked_to_packed_ii.i \
gr_unpacked_to_packed_ss.i \
@@ -257,6 +263,9 @@
gr_sub_ff.cc \
gr_sub_ii.cc \
gr_sub_ss.cc \
+ gr_threshold_detector_fb.cc \
+ gr_threshold_detector_ib.cc \
+ gr_threshold_detector_sb.cc \
gr_unpacked_to_packed_bb.cc \
gr_unpacked_to_packed_ii.cc \
gr_unpacked_to_packed_ss.cc \
Modified:
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/generate_common.py
===================================================================
---
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/generate_common.py
2007-11-29 21:47:42 UTC (rev 7056)
+++
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/generate_common.py
2007-11-29 21:54:44 UTC (rev 7057)
@@ -61,7 +61,8 @@
('gr_sample_and_hold_XX', ('bb','ss','ii','ff')),
('gr_argmax_XX', ('fs','is','ss')),
('gr_max_XX', ('ff','ii','ss')),
- ('gr_peak_detector_XX', ('fb','ib','sb'))
+ ('gr_peak_detector_XX', ('fb','ib','sb')),
+ ('gr_threshold_detector_XX', ('fb','ib','sb'))
)
Modified:
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/gengen_generated.i
===================================================================
---
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/gengen_generated.i
2007-11-29 21:47:42 UTC (rev 7056)
+++
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/gengen_generated.i
2007-11-29 21:54:44 UTC (rev 7057)
@@ -77,6 +77,9 @@
#include <gr_sub_ff.h>
#include <gr_sub_ii.h>
#include <gr_sub_ss.h>
+#include <gr_threshold_detector_fb.h>
+#include <gr_threshold_detector_ib.h>
+#include <gr_threshold_detector_sb.h>
#include <gr_unpacked_to_packed_bb.h>
#include <gr_unpacked_to_packed_ii.h>
#include <gr_unpacked_to_packed_ss.h>
@@ -167,6 +170,9 @@
%include <gr_sub_ff.i>
%include <gr_sub_ii.i>
%include <gr_sub_ss.i>
+%include <gr_threshold_detector_fb.i>
+%include <gr_threshold_detector_ib.i>
+%include <gr_threshold_detector_sb.i>
%include <gr_unpacked_to_packed_bb.i>
%include <gr_unpacked_to_packed_ii.i>
%include <gr_unpacked_to_packed_ss.i>
Added:
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/gr_threshold_detector_XX.cc.t
===================================================================
---
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/gr_threshold_detector_XX.cc.t
(rev 0)
+++
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/gr_threshold_detector_XX.cc.t
2007-11-29 21:54:44 UTC (rev 7057)
@@ -0,0 +1,64 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007 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 3, 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.
+ */
+
+// @WARNING@
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <@address@hidden>
+#include <gr_io_signature.h>
+
address@hidden@
address@hidden@ (float threshold)
+{
+ return @SPTR_NAME@ (new @NAME@ (threshold));
+}
+
address@hidden@::@NAME@ (float threshold)
+ : gr_sync_block ("@BASE_NAME@",
+ gr_make_io_signature (1, 1, sizeof (@I_TYPE@)),
+ gr_make_io_signature (1, 1, sizeof (char))),
+ d_threshold(threshold), d_found(0)
+{
+}
+
+int
address@hidden@::work (int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+{
+ int i = 0;
+ @I_TYPE@ *iptr = (@I_TYPE@ *) input_items[0];
+ char *optr = (char *) output_items[0];
+
+ memset(optr, 0, noutput_items*sizeof(char));
+
+ while(i < noutput_items) {
+ if(iptr[i] > d_threshold) {
+ optr[i];
+ }
+ i++;
+ }
+ return noutput_items;
+}
Added:
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/gr_threshold_detector_XX.h.t
===================================================================
---
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/gr_threshold_detector_XX.h.t
(rev 0)
+++
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/gr_threshold_detector_XX.h.t
2007-11-29 21:54:44 UTC (rev 7057)
@@ -0,0 +1,71 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007 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 3, 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.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <gr_sync_block.h>
+
+class @NAME@;
+typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
+
address@hidden@ address@hidden@ (float threshold = 0.25);
+
+/*!
+ * \brief Detect the peak of a signal
+ * \ingroup block
+ *
+ * If a peak is detected above a set threadhold, this block outputs a 1,
+ * or it outputs 0's.
+ *
+ * \param threshold threshold above which the detector is signaled
+ */
+class @NAME@ : public gr_sync_block
+{
+ friend @SPTR_NAME@ address@hidden@ (float threshold);
+
+ @NAME@ (float threshold);
+
+ private:
+ float d_threshold;
+ unsigned char d_found;
+
+ public:
+
+ /*! \brief Set the threshold value
+ * \param thr new threshold factor
+ */
+ void set_threshold(float thr) { d_threshold = thr; }
+
+ /*! \brief Get the threshold value
+ * \return threshold factor
+ */
+ float threshold() { return d_threshold; }
+
+ int work (int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+};
+
+#endif
Added:
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/gr_threshold_detector_XX.i.t
===================================================================
---
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/gr_threshold_detector_XX.i.t
(rev 0)
+++
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/gengen/gr_threshold_detector_XX.i.t
2007-11-29 21:54:44 UTC (rev 7057)
@@ -0,0 +1,37 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007 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 3, 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.
+ */
+
+// @WARNING@
+
+GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@)
+
address@hidden@ address@hidden@ (float threshold = 0.25);
+
+class @NAME@ : public gr_sync_block
+{
+ private:
+ @NAME@ (float threshold);
+
+ public:
+ void set_threshold(float thr) { d_threshold = thr; }
+ float threshold() { return d_threshold; }
+};
Modified:
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py
===================================================================
---
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py
2007-11-29 21:47:42 UTC (rev 7056)
+++
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py
2007-11-29 21:54:44 UTC (rev 7057)
@@ -237,7 +237,8 @@
#print rotated_const
self.ofdm_demod = gr.ofdm_frame_sink(rotated_const, range(arity),
self._rcvd_pktq,
- self._occupied_tones)
+ self._occupied_tones,
+ 0.25, 0.25*.25/4.0)
self.connect(self, self.ofdm_recv)
self.connect((self.ofdm_recv, 0), (self.ofdm_demod, 0))
Modified:
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
===================================================================
---
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
2007-11-29 21:47:42 UTC (rev 7056)
+++
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
2007-11-29 21:54:44 UTC (rev 7057)
@@ -88,6 +88,7 @@
#ML measurements input to sampler block and detect
self.sub1 = gr.add_const_ff(-1)
self.pk_detect = gr.peak_detector_fb(0.2, 0.25, 30, 0.0005)
+ #self.pk_detect = gr.threshold_detector_fb(0.5)
self.regen = gr.regenerate_bb(symbol_length)
self.sampler = gr.ofdm_sampler(fft_length,symbol_length)
Modified:
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-examples/python/ofdm/plot_ofdm.m
===================================================================
---
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-examples/python/ofdm/plot_ofdm.m
2007-11-29 21:47:42 UTC (rev 7056)
+++
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-examples/python/ofdm/plot_ofdm.m
2007-11-29 21:54:44 UTC (rev 7057)
@@ -7,7 +7,7 @@
fftc_split = split_vect(fftc, fft_size);
figure(1)
-set(gcf, 'Position', [50 50 1000 600]);
+#set(gcf, 'Position', [50 50 1000 600]);
a = size(ofdm_split);
if nargin == 3
@@ -25,36 +25,36 @@
subplot(2,2,1)
plot(real(x), imag(x), 'bo')
- set(gca, 'FontSize', 30, 'FontWeight', 'Bold');
+ #set(gca, 'FontSize', 30, 'FontWeight', 'Bold');
axis([-1.5, 1.5, -1.5, 1.5])
- title('I&Q Constellation', 'FontSize', 36);
- xlabel('Inphase', 'FontSize', 32);
- ylabel('Quadrature', 'FontSize', 32);
+ #title('I&Q Constellation', 'FontSize', 36);
+ #xlabel('Inphase', 'FontSize', 32);
+ #ylabel('Quadrature', 'FontSize', 32);
subplot(2,2,3)
plot(angle(x*j), 'bo')
- set(gca, 'FontSize', 30, 'FontWeight', 'Bold');
+ #set(gca, 'FontSize', 30, 'FontWeight', 'Bold');
axis([0, occ_tones, -3.5, 3.5])
- title('Equalized Symbol Angle', 'FontSize', 36);
- xlabel('Bin Number (Occ. Tones)', 'FontSize', 32);
- ylabel('Symbol Angle', 'FontSize', 32);
+ #title('Equalized Symbol Angle', 'FontSize', 36);
+ #xlabel('Bin Number (Occ. Tones)', 'FontSize', 32);
+ #ylabel('Symbol Angle', 'FontSize', 32);
subplot(2,2,2)
plot(angle(y*j), 'bo')
- set(gca, 'FontSize', 30, 'FontWeight', 'Bold');
+ #set(gca, 'FontSize', 30, 'FontWeight', 'Bold');
axis([0, fft_size, -3.5, 3.5])
- title('Unequalized Symbol Angle', 'FontSize', 36);
- xlabel('Bin Number (FFT Size)', 'FontSize', 32);
- ylabel('Symbol Angle', 'FontSize', 32);
+ #title('Unequalized Symbol Angle', 'FontSize', 36);
+ #xlabel('Bin Number (FFT Size)', 'FontSize', 32);
+ #ylabel('Symbol Angle', 'FontSize', 32);
Y = 20*log10(abs(y) ./ max(abs(y)));
subplot(2,2,4)
plot(Y, 'b-')
- set(gca, 'FontSize', 30, 'FontWeight', 'Bold');
+ #set(gca, 'FontSize', 30, 'FontWeight', 'Bold');
axis([0, fft_size, -50, 1]);
- title('Frequency Domain of Unequalized Rx', 'FontSize', 36);
- xlabel('Bin Number (FFT Size)', 'FontSize', 32);
- ylabel('Power (dB)', 'FontSize', 32);
+ #title('Frequency Domain of Unequalized Rx', 'FontSize', 36);
+ #xlabel('Bin Number (FFT Size)', 'FontSize', 32);
+ #ylabel('Power (dB)', 'FontSize', 32);
% N = 20*log10(var(abs(x)-1))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r7057 - in gnuradio/branches/developers/trondeau/ofdm2: gnuradio-core/src/lib/general gnuradio-core/src/lib/gengen gnuradio-core/src/python/gnuradio/blks2impl gnuradio-examples/python/ofdm,
trondeau <=