Commit Graph
668 Commits
Author SHA1 Message Date
Raymond.Knopp 93a244cfaf debugging for 20 MHz RRU 2017-01-02 23:39:35 +01:00
Raymond.Knopp db4b77ebd2 Merge remote-tracking branch 'origin/develop' into enhancement-10-harmony
Conflicts:
	targets/RT/USER/lte-softmodem.c
2016-12-22 23:17:37 +01:00
Raymond.Knopp 12ed6c21f1 minor changes in lte-enb.c and rcc configuration files 2016-12-22 23:16:31 +01:00
Florian Kaltenberger a525be94c3 changing antenna number back to 1 2016-12-15 17:25:15 +01:00
gabrielC f79dd53edf Merge remote-tracking branch 'origin/feature-21-TM7-tmp' into develop_integration_w50 2016-12-15 11:39:04 +01:00
Florian Kaltenberger e470e2d3bd Merge remote-tracking branch 'origin/develop' into feature-21-TM7-tmp
Conflicts:
	targets/RT/USER/lte-enb.c
2016-12-07 09:40:20 +01:00
gabrielC 0fb34b2e28 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop1B 2016-12-06 12:05:25 +01:00
Raymond.Knopp 7e4e63ae64 Merge remote-tracking branch 'origin/develop' into enhancement-10-harmony
Conflicts:
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
2016-12-06 07:24:03 +01:00
Raymond.Knopp 108cf6bff0 renaming of RCC configuration files 2016-12-04 12:20:12 +01:00
Raymond Knopp 54057dce28 Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony 2016-12-04 20:13:31 +01:00
Raymond Knopp 7be5af4c09 Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony 2016-12-04 17:50:14 +01:00
Raymond Knopp 76ee52a635 small changes for rru debugging 2016-12-04 17:49:25 +01:00
Raymond.Knopp 0717c18ccb modifications for PRACH on IF4p5 2016-12-04 12:11:03 +01:00
Raymond.Knopp 1255cf856f Merge remote-tracking branch 'origin/develop' into enhancement-10-harmony
Conflicts:
	targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
2016-12-04 09:46:02 +01:00
Raymond Knopp 688fe7bcf8 Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony 2016-12-02 07:36:27 +01:00
Raymond Knopp cfc308dd4c new IF5 configuration file for RRU 2016-12-02 07:35:34 +01:00
Raymond.Knopp 8aa61a1d29 new IF5 configuration file 2016-12-01 23:32:07 +01:00
Raymond.Knopp 490b695b3d Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony 2016-12-01 21:36:48 +01:00
Raymond Knopp 8678be1692 fixed IF5 timing 2016-12-02 05:36:23 +01:00
Raymond.Knopp 2774702108 IF5 timing for RCC 2016-12-01 21:36:33 +01:00
Rohit Gupta 045c947015 Merge branch 'develop' into feature-68-enb-agent 2016-11-25 10:08:53 +01:00
Xiwen JIANG 8a08206670 Merge branch 'develop' into feature-21-TM7 2016-11-24 17:59:30 +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 e450941f7a Merge branch 'develop' into feature-21-TM7 2016-11-21 12:08:30 +01:00
Florian Kaltenberger e86b3e31c7 changing some config files 2016-11-21 11:39:47 +01:00
GabrirelCouturier 34b75f393d Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into bugfix-26 2016-11-21 11:19:30 +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
Xenofon Foukas 1c86e23edf Merge remote-tracking branch 'origin/develop' into feature-68-enb-agent 2016-11-11 08:54:56 +02: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
Xenofon Foukas 985dcdc38c Removed deprecated configuration files for FlexRAN agent 2016-11-09 12:11:26 +02:00
Xenofon Foukas 8baf3e7e57 Changed naming convention for flexran related calls 2016-11-04 17:28:04 +02:00
Raymond Knopp 11db1d89bb Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony
Conflicts:
	targets/RT/USER/lte-enb.c
2016-10-27 09:58:56 +02:00
Raymond Knopp 5e1d462aa9 resynch for initial RF acqusition 2016-10-27 09:56:23 +02:00
luhan wang 727cdb4a87 updates for udp IF4p5 2016-10-27 09:45:56 +02:00
Xenofon Foukas b6c7909d03 Fixed bugs related to MAC padding and RLC requests in AM mode 2016-10-24 19:14:07 +03:00
hbilel 31fbc80520 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop1B
parent a6742020 - Commit 1fa2f76e61

Conflicts:
	targets/RT/USER/lte-softmodem.c
2016-10-24 16:21:05 +02:00
Rohit Gupta 1fa2f76e61 minor fix for config file for new changes to RRH/TM1 2016-10-21 23:25:53 +02:00
luhan wang f1abf1a775 Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony 2016-10-20 14:20:27 +02:00
Xenofon Foukas 9ed966cfe6 Added conf file for flexran oaisim 2016-10-19 15:16:58 +03:00
Raymond Knopp 8c37787e23 added 25 PRB rru file 2016-10-19 09:30:42 +02:00
luhan wang 9b9a7e50b4 Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony 2016-10-19 08:23:18 +02:00
Xenofon Foukas 93b9b73582 Merge remote-tracking branch 'oai/develop' into oai-integration
Conflicts:
	cmake_targets/tools/build_helper
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler.c
2016-10-18 16:27:56 +03:00
hbilel 0705e71ffc [OAI-UE] SRS feature
1- Implement SRS procedures
2016-10-12 14:29:48 +02:00