afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

attempt to update physical configuration

Browse source
This commit is contained in:
Blake J. Harnden 2018-03-21 12:54:13 -07:00
parent 802393725e
commit b6cfc2085c
1 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
daemon/core/emane/universal.py
View file

@ -22,30 +22,20 @@ class EmaneUniversalModel(EmaneModel):
# universal PHY parameters # universal PHY parameters
_confmatrix_base = [ _confmatrix_base = [
("bandwidth", ConfigDataTypes.UINT64.value, "1M", ("bandwidth", ConfigDataTypes.UINT64.value, "1M", "", "rf bandwidth (Hz)"),
"", "rf bandwidth (hz)"), ("frequency", ConfigDataTypes.UINT64.value, "2.347G", "", "frequency (Hz)"),
("frequency", ConfigDataTypes.UINT64.value, "2.347G", ("frequencyofinterest", ConfigDataTypes.UINT64.value, "2.347G", "", "frequency of interest (Hz)"),
"", "frequency (Hz)"), ("subid", ConfigDataTypes.UINT16.value, "1", "", "subid"),
("frequencyofinterest", ConfigDataTypes.UINT64.value, "2.347G", ("systemnoisefigure", ConfigDataTypes.FLOAT.value, "4.0", "", "system noise figure (dB)"),
"", "frequency of interest (Hz)"), ("txpower", ConfigDataTypes.FLOAT.value, "0.0", "", "transmit power (dBm)"),
("subid", ConfigDataTypes.UINT16.value, "1",
"", "subid"),
("systemnoisefigure", ConfigDataTypes.FLOAT.value, "4.0",
"", "system noise figure (dB)"),
("txpower", ConfigDataTypes.FLOAT.value, "0.0",
"", "transmit power (dBm)"),
] ]
_confmatrix_091 = [ _confmatrix_091 = [
("fixedantennagain", ConfigDataTypes.FLOAT.value, "0.0", ("fixedantennagain", ConfigDataTypes.FLOAT.value, "0.0", "", "antenna gain (dBi)"),
"", "antenna gain (dBi)"), ("fixedantennagainenable", ConfigDataTypes.BOOL.value, "1", "On,Off", "enable fixed antenna gain"),
("fixedantennagainenable", ConfigDataTypes.BOOL.value, "1", ("noisemode", ConfigDataTypes.STRING.value, "none", "none,all,outofband", "noise processing mode"),
"On,Off", "enable fixed antenna gain"), ("noisebinsize", ConfigDataTypes.UINT64.value, "20", "", "noise bin size in microseconds"),
("noisemode", ConfigDataTypes.STRING.value, "none", ("propagationmodel", ConfigDataTypes.STRING.value, "2ray", "precomputed,2ray,freespace", "path loss mode"),
"none,all,outofband", "noise processing mode"), ("fading.model", ConfigDataTypes.STRING.value, "none", "none,event,nakagami", "Defines fading model"),
("noisebinsize", ConfigDataTypes.UINT64.value, "20",
"", "noise bin size in microseconds"),
("propagationmodel", ConfigDataTypes.STRING.value, "2ray",
"precomputed,2ray,freespace", "path loss mode"),
] ]
config_matrix = _confmatrix_base + _confmatrix_091 config_matrix = _confmatrix_base + _confmatrix_091