.

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

@@ -46,6 +46,12 @@
       "description": "NR band number",
       "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.",
+      "type": ["integer", "null"],
+      "default": null
+    },
     "ssb_pos_bitmap": {
       "title": "SSB Position Bitmap",
       "description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",

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

@@ -348,7 +348,7 @@
               n_id_cell:  {{ cell2.pci }},
               gnb_id_bits
               dl_nr_arfcn
-              ssb_nr_arfcn
+              ssb_nr_arfcn ... + lte.default_ssb_nr_arfcn(cell2.dl_nr_arfcn)
               ul_nr_arfcn
               tac
               band
@@ -586,10 +586,10 @@
           n_id_cell:    {{ cell.pci }},
           band:         {{ cell.nr_band }},
           dl_nr_arfcn:  {{ cell.dl_nr_arfcn }},
-          // XXX add ssb_nr_arfcn if configured (omit if not configured to let enb compute it itself by its default rule)
           bandwidth:    {{ cell.bandwidth }},
 
           subcarrier_spacing: 30,   // XXX FDD -> 15
+          ssb_nr_arfcn:   {{ cell.get('ssb_nr_arfcn', lte.default_ssb_nr_arfcn(cell.dl_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/lte.jinja2

 {#- Package lte provides helpers for configuring LTE cells. -#}
 
+{#- XXX -> nr ? #}
+{%- macro default_ssb_nr_arfcn(dl_nr_arfcn) %}
+{%-   set f = nr.get_frequency(nrarfcn=632628)  %}
+{%-   set gscn = nr.get_gscn_by_frequency(f)-1  %}{# nrarfcn round up, amari down #}
+{%-   set fg = nr.get_frequency_by_gscn(gscn)   %}
+{%-   set fg_arfcn = nr.get_nrarfcn(fg)         %}
+{{- fg_arfcn }}
+{%- endmacro %}
+
 {#- cell_tdd_config returns tdd_config for an LTE cell. #}
 {%- macro cell_tdd_config(cell) %}
 {%-   set _ = {'[Configuration 2] 5ms 2UL 6DL (default)':        2,

software/ors-amarisoft/instance-ue-nr-input-schema.json.jinja2

@@ -3,10 +3,5 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-    "ssb_nr_arfcn": {
-      "title": "SSB NR ARFCN",
-      "description": "SSB NR ARFCN, you can retrieve from ENB/GNB side",
-      "type": "number"
-    },
   }
 }