.

software/ors-amarisoft/amari/slap.jinja2

@@ -160,15 +160,18 @@
 {%-         for k, v in defaults['cell/' + _.cell_type].items()                             %}
 {%-           do _.setdefault(k, v)                                                         %}
 {%-         endfor                                                                          %}
-{%-         if _.cell_type == 'lte'                                                     %}
+{%-         set xcell_type = _.cell_type                                                    %}
+{%-       else                                                                              %}
+{%-         set xcell_type = _.ue_cell_type                                                 %}
+{%-       endif                                                                             %}
+{%-       if xcell_type == 'lte'                                                            %}
 {%-         do _.setdefault('ul_earfcn',    default_ul_earfcn(_.dl_earfcn))                 %}
-{%-         elif _.cell_type == 'nr'                                                    %}
+{%-       elif xcell_type == 'nr'                                                           %}
 {%-         do _.setdefault('ul_nr_arfcn',  default_ul_nr_arfcn(_.dl_nr_arfcn, _.nr_band))  %}
 {%-         do _.setdefault('ssb_nr_arfcn', default_ssb_nr_arfcn(_.dl_nr_arfcn))            %}
 {%-       else                                                                              %}
 {%-         do bug('unreachable')                                                           %}
 {%-       endif                                                                             %}
-{%-       endif                                                                         %}
 {%-       do icell_dict.update({ref: icell})                                                %}
 {%-       set ru = _['ru']                                                                  %}
 {%-       if ru.ru_type not in ('ru_ref', 'ruincell_ref')                                   %}

software/ors-amarisoft/config/ue.cfg

@@ -34,6 +34,7 @@
           n_antenna_ul: 1,
 
           dl_earfcn: 38050,
+          ul_earfcn: 38050,
           bandwidth: 5,
 
           global_timing_advance: -1,
@@ -56,8 +57,9 @@
 
           band:         7,
           dl_nr_arfcn:  537200,
-          bandwidth:    5,
+          ul_nr_arfcn:  513200,
           ssb_nr_arfcn: 537170,
+          bandwidth:    5,
 
           subcarrier_spacing: 15,
         },

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

@@ -17,6 +17,7 @@
     },
 
     "dl_earfcn": { "$ref": "../../../cell/lte/input-schema.json#/properties/dl_earfcn" },
+    "ul_earfcn": { "$ref": "../../../cell/lte/input-schema.json#/properties/ul_earfcn" },
     "bandwidth": { "$ref": "../../../cell/lte/input-schema.json#/properties/bandwidth" }
   }
 }

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

@@ -21,6 +21,7 @@
     "dl_nr_arfcn":  { "$ref": "../../../cell/nr/input-schema.json#/properties/dl_nr_arfcn" },
     "bandwidth":    { "$ref": "../../../cell/nr/input-schema.json#/properties/bandwidth" },
     "nr_band":      { "$ref": "../../../cell/nr/input-schema.json#/properties/nr_band" },
+    "ul_nr_arfcn":  { "$ref": "../../../cell/nr/input-schema.json#/properties/ul_nr_arfcn" },
     "ssb_nr_arfcn": { "$ref": "../../../cell/nr/input-schema.json#/properties/ssb_nr_arfcn" }
   }
 }