.

software/ors-amarisoft/config/gnb.jinja2.cfg

@@ -7,7 +7,7 @@
 {%- endif %}
 
 #define N_ANTENNA_DL         {{ slapparameter_dict.get('n_antenna_dl', slap_configuration['configuration.default_n_antenna_dl']) }}
-{% if slapparameter_dict.get('rrh', 'ORS') == "M2RU Sunwave" %}
+{% if ru == "m2ru" %}
 #define N_ANTENNA_UL         {{ slapparameter_dict.get('n_antenna_ul', 1) }}
 {% else %}
 #define N_ANTENNA_UL         {{ slapparameter_dict.get('n_antenna_ul', slap_configuration['configuration.default_n_antenna_dl']) }}
@@ -19,7 +19,7 @@
   log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,ngap.level=debug,ngap.max_size=1,xnap.level=debug,xnap.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
 {% endif %}
   log_filename: "{{ directory['log'] }}/gnb.log",
-{% if slapparameter_dict.get('rrh', 'ORS') == "M2RU Sunwave" %}
+{% if ru == "m2ru" %}
   rf_driver: {
 {%- if slapparameter_dict.get('disable_sdr', False) %}
       name: "dummy",
@@ -140,7 +140,7 @@
     bandwidth: {{ slapparameter_dict.get('nr_bandwidth', slap_configuration['configuration.default_nr_bandwidth']) }},
     n_antenna_dl: N_ANTENNA_DL,
     n_antenna_ul: N_ANTENNA_UL,
-{%- if slapparameter_dict.get('rrh', 'ORS') == "ORS" %}
+{%- if bbu == "ors" %}
     manual_ref_signal_power: true,
 {%- if one_watt == "True" %}
     ss_pbch_block_power: {{ (tx_gain | int)  - 54 }},
@@ -257,7 +257,7 @@
       prach_config_index: 160,
       msg1_subcarrier_spacing: 30,
       msg1_fdm: 1,
-{% if slapparameter_dict.get('rrh', 'ORS') == "M2RU Sunwave" %}
+{% if ru == "m2ru" %}
       msg1_frequency_start: 0,
 {% else %}
       msg1_frequency_start: -1,
@@ -273,7 +273,7 @@
       cb_preambles_per_ssb: 8,
     },
     pdcch: {
-{% if slapparameter_dict.get('rrh', 'ORS') == "M2RU Sunwave" %}
+{% if ru == "m2ru" %}
       n_rb_coreset0: 48,
       n_symb_coreset0: 1,
 {% endif %}
@@ -281,7 +281,7 @@
       dedicated_coreset: {
         rb_start: -1,
         l_crb: -1,
-{% if slapparameter_dict.get('rrh', 'ORS') == "M2RU Sunwave" %}
+{% if ru == "m2ru" %}
         duration: 1,
 {% else %}
         duration: 0,
@@ -311,7 +311,7 @@
       dmrs_add_pos: 1,
       dmrs_type: 1,
       dmrs_max_len: 1,
-{% if slapparameter_dict.get('rrh', 'ORS') == "M2RU Sunwave" %}
+{% if ru == "m2ru" %}
       k0: 0,
       k1: [ 8, 7, 7, 6, 5, 4, 12, 11 ],
 {% elif tdd_config == 3 %}
@@ -553,7 +553,7 @@
       mcs_table: "qam256",
       mcs_table_tp: "qam256",
       ldpc_max_its: 5,
-{% if slapparameter_dict.get('rrh', 'ORS') == "M2RU Sunwave" %}
+{% if ru == "m2ru" %}
       k2: 4,
       msg3_k2: 7,
 {% elif tdd_config == 3 %}