.

software/ors-amarisoft/amari/slap.jinja2

@@ -136,6 +136,14 @@
 {%-         for k, v in defaults['cell/' + _.cell_type].items()                       %}
 {%-           do _.setdefault(k, v)                                                   %}
 {%-         endfor                                                                    %}
+{%-         if _.cell_type == 'lte'                                                   %}
+{%-           _.setdefault('ul_earfcn',    lte.default_ul_earfcn(_.dl_earfcn)         %}
+{%-         elif _.cell_type == 'nr'                                                  %}
+{%-           _.setdefault('ul_nr_arfcn',  lte.default_ul_nr_arfcn(_.dl_nr_arfcn))    %}
+{%-           _.setdefault('ssb_nr_arfcn', lte.default_ssb_nr_arfcn(_.dl_nr_arfcn))   %}
+{%-         else                                                                      %}
+{%-           do bug('unreachable')                                                   %}
+{%-         endif                                                                     %}
 {%-       endif                                                                       %}
 {%-       do icell_dict.update({ref: icell})                                          %}
 {%-       set ru = _['ru']                                                            %}

software/ors-amarisoft/cell/lte/input-schema.json

@@ -49,6 +49,11 @@
       "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
       "type": "integer"
     },
+    "ul_earfcn": {
+      "title": "UL EARFCN",
+      "description": "Uplink E-UTRA Absolute Radio Frequency Channel Number of the cell. By default a frequency corresponding to dl_earfcn is chosen.",
+      "type": "integer"
+    },
     "pci": {
       "default": 1
     },

software/ors-amarisoft/cell/nr/input-schema.json

@@ -47,6 +47,11 @@
       "description": "NR band number",
       "type": "integer"
     },
+    "ul_nr_arfcn": {
+      "title": "UL NR ARFCN",
+      "description": "Uplink NR Absolute Radio Frequency Channel Number of the cell. By default a frequency corresponding to dl_nr_arfcn is chosen.",
+      "type": "integer"
+    },
     "ssb_nr_arfcn": {
       "title": "SSB NR ARFCN",
       "description": "SSB NR Absolute Radio Frequency Channel Number of the cell. If set it must be an element of global synchronization raster. By default a valid frequency nearby dl_nr_arfcn is chosen.",

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

@@ -109,6 +109,7 @@
           tac:          {{ cell.tac }},
           n_id_cell:    {{ cell.pci }},
           dl_earfcn:    {{ cell.dl_earfcn }},
+          ul_earfcn:    {{ cell.ul_earfcn }},
           root_sequence_index: {{ cell.get('root_sequence_index',
                                     slapparameter_dict.get('root_sequence_index',
                                       204 + i)) }},
@@ -125,6 +126,7 @@
               cell_id:    {{ cfg('enb_id') }}{{ cell2.cell_id.removeprefix('0x') }}, // -> {{ J(jref_of_shared(icell2)) }}
               n_id_cell:  {{ cell2.pci }},
               dl_earfcn:  {{ cell2.dl_earfcn }},
+              ul_earfcn:  {{ cell2.ul_earfcn }},
               tac:        {{ cell2.tac }},
 {%-           elif cell2.cell_type == 'nr' %}
               rat:        "nr",
@@ -132,7 +134,7 @@
               n_id_cell:  {{ cell2.pci }},
               gnb_id_bits
               dl_nr_arfcn
-              ssb_nr_arfcn ... + lte.default_ssb_nr_arfcn(cell2.dl_nr_arfcn)
+              ssb_nr_arfcn
               ul_nr_arfcn
               tac
               band
@@ -370,10 +372,11 @@
           n_id_cell:    {{ cell.pci }},
           band:         {{ cell.nr_band }},
           dl_nr_arfcn:  {{ cell.dl_nr_arfcn }},
+          ul_nr_arfcn:  {{ cell.ul_nr_arfcn }},
           bandwidth:    {{ cell.bandwidth }},
 
           subcarrier_spacing: {{ 30  if cell.rf_mode == 'tdd'  else 15 }},
-          ssb_nr_arfcn:   {{ cell.get('ssb_nr_arfcn', lte.default_ssb_nr_arfcn(cell.dl_nr_arfcn)) }},
+          ssb_nr_arfcn:   {{ cell.ssb_nr_arfcn }},
           ssb_pos_bitmap: {{ cell.ssb_pos_bitmap }},
 
           root_sequence_index: 1,   // XXX adjust from cfg('root_sequence_index') XXX place

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

@@ -47,6 +47,7 @@
           n_antenna_ul: {{ ru.n_antenna_ul }},
 
           dl_earfcn: {{ cell.dl_earfcn }},
+          ul_earfcn: {{ cell.ul_earfcn }},
           bandwidth: {{ cell.bandwidth.removesuffix(' MHz') }},
 
           global_timing_advance: -1,
@@ -77,8 +78,9 @@
 
           band:         {{ cell.nr_band }},
           dl_nr_arfcn:  {{ cell.dl_nr_arfcn }},
+          ul_nr_arfcn:  {{ cell.ul_nr_arfcn }},
+          ssb_nr_arfcn: {{ cell.ssb_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  if cell.rf_mode == 'tdd'  else 15 }},
         },