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

daemon: Use Emane.version directly instead of checking if EventService

Browse source 
exists.
This commit is contained in:
Tom Goff 2015-09-30 14:41:13 -04:00
parent 026f54d658
commit 3a13b8c92d
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
daemon/core/emane/rfpipe.py
View file

@ -18,7 +18,7 @@ except:
pass
from core.api import coreapi
from core.constants import *
from emane import EmaneModel
from emane import Emane, EmaneModel
from universal import EmaneUniversalModel
class EmaneRfPipeModel(EmaneModel):
@ -27,7 +27,7 @@ class EmaneRfPipeModel(EmaneModel):
# model name
_name = "emane_rfpipe"
if 'EventService' in globals():
if Emane.version >= Emane.EMANE091:
xml_path = '/usr/share/emane/xml/models/mac/rfpipe'
else:
xml_path = "/usr/share/emane/models/rfpipe/xml"
@ -64,7 +64,7 @@ class EmaneRfPipeModel(EmaneModel):
("delay", coreapi.CONF_DATA_TYPE_FLOAT, '0.0',
'', 'transmission delay (sec)'),
]
if 'EventService' in globals():
if Emane.version >= Emane.EMANE091:
_confmatrix_mac = _confmatrix_mac_base + _confmatrix_mac_091
else:
_confmatrix_mac = _confmatrix_mac_base + _confmatrix_mac_081