diff --git a/software/ors-amarisoft/config/enb.jinja2.cfg b/software/ors-amarisoft/config/enb.jinja2.cfg index 9ac18155893fb1c323f4aed534115b0e1d9c9090..f939ddd887872ff3e3deca35d9704dd1f32ef35f 100644 --- a/software/ors-amarisoft/config/enb.jinja2.cfg +++ b/software/ors-amarisoft/config/enb.jinja2.cfg @@ -367,8 +367,7 @@ ho_from_meas: true, } - // NR cells XXX restore -{# + // NR cells nr_cell_list: [ {%- for i, (cell_ref, icell) in enumerate(icell_dict|dictsort) %} {%- set cell = icell['_'] %} @@ -405,9 +404,9 @@ {%- if slapparameter_dict.get('rrh', 'ORS') == "ORS" %} manual_ref_signal_power: true, {%- if 'XXX_one_watt' == "True" %} - ss_pbch_block_power: {{ (tx_gain | int) - 54 }}, + ss_pbch_block_power: {{ ru.tx_gain - 54 }}, {%- else %} - ss_pbch_block_power: {{ (tx_gain | int) - 35 }}, + ss_pbch_block_power: {{ ru.tx_gain - 35 }}, {%- endif -%} {%- endif %} @@ -452,6 +451,7 @@ {%- endfor %} ], +{# XXX restore nr_cell_default: { ssb_period: 20, @@ -860,25 +860,25 @@ drb_config: "{{ cell_ref }}-drb.cfg", - meas_config_desc: { - a1_report_type: "rsrp", - a1_rsrp: -60, - a1_hysteresis: 10, - a1_time_to_trigger: 100, - a2_report_type: "rsrp", - a2_rsrp: -70, - a2_hysteresis: 0, - a2_time_to_trigger: 100, - a3_report_type: "rsrp", - a3_offset: {{ slapparameter_dict.get('nr_handover_a3_offset', 6) }}, - a3_hysteresis: 0, - a3_time_to_trigger: {{ slapparameter_dict.get('nr_handover_time_to_trigger', 100) }}, - ssb_rsrq_filter_coeff: 3, - ssb_sinr_filter_coeff: 5 - }, - meas_gap_config: { - pattern_id: 0 - }, + meas_config_desc: { + a1_report_type: "rsrp", + a1_rsrp: -60, + a1_hysteresis: 10, + a1_time_to_trigger: 100, + a2_report_type: "rsrp", + a2_rsrp: -70, + a2_hysteresis: 0, + a2_time_to_trigger: 100, + a3_report_type: "rsrp", + a3_offset: {{ slapparameter_dict.get('nr_handover_a3_offset', 6) }}, + a3_hysteresis: 0, + a3_time_to_trigger: {{ slapparameter_dict.get('nr_handover_time_to_trigger', 100) }}, + ssb_rsrq_filter_coeff: 3, + ssb_sinr_filter_coeff: 5 + }, + meas_gap_config: { + pattern_id: 0 + }, }, #} } diff --git a/software/ors-amarisoft/config/out/enb.cfg b/software/ors-amarisoft/config/out/enb.cfg index da51a957c97a0a1327d1264ed6e7cda95f653869..2bdf91415f873511519ae5a1fb2db4da17466e6a 100644 --- a/software/ors-amarisoft/config/out/enb.cfg +++ b/software/ors-amarisoft/config/out/enb.cfg @@ -225,6 +225,41 @@ ho_from_meas: true, } - // NR cells XXX restore + // NR cells + nr_cell_list: [ + + // CELL2_b (RU2_b) + { + rf_port: 1, + n_antenna_dl: 2, + n_antenna_ul: 1, + + cell_id: 0x22, + n_id_cell: 22, + band: 7, + dl_nr_arfcn: 537200, + ul_nr_arfcn: 513200, + bandwidth: 5, + + subcarrier_spacing: 15, + ssb_nr_arfcn: 537170, + ssb_pos_bitmap: 10000000, + + root_sequence_index: 1, // XXX adjust from cfg('root_sequence_index') XXX place + + + // XXX peers for HO + + // XXX CA + + // tune NR parameters for the cell + manual_ref_signal_power: true, + ss_pbch_block_power: -46,, + + + + }, + ], + } \ No newline at end of file