Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
openairinterface5G
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
19
Merge Requests
19
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
oai
openairinterface5G
Commits
03d404a6
Commit
03d404a6
authored
Feb 14, 2019
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issue-399-master-ue-hot-fix' into 'master'
Hot fix on UE configuration module See merge request
!506
parents
f7a2965b
28a1fcde
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
5 deletions
+32
-5
README.txt
README.txt
+1
-0
ci-scripts/runTestOnVM.sh
ci-scripts/runTestOnVM.sh
+26
-2
targets/RT/USER/lte-uesoftmodem.c
targets/RT/USER/lte-uesoftmodem.c
+5
-3
No files found.
README.txt
View file @
03d404a6
...
@@ -61,3 +61,4 @@ v1.0.0 -> January 2019. This version first implements the architectural split de
...
@@ -61,3 +61,4 @@ v1.0.0 -> January 2019. This version first implements the architectural split de
S1-flex has been introduced.
S1-flex has been introduced.
New tools: config library, telnet server, ...
New tools: config library, telnet server, ...
A lot of bugfixes and a proper automated Continuous Integration process validates contributions.
A lot of bugfixes and a proper automated Continuous Integration process validates contributions.
v1.0.1 -> February 2019: Bug fix for the UE L1 simulator.
ci-scripts/runTestOnVM.sh
View file @
03d404a6
...
@@ -604,10 +604,34 @@ function start_l2_sim_ue {
...
@@ -604,10 +604,34 @@ function start_l2_sim_ue {
if
[
$i
-lt
50
]
if
[
$i
-lt
50
]
then
then
UE_SYNC
=
0
UE_SYNC
=
0
echo
"L2-SIM UE is NOT sync'ed w/eNB"
echo
"L2-SIM UE is NOT sync'ed w/ eNB"
return
else
else
UE_SYNC
=
1
UE_SYNC
=
1
echo
"L2-SIM UE is sync'ed w/eNB"
echo
"L2-SIM UE is sync'ed w/ eNB"
fi
# Checking oip1 interface has now an IP address
i
=
"0"
echo
"ifconfig oip1 | egrep -c
\"
inet addr
\"
"
>
$1
while
[
$i
-lt
10
]
do
sleep
5
CONNECTED
=
`
ssh
-o
StrictHostKeyChecking
=
no ubuntu@
$LOC_VM_IP_ADDR
<
$1
`
if
[
$CONNECTED
-eq
1
]
then
i
=
"100"
else
i
=
$[$i
+1]
fi
done
rm
$1
if
[
$i
-lt
50
]
then
UE_SYNC
=
0
echo
"L2-SIM UE oip1 is NOT sync'ed w/ EPC"
else
UE_SYNC
=
1
echo
"L2-SIM UE oip1 is sync'ed w/ EPC"
fi
fi
sleep
10
sleep
10
}
}
...
...
targets/RT/USER/lte-uesoftmodem.c
View file @
03d404a6
...
@@ -693,9 +693,13 @@ int main( int argc, char **argv ) {
...
@@ -693,9 +693,13 @@ int main( int argc, char **argv ) {
#if defined (XFORMS)
#if defined (XFORMS)
int
ret
;
int
ret
;
#endif
#endif
configmodule_interface_t
*
config_mod
;
start_background_system
();
start_background_system
();
if
(
load_configmodule
(
argc
,
argv
,
CONFIG_ENABLECMDLINEONLY
)
==
NULL
)
{
config_mod
=
load_configmodule
(
argc
,
argv
,
CONFIG_ENABLECMDLINEONLY
);
if
(
config_mod
==
NULL
)
{
exit_fun
(
"[SOFTMODEM] Error, configuration module init failed
\n
"
);
exit_fun
(
"[SOFTMODEM] Error, configuration module init failed
\n
"
);
}
}
...
@@ -811,8 +815,6 @@ int main( int argc, char **argv ) {
...
@@ -811,8 +815,6 @@ int main( int argc, char **argv ) {
}
else
init_openair0
(
frame_parms
[
0
],(
int
)
rx_gain
[
0
][
0
]);
}
else
init_openair0
(
frame_parms
[
0
],(
int
)
rx_gain
[
0
][
0
]);
if
(
simL1flag
==
1
)
{
if
(
simL1flag
==
1
)
{
AssertFatal
(
NULL
!=
load_configmodule
(
argc
,
argv
,
CONFIG_ENABLECMDLINEONLY
),
"[SOFTMODEM] Error, configuration module init failed
\n
"
);
RCConfig_sim
();
RCConfig_sim
();
}
}
...
...
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