Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
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
lizhongxiao
OpenXG-RAN
Commits
426ba799
Commit
426ba799
authored
Oct 05, 2023
by
Deokseong "David" Kim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Episys/david/usrp gain adj
parent
0695bb62
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
17 deletions
+22
-17
ci-scripts/run_sl_test.py
ci-scripts/run_sl_test.py
+2
-2
ci-scripts/sl_net_config.json
ci-scripts/sl_net_config.json
+19
-14
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+1
-1
No files found.
ci-scripts/run_sl_test.py
View file @
426ba799
...
@@ -252,7 +252,7 @@ class Node:
...
@@ -252,7 +252,7 @@ class Node:
def
_update_cmd
(
self
,
role
:
str
,
cmd
:
str
)
->
str
:
def
_update_cmd
(
self
,
role
:
str
,
cmd
:
str
)
->
str
:
if
OPTS
.
basic
:
return
redirect_output
(
'uname -a'
,
self
.
log_file_path
)
if
OPTS
.
basic
:
return
redirect_output
(
'uname -a'
,
self
.
log_file_path
)
dest
=
''
if
'--dest'
in
cmd
or
OPTS
.
dest
==
''
else
f' --dest
{
OPTS
.
dest
}
'
dest
=
''
if
'--dest'
in
cmd
or
OPTS
.
dest
==
''
else
f' --dest
{
OPTS
.
dest
}
'
tx_msg
=
f
' --message "
{
OPTS
.
message
}
"'
if
len
(
OPTS
.
message
)
>
0
else
''
tx_msg
=
f
" --message '
{
OPTS
.
message
}
'"
if
len
(
OPTS
.
message
)
>
0
else
""
if
role
==
'syncref'
:
if
role
==
'syncref'
:
cmd
=
cmd
+
tx_msg
+
f' --mcs
{
OPTS
.
mcs
}
'
+
dest
cmd
=
cmd
+
tx_msg
+
f' --mcs
{
OPTS
.
mcs
}
'
+
dest
if
'rfsim'
==
OPTS
.
test
:
if
'rfsim'
==
OPTS
.
test
:
...
@@ -426,7 +426,7 @@ def set_attenuation(attenuation: int, atten_host: str, user: str) -> None:
...
@@ -426,7 +426,7 @@ def set_attenuation(attenuation: int, atten_host: str, user: str) -> None:
"""
"""
if
OPTS
.
att
>=
0
:
if
OPTS
.
att
>=
0
:
LOGGER
.
info
(
'Setting attenuation'
)
LOGGER
.
info
(
'Setting attenuation'
)
atten_set_cmd
=
f"curl http://169.254.10.10/:CHAN:
3
:SETATT:
{
attenuation
}
"
#CHAN:1:2:3:4:SETATT:25.5
atten_set_cmd
=
f"curl http://169.254.10.10/:CHAN:
1:2:3:4
:SETATT:
{
attenuation
}
"
#CHAN:1:2:3:4:SETATT:25.5
atten_get_cmd
=
f"curl http://169.254.10.10/:ATT?"
atten_get_cmd
=
f"curl http://169.254.10.10/:ATT?"
host_IPs
=
check_output
([
'hostname'
,
'-I'
]).
decode
().
strip
().
split
()
host_IPs
=
check_output
([
'hostname'
,
'-I'
]).
decode
().
strip
().
split
()
LOCAL_IP
=
host_IPs
[
1
]
if
len
(
host_IPs
)
>
1
else
host_IPs
[
0
]
LOCAL_IP
=
host_IPs
[
1
]
if
len
(
host_IPs
)
>
1
else
host_IPs
[
0
]
...
...
ci-scripts/sl_net_config.json
View file @
426ba799
...
@@ -19,33 +19,30 @@
...
@@ -19,33 +19,30 @@
"role"
:
"syncref"
,
"role"
:
"syncref"
,
"id"
:
""
,
"id"
:
""
,
"ip"
:
""
,
"ip"
:
""
,
"cmd"
:
"sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --sync-ref --rbsl 52 --numerology 1 --band 78 --SLC
3
600000000 --ue-txgain 0 --usrp-args type=n3xx,addr=192.168.10.2,subdev=A:0,master_clock_rate=122.88e6 --log_config.global_log_options time,nocolor > ~/syncref.log 2>&1"
"cmd"
:
"sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --sync-ref --rbsl 52 --numerology 1 --band 78 --SLC
2
600000000 --ue-txgain 0 --usrp-args type=n3xx,addr=192.168.10.2,subdev=A:0,master_clock_rate=122.88e6 --log_config.global_log_options time,nocolor > ~/syncref.log 2>&1"
},
},
{
{
"role"
:
"nearby"
,
"role"
:
"nearby"
,
"id"
:
""
,
"id"
:
""
,
"ip"
:
"10.1.1.80"
,
"ip"
:
"10.1.1.80"
,
"cmd"
:
"cd $HOME/openairinterface5g/ci-scripts; python3 sl_rx_agent.py --cmd
\"
sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --rbsl 52 --numerology 1 --band 78 --SLC 3600000000 --ue-rxgain 75 --usrp-args type=n3xx,addr=192.168.10.2,subdev=A:0,master_clock_rate=122.88e6 --log_config.global_log_options time,nocolor > ~/nearby.log 2>&1
\"
"
"_comment"
:
"atten value = 30, ue-rxgain = 80 for the cable conneciton"
,
"cmd"
:
"cd $HOME/openairinterface5g/ci-scripts; python3 sl_rx_agent.py --cmd
\"
sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --rbsl 52 --numerology 1 --band 78 --SLC 2600000000 --ue-rxgain 80 --usrp-args type=n3xx,addr=192.168.10.2,subdev=A:0,master_clock_rate=122.88e6 --log_config.global_log_options time,nocolor > ~/nearby.log 2>&1
\"
"
}
}
],
],
"net_2"
:
[
"net_2"
:
[
{
{
"role"
:
"syncref"
,
"role"
:
"syncref"
,
"id"
:
"
1
"
,
"id"
:
""
,
"ip"
:
""
,
"ip"
:
""
,
"cmd"
:
"sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --sync-ref --rbsl 52 --numerology 1 --band 78 --SLC 3600000000 --ue-txgain 0 --usrp-args type=n3xx,addr=192.168.10.2,subdev=A:0,master_clock_rate=122.88e6 --log_config.global_log_options time,nocolor --node-number 1 > ~/syncref1.log 2>&1"
"_comment"
:
"atten value = 30, ue-rxgain = 80 for the cable conneciton"
,
},
"cmd"
:
"sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --sync-ref --rbsl 52 --numerology 1 --band 78 --SLC 2600000000 --ue-txgain 0 --usrp-args type=n3xx,addr=192.168.10.2,subdev=A:0,master_clock_rate=122.88e6 --log_config.global_log_options time,nocolor > ~/syncref.log 2>&1"
{
"role"
:
"nearby"
,
"id"
:
"2"
,
"ip"
:
"10.1.1.80"
,
"cmd"
:
"cd $HOME/openairinterface5g/ci-scripts; python3 sl_rx_agent.py --cmd
\"
sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --rbsl 52 --numerology 1 --band 78 --SLC 3600000000 --ue-txgain 0 --ue-rxgain 75 --usrp-args type=n3xx,addr=192.168.10.2,subdev=A:0,master_clock_rate=122.88e6 --log_config.global_log_options time,nocolor --node-number 2 > ~/nearby2.log 2>&1
\"
"
},
},
{
{
"role"
:
"nearby"
,
"role"
:
"nearby"
,
"id"
:
"
3
"
,
"id"
:
""
,
"ip"
:
"10.1.1.63"
,
"ip"
:
"10.1.1.63"
,
"cmd"
:
"cd $HOME/openairinterface5g/ci-scripts; python3 sl_rx_agent.py --cmd
\"
sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --rbsl 52 --numerology 1 --band 78 --SLC 3600000000 --ue-rxgain 100 --usrp-args type=b200,serial=3150384,clock_source=external --log_config.global_log_options time,nocolor --node-number 3 > ~/nearby3.log 2>&1
\"
"
"_comment"
:
"atten value = 30, ue-rxgain = 80 for the cable conneciton"
,
"cmd"
:
"cd $HOME/openairinterface5g/ci-scripts; python3 sl_rx_agent.py --cmd
\"
sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --rbsl 52 --numerology 1 --band 78 --SLC 2600000000 --ue-rxgain 80 --usrp-args type=b200,serial=3150384,clock_source=external --log_config.global_log_options time,nocolor > ~/nearby.log 2>&1
\"
"
}
}
],
],
"net_3"
:
[
"net_3"
:
[
...
@@ -53,13 +50,21 @@
...
@@ -53,13 +50,21 @@
"role"
:
"syncref"
,
"role"
:
"syncref"
,
"id"
:
"1"
,
"id"
:
"1"
,
"ip"
:
""
,
"ip"
:
""
,
"cmd"
:
"sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --sync-ref --rbsl 52 --numerology 1 --band 78 --SLC 3600000000 --ue-txgain 0 --usrp-args type=n3xx,addr=192.168.10.2,subdev=A:0,master_clock_rate=122.88e6 --log_config.global_log_options time,nocolor > ~/syncref.log 2>&1"
"cmd"
:
"sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --sync-ref --rbsl 52 --numerology 1 --band 78 --SLC 2600000000 --ue-txgain 0 --usrp-args type=n3xx,addr=192.168.10.2,subdev=A:0,master_clock_rate=122.88e6 --log_config.global_log_options time,nocolor --node-number 1 > ~/syncref1.log 2>&1"
},
{
"role"
:
"nearby"
,
"id"
:
"2"
,
"ip"
:
"10.1.1.80"
,
"_comment"
:
"atten value = 30, ue-rxgain = 80 for the cable conneciton"
,
"cmd"
:
"cd $HOME/openairinterface5g/ci-scripts; python3 sl_rx_agent.py --cmd
\"
sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --rbsl 52 --numerology 1 --band 78 --SLC 2600000000 --ue-txgain 0 --ue-rxgain 80 --usrp-args type=n3xx,addr=192.168.10.2,subdev=A:0,master_clock_rate=122.88e6 --log_config.global_log_options time,nocolor --node-number 2 > ~/nearby2.log 2>&1
\"
"
},
},
{
{
"role"
:
"nearby"
,
"role"
:
"nearby"
,
"id"
:
"3"
,
"id"
:
"3"
,
"ip"
:
"10.1.1.63"
,
"ip"
:
"10.1.1.63"
,
"cmd"
:
"cd $HOME/openairinterface5g/ci-scripts; python3 sl_rx_agent.py --cmd
\"
sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --rbsl 52 --numerology 1 --band 78 --SLC 3600000000 --ue-rxgain 100 --usrp-args type=b200,serial=3150384,clock_source=external --log_config.global_log_options time,nocolor > ~/nearby.log 2>&1
\"
"
"_comment"
:
"atten value = 30, ue-rxgain = 80 for the cable conneciton"
,
"cmd"
:
"cd $HOME/openairinterface5g/ci-scripts; python3 sl_rx_agent.py --cmd
\"
sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem --sl-mode 2 --rbsl 52 --numerology 1 --band 78 --SLC 2600000000 --ue-rxgain 80 --usrp-args type=b200,serial=3150384,clock_source=external --log_config.global_log_options time,nocolor --node-number 3 > ~/nearby3.log 2>&1
\"
"
}
}
]
]
},
},
...
...
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
426ba799
...
@@ -1616,7 +1616,7 @@ void validate_rx_payload_str(NR_DL_UE_HARQ_t *harq, int slot, bool polar_decoded
...
@@ -1616,7 +1616,7 @@ void validate_rx_payload_str(NR_DL_UE_HARQ_t *harq, int slot, bool polar_decoded
LOG_D
(
NR_PHY
,
"result[%d]=%c
\n
"
,
i
,
result
[
i
]);
LOG_D
(
NR_PHY
,
"result[%d]=%c
\n
"
,
i
,
result
[
i
]);
}
}
char
*
usr_msg_ptr
=
&
result
[
0
];
char
*
usr_msg_ptr
=
&
result
[
0
];
char
tmp_flag
[
128
];
char
tmp_flag
[
128
]
=
{}
;
memset
(
tmp_flag
,
'+'
,
strlen
(
"Received your text! It says: "
)
+
test_msg_len
);
memset
(
tmp_flag
,
'+'
,
strlen
(
"Received your text! It says: "
)
+
test_msg_len
);
LOG_I
(
NR_PHY
,
"%s
\n
"
,
tmp_flag
);
LOG_I
(
NR_PHY
,
"%s
\n
"
,
tmp_flag
);
LOG_I
(
NR_PHY
,
"Received your text! It says: %s
\n
"
,
usr_msg_ptr
);
LOG_I
(
NR_PHY
,
"Received your text! It says: %s
\n
"
,
usr_msg_ptr
);
...
...
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