Commit cee4b789 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼 Committed by Joanne Hugé

ors-amarisoft: lteue doesn't support gain in list

parent 30e48d10
...@@ -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
......
...@@ -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 }}",
......
...@@ -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: [{
......
...@@ -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 %}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment