diff options
author | trondeau <trondeau@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-01-02 17:35:35 +0000 |
---|---|---|
committer | trondeau <trondeau@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-01-02 17:35:35 +0000 |
commit | ce16514534e5d7ebbc4fe46e2b09a25ccc5fdafd (patch) | |
tree | 2d9ae1179cb26f213125accabaea8eb05d63f109 /gnuradio-core/src/utils/gr_read_binary.py | |
parent | 481636b7be1462dc9f1909ac4700002af63dc8c0 (diff) |
Merging ofdm2 branch -r7047:7321 into trunk. This updates the OFDM code to hier_block2 in blks2impl and removed from blksimpl. The new code
implements a decision feedback sync loop to lock the phase/freq, removes two unnecessary premables and performs frame sync and equalization off
single preamble symbol. Also adds/updates Python plotting tools and a branchless clip algorithm in gr_math.h.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7324 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src/utils/gr_read_binary.py')
-rw-r--r-- | gnuradio-core/src/utils/gr_read_binary.py | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/gnuradio-core/src/utils/gr_read_binary.py b/gnuradio-core/src/utils/gr_read_binary.py deleted file mode 100644 index ae91b44806..0000000000 --- a/gnuradio-core/src/utils/gr_read_binary.py +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env python -# -# 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. -# - -import struct - -def read_binary(filename, type): - n = struct.calcsize(type) - f = open(filename, 'rb') - out = list() - lin = f.read(n) - while(len(lin) == n): - cp = struct.unpack(type, lin) - out.append(cp) - lin = f.read(n) - return out - -def read_char_binary(filename): - return read_binary(filename, 'c') - -def read_float_binary(filename): - return read_binary(filename, 'f') - -def read_int_binary(filename): - return read_binary(filename, 'i') - -def read_short_binary(filename): - return read_binary(filename, 'h') - -def read_complex_binary(filename): - n = struct.calcsize('ff') - f = open(filename, 'rb') - re = list() - im = list() - lin = f.read(n) - while(len(lin) == n): - cp = struct.unpack('ff', lin) - re.append(cp[0]) - im.append(cp[1]) - lin = f.read(n) - return (re, im) - - |