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

fixed issue with emane location events and publishing node data

Browse source
This commit is contained in:
Blake J. Harnden 2018-08-07 10:51:33 -07:00
parent 75ea42b2e8
commit 08b27ad0d7
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
daemon/core/coreobj.py
View file

@ -195,9 +195,9 @@ class PyCoreObj(object):
Build a data object for this node. Build a data object for this node.
:param message_type: purpose for the data object we are creating :param message_type: purpose for the data object we are creating
:param float lat: latitude :param str lat: latitude
:param float lon: longitude :param str lon: longitude
:param float alt: altitude :param str alt: altitude
:return: node data object :return: node data object
:rtype: core.data.NodeData :rtype: core.data.NodeData
""" """

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

@ -808,9 +808,10 @@ class EmaneManager(ModelManager):
# yaw,pitch,roll,azimuth,elevation,velocity are unhandled # yaw,pitch,roll,azimuth,elevation,velocity are unhandled
lat = attrs["latitude"] lat = attrs["latitude"]
long = attrs["longitude"] lon = attrs["longitude"]
alt = attrs["altitude"] alt = attrs["altitude"]
self.handlelocationeventtoxyz(txnemid, lat, long, alt) logger.debug("emane location event: %s,%s,%s", lat, lon, alt)
self.handlelocationeventtoxyz(txnemid, lat, lon, alt)
def handlelocationeventtoxyz(self, nemid, lat, lon, alt): def handlelocationeventtoxyz(self, nemid, lat, lon, alt):
""" """
@ -848,7 +849,7 @@ class EmaneManager(ModelManager):
# don"t use node.setposition(x,y,z) which generates an event # don"t use node.setposition(x,y,z) which generates an event
node.position.set(x, y, z) node.position.set(x, y, z)
node_data = node.data(message_type=0, lat=lat, lon=lon, alt=alt) node_data = node.data(message_type=0, lat=str(lat), lon=str(lon), alt=str(alt))
self.session.broadcast_node(node_data) self.session.broadcast_node(node_data)
return True return True