.

software/ors-amarisoft/config/lte.jinja2

@@ -289,14 +289,15 @@
 
 {#- XXX -> nr ? #}
 {%- macro default_ssb_nr_arfcn(dl_nr_arfcn) %}
-{#- NOTE: rechecked computations wrt https://tech-academy.amarisoft.com/OutOfBox_UEsim_SA.html#Tips_SSB_Frequency #}
-{%-   set f = nr.get_frequency(nrarfcn=dl_nr_arfcn)  %}
-{%-   set gscn = nr.get_gscn_by_frequency(f)    %}
-{%-   if nr.get_frequency_by_gscn(gscn) > f     %}{# nrarfcn rounds up, amari down #}
-{%-     set gscn = gscn - 1                     %}
-{%-   endif                                     %}
-{%-   set fg = nr.get_frequency_by_gscn(gscn)   %}
-{%-   set fg_arfcn = nr.get_nrarfcn(fg)         %}
+{#- NOTE: computations rechecked wrt https://tech-academy.amarisoft.com/OutOfBox_UEsim_SA.html#Tips_SSB_Frequency #}
+{%-   set nr = nrarfcn_module                       %}
+{%-   set f = nr.get_frequency(nrarfcn=dl_nr_arfcn) %}
+{%-   set gscn = nr.get_gscn_by_frequency(f)        %}
+{%-   if nr.get_frequency_by_gscn(gscn) > f         %}{# nrarfcn rounds up, amari down #}
+{%-     set gscn = gscn - 1                         %}
+{%-   endif                                         %}
+{%-   set fg = nr.get_frequency_by_gscn(gscn)       %}
+{%-   set fg_arfcn = nr.get_nrarfcn(fg)             %}
 {{- fg_arfcn }}
 {%- endmacro %}
 

software/ors-amarisoft/config/ue.cfg

@@ -10,10 +10,14 @@
   // Radio Units
   rf_driver: {
       name: "sdr",
-      args: "",
+      // _UCELL1_ru 2T1R
+      // _UECELL2_ru 2T2R
+      args: "dev0=/dev/sdr0,dev1=/dev/sdr2",
+      rx_antenna:"tx_rx",
+      tdd_tx_mod: 1,
   },
-  tx_gain: [],
-  rx_gain: [],
+  tx_gain: [41, 41, 31, 31],
+  rx_gain: [42, 32, 32],
 
 
   cell_groups: [{
@@ -22,6 +26,18 @@
     multi_ue: true,
 
     cells: [
+
+        // UCELL1
+        {
+          rf_port:      0,
+          n_antenna_dl: 2,
+          n_antenna_ul: 1,
+
+          dl_earfcn: 38050,
+          bandwidth: 25,
+
+          global_timing_advance: -1,
+        },
     ],
     pdcch_decode_opt: false,
     pdcch_decode_opt_threshold: 0.1,
@@ -32,6 +48,20 @@
     multi_ue: true,
 
     cells: [
+
+        // UECELL2
+        {
+          rf_port:      1,
+          n_antenna_dl: 2,
+          n_antenna_ul: 2,
+
+          band:         7,
+          dl_nr_arfcn:  537200,
+          bandwidth:    5,
+          ssb_nr_arfcn: 537170,
+
+          subcarrier_spacing: 15,
+        },
     ]
   }],
 

software/ors-amarisoft/slapos-render-config.py

@@ -16,6 +16,7 @@ def j2render(config, jcfg):
     for k, v in ctx.items():
         textctx += 'json %s %s\n' % (k, json.dumps(v))
     textctx += 'import json_module json\n'
+    textctx += 'import nrarfcn_module nrarfcn\n'
     buildout = None # stub
     r = jinja2_template.Recipe(buildout, "recipe", {
       'extensions': 'jinja2.ext.do',