maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,024 Commits 5 Branches 0 Tags
ba55fcac27fb34dad97beea1bcd609a6dfa8a88d
Commit Graph
723 Commits
Author SHA1 Message Date
Cedric Roux e62f569b5d Merge remote-tracking branch 'origin/various-l2-fixes-187' into develop_integration_w07 2017-02-17 18:23:00 +01:00
Cedric Roux f58c7b1be9 integration fix: restore enb.band7.tm1.usrpb210.conf 
Many variables were changed that should not have been changed.
 2017-02-17 12:41:13 +01:00
Chia-Yu Chang 1b417979e9 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into various-l2-fixes-187 
Conflicts:
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.25PRB.lo.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.usrpb210.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.50PRB.oaisim.conf
 2017-02-17 12:01:26 +01:00
gabrielC eadcba956e Merge branch 'develop-realtime-lts' into develop_integration_w07 
Conflicts:
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c
 2017-02-17 11:51:03 +01:00
pyroclaste 3dd1faadd4 Add the compression for IF5 and RTT measurements for FH and RF 2017-02-17 11:38:44 +01:00
Cedric Roux f92bd91544 Merge branch 'enhancement-199-nas-multi-ue' into develop_integration_w07 
Conflicts:
	openair1/SCHED/phy_procedures_lte_ue.c
	targets/RT/USER/lte-softmodem.c
	targets/SIMU/USER/oaisim.c
	targets/SIMU/USER/oaisim_functions.c
 2017-02-16 12:14:26 +01:00
laurent be0541aa8c remove a race 2017-02-16 11:38:38 +01:00
Laurent 6f6f9acb52 merge develop; add option to set affinity in UE 2017-02-16 11:34:02 +01:00
gabrielC 2dc9dc0316 Merge remote-tracking branch 'origin/tm4-fixes' into develop_integration_w07 
Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/LTE_TRANSPORT/power_control.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	targets/SIMU/USER/oaisim_functions.c
 2017-02-14 15:25:37 +01:00
Cedric Roux 94e039ac87 Merge remote-tracking branch 'origin/fix-if4p5' into develop_integration_w06 
Conflicts:
	openair1/PHY/LTE_TRANSPORT/prach.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
 2017-02-10 14:59:39 +01:00
Younes 91e12a9724 Fix if4p5 2017-02-10 14:51:43 +01:00
Cedric Roux 0ada1e9e32 Merge remote-tracking branch 'origin/oaisim-rru' into develop_integration_w06 
Conflicts:
	openair2/RRC/LITE/rrc_UE.c
 2017-02-10 11:36:06 +01:00
Navid Nikaein 6b81ddf611 fix the compilation issue with flexran 2017-02-08 14:41:07 +01:00
Florian Kaltenberger e0b8998def fixing bug in PDSCH power allocation for TM2 
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/PHY/LTE_TRANSPORT/power_control.c
 2017-02-07 10:02:49 +01:00
Raymond Knopp bb5ee76ad8 changes in oaisim to support RRU + fronthaul. minor bugs corrected in UE. 2017-02-05 14:31:00 -08:00
Laurent 9f33d0904b merge develop 2017-02-01 13:08:35 +01:00
Elena_Lukashova a51c30f459 Merge branch 'develop' into feature-59-tm4 
dlsim_tm4 works fine.
dlsim has a bug in llr processing after llr computations (see XFORMS).
 2017-01-30 13:37:24 +01:00
Frédéric Leroy fe2193ba75 fix .ue* filenames in scripts and documentation 
TODO add option to conf2uedata and adapt script
 2017-01-25 13:29:48 +01:00
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