Commit Graph
366 Commits
Author SHA1 Message Date
lukashov 20cc8bc9f6 Fixing FDD for TM4 2016-03-03 16:35:50 +01:00
lukashov 1843ef7928 Merge branch 'develop' into feature-59-tm4
Conflicts:
	openair1/PHY/TOOLS/lte_phy_scope.c
	openair1/SIMULATION/LTE_PHY/dlsim.c
2016-03-02 16:19:19 +01:00
lukashov c1f4953008 Fixing new modulation tables for TM4 and TM6. Now all modulation orders and combinations work and the maginutes are at appropriate level. 2016-03-02 11:02:05 +01:00
Florian Kaltenberger b46c6b700b previous bugfix for dl_power_off in TM3 was incomplete 2016-03-01 12:08:59 +01:00
Florian Kaltenberger 7f645f9f34 Merge branch 'feature-59-tm4' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-59-tm4 2016-03-01 11:41:04 +01:00
Florian Kaltenberger d988214e01 debug info for power control 2016-03-01 11:40:34 +01:00
lukashov 04b07f8bd3 Fixing bug with dl_offset in TM3. Always must be 1. 2016-03-01 11:08:45 +01:00
lukashov 0022ccf790 Revert "Adding different shifts for CWs coming from dif constellations"
Streams must have the same shift, otherwise error floor. O
This reverts commit dbf587a515.
2016-02-29 12:32:51 +01:00
lukashov dbf587a515 Adding different shifts for CWs coming from dif constellations 2016-02-22 23:39:36 +01:00
lukashov 193ab717fa Fix channel level 2016-02-22 22:49:34 +01:00
lukashov f922b493a6 Bug in modulation.c with new qam tables. Error floor for 16QAM and 64QAM. Going back to old ones till fix the bug. 2016-02-22 22:43:47 +01:00
Florian Kaltenberger 8984944444 fixing a bug in cmult_vv, removing unused code. 2016-02-19 11:47:25 +01:00
kaltenbe d9ec978c9c Merge remote-tracking branch 'origin/develop' into enhancement-74-SoDeRa
Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	targets/ARCH/COMMON/common_lib.c
	targets/ARCH/COMMON/common_lib.h
	targets/RT/USER/lte-softmodem.c
2016-02-16 15:45:12 +01:00
kaltenbe 92987e4c9b small modifications in lms_lib.cpp
added configuration file for lowband of SoDeRa
2016-02-14 20:31:38 +01:00
kaltenbe 051a4e2aa5 added Si5351C directory
changes in lmslib.cpp
2016-02-11 10:04:36 +01:00
Rohit Gupta eb690c8919 merge develop + resolve conflicts 2016-02-10 19:24:13 +01:00
Aikaterini d209fe5dd8 merge develop into branch 2016-02-03 19:27:05 +01:00
Rohit Gupta a5f21b0488 Merge branch 'develop' into feature-43-doxygen 2016-02-02 13:06:31 +01:00
Florian Kaltenberger 8bbcfbe5cb changing LOG_E to LOG_W in rx_pucch_emul when UE is not found (this might happen during attach procedure but is ok since nothing will happen) 2016-02-01 14:18:00 +01:00
lukashov bca0b40679 Small changes in precoder to max MI 1stream 2016-01-24 16:44:33 +01:00
lukashov 9410e89310 Small change in measurements: while calculating pmi take into account ch_12[1] as well. 2016-01-22 11:52:51 +01:00
lukashov c453384e97 Small improvement in correlation 2016-01-20 16:29:07 +01:00
lukashov c7d2bbe513 avg_0[0] = avg_0[0] + avg_0[1];
avg_1[0] = avg_1[0] + avg_1[1];
Diff per-layer shift
2016-01-20 16:08:54 +01:00
lukashov 56c660dbe9 Undoing previos commit. Previous commit is kept to generate TM4 PCE AWGN plots with the right precoder. 2016-01-18 22:55:47 +01:00
lukashov e60c6e3f84 This commit is to generate TM4 awgn with perfect channel estimation with the right precoder.
To be reverted after.
2016-01-18 21:09:59 +01:00
lukashov dcf4473284 Coming back to
avg_0[0] = avg_0[0] + avg_0[1];
  avg_1[0] = avg_1[0] + avg_1[1];
  avg_0[0] = max (avg_0[0], avg_1[0]);
  avg_1[0] = avg_0[0];
2016-01-18 18:04:54 +01:00
aikaterini.trilyraki a384b91e91 pull from develop 2016-01-18 15:16:02 +01:00
Rohit Gupta 043e771ed7 resolve conficts due to merge from develop 2016-01-17 20:18:44 +01:00
lukashov b6ac32b0db Chosing the max channel among the four and passing same shift everywhere. 2016-01-17 16:50:53 +01:00
lukashov 071db178eb avg_0[0] = max(avg_0[0],avg_0[1]);
avg_1[0] = max(avg_1[0],avg_1[1]);
2016-01-17 02:29:14 +01:00
lukashov f703b8e1c5 Playing with average channel level: avg_0[0] = max(avg_0[0],avg_1[0]);
avg_1[0] = max(avg_0[1],avg_1[1]); taking this into account in correlation.
2016-01-17 00:39:39 +01:00
lukashov f415d7118d Applying output shift on per-antenna basis in demodulation 2016-01-16 12:49:58 +01:00
Rohit Gupta 9ab924399c Merge branch 'develop' into feature-38-bladerf
Conflicts:
	cmake_targets/CMakeLists.txt
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c
2016-01-15 12:36:31 +01:00
lukashov 98b91e1d4c Improving previous commit 2016-01-14 22:14:24 +01:00
lukashov 7b5165c70a Small change in log2_approx in demodulation 2016-01-14 21:05:56 +01:00
lukashov b00f64ed56 1)Removing dlsch_dual_stream_correlation
2) Fixing bug in mrc_TM4 - removing loop over tx antennas.
2016-01-14 10:55:49 +01:00
lukashov 10e8d30699 NULL pointer 2016-01-13 23:54:25 +01:00
lukashov fa315a3115 Fixing bug in passing arguments to dlsch_dual_stream_correlation, introducing dlsch_dual_stream_correlation_opposite 2016-01-13 18:54:03 +01:00
lukashov e2d13c9762 Revert "Experimanetal change in dlsch_channel_commensation_TM34. Will not work for more than 2 antennas."
This reverts commit cbd30e62fa.
2016-01-13 14:43:47 +01:00
lukashov cbd30e62fa Experimanetal change in dlsch_channel_commensation_TM34. Will not work for more than 2 antennas.
Testing.
2016-01-13 12:17:29 +01:00
lukashov 5e1e8a58a7 Fixing previous commit 2016-01-11 16:12:21 +01:00
lukashov e5a94ee6dd Exchanging rho for thr first stream and for the second in qpsk_qpsk_llr 2016-01-11 16:04:10 +01:00
lukashov 42eeb9d65e New attempt to scale IA receiver 2016-01-11 15:53:13 +01:00
lukashov e4dec0771c Another change for aver level: now log2aaprox(ch11/2) + log2approx(ch21/2) -13 +shift 2016-01-11 15:04:03 +01:00
lukashov 388452f1bc For in demodulation TM4 trying average as a sum of energy in both antennas.
Changing names of output files in dlsim respectiively.
2016-01-11 11:10:04 +01:00
lukashov a5f9c92507 Merge remote-tracking branch 'origin/hotfix-71-freq_channel' into feature-59-tm4
Conflicts:
	openair1/PHY/TOOLS/cdot_prod.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.usrpb210.conf
2016-01-08 16:33:14 +01:00
lukashov bbb369a937 Small bugfix for TM5 and TM6 2016-01-08 15:53:41 +01:00
lukashov 42eb48faa7 Fixing previous commit: messed up with parenthesis in dlsch_demodulation.c 2016-01-08 15:32:53 +01:00
Raymond Knopp ee1d0d56ad added noise-figure trace in stats. 2016-01-07 17:38:56 +01:00
lukashov b80a6660bf Some more clean up in dlsch_demodulation.c 2016-01-07 13:50:45 +01:00