maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,598 Commits 5 Branches 0 Tags
442bb79bd042a3e152997a5dbdd9bc997808d9f8
Commit Graph
690 Commits
Author SHA1 Message Date
Cedric Roux 74d07a70f6 Merge branch 'enhancement-192-beamforming' into develop_integration_w03 
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/MODULATION/beamforming.c
	openair1/PHY/defs.h
	targets/RT/USER/lte-enb.c
 2017-01-20 16:58:29 +01:00
Cedric Roux e6f3c9b899 Merge branch 'enhancement-10-harmony' into develop_integration_w03 
Conflicts:
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
 2017-01-20 16:49:39 +01:00
Raymond.Knopp 56241235cf rcc configuration file band 7 if5. 2017-01-20 08:44:41 +01:00
Florian Kaltenberger 0695828e4c some fixes 2017-01-18 16:43:02 +01:00
Tien-Thinh Nguyen dce5191542 update to make harmony work with Mobipass[Ercom] 2017-01-18 13:53:05 +01:00
Raymond.Knopp 773afc1490 TX power calibration, RX_W by default 2017-01-18 13:21:07 +01:00
Raymond.Knopp 12cc35932a Merge branch 'develop' into develop-new-LMSSDR 
Conflicts:
	targets/RT/USER/lte-softmodem.c
 2017-01-18 10:44:37 +01:00
Cedric Roux 31cbb18f0e Merge branch '180-fix_TDDConfigurationFileParseRrror' into develop_integration_w02 2017-01-13 17:07:13 +01:00
Cedric Roux adfaa6d9f3 Merge branch 'develop-new-LMSSDR' into develop_integration_w02 
Conflicts:
	targets/RT/USER/lte-softmodem.c
 2017-01-13 17:01:30 +01:00
Raymond.Knopp c70e705aa4 lmssdr configuration file 2017-01-11 16:10:27 +01:00
calvin wang 637e2f0793 fix TDD config file parse error and add TDD band40 config file 2017-01-09 11:20:13 +08:00
Raymond.Knopp c1360397ed CMakeList.txt changes for LMSSDR, lmssdr config file 50 PRB, rx gain setting in lms_lib.cpp 2017-01-07 14:55:04 +01:00
Raymond.Knopp 6e9a28b1a7 Merge remote-tracking branch 'origin/develop' into develop-new-LMSSDR 
Conflicts:
	targets/RT/USER/lte-softmodem.c
 2017-01-07 13:06:23 +01:00
Raymond.Knopp 14d28e2dbd fixes for precoding (turning off if nb_antennas_tx=1), configuration files, timing advance with 3/4 sampling on 20 MHz, logging in MAC 2017-01-07 12:41:36 +01:00
Raymond.Knopp de8ab34d85 Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony 2017-01-06 20:29:44 +01:00
Raymond Knopp 0e919b9913 configuration file band7 rru 2017-01-07 04:28:06 +01:00
Raymond.Knopp 328731af18 band7 rcc configuration 2017-01-06 20:26:42 +01:00
Raymond.Knopp 28d16f4a91 Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony 
Conflicts:
	openair1/SCHED/phy_procedures_lte_eNb.c
 2017-01-05 01:48:52 +01:00
Raymond Knopp 219016e7a4 Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony 
Conflicts:
	openair1/PHY/INIT/lte_init.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
	targets/SIMU/USER/init_lte.c
 2017-01-04 07:18:52 +01:00
Raymond Knopp 1d331c0bf8 Changes for 20 MHz RRU (dual-thread mode) 2017-01-03 07:46:36 +01:00
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