Commit c1824f07 authored by Ben Wojtowicz's avatar Ben Wojtowicz

version 00.05

parent 007779dc
......@@ -7,4 +7,11 @@ v00.03 Octave release with support for PDSCH transmission and
reception for SIB1 encoding/decoding. This includes
turbo encoding/decoding.
v00.04 First release with C++ gnuradio support. Contains PSS
SSS, CRS, and PBCH reception for FDD in C++ for gnuradio.
\ No newline at end of file
SSS, CRS, and PBCH reception for FDD in C++ for gnuradio.
v00.05 C++ changes: Fixed bug in frequency offset removal,
added PDSCH reception for SIB1 decoding (including turbo
decoding).
Octave changes: Fixed bug in 3 antenna spacial multiplexing
(lte_layer_mapper). Fixed bug in 16QAM
(lte_modulation_mapper). Fixed parameter conversions in
SIB1 unpacking.
......@@ -73,9 +73,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
## .h file is sometimes built, but not always ... so that one has to
## be added manually by the including Makefile.am .
swig_built_sources += \
src/LTE_fdd_dl_fs.py \
src/LTE_fdd_dl_fs.cc
swig_built_sources += src/LTE_fdd_dl_fs.py src/LTE_fdd_dl_fs.cc
STD_SWIG_PYTHON_ARGS += -outdir src
......@@ -83,36 +81,36 @@ STD_SWIG_PYTHON_ARGS += -outdir src
## Makefile.am by setting the variable value there, then including
## Makefile.swig .
LTE_fdd_dl_fs_swiginclude_HEADERS = \
src/LTE_fdd_dl_fs.i \
LTE_fdd_dl_fs_swiginclude_HEADERS = \
src/LTE_fdd_dl_fs.i \
$(LTE_fdd_dl_fs_swiginclude_headers)
LTE_fdd_dl_fs_pylib_LTLIBRARIES = \
LTE_fdd_dl_fs_pylib_LTLIBRARIES = \
_LTE_fdd_dl_fs.la
_LTE_fdd_dl_fs_la_SOURCES = \
src/LTE_fdd_dl_fs.cc \
_LTE_fdd_dl_fs_la_SOURCES = \
src/LTE_fdd_dl_fs.cc \
$(LTE_fdd_dl_fs_la_swig_sources)
_LTE_fdd_dl_fs_la_LIBADD = \
_LTE_fdd_dl_fs_la_LIBADD = \
$(STD_SWIG_LA_LIB_ADD) \
$(LTE_fdd_dl_fs_la_swig_libadd)
_LTE_fdd_dl_fs_la_LDFLAGS = \
_LTE_fdd_dl_fs_la_LDFLAGS = \
$(STD_SWIG_LA_LD_FLAGS) \
$(LTE_fdd_dl_fs_la_swig_ldflags)
_LTE_fdd_dl_fs_la_CXXFLAGS = \
_LTE_fdd_dl_fs_la_CXXFLAGS = \
$(STD_SWIG_CXX_FLAGS) \
$(LTE_fdd_dl_fs_la_swig_cxxflags)
LTE_fdd_dl_fs_python_PYTHON = \
src/LTE_fdd_dl_fs.py \
LTE_fdd_dl_fs_python_PYTHON = \
src/LTE_fdd_dl_fs.py \
$(LTE_fdd_dl_fs_python)
## Entry rule for running SWIG
src/LTE_fdd_dl_fs.h src/LTE_fdd_dl_fs.py src/LTE_fdd_dl_fs.c: src/LTE_fdd_dl_fs.i
src/LTE_fdd_dl_fs.h src/LTE_fdd_dl_fs.py src/LTE_fdd_dl_fs.cc: src/LTE_fdd_dl_fs.i
## This rule will get called only when MAKE decides that one of the
## targets needs to be created or re-created, because:
##
......
......@@ -20,7 +20,7 @@ dnl the Free Software Foundation, Inc., 51 Franklin Street,
dnl Boston, MA 02110-1301, USA.
dnl
AC_INIT(openlte,0.0.1)
AC_INIT(openlte,0.5.0)
AC_PREREQ(2.57)
AC_CONFIG_AUX_DIR([.])
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -28,6 +28,8 @@
% Rev History: Ben Wojtowicz 10/28/2011 Created
% Ben Wojtowicz 01/29/2012 Fixed license statement
% Ben Wojtowicz 02/19/2012 Added newline to EOF
% Ben Wojtowicz 03/28/2012 Fixed a bug in 3 antenna spatial
% multiplexing
%
function [x] = lte_layer_mapper(d, v, style)
......@@ -96,7 +98,7 @@ function [x] = lte_layer_mapper(d, v, style)
for(n=0:M_layer_symb-1)
x(0+1, n+1) = d(0+1, n+1);
x(1+1, n+1) = d(1+1, 2*n+0+1);
x(2+1, n+1) = d(2+1, 2*n+1+1);
x(2+1, n+1) = d(1+1, 2*n+1+1);
endfor
endif
elseif(v == 4 && (N_cw == 1 || N_cw == 2))
......
......@@ -26,6 +26,7 @@
% Rev History: Ben Wojtowicz 10/28/2011 Created
% Ben Wojtowicz 01/29/2012 Fixed license statement
% Ben Wojtowicz 02/19/2012 Added newline to EOF
% Ben Wojtowicz 03/27/2012 Fixed a bug with 16QAM
%
function [symbs] = lte_modulation_mapper(bits, mod_type)
......@@ -70,7 +71,7 @@ function [symbs] = lte_modulation_mapper(bits, mod_type)
N_bits = N_bits + 4-mod(N_bits, 4);
endif
for(n=0:(N_bits/4)-1)
input = loc_bits(n*2+1)*8 + loc_bits(n*2+1+1)*4 + loc_bits(n*2+2+1)*2 + loc_bits(n*4+3+1);
input = loc_bits(n*4+1)*8 + loc_bits(n*4+1+1)*4 + loc_bits(n*4+2+1)*2 + loc_bits(n*4+3+1);
if(input == 0)
symbs(n+1) = +1/sqrt(10) + j*1/sqrt(10);
elseif(input == 1)
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment