.

software/ors-amarisoft/config/ue-lte.jinja2.cfg

@@ -56,18 +56,64 @@ rf_driver: {
 
 
   cell_groups: [{
+    // LTE cells
+    group_type: "lte",
     multi_ue: true,
+
     cells: [
+{%- for cell_ref, icell in icell_dict|dictsort  %}
+{%-   set cell = icell['_']                     %}
+{%-   if cell.ue_cell_type == 'lte'             %}
+{%-     set ru_ref = J(jcell_ru_ref(icell))     %}
+{%-     set iru = iru_dict[ru_ref]              %}
+{%-     set ru = iru['_']                       %}
+
+        // {{ J(jref_of_shared(icell)) }}
         {
-        bandwidth: N_RB_DL,
-        dl_earfcn: {{ slapparameter_dict.get('dl_earfcn', 0) }},
-        n_antenna_dl: {{ slapparameter_dict.get('n_antenna_dl', slap_configuration['configuration.default_n_antenna_dl']) }},
-        n_antenna_ul: {{ slapparameter_dict.get('n_antenna_ul', slap_configuration['configuration.default_n_antenna_ul']) }},
+          rf_port:      {{ ru._rf_port }},
+          n_antenna_dl: {{ ru.n_antenna_dl }},
+          n_antenna_ul: {{ ru.n_antenna_ul }},
+
+          dl_earfcn: {{ cell.dl_earfcn }},
+          bandwidth: {{ lte.cell_n_rb_dl(cell) }},
+
           global_timing_advance: -1,
-      }
+        },
+{%-   endif %}
+{%- endfor %}
     ],
     pdcch_decode_opt: false,
     pdcch_decode_opt_threshold: 0.1,
+
+  }, {
+    // NR cells
+    group_type: "nr",
+    multi_ue: true,
+
+    cells: [
+{%- for cell_ref, icell in icell_dict|dictsort  %}
+{%-   set cell = icell['_']                     %}
+{%-   if cell.ue_cell_type == 'nr'              %}
+{%-     set ru_ref = J(jcell_ru_ref(icell))     %}
+{%-     set iru = iru_dict[ru_ref]              %}
+{%-     set ru = iru['_']                       %}
+
+        // {{ J(jref_of_shared(icell)) }}
+        {
+          rf_port:      {{ ru._rf_port }},
+          n_antenna_dl: {{ ru.n_antenna_dl }},
+          n_antenna_ul: {{ ru.n_antenna_ul }},
+
+          band:         {{ cell.nr_band }},
+          dl_nr_arfcn:  {{ cell.dl_nr_arfcn }},
+          bandwidth:    {{ cell.bandwidth }},
+          ssb_nr_arfcn: {{ cell.get('ssb_nr_arfcn', lte.default_ssb_nr_arfcn(cell.dl_nr_arfcn)) }},
+
+          subcarrier_spacing: 30, // XXX FDD -> 15
+        },
+{%-   endif %}
+{%- endfor %}
+    ]
   }],
 
   ue_list: [

software/ors-amarisoft/config/ue-nr.jinja2.cfg

@@ -12,6 +12,7 @@ rf_driver: {
     },
     tx_gain: {{ slapparameter_dict.get('tx_gain', 60) }},
     rx_gain: {{ slapparameter_dict.get('rx_gain', 40) }},
+
     cell_groups: [{
       group_type: "nr",
       multi_ue: false,
@@ -27,6 +28,7 @@ rf_driver: {
         }
       ],
     }],
+
     ue_list: [
       {
       sim_algo: "{{ slapparameter_dict.get('sim_algo', 'milenage') }}",