software/ors-amarisoft: add tdd configs with high UL

software/ors-amarisoft/buildout.hash.cfg

@@ -64,7 +64,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = 81fe1f49c9ecdd06a30a1ecbf77526c9
+md5sum = 7303d4c122cfbb94ac9c99de21cdfe83
 
 [sib23.jinja2.asn]
 filename = config/sib23.jinja2.asn
@@ -72,7 +72,7 @@ md5sum = 5e782fd4b93dc621ddac936913c085f2
 
 [gnb.jinja2.cfg]
 filename = config/gnb.jinja2.cfg
-md5sum = 8f0dc5218bf6ae1574518a750ba00d8a
+md5sum = f1dfb3f022a7d895679f3931c4850290
 
 [ltelogs.jinja2.sh]
 filename = ltelogs.jinja2.sh

software/ors-amarisoft/changelog.rst

@@ -4,6 +4,8 @@ Version 1.0.3XX (2023-06-XX)
 -------------
 
 * Change Slice Differentiator input parameter to hexadecimal representation
+* Add TDD Configurations with maximum uplink
+* Modify reference power signal to improve radio link over long distances
 
 Version 1.0.326 (2023-06-14)
 -------------

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

+{%- if slapparameter_dict.get('tdd_ul_dl_config', '[Configuration 2] 5ms 2UL 6DL (default)') == '[Configuration 2] 5ms 2UL 6DL (default)' %}
+{%- set tdd_config = 2 %}
+{%- elif slapparameter_dict.get('tdd_ul_dl_config', '[Configuration 2] 5ms 2UL 6DL (default)') == '[Configuration 6] 5ms 5UL 3DL (maximum uplink)' %}
+{%- set tdd_config = 6 %}
+{%- endif %}
 {% if rf_mode == 'tdd' %}
 #define TDD                 1
 {% else %}
@@ -108,7 +113,7 @@
     manual_ref_signal_power: true,
 {% endif %}
 #if TDD == 1
-    uldl_config: 2,
+    uldl_config: {{ tdd_config }},
     sp_config: 7,
 #endif
     n_rb_dl: N_RB_DL,

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

@@ -144,7 +144,7 @@
         ul_symbols: 4,
       },
     },
-{% elif slapparameter_dict.get('tdd_ul_dl_config', '5ms 2UL 7DL 4/6 (default)') == '2.5ms 1UL 3DL 2/10' %}
+{% elif tdd_config == 2 %}
     tdd_ul_dl_config: {
       pattern1: {
         period: 2.5,
@@ -154,6 +154,16 @@
         ul_symbols: 2,
       },
     },
+{% elif tdd_config == 3 %}
+    tdd_ul_dl_config: {
+      pattern1: {
+         period: 5, /* in ms */
+         dl_slots: 1,
+         dl_symbols: 10,
+         ul_slots: 8,
+         ul_symbols: 2,
+      },
+    },
 {% endif %}
     ssb_period: 20,
     n_id_cell: {{ slapparameter_dict.get('pci', 500) }},
@@ -269,10 +279,17 @@
       },
       rar_al_index: 2,
       si_al_index: 2,
+{% if tdd_config == 3 %}
+      uss: {
+       n_candidates: [ 0, 8, 1, 0, 0 ],
+       dci_0_1_and_1_1: true,
+      },
+{% else %}
       uss: {
         n_candidates: [ 0, 2, 1, 0, 0 ],
         dci_0_1_and_1_1: true,
       },
+{% endif %}
       al_index: 1,
     },
     pdsch: {
@@ -283,6 +300,8 @@
 {% if slapparameter_dict.get('rrh', 'ORS') == "M2RU Sunwave" %}
       k0: 0,
       k1: [ 8, 7, 7, 6, 5, 4, 12, 11 ],
+{% elif tdd_config == 3 %}
+      k1: [4, 11], 
 {% endif %}
       mcs_table: "qam256",
       rar_mcs: 2,
@@ -325,6 +344,7 @@
           offset: 1,
           qcl_info_periodic_csi_rs: 0,
         },
+{% if tdd_config != 3 %}
         {
           csi_rs_id: 1,
           n_ports: 1,
@@ -389,6 +409,7 @@
           offset: 12,
           qcl_info_periodic_csi_rs: 0,
         },
+{% endif %}
       ],
       nzp_csi_rs_resource_set: [
         {
@@ -396,12 +417,14 @@
           nzp_csi_rs_resources: [ 0 ],
           repetition: false,
         },
+{% if tdd_config != 3 %}
         {
           csi_rs_set_id: 1,
           nzp_csi_rs_resources: [ 1, 2, 3, 4 ],
           repetition: false,
           trs_info: true,
         },
+{% endif %}
       ],
      csi_im_resource: [
         {
@@ -452,11 +475,13 @@
           csi_im_resource_set_list: [ 0 ],
           resource_type: "periodic",
         },
+{% if tdd_config != 3 %}
         {
           csi_rsc_config_id: 2,
           nzp_csi_rs_resource_set_list: [ 1 ],
           resource_type: "periodic",
         },
+{% endif %}
       ],
       csi_report_config: [
         {
@@ -517,6 +542,9 @@
 {% if slapparameter_dict.get('rrh', 'ORS') == "M2RU Sunwave" %}
       k2: 4,
       msg3_k2: 7,
+{% elif tdd_config == 3 %}
+      k2: [11, 12, 4, 5, 6, 7, 7, 8], 
+      msg3_k2: 7,
 {% endif %}
       p0_nominal_with_grant: -84,
       msg3_mcs: 4,

software/ors-amarisoft/instance-enb-input-schema.json.jinja2

@@ -222,6 +222,16 @@
       "type": "number",
       "default": {{ default_lte_inactivity_timer }}
     },
+    "tdd_ul_dl_config": {
+      "title": "TDD",
+      "description": "TDD",
+      "type": "string",
+      "enum": [
+        "[Configuration 2] 5ms 2UL 6DL (default)",
+        "[Configuration 6] 5ms 5UL 3DL (maximum uplink)"
+      ],
+      "default": "5ms 2UL 7DL 4/6 (default)"
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-fdd-enb-input-schema.json

@@ -220,6 +220,16 @@
       "type": "number",
       "default": 10000
     },
+    "tdd_ul_dl_config": {
+      "title": "TDD",
+      "description": "TDD",
+      "type": "string",
+      "enum": [
+        "[Configuration 2] 5ms 2UL 6DL (default)",
+        "[Configuration 6] 5ms 5UL 3DL (maximum uplink)"
+      ],
+      "default": "5ms 2UL 7DL 4/6 (default)"
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-fdd-gnb-input-schema.json

@@ -45,7 +45,8 @@
       "type": "string",
       "enum": [
         "5ms 2UL 7DL 4/6 (default)",
-        "2.5ms 1UL 3DL 2/10"
+        "2.5ms 1UL 3DL 2/10",
+        "5ms 8UL 3DL 2/10 (maximum uplink)"
       ],
       "default": "5ms 2UL 7DL 4/6 (default)"
     },

software/ors-amarisoft/instance-gnb-input-schema.json.jinja2

@@ -57,7 +57,8 @@
       "type": "string",
       "enum": [
         "5ms 2UL 7DL 4/6 (default)",
-        "2.5ms 1UL 3DL 2/10"
+        "2.5ms 1UL 3DL 2/10",
+        "5ms 8UL 3DL 2/10 (maximum uplink)"
       ],
       "default": "5ms 2UL 7DL 4/6 (default)"
     },

software/ors-amarisoft/instance-tdd-enb-input-schema.json

@@ -118,6 +118,16 @@
       "type": "number",
       "default": 10000
     },
+    "tdd_ul_dl_config": {
+      "title": "TDD",
+      "description": "TDD",
+      "type": "string",
+      "enum": [
+        "[Configuration 2] 5ms 2UL 6DL (default)",
+        "[Configuration 6] 5ms 5UL 3DL (maximum uplink)"
+      ],
+      "default": "5ms 2UL 7DL 4/6 (default)"
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-tdd-gnb-input-schema.json

@@ -55,7 +55,8 @@
       "type": "string",
       "enum": [
         "5ms 2UL 7DL 4/6 (default)",
-        "2.5ms 1UL 3DL 2/10"
+        "2.5ms 1UL 3DL 2/10",
+        "5ms 8UL 3DL 2/10 (maximum uplink)"
       ],
       "default": "5ms 2UL 7DL 4/6 (default)"
     },

software/ors-amarisoft/instance-tdd1900-enb-input-schema.json

@@ -118,6 +118,16 @@
       "type": "number",
       "default": 10000
     },
+    "tdd_ul_dl_config": {
+      "title": "TDD",
+      "description": "TDD",
+      "type": "string",
+      "enum": [
+        "[Configuration 2] 5ms 2UL 6DL (default)",
+        "[Configuration 6] 5ms 5UL 3DL (maximum uplink)"
+      ],
+      "default": "5ms 2UL 7DL 4/6 (default)"
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json

@@ -45,7 +45,8 @@
       "type": "string",
       "enum": [
         "5ms 2UL 7DL 4/6 (default)",
-        "2.5ms 1UL 3DL 2/10"
+        "2.5ms 1UL 3DL 2/10",
+        "5ms 8UL 3DL 2/10 (maximum uplink)"
       ],
       "default": "5ms 2UL 7DL 4/6 (default)"
     },

software/ors-amarisoft/instance-tdd2600-enb-input-schema.json

@@ -118,6 +118,16 @@
       "type": "number",
       "default": 10000
     },
+    "tdd_ul_dl_config": {
+      "title": "TDD",
+      "description": "TDD",
+      "type": "string",
+      "enum": [
+        "[Configuration 2] 5ms 2UL 6DL (default)",
+        "[Configuration 6] 5ms 5UL 3DL (maximum uplink)"
+      ],
+      "default": "5ms 2UL 7DL 4/6 (default)"
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json

@@ -45,7 +45,8 @@
       "type": "string",
       "enum": [
         "5ms 2UL 7DL 4/6 (default)",
-        "2.5ms 1UL 3DL 2/10"
+        "2.5ms 1UL 3DL 2/10",
+        "5ms 8UL 3DL 2/10 (maximum uplink)"
       ],
       "default": "5ms 2UL 7DL 4/6 (default)"
     },

software/ors-amarisoft/instance-tdd3500-enb-input-schema.json

@@ -118,6 +118,16 @@
       "type": "number",
       "default": 10000
     },
+    "tdd_ul_dl_config": {
+      "title": "TDD",
+      "description": "TDD",
+      "type": "string",
+      "enum": [
+        "[Configuration 2] 5ms 2UL 6DL (default)",
+        "[Configuration 6] 5ms 5UL 3DL (maximum uplink)"
+      ],
+      "default": "5ms 2UL 7DL 4/6 (default)"
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json

@@ -45,7 +45,8 @@
       "type": "string",
       "enum": [
         "5ms 2UL 7DL 4/6 (default)",
-        "2.5ms 1UL 3DL 2/10"
+        "2.5ms 1UL 3DL 2/10",
+        "5ms 8UL 3DL 2/10 (maximum uplink)"
       ],
       "default": "5ms 2UL 7DL 4/6 (default)"
     },

software/ors-amarisoft/instance-tdd3700-enb-input-schema.json

@@ -118,6 +118,16 @@
       "type": "number",
       "default": 10000
     },
+    "tdd_ul_dl_config": {
+      "title": "TDD",
+      "description": "TDD",
+      "type": "string",
+      "enum": [
+        "[Configuration 2] 5ms 2UL 6DL (default)",
+        "[Configuration 6] 5ms 5UL 3DL (maximum uplink)"
+      ],
+      "default": "5ms 2UL 7DL 4/6 (default)"
+    },
     "use_ipv4": {
       "default": false,
       "title": "Use IPv4",

software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json

@@ -45,7 +45,8 @@
       "type": "string",
       "enum": [
         "5ms 2UL 7DL 4/6 (default)",
-        "2.5ms 1UL 3DL 2/10"
+        "2.5ms 1UL 3DL 2/10",
+        "5ms 8UL 3DL 2/10 (maximum uplink)"
       ],
       "default": "5ms 2UL 7DL 4/6 (default)"
     },