Commit Graph
1690 Commits
Author SHA1 Message Date
Florian Kaltenberger 28923dc8e2 fixing bug introduced in 5c5c336300 2016-11-28 13:58:41 +01:00
Florian Kaltenberger a4f8fff92b Merge remote-tracking branch 'origin/develop' into feature-21-TM7
Conflicts:
	targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
2016-11-28 12:56:13 +01:00
Florian Kaltenberger 426e6cd74b bugfix for TDD: special subframe was not transmitted. 2016-11-25 16:55:35 +01:00
Xiwen JIANG 8a08206670 Merge branch 'develop' into feature-21-TM7 2016-11-24 17:59:30 +01:00
Florian Kaltenberger 933dc966c0 fix for EXMIMO 2016-11-24 17:14:50 +01:00
Florian Kaltenberger 3b7a9400f2 Merge branch 'master' into develop
Conflicts:
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.exmimo2.conf
2016-11-24 17:14:44 +01:00
Florian Kaltenberger f15426d75c fixing config file 2016-11-24 16:56:30 +01:00
Florian Kaltenberger f8aea6189d Merge branch 'feature-21-TM7' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-21-TM7 2016-11-24 14:44:06 +01:00
Florian Kaltenberger 7715900222 some more bugfixes (old and introcuded by merge) plus ability too use phy-test for tm7 2016-11-24 14:42:59 +01:00
Xiwen JIANG 953de398a3 adapt the tm7 configuration file 2016-11-24 10:46:20 +01:00
Florian Kaltenberger 441b062e3a changing config files 2016-11-23 15:15:56 +01:00
Florian Kaltenberger f446a5ea17 Merge branch 'develop' into feature-21-TM7 2016-11-22 18:24:40 +01:00
Florian Kaltenberger c3c3f27487 fixes for phy-test option at eNB 2016-11-22 18:15:57 +01:00
Florian Kaltenberger e450941f7a Merge branch 'develop' into feature-21-TM7 2016-11-21 12:08:30 +01:00
Florian Kaltenberger 5c5c336300 fixes to make lte-softmodem compile again 2016-11-21 11:55:36 +01:00
Florian Kaltenberger e86b3e31c7 changing some config files 2016-11-21 11:39:47 +01:00
Florian Kaltenberger 12f1cb9c7c fixing original dlsim from develop 2016-11-18 16:23:01 +01:00
Florian Kaltenberger 8769024922 Merge remote-tracking branch 'origin/develop' into feature-21-TM7
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/INIT/lte_param_init.c
	openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
	openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
	openair1/PHY/LTE_REFSIG/lte_dl_uespec.c
	openair1/PHY/LTE_TRANSPORT/dci.c
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/PHY/LTE_TRANSPORT/initial_sync.c
	openair1/PHY/LTE_TRANSPORT/pbch.c
	openair1/PHY/LTE_TRANSPORT/pilots.c
	openair1/PHY/LTE_TRANSPORT/pmch.c
	openair1/PHY/LTE_TRANSPORT/proto.h
	openair1/PHY/defs.h
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/phy_procedures_lte_ue.c
	openair1/SIMULATION/LTE_PHY/dlsim.c
	openair1/SIMULATION/LTE_PHY/mbmssim.c
	openair1/SIMULATION/LTE_PHY/pdcchsim.c
	openair1/SIMULATION/LTE_PHY/ulsim.c
	openair2/ENB_APP/enb_config.c
	openair2/RRC/LITE/rrc_eNB.c
	targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c
	targets/RT/USER/sched_rx_pdsch.c
	targets/SIMU/USER/init_lte.c
	targets/SIMU/USER/oaisim_functions.c
2016-11-18 15:35:21 +01:00
Rohit Gupta be0b164a52 minor type updates to E-UTRAN User Guide 2016-11-14 18:49:07 +01:00
Rohit Gupta 54d8b116f9 updates to E-UTRAN User Guide 2016-11-14 18:40:03 +01:00
Rohit Gupta ad8b86d93a Update rcc.band7.tm1.if5.usrpb210.conf 2016-11-10 18:11:19 +01:00
Rohit Gupta 58284f60e7 Update rru.band7.tm1.if5.usrpb210.conf 2016-11-10 18:10:21 +01:00
Rohit Gupta 0362cb8644 Update rru.band7.tm1.if5.usrpb210.conf 2016-11-10 18:09:09 +01:00
Rohit Gupta 1a99e785a0 remove warnings 2016-11-08 03:14:01 +01:00
Florian Kaltenberger 535755a528 resetting two files to their state in develop 2016-11-03 17:02:06 +01:00
Florian Kaltenberger c61d74cd49 Merge remote-tracking branch 'origin/develop' into enhancement-64-phy_test 2016-11-03 16:45:17 +01:00
Rohit Gupta 1fa2f76e61 minor fix for config file for new changes to RRH/TM1 2016-10-21 23:25:53 +02:00
Florian Kaltenberger b502b5060e Merge remote-tracking branch 'origin/develop' into enhancement-64-phy_test
Conflicts:
	targets/ARCH/EXMIMO/USERSPACE/OCTAVE/txsig.m
	targets/RT/USER/lte-ue.c
2016-10-19 21:04:00 +02:00
Rohit Gupta e345a5d451 hotfix for UE synchronization 2016-10-17 10:35:22 +02:00
Rohit Gupta 039d017561 Merge branch 'enhancement-10-harmony-lts' into develop 2016-10-12 23:33:23 +02:00
Dominique Nussbaum 8dcf0f0cfd option -a is now handled correctly at UE 2016-10-12 10:17:07 +02:00
Rohit Gupta 256948d61c make single thread mode=1 by default 2016-10-11 21:49:18 +02:00
Rohit Gupta e084e58388 merge from develop 2016-10-11 18:52:14 +02:00
Rohit Gupta b481bfd985 Merge branch 'develop' into feature-131-new-license 2016-10-10 19:25:02 +02:00
Rohit Gupta c51edecdee Merge branch 'bugfix-136-OAI-UE-Attach-fixes' into 'develop'
[OAI-UE] issue#136 attach fixes:

- pusch/pucch power control
           - pucch encoding call
           - srb/drb add with default value

See merge request !44
2016-10-10 12:03:51 +02:00
Raymond Knopp 4ad723a176 added rcc gtkw files. 2016-10-08 10:40:36 -07:00
fnabet 310a87ea90 [OAI-UE] issue#136 attach fixes:
- pusch/pucch power control
           - pucch encoding call
           - srb/drb add with default value
2016-10-07 18:30:55 +02:00
Rohit Gupta 4787c975ec delete files with GPL License + modify build scripts 2016-10-07 18:19:43 +02:00
Rohit Gupta 73aa265793 Merge branch 'develop' into feature-131-new-license 2016-10-07 13:58:08 +02:00
Tien-Thinh Nguyen 461e2430d1 fix the issues related to sending ULlULL... to RRU 2016-10-06 14:40:30 +02:00
Tien-Thinh Nguyen b8d2455320 fix issues to work with multiple carriers (conga-ercom) 2016-10-04 17:59:07 +02:00
Tien-Thinh Nguyen e395164a4c fix issues to work with multiple carriers (conga-ercom) 2016-10-04 17:02:50 +02:00
Rohit Gupta c1490bb88d Merge branch 'develop' into enhancement-10-harmony 2016-10-03 15:44:40 +02:00
Rohit Gupta 1db923d6f9 Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony 2016-10-03 15:44:14 +02:00
Rohit Gupta ec7d0ff2c3 fix compilation warnings 2016-10-02 00:24:25 +02:00
Raymond Knopp 9f972b7f22 updated high-level slideset. 2016-10-01 01:42:20 -07:00
laurent 402bd21bd7 merge harmony 2016-09-30 14:40:39 +02:00
laurent 5822c850cb small2 2016-09-30 12:34:57 +02:00
Rohit Gupta 9f485ac5a9 minor fix to config files 2016-09-30 11:14:09 +02:00
hutch c6cb8ed260 hotfix for eRRC 2016-09-30 11:10:13 +02:00