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

Merge branch 'develop' into enhancement/xy-to-lonlat

Browse source
This commit is contained in:
Blake Harnden 2020-02-21 16:43:18 -08:00
commit f1a7c10e91
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/core/api/tlv/dataconversion.py
View file

@ -31,9 +31,9 @@ def convert_node(node_data):
(NodeTlvs.CANVAS, node_data.canvas), (NodeTlvs.CANVAS, node_data.canvas),
(NodeTlvs.NETWORK_ID, node_data.network_id), (NodeTlvs.NETWORK_ID, node_data.network_id),
(NodeTlvs.SERVICES, node_data.services), (NodeTlvs.SERVICES, node_data.services),
(NodeTlvs.LATITUDE, node_data.latitude), (NodeTlvs.LATITUDE, str(node_data.latitude)),
(NodeTlvs.LONGITUDE, node_data.longitude), (NodeTlvs.LONGITUDE, str(node_data.longitude)),
(NodeTlvs.ALTITUDE, node_data.altitude), (NodeTlvs.ALTITUDE, str(node_data.altitude)),
(NodeTlvs.ICON, node_data.icon), (NodeTlvs.ICON, node_data.icon),
(NodeTlvs.OPAQUE, node_data.opaque), (NodeTlvs.OPAQUE, node_data.opaque),
], ],

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

@ -698,8 +698,6 @@ class EmaneManager(ModelManager):
self.initeventservice(shutdown=True) self.initeventservice(shutdown=True)
if self.eventmonthread is not None: if self.eventmonthread is not None:
# TODO: fix this
self.eventmonthread._Thread__stop()
self.eventmonthread.join() self.eventmonthread.join()
self.eventmonthread = None self.eventmonthread = None
@ -773,7 +771,7 @@ class EmaneManager(ModelManager):
x = int(x) x = int(x)
y = int(y) y = int(y)
z = int(z) z = int(z)
logging.info( logging.debug(
"location event NEM %s (%s, %s, %s) -> (%s, %s, %s)", "location event NEM %s (%s, %s, %s) -> (%s, %s, %s)",
nemid, nemid,
lat, lat,