Raymond Knopp
90c66bb7b1
Merge remote-tracking branch 'origin/develop' into aw2s-n41
...
Conflicts:
executables/nr-softmodem.c
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_TRANSPORT/pucch_rx.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2022-01-24 11:11:46 +01:00
Laurent THOMAS
a5c5264ef3
merge develop
2022-01-14 21:09:02 +01:00
Laurent THOMAS
3f2dd17191
code review comments + re-test
2022-01-13 16:04:16 +01:00
Cedric Roux
0806734254
T tracer: add option to have both T traces and regular console logs
...
Use --T_stdout 2 to have both.
--T_stdout 0 is still the way to have only T traces and no console logs.
2022-01-11 11:04:00 +01:00
Laurent THOMAS
bc05bd882d
cleaning after big merge
2022-01-10 11:44:45 +01:00
Laurent THOMAS
2615a6722a
fix get_nr_table_idx to make same as develop branch
2022-01-03 19:32:47 +01:00
Laurent THOMAS
6be158b664
add gtp-u echo reply implementation, and ci trace improvement
2021-12-30 12:50:32 +01:00
Laurent THOMAS
5ead416cd0
remove volonatry process maximum life time of 600sec (episys?)
2021-12-28 16:58:23 +01:00
Laurent THOMAS
31d9da3f73
cleanup nr_band() function
2021-12-27 17:10:19 +01:00
Robert Schmidt
1ebcd1ed32
Print LOG time as uptime
2021-12-27 12:24:24 +01:00
Laurent THOMAS
799463994a
merge NR_F1C_F1U_extensions
2021-12-27 10:32:53 +01:00
Laurent THOMAS
e83e70eeb0
perfect use of not initialized variable: random assert
2021-12-26 18:12:13 +01:00
Laurent THOMAS
764ec5a234
improve log header
2021-12-26 15:44:10 +01:00
Robert Schmidt
3521b636d8
Restore original logging format
2021-12-24 12:00:42 +01:00
Robert Schmidt
6c823168fe
Merge remote-tracking branch 'origin/episys-merge-nsa' into integration_2021_wk51_d
2021-12-24 10:13:27 +01:00
Laurent THOMAS
792b6b4e0b
merge develop
2021-12-23 22:52:36 +01:00
hardy
0b4d3d92a2
Merge remote-tracking branch 'origin/NR_RRC_configuration_functions' into integration_2021_wk51_c
2021-12-23 10:44:42 +01:00
francescomani
9e8c0c97f7
Merge remote-tracking branch 'origin/develop' into NR_RRC_configuration_functions
2021-12-22 15:09:24 +01:00
Melissa Elkadi
e7ef264226
Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa
2021-12-21 06:02:40 -08:00
Laurent THOMAS
d73ec04635
merge develop
2021-12-20 09:29:52 +01:00
Laurent THOMAS
3fde37a28d
fix after merge and a ci bug (containers)
2021-12-17 21:57:00 +01:00
Laurent THOMAS
0f00e57148
merge develop
2021-12-17 16:29:53 +01:00
Eurecom
cfbced8b5f
Remove wrong abort call for the case of affinity!= -1
2021-12-10 13:18:58 +01:00
Robert Schmidt
dc294a8b63
Drop unneeded form.h include from telnet
2021-12-09 15:29:37 +01:00
francescomani
018ac0616b
Merge remote-tracking branch 'origin/develop' into NR_RRC_configuration_functions
2021-12-07 09:27:27 +01:00
Melissa Elkadi
fd2f61debc
Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa
2021-12-03 05:44:34 -08:00
Laurent Thomas
1f1f85c7bc
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into tx-proc-optim
2021-12-02 14:17:49 +01:00
matzakos
1da693dd78
Merge remote-tracking branch 'origin/develop' into NR_F1C_F1U_extensions
2021-12-02 13:54:08 +01:00
Cedric Roux
d4c4fdf7f3
T tracer: add harq pid in nr ul/dl/dl retx traces
2021-11-25 15:59:40 +01:00
francescomani
b9dd8d3f28
function for rrc ul tda (removed from config files)
2021-11-25 14:44:22 +01:00
Cedric Roux
b65b0e2eaf
T tracer: trace MAC DL retransmission PDUs in the gnb
...
and adapt macpdu2wireshark to deal with them
2021-11-25 11:27:17 +01:00
francescomani
83e1b2f850
function for rrc dl tda (removed from config files)
2021-11-24 13:44:18 +01:00
Melissa Elkadi
92ef60d07f
This commit does the following:
...
1. Reverts GTPU_need_ITTI back to develop
2. Removed gdb helper and co files
3. Reverts changes to logging mechanism
4. Reverts changes to assert that were unnecessary
5. Reverts changes to VNF that occured from a bad merge
6. Removes unnecessary else() in gNB softmodem
2021-11-23 15:49:47 -08:00
Laurent THOMAS
66073d50fc
merge develop
2021-11-15 10:25:52 +01:00
francescomani
2eac9f53c7
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2021-11-11 16:35:46 +01:00
Raymond Knopp
88e0c12f25
some adjustments after merge with develop
2021-11-11 08:43:10 +01:00
Raymond Knopp
95343c6658
Merge remote-tracking branch 'origin/develop' into tx-proc-optim
...
Conflicts:
common/utils/nr/nr_common.h
openair1/PHY/NR_TRANSPORT/pucch_rx.c
2021-11-11 08:34:06 +01:00
Raymond Knopp
07d735f93c
step-by-step merging from tx-proc-optim-lts. Everything except NR_TRANSPORT merged. Some issues with 64QAM modulation
2021-11-11 08:28:10 +01:00
Melissa Elkadi
046258f1ba
Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa
2021-11-09 15:17:58 -08:00
hardy
4c2c7f92a5
Merge remote-tracking branch 'origin/code-cleanup-2021oct24' into integration_2021_wk45_b
2021-11-08 13:12:52 +01:00
hardy
9c1336157e
Merge remote-tracking branch 'origin/NR_SA_band_96' into integration_2021_wk45_b
2021-11-08 13:12:28 +01:00
Laurent THOMAS
9d1fe78e2e
merge develop, no working yet
2021-11-04 12:53:01 +01:00
Laurent THOMAS
d49165f07a
merge develop
2021-11-03 17:28:06 +01:00
Melissa Elkadi
e8f965d010
Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa
2021-11-03 06:32:38 -07:00
hardy
cc18013320
Merge remote-tracking branch 'origin/NR_cset_bwp_fixes' into integration_2021_wk44
2021-11-03 13:38:55 +01:00
Melissa Elkadi
4eb0aceab6
Merge remote-tracking branch 'eurecom/develop' into episys/master-nsa
2021-10-27 15:05:05 -07:00
frtabu
a6dd62a50f
Enhance loader to allow library version selection for executables, as ldcptest which do not use the config module.
2021-10-27 14:42:12 +02:00
francescomani
4d21ec23df
Merge remote-tracking branch 'origin/develop' into NR_SA_band_96
2021-10-27 14:21:02 +02:00
francescomani
d4c4f092b4
Merge remote-tracking branch 'origin/develop' into NR_cset_bwp_fixes
2021-10-27 14:06:25 +02:00
Laurent THOMAS
e3f9fd6b01
code cleanup, no feature
2021-10-24 14:47:24 +02:00