Rohit Gupta
7361e74eb9
Merge branch 'enhancement-10-harmony' into develop
2016-09-27 10:40:03 +02:00
Rohit Gupta
f80617601d
Merge branch 'develop'
2016-09-27 10:39:46 +02:00
Rohit Gupta
33fddd3a9a
Merge branch 'develop' into enhancement-10-harmony
2016-09-27 10:39:28 +02:00
Rohit Gupta
460f01f6d3
Gitlab CI test case modified file + disable cpu affinity
2016-09-27 10:38:13 +02:00
Raymond Knopp
ff90a54ad9
bugfix for 4096 and 8192-point dfts.
2016-09-26 12:08:33 -07:00
Rohit Gupta
265a2d01bd
update USRP config files with calibration verified
2016-09-26 19:08:11 +02:00
Florian Kaltenberger
784c4e4941
adding missing symbol to octave tools
2016-09-26 17:19:51 +02:00
Rohit Gupta
da100fb693
add NTP for synch time between test setup machines
2016-09-26 14:21:35 +02:00
Rohit Gupta
b1fc862b9b
Merge branch 'enhancement-10-harmony' of gitlab.eurecom.fr:oai/openairinterface5g into enhancement-10-harmony
2016-09-26 14:18:34 +02:00
Rohit Gupta
2d3333dd6b
Gitlab CI: fix for cleaning memory only when critically low
2016-09-26 14:13:32 +02:00
Rohit Gupta
c7ae754066
compilation fix for pbchsim
2016-09-26 13:12:34 +02:00
Rohit Gupta
ce9c87026d
minor compilation fixes to LMSSDR driver
2016-09-26 13:05:48 +02:00
Rohit Gupta
2f00edeb8e
minor compilation fixes to BladeRF driver
2016-09-26 12:53:50 +02:00
Florian Kaltenberger
e94eb6673c
moving hastable into other directory and adding OAI license
2016-09-25 16:29:12 +02:00
Florian Kaltenberger
cc6926c559
removing duplicate files
2016-09-25 16:13:58 +02:00
Raymond Knopp
3124cb2c00
more fixes for oaisim, TM2.
2016-09-25 14:53:16 +02:00
Raymond Knopp
7df5c381fd
Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony
2016-09-24 22:04:19 -07:00
Raymond Knopp
829ee59707
fixes for oaisim, testing TM2
2016-09-24 22:03:35 -07:00
Rohit Gupta
e584ce06c4
Gitlab CI:minor type in python script
2016-09-24 21:16:10 +02:00
Rohit Gupta
a4d3ec8dc4
Gitlab CI:minor fix to log directory creation
2016-09-24 21:14:31 +02:00
Rohit Gupta
2098dcdd0a
Gitlab CI: minor fix to how processes are terminated
2016-09-24 21:06:19 +02:00
Rohit Gupta
1edceeb6ea
config files fix for new params in enhancement-10-harmony branch
2016-09-24 19:58:24 +02:00
Rohit Gupta
574fbd661c
activate TX path of UE
2016-09-23 16:38:20 +02:00
Raymond Knopp
7c9f9763e8
Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony
2016-09-23 02:39:02 +02:00
Raymond Knopp
5e7f007009
fixed --single-thread flag (when not set)
2016-09-23 02:08:52 +02:00
Rohit Gupta
23822ea203
send SIGINT before processes are killed in test setup
2016-09-22 18:55:14 +02:00
Rohit Gupta
5b489d530d
Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony
2016-09-22 18:37:01 +02:00
Rohit Gupta
29fac70eb6
minor fix pthread_create call
2016-09-22 18:36:35 +02:00
Raymond Knopp
19818393e6
Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony
2016-09-22 16:23:30 +02:00
Raymond Knopp
e5b643d03c
updates for UE with USRP
2016-09-22 16:22:55 +02:00
Rohit Gupta
fea3c34b58
minor fix to UE logging for test setup
2016-09-22 16:03:11 +02:00
Rohit Gupta
898774d68a
minor compilation fix
2016-09-21 19:08:25 +02:00
Rohit Gupta
41b80a11d0
Merge from develop
2016-09-21 18:27:24 +02:00
Raymond Knopp
7af3d98fd9
bugfix in ulsch_decoding. removal of logging in pucch.c and usrp_lib.cpp.
2016-09-21 17:23:50 +02:00
luhan wang
7e6b0c34d2
Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony
2016-09-21 09:18:45 +02:00
luhan wang
094f439626
comment in phy_procedures_lte_eNb.c
2016-09-21 09:18:31 +02:00
Raymond Knopp
f05013a287
real changes for L1 threading. previous was bogus
2016-09-20 16:55:16 +02:00
Raymond Knopp
8d15dfe894
small bugs for lte-softmodem with parallel threads in L1
2016-09-20 07:57:27 -07:00
Raymond Knopp
43f96a0eac
finishing merge with develop
2016-09-19 14:13:11 -07:00
Wilson W.K. Thong
754cab7ec4
added SFN to wireshark logging output
...
Conflicts:
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/ue_procedures.c
2016-09-19 15:08:50 +08:00
Raymond Knopp
7678f88a47
Merge branch 'develop' into enhancement-10-harmony
...
Conflicts:
cmake_targets/autotests/test_case_list.xml
openair1/PHY/INIT/lte_init.c
openair1/PHY/INIT/lte_param_init.c
openair1/PHY/LTE_TRANSPORT/pucch.c
openair1/SIMULATION/LTE_PHY/pdcchsim.c
openair2/ENB_APP/enb_config.h
openair2/RRC/LITE/rrc_eNB.c
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.generic.oaisim.local_no_mme.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
targets/RT/USER/lte-softmodem.c
targets/SIMU/USER/init_lte.c
targets/SIMU/USER/oaisim.c
targets/SIMU/USER/oaisim_functions.c
2016-09-18 22:16:29 -07:00
Wilson W.K. Thong
95077bae4f
removed words 'wilson' from src
2016-09-19 12:01:16 +08:00
Wilson W.K. Thong
1de77c7a4e
changed so USRP also uses the piece of codes EXMIMO is uing in setting TA=624 when it is TDD
...
(cherry picked from commit a75dbc4156ed4e216145f1deb81c6e04c1cddf02)
2016-09-19 12:00:39 +08:00
Wilson W.K. Thong
6feb848ebe
removed all 'wilson' and 'ASTRI' words from comments
...
Conflicts:
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/RLC/rlc_rrc.c
2016-09-19 11:53:55 +08:00
Wilson W.K. Thong
19c81e741e
fixed hard-code DRB-ID<->LC-ID mapping (DRB-ID = LC-ID - 2) so they are not fully configurable
...
fixed hard-code default DRB-ID (1) so it is now fully configurable
(cherry picked from commit 4499124853b8985c3f157721997125370f1ca475)
Conflicts:
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
Conflicts:
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
2016-09-19 11:53:55 +08:00
Wilson W.K. Thong
7e2c8e39f8
fixed oaisim build failed with the new KeNB refresh request message from NAS -> AS
2016-09-19 11:32:46 +08:00
Wilson W.K. Thong
fe2b7d80d3
removed 'wilson' from the codes
2016-09-19 11:32:46 +08:00
Wilson W.K. Thong
6b48fd6380
** new procedure - refresh kENB from NAS -> AS **
...
added flow to refresh KeNB key in RRC on receiving S1AP-InitialContextSetup
added flow to configure PDCP security mode
enabled filling in the PDCP MAC code during and after RRC-SMC procedure
(cherry picked from commit 898cd5c45aedb27625d73352568211b4467c8dd9)
2016-09-19 11:32:46 +08:00
Raymond Knopp
b8a37a34cf
pucch format 2/2a/2b UE TX
2016-09-17 14:55:26 -07:00
Raymond Knopp
2d73663bc6
modifications for odd N_RB_DL in dlsch_modulation.c
2016-09-15 10:03:50 -07:00