Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Xavier Thompson
slapos
Commits
cee4b789
Commit
cee4b789
authored
Jul 19, 2024
by
Thomas Gambier
🚴🏼
Committed by
Joanne Hugé
Oct 09, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ors-amarisoft: lteue doesn't support gain in list
parent
30e48d10
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
6 deletions
+12
-6
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+3
-3
software/ors-amarisoft/config/enb.jinja2.cfg
software/ors-amarisoft/config/enb.jinja2.cfg
+1
-1
software/ors-amarisoft/config/ue.jinja2.cfg
software/ors-amarisoft/config/ue.jinja2.cfg
+1
-1
software/ors-amarisoft/slaplte.jinja2
software/ors-amarisoft/slaplte.jinja2
+7
-1
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
cee4b789
...
@@ -24,7 +24,7 @@ md5sum = 71255edd8b9bfc7460b32b723da01cf8
...
@@ -24,7 +24,7 @@ md5sum = 71255edd8b9bfc7460b32b723da01cf8
[slaplte.jinja2]
[slaplte.jinja2]
_update_hash_filename_ = slaplte.jinja2
_update_hash_filename_ = slaplte.jinja2
md5sum =
bcc96576d1d0a2c6bf9740dcc58b52a3
md5sum =
070b523a15c0ce70dffc907e9215b225
[ru_amarisoft-stats.jinja2.py]
[ru_amarisoft-stats.jinja2.py]
_update_hash_filename_ = ru/amarisoft-stats.jinja2.py
_update_hash_filename_ = ru/amarisoft-stats.jinja2.py
...
@@ -88,7 +88,7 @@ md5sum = dd50b4e4780830ddbde28b84af118f18
...
@@ -88,7 +88,7 @@ md5sum = dd50b4e4780830ddbde28b84af118f18
[enb.jinja2.cfg]
[enb.jinja2.cfg]
filename = config/enb.jinja2.cfg
filename = config/enb.jinja2.cfg
md5sum =
1b8dc68206485299c08ab0e1544773f6
md5sum =
d9f18f0e00f0c799ec44dc0a27567892
[drb_lte.jinja2.cfg]
[drb_lte.jinja2.cfg]
filename = config/drb_lte.jinja2.cfg
filename = config/drb_lte.jinja2.cfg
...
@@ -124,7 +124,7 @@ md5sum = f07c85916bcb7e4002c8edc3d087c1be
...
@@ -124,7 +124,7 @@ md5sum = f07c85916bcb7e4002c8edc3d087c1be
[ue.jinja2.cfg]
[ue.jinja2.cfg]
filename = config/ue.jinja2.cfg
filename = config/ue.jinja2.cfg
md5sum =
acaa1aab5329de4ca25edb9aa570208e
md5sum =
490c0b91c1bfa7b1c2a1f592dd766ab9
[software.cfg.html]
[software.cfg.html]
_update_hash_filename_ = gadget/software.cfg.html
_update_hash_filename_ = gadget/software.cfg.html
...
...
software/ors-amarisoft/config/enb.jinja2.cfg
View file @
cee4b789
...
@@ -143,7 +143,7 @@
...
@@ -143,7 +143,7 @@
log_filename: "{{ directory['log'] }}/enb.log",
log_filename: "{{ directory['log'] }}/enb.log",
{# instantiate radio units #}
{# instantiate radio units #}
{{ slaplte.ru_config(iru_dict, slapparameter_dict) }}
{{ slaplte.ru_config(iru_dict, slapparameter_dict
, True
) }}
{%- if slapparameter_dict.get('websocket_password', '') %}
{%- if slapparameter_dict.get('websocket_password', '') %}
com_addr: "[{{ gtp_addr_v6 }}]:{{ slapparameter_dict.com_ws_port }}",
com_addr: "[{{ gtp_addr_v6 }}]:{{ slapparameter_dict.com_ws_port }}",
...
...
software/ors-amarisoft/config/ue.jinja2.cfg
View file @
cee4b789
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
{%- endif %}
{%- endif %}
{# instantiate radio units #}
{# instantiate radio units #}
{{ slaplte.ru_config(iru_dict, slapparameter_dict) }}
{{ slaplte.ru_config(iru_dict, slapparameter_dict
, False
) }}
cell_groups: [{
cell_groups: [{
...
...
software/ors-amarisoft/slaplte.jinja2
View file @
cee4b789
...
@@ -432,7 +432,7 @@
...
@@ -432,7 +432,7 @@
{#- ---- building configuration ---- #}
{#- ---- building configuration ---- #}
{#- ru_config emits RF driver configuration for specified Radio Units. #}
{#- ru_config emits RF driver configuration for specified Radio Units. #}
{%- macro ru_config(iru_dict, slapparameter_dict) %}
{%- macro ru_config(iru_dict, slapparameter_dict
, support_gain_in_list
) %}
// Radio Units
// Radio Units
rf_driver: {
rf_driver: {
{%- set dev_argv = [] %}
{%- set dev_argv = [] %}
...
@@ -516,6 +516,12 @@
...
@@ -516,6 +516,12 @@
},
},
{#- emit tx/rx gain for all channels #}
{#- emit tx/rx gain for all channels #}
{%- if support_gain_in_list %}
tx_gain: {{ tx_gainv }},
tx_gain: {{ tx_gainv }},
rx_gain: {{ rx_gainv }},
rx_gain: {{ rx_gainv }},
{%- else %}
tx_gain: {{ tx_gainv[0] }},
rx_gain: {{ rx_gainv[0] }},
{%- endif %}
{%- endmacro %}
{%- endmacro %}
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