X cancel 5G for now

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

@@ -4,6 +4,7 @@
 
 {#- defaults provide default values for parameters.
     it should be kept in sync with "default" in json schemas  #}
+{#- XXX ssb_pos_bitmap=10000000 is for TDD only; FDD -> "1000"	#}
 {%- set defaults = {
       'enb_id': '0x1A2D0',
       'gnb_id': '0x12345',
@@ -564,7 +565,8 @@
   ho_from_meas: true,
   },
 
-  // NR cells
+  // NR cells	XXX restore
+{#
   nr_cell_list: [
 {%- for i, (cell_ref, icell) in enumerate(icell_dict|dictsort) %}
 {%-   set cell = icell['_']                   %}
@@ -585,7 +587,7 @@
           dl_nr_arfcn:  {{ cell['dl_nr_arfcn'] }},
           bandwidth:    {{ cell['bandwidth'] }},
 
-          subcarrier_spacing: 30,
+          subcarrier_spacing: 30,   // XXX FDD -> 15
           ssb_pos_bitmap: {{ cell['ssb_pos_bitmap'] }},
 
           root_sequence_index: 1,   // XXX adjust from cfg('root_sequence_index') XXX place
@@ -723,7 +725,7 @@
     sr_period: 40,
     dmrs_type_a_pos: 2,
     prach: {
-      prach_config_index: 160,
+      prach_config_index: 160,      // XXX TDD only & TDD_CONFIG != 4
       msg1_subcarrier_spacing: 30,
       msg1_fdm: 1,
 {% if ru.ru_type == 'sunwave' %}
@@ -735,7 +737,7 @@
       preamble_received_target_power: -110,
       preamble_trans_max: 7,
       power_ramping_step: 4,
-      ra_response_window: 20,
+      ra_response_window: {{ 20 if tdd else 10 }},
       restricted_set_config: "unrestricted_set",
       ra_contention_resolution_timer: 64,
       ssb_per_prach_occasion: 1,
@@ -1480,3 +1482,4 @@
   },
   },
 }
+#}

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

@@ -149,7 +149,19 @@ json_params = """{
                 "slave_reference":      "_CELL1_b",
                 "slap_software_type":   "enb",
                 "_": %(jCELL1_b)s
-            },
+            }
+        ]
+    },
+    "directory": {
+        "log": "log",
+        "etc": "etc",
+        "var": "var"
+    },
+    "slapparameter_dict": {
+    }
+}""" % globals()
+
+"""
             {
                 "slave_title":          "Cell 1c",
                 "slave_reference":      "_CELL1_c",
@@ -180,16 +192,7 @@ json_params = """{
                 "slap_software_type":   "enb",
                 "_": %(jRU2_b)s
             }
-        ]
-    },
-    "directory": {
-        "log": "log",
-        "etc": "etc",
-        "var": "var"
-    },
-    "slapparameter_dict": {
-    }
-}""" % globals()
+"""
 
 import os
 from jinja2 import Environment, StrictUndefined, \