Commit b81d6ac3 authored by 黄灏's avatar 黄灏

ok with phone

parent c4e86a3d
......@@ -985,7 +985,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
harq->feedback_slot = pucch->ul_slot;
harq->is_waiting = true;
UE->mac_stats.dl.rounds[harq->round]++;
LOG_I(NR_MAC,
LOG_D(NR_MAC,
"%4d.%2d [DLSCH/PDSCH/PUCCH] RNTI %04x DCI L %d start %3d RBs %3d startSymbol %2d nb_symbol %2d dmrspos %x MCS %2d nrOfLayers %d TBS %4d HARQ PID %2d round %d RV %d NDI %d dl_data_to_ULACK %d (%d.%d) PUCCH allocation %d TPC %d\n",
frame,
slot,
......
......@@ -83,7 +83,7 @@ gNBs =
prach_msg1_FDM = 0;
prach_msg1_FrequencyStart = 0;
zeroCorrelationZoneConfig = 13;
preambleReceivedTargetPower = -96;
preambleReceivedTargetPower = -86;
#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
preambleTransMax = 6;
#powerRampingStep
......@@ -113,14 +113,14 @@ gNBs =
restrictedSetConfig = 0,
msg3_DeltaPreamble = 1;
p0_NominalWithGrant =-90;
p0_NominalWithGrant =-80;
# pucch-ConfigCommon setup :
# pucchGroupHopping
# 0 = neither, 1= group hopping, 2=sequence hopping
pucchGroupHopping = 0;
hoppingId = 40;
p0_nominal = -90;
p0_nominal = -80;
# ssb_PositionsInBurs_BitmapPR
# 1=short, 2=medium, 3=long
ssb_PositionsInBurst_PR = 2;
......@@ -152,7 +152,7 @@ gNBs =
nrofUplinkSlots = 2;
nrofUplinkSymbols = 4;
ssPBCH_BlockPower = -25;
ssPBCH_BlockPower = -15;
}
);
......@@ -168,7 +168,7 @@ gNBs =
////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.199.214";
amf_ip_address = ( { ipv4 = "172.11.200.14";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
......@@ -178,10 +178,10 @@ gNBs =
NETWORK_INTERFACES :
{
GNB_INTERFACE_NAME_FOR_NG_AMF = "enp90s0";
GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.199.218";
GNB_INTERFACE_NAME_FOR_NGU = "enp90s0";
GNB_IPV4_ADDRESS_FOR_NGU = "192.168.199.218";
GNB_INTERFACE_NAME_FOR_NG_AMF = "docker-openxg";
GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.11.200.1";
GNB_INTERFACE_NAME_FOR_NGU = "docker-openxg";
GNB_IPV4_ADDRESS_FOR_NGU = "172.11.200.1";
GNB_PORT_FOR_S1U = 2152; # Spec 2152
};
......@@ -193,8 +193,8 @@ MACRLCs = (
num_cc = 1;
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150;
pucch_TargetSNRx10 = 200;
pusch_TargetSNRx10 = 250;
pucch_TargetSNRx10 = 250;
ulsch_max_frame_inactivity = 1;
}
);
......@@ -205,7 +205,7 @@ L1s = (
tr_n_preference = "local_mac";
pusch_proc_threads = 8;
prach_dtx_threshold = 220;
pucch0_dtx_threshold = 150;
pucch0_dtx_threshold = 250;
ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
tx_amp_backoff_dB = 12; //12
}
......@@ -216,11 +216,11 @@ RUs = (
local_rf = "yes"
nb_tx = 1
nb_rx = 1
att_tx = 10
att_tx = 0
att_rx = 0;
bands = [78];
max_pdschReferenceSignalPower = -27;
max_rxgain = 20;
max_rxgain = 30;
sf_extension = 0;
eNB_instances = [0];
#beamforming 1x4 matrix:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment