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

updated emane options to contain all nakagami settings for display within ui, sorted options

Browse source
This commit is contained in:
Blake J. Harnden 2018-03-21 14:24:33 -07:00
parent b6cfc2085c
commit 86afded824
2 changed files with 40 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1014,36 +1014,32 @@ class EmaneGlobalModel(EmaneModel):
_DEFAULT_DEV = "ctrl0"
name = "emane"
_confmatrix_platform_base = [
("otamanagerchannelenable", ConfigDataTypes.BOOL.value, _DEFAULT_OTA, "on,off", "enable OTA Manager channel"),
("otamanagergroup", ConfigDataTypes.STRING.value, "224.1.2.8:45702", "", "OTA Manager group"),
("otamanagerdevice", ConfigDataTypes.STRING.value, _DEFAULT_DEV, "", "OTA Manager device"),
("eventservicegroup", ConfigDataTypes.STRING.value, "224.1.2.8:45703", "", "Event Service group"),
("eventservicedevice", ConfigDataTypes.STRING.value, _DEFAULT_DEV, "", "Event Service device"),
("platform_id_start", ConfigDataTypes.INT32.value, "1", "", "starting Platform ID"),
]
# defined from 0.9.1
_confmatrix_platform = [
("controlportendpoint", ConfigDataTypes.STRING.value, "0.0.0.0:47000", "", "Control port address"),
("antennaprofilemanifesturi", ConfigDataTypes.STRING.value, "", "", "antenna profile manifest URI"),
("eventservicettl", ConfigDataTypes.INT8.value, "1", "", "Event Service TTL"),
("controlportendpoint", ConfigDataTypes.STRING.value, "0.0.0.0:47000", "", "Control port address"),
("eventservicedevice", ConfigDataTypes.STRING.value, _DEFAULT_DEV, "", "Event Service device"),
("eventservicegroup", ConfigDataTypes.STRING.value, "224.1.2.8:45703", "", "Event Service group"),
("eventservicettl", ConfigDataTypes.UINT8.value, "1", "", "Event Service TTL"),
("otamanagerchannelenable", ConfigDataTypes.BOOL.value, _DEFAULT_OTA, "on,off", "enable OTA Manager channel"),
("otamanagerdevice", ConfigDataTypes.STRING.value, _DEFAULT_DEV, "", "OTA Manager device"),
("otamanagergroup", ConfigDataTypes.STRING.value, "224.1.2.8:45702", "", "OTA Manager group"),
("otamanagerloopback", ConfigDataTypes.BOOL.value, "0", "on,off", "Enable OTA multicast loopback"),
("otamanagermtu", ConfigDataTypes.INT32.value, "0", "", "OTA channel MTU in bytes, 0 to disable"),
("otamanagerpartcheckthreshold", ConfigDataTypes.INT16.value, "2", "",
("otamanagermtu", ConfigDataTypes.UINT32.value, "0", "", "OTA channel MTU in bytes, 0 to disable"),
("otamanagerpartcheckthreshold", ConfigDataTypes.UINT16.value, "2", "",
"Rate in seconds a check is performed to see if any OTA packet part reassembly efforts should be abandoned"),
("otamanagerparttimeoutthreshold", ConfigDataTypes.INT16.value, "5", "",
("otamanagerparttimeoutthreshold", ConfigDataTypes.UINT16.value, "5", "",
"Threshold in seconds to wait for another OTA packet part for an existing reassembly effort before "
"abandoning the effort"),
("otamanagerttl", ConfigDataTypes.INT8.value, "1", "", "OTA channel multicast message TTL"),
("stats.event.maxeventcountrows", ConfigDataTypes.INT32.value, "0", "",
("otamanagerttl", ConfigDataTypes.UINT8.value, "1", "", "OTA channel multicast message TTL"),
("stats.event.maxeventcountrows", ConfigDataTypes.UINT32.value, "0", "",
"Event channel max event count table rows"),
("stats.ota.maxeventcountrows", ConfigDataTypes.INT32.value, "0", "",
("stats.ota.maxeventcountrows", ConfigDataTypes.UINT32.value, "0", "",
"OTA channel max event count table rows"),
("stats.ota.maxpacketcountrows", ConfigDataTypes.INT32.value, "0", "",
("stats.ota.maxpacketcountrows", ConfigDataTypes.UINT32.value, "0", "",
"OTA channel max packet count table rows"),
("platform_id_start", ConfigDataTypes.INT32.value, "1", "", "starting Platform ID"),
]
_confmatrix_platform = _confmatrix_platform_base + _confmatrix_platform
# defined from 0.9.2
_confmatrix_nem = [

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

@ -21,23 +21,37 @@ class EmaneUniversalModel(EmaneModel):
_xmllibrary = "universalphylayer"
# universal PHY parameters
_confmatrix_base = [
config_matrix = [
("bandwidth", ConfigDataTypes.UINT64.value, "1M", "", "rf bandwidth (Hz)"),
("frequency", ConfigDataTypes.UINT64.value, "2.347G", "", "frequency (Hz)"),
("frequencyofinterest", ConfigDataTypes.UINT64.value, "2.347G", "", "frequency of interest (Hz)"),
("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 = [
("fading.model", ConfigDataTypes.STRING.value, "none", "none,event,nakagami", "Defines fading model"),
("fading.nakagami.distance0", ConfigDataTypes.FLOAT.value, "100.0", "",
"Nakagami D0: distance lower bound in meters"),
("fading.nakagami.distance1", ConfigDataTypes.FLOAT.value, "250.0", "",
"Nakagami D1: distance upper bound in meters"),
("fading.nakagami.m0", ConfigDataTypes.FLOAT.value, "0.75", "", "Nakagami M0: shape factor for distance < D0"),
("fading.nakagami.m1", ConfigDataTypes.FLOAT.value, "1.0", "",
"Nakagami M1: shape factor for distance >= D0 < D1"),
("fading.nakagami.m2", ConfigDataTypes.FLOAT.value, "200.0", "",
"Nakagami M2: shape factor for distance >= D1"),
("fixedantennagain", ConfigDataTypes.FLOAT.value, "0.0", "", "antenna gain (dBi)"),
("fixedantennagainenable", ConfigDataTypes.BOOL.value, "1", "On,Off", "enable fixed antenna gain"),
("noisemode", ConfigDataTypes.STRING.value, "none", "none,all,outofband", "noise processing mode"),
("frequency", ConfigDataTypes.UINT64.value, "2.347G", "", "frequency (Hz)"),
("frequencyofinterest", ConfigDataTypes.UINT64.value, "2.347G", "", "frequency of interest (Hz)"),
("noisebinsize", ConfigDataTypes.UINT64.value, "20", "", "noise bin size in microseconds"),
("noisemaxclampenable", ConfigDataTypes.BOOL.value, "0", "On,Off", "Noise max clamp enable"),
("noisemaxmessagepropagation", ConfigDataTypes.UINT64.value, "200000", "",
"Noise maximum message propagation in microsecond"),
("noisemaxsegmentduration", ConfigDataTypes.UINT64.value, "1000000", "",
"Noise maximum segment duration in microseconds"),
("noisemaxsegmentoffset", ConfigDataTypes.UINT64.value, "300000", "",
"Noise maximum segment offset in microseconds"),
("noisemode", ConfigDataTypes.STRING.value, "none", "none,all,outofband", "noise processing mode"),
("propagationmodel", ConfigDataTypes.STRING.value, "2ray", "precomputed,2ray,freespace", "path loss mode"),
("fading.model", ConfigDataTypes.STRING.value, "none", "none,event,nakagami", "Defines fading model"),
("subid", ConfigDataTypes.UINT16.value, "1", "", "subid"),
("systemnoisefigure", ConfigDataTypes.FLOAT.value, "4.0", "", "system noise figure (dB)"),
("timesyncthreshold", ConfigDataTypes.UINT64.value, "10000", "", "Time sync threshold"),
("txpower", ConfigDataTypes.FLOAT.value, "0.0", "", "transmit power (dBm)"),
]
config_matrix = _confmatrix_base + _confmatrix_091
@classmethod
def getphydoc(cls, e, mac, values, phynames):