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

merged latest from develop

Browse source
This commit is contained in:
Blake Harnden 2020-03-28 13:18:25 -07:00
commit 1efa1284bb
3 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,6 @@ from core.xml import emanexml
if TYPE_CHECKING:
from core.emulator.session import Session
try:
from emane.events import EventService
from emane.events import LocationEvent
@ -845,6 +844,12 @@ class EmaneGlobalModel:
def __init__(self, session: "Session") -> None:
self.session = session
self.core_config = [
Configuration(
_id="platform_id_start",
_type=ConfigDataTypes.INT32,
default="1",
label="Starting Platform ID",
),
Configuration(
_id="nem_id_start",
_type=ConfigDataTypes.INT32,
@ -891,15 +896,6 @@ class EmaneGlobalModel:
"otamanagergroup": "224.1.2.8:45702",
}
self.emulator_config = emanemanifest.parse(emulator_xml, emulator_defaults)
self.emulator_config.insert(
0,
Configuration(
_id="platform_id_start",
_type=ConfigDataTypes.INT32,
default="1",
label="Starting Platform ID (core)",
),
)
def configurations(self) -> List[Configuration]:
return self.emulator_config + self.core_config