Commit Graph
1303 Commits
Author SHA1 Message Date
Raymond Knopp 626d107978 Merge branch 'develop' into enhancement-10-harmony
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/SCHED/phy_mac_stub.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c
2016-06-14 05:41:18 -07:00
Rohit Gupta eade3fe8d0 Fix for RRH Config file (5MHz) 2016-06-07 17:05:38 +02:00
Rohit Gupta bc4bd8200f Fix for RRH Config file (10MHz) 2016-06-07 17:04:07 +02:00
Raymond Knopp deab4aa208 debugging with USRP 2016-06-01 20:44:57 +02:00
Xiwen JIANG 719a94d2c4 add exmimo octave api env to TDD rec proj 2016-05-31 17:38:01 +02:00
Xiwen JIANG 5370685740 Merge branch 'master' into feature-21-TM7 2016-05-30 17:13:09 +02:00
Navid Nikaein 956dfa0922 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-44-dedicated-drb 2016-05-30 13:11:29 +02:00
Rohit Gupta ebfcbce425 remove redundant config files of eNB 2016-05-25 19:54:51 +02:00
Navid Nikaein 107eec224e Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-44-dedicated-drb 2016-05-25 09:36:32 +02:00
Xenofon Foukas 0f5b01457b Merge remote-tracking branch 'oai/develop' into oai-integration
Conflicts:
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler.c
2016-05-17 13:18:09 +01:00
Raymond Knopp 4ea125e195 modified SoDeRa band 13 50 PRB configuration file for EPC on localhost with eNodeB 2016-05-11 11:53:58 +02:00
Raymond Knopp 4070a3affa fixed CCE allocation bug. 2016-05-10 19:34:36 +02:00
nikaeinn b133c791c9 adjust the rrh config params 2016-05-10 01:06:49 +02:00
nikaeinn cb50fd1d39 add a new line between each configuration section 2016-05-09 19:26:05 +02:00
Navid Nikaein 3430dbc41d merge with the develop branch 2016-05-03 15:51:07 +02:00
Xenofon Foukas b9c9293144 Added support for multiple eNBs 2016-04-25 17:12:11 +01:00
Rohit Gupta 9c14a20bd3 updates to USRP calibration + few modifications in config files 2016-04-20 15:17:22 +02:00
Xenofon Foukas 59ba6f9e7b Made config changes for remote scheduler and eNB 2016-04-20 13:41:49 +01:00
gauthier 10d6eccb9f UL timing parameter for USRP B2x0, some adjustments in B2x0 configuration files for Band 7 2016-04-20 09:16:32 +02:00
Florian Kaltenberger 2b213a0ccc Merge branch 'develop' into feature-59-tm4
Conflicts:
	openair1/SIMULATION/LTE_PHY/dlsim.c
2016-04-19 15:50:05 +02:00
Xenofon Foukas d4fd08785d Modified eNB conf file for USRP to use 50 rbs 2016-04-14 14:51:00 +01:00
gauthier 20e2460913 minor change in timing for 5 MHz on USRP B210 2016-04-12 12:38:19 +02:00
Florian Kaltenberger 663a5f44f5 Merge remote-tracking branch 'origin/develop' into feature-59-tm4 2016-04-12 12:38:17 +02:00
Raymond Knopp 6ddc7b3bc9 Merge branch 'bugfix-48-L1L2signaling' of https://gitlab.eurecom.fr/oai/openairinterface5g into bugfix-48-L1L2signaling
Conflicts:
	openair1/SCHED/phy_procedures_lte_eNb.c
2016-04-10 23:29:28 +02:00
Raymond Knopp 2dfe84a7e4 bugfixing for UL. Remaining problems: CCE allocations in subframe 5 lead to occasional illegal DCI allocations (affects UL DCI which is missed by UE). waveform compliance with CQI in ULSCH. 2016-04-10 23:25:58 +02:00
Rohit Gupta bdaedcd487 Merge from hotfix-106-usrp_rt_dc_offset 2016-04-09 19:13:55 +02:00
Navid Nikaein b5e3fa0521 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-44-dedicated-drb 2016-04-06 19:22:19 +02:00
Xenofon Foukas 46b1280a5e Merge remote-tracking branch 'oai/develop' into feature-68-enb-agent 2016-04-06 08:50:09 +01:00
Rohit Gupta 4ff17e2b03 Fixed the rx gain setting of USRP 2016-04-04 16:52:14 +02:00
Navid Nikaein b8181d06f1 merge with the develop 2016-04-04 14:47:46 +02:00
Raymond Knopp 9e312bfc6f Merge branch 'bugfix-48-L1L2signaling' of https://gitlab.eurecom.fr/oai/openairinterface5g into bugfix-48-L1L2signaling 2016-04-02 12:22:48 +02:00
Raymond Knopp 944720d26d 8bit LLR on ULSCH decoding 2016-04-02 12:22:27 +02:00
Raymond Knopp e71aebc603 Merge remote-tracking branch 'origin/develop' into bugfix-48-L1L2signaling
Conflicts:
	openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/pre_processor.c
	openair2/LAYER2/openair2_proc.c
	openair2/RRC/LITE/rrc_eNB.c
	openair3/NAS/UE/API/USIM/usim_api.c
	openair3/NAS/UE/ESM/esm_ebr_context.c
2016-03-31 14:36:12 -07:00
Xenofon Foukas 985a2ec261 Merge remote-tracking branch 'oai/develop' into feature-68-enb-agent 2016-03-31 11:08:02 +01:00
Florian Kaltenberger f5c798e48c transmission mode is now taken into account in RRC signalling
small bugfix in dlsch_demodulation
shunted out TM3-7 specific DCI generation in scheduler to enable basic operation. more work needed.
2016-03-31 11:34:32 +02:00
Rohit Gupta 8028652a71 hotfix for enb/EPC local config file 2016-03-25 20:08:04 +01:00
gauthier 81f5d25e65 changed some PUSCH/PUCCH parameters in configuration file. 2016-03-25 08:49:20 +01:00
Xenofon Foukas 891cd96638 Merge remote-tracking branch 'oai/develop' into feature-68-enb-agent 2016-03-22 17:15:54 +02:00
Xiwen JIANG 42ffffd902 Merge branch 'develop' into feature-21-TM7 2016-03-21 17:26:07 +01:00
lukashov 978a7a627e Merge branch 'develop' into feature-59-tm4
Conflicts:
	openair1/PHY/TOOLS/lte_phy_scope.c
2016-03-21 15:31:19 +01:00
Xenofon Foukas 7481959647 Added agent config file for band7 usrbb210 2016-03-18 19:38:55 +00:00
Raymond Knopp b441c37b40 added Timing advance tracing to .vcd output. Increase maximum UL RB count to 45. Measured UL throughput @ 15 Mbit/s (40 PRBs). 2016-03-18 08:00:51 +01:00
Raymond Knopp 84a1c7377b Merge remote-tracking branch 'origin/develop' into bugfix-48-L1L2signaling
Conflicts:
	openair1/PHY/LTE_TRANSPORT/print_stats.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/phy_procedures_lte_ue.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.usrpb210.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
2016-03-17 17:47:16 +01:00
Rohit Gupta 667a4987f9 Merge branch 'develop' into Feature-6-fix_test_core_network_with_scenarios 2016-03-15 19:10:34 +01:00
gauthier 26f5d0d93d more changes to uplink scheduling and vcd logging 2016-03-15 17:41:06 +01:00
Raymond Knopp d9e40977ed changes to VCD logging for UL debugging 2016-03-13 22:58:00 +01:00
gauthier 9915db7397 extra logging for debugging (with Csaba Sipos) 2016-03-11 14:47:13 +01:00
trilyrak 85d010d987 update run_enb_s1_usrp script 2016-03-10 15:47:04 +01:00
Xenofon Foukas 1b972a5537 Merge remote-tracking branch 'remotes/oai/develop' into feature-68-enb-agent 2016-03-10 14:41:50 +00:00
Florian Kaltenberger 160f5e0786 Merge remote-tracking branch 'origin/develop' into feature-59-tm4
Conflicts:
	openair1/SIMULATION/LTE_PHY/dlsim.c
2016-03-09 20:35:57 +01:00