Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Michael Black
OpenXG UE
Commits
167a0b10
Commit
167a0b10
authored
Dec 10, 2018
by
Guy De Souza
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'nr_pdsch' of
https://gitlab.eurecom.fr/oai/openairinterface5g
into nr_pdsch
parents
8b4b8627
818f4a70
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+2
-2
targets/RT/USER/nr-uesoftmodem.c
targets/RT/USER/nr-uesoftmodem.c
+10
-10
No files found.
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
167a0b10
...
...
@@ -2717,7 +2717,7 @@ void nr_ue_measurement_procedures(
}
#endif
// accumulate and filter timing offset estimation every nr_tti_rx (instead of every frame)
if
((
(
slot
%
2
)
==
0
)
&&
(
l
==
(
1
-
frame_parms
->
Ncp
)))
{
if
((
slot
==
2
)
&&
(
l
==
(
1
-
frame_parms
->
Ncp
)))
{
// AGC
/*
...
...
@@ -5058,7 +5058,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SLOT_FEP
,
VCD_FUNCTION_IN
);
nr_slot_fep
(
ue
,
l
,
nr_tti_rx
,
nr_tti_rx
<<
1
,
0
,
0
,
1
,
...
...
targets/RT/USER/nr-uesoftmodem.c
View file @
167a0b10
...
...
@@ -85,10 +85,10 @@ unsigned short config_frames[4] = {2,9,11,13};
// current status is that every UE has a DL scope for a SINGLE eNB (eNB_id=0)
// at eNB 0, an UL scope for every UE
FD_lte_phy_scope_ue
*
form_ue
[
NUMBER_OF_UE_MAX
];
FD_lte_phy_scope_enb
*
form_enb
[
MAX_NUM_CCs
][
NUMBER_OF_UE_MAX
];
FD_stats_form
*
form_stats
=
NULL
,
*
form_stats_l2
=
NULL
;
//
FD_lte_phy_scope_enb *form_enb[MAX_NUM_CCs][NUMBER_OF_UE_MAX];
//
FD_stats_form *form_stats=NULL,*form_stats_l2=NULL;
char
title
[
255
];
unsigned
char
scope_enb_num_ue
=
2
;
//
unsigned char scope_enb_num_ue = 2;
static
pthread_t
forms_thread
;
//xforms
#endif //XFORMS
#include "nr-uesoftmodem.h"
...
...
@@ -440,8 +440,8 @@ static void *scope_thread(void *arg) {
while
(
!
oai_exit
)
{
//len = dump_ue_stats (PHY_vars_UE_g[0][0], &PHY_vars_UE_g[0][0]->proc.proc_rxtx[0],stats_buffer, 0, mode,rx_input_level_dBm);
//fl_set_object_label(form_stats->stats_text, stats_buffer);
fl_clear_browser
(
form_stats
->
stats_text
);
fl_add_browser_line
(
form_stats
->
stats_text
,
stats_buffer
);
//
fl_clear_browser(form_stats->stats_text);
//
fl_add_browser_line(form_stats->stats_text, stats_buffer);
//if (PHY_vars_UE_g[0][0]->is_synchronized == 1)
phy_scope_UE
(
form_ue
[
0
],
...
...
@@ -451,7 +451,7 @@ static void *scope_thread(void *arg) {
//printf("doing forms\n");
//usleep(100000); // 100 ms
sleep
(
1
);
sleep
(
0
.
1
);
}
// printf("%s",stats_buffer);
...
...
@@ -1127,8 +1127,8 @@ int main( int argc, char **argv ) {
fl_initialize
(
&
fl_argc
,
argv
,
NULL
,
0
,
0
);
// restore the original command line args
// argv = fl_get_cmdline_args( &argc );
form_stats
=
create_form_stats_form
();
fl_show_form
(
form_stats
->
stats_form
,
FL_PLACE_HOTSPOT
,
FL_FULLBORDER
,
"stats"
);
//
form_stats = create_form_stats_form();
//
fl_show_form (form_stats->stats_form, FL_PLACE_HOTSPOT, FL_FULLBORDER, "stats");
UE_id
=
0
;
form_ue
[
UE_id
]
=
create_lte_phy_scope_ue
();
sprintf
(
title
,
"NR DL SCOPE UE"
);
...
...
@@ -1218,8 +1218,8 @@ int main( int argc, char **argv ) {
if
(
do_forms
==
1
)
{
pthread_join
(
forms_thread
,
&
status
);
fl_hide_form
(
form_stats
->
stats_form
);
fl_free_form
(
form_stats
->
stats_form
);
//
fl_hide_form(form_stats->stats_form);
//
fl_free_form(form_stats->stats_form);
fl_hide_form
(
form_ue
[
0
]
->
lte_phy_scope_ue
);
fl_free_form
(
form_ue
[
0
]
->
lte_phy_scope_ue
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment