Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into mavlink-px4-update
Browse files Browse the repository at this point in the history
  • Loading branch information
adrnp committed Dec 7, 2017
2 parents b564447 + 4aff05c commit cf6942b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions connection/message_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ class GlobalFrameMessage(Message):

def __init__(self, time, latitude, longitude, altitude):
super().__init__(time)
self._longitude = int(longitude)
self._latitude = int(latitude)
self._altitude = int(altitude)
self._longitude = longitude
self._latitude = latitude
self._altitude = altitude

@property
def longitude(self):
Expand Down
4 changes: 2 additions & 2 deletions drone.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def __init__(self, protocol='tcp', ip_addr='127.0.0.1', port=5760, threaded=True

@property
def global_position(self):
return np.array([self._longitude, self._latitude, self._altitude], dtype=np.int32)
return np.array([self._longitude, self._latitude, self._altitude])

def _update_global_position(self, msg):
self._longitude = msg.longitude
Expand All @@ -96,7 +96,7 @@ def _update_global_position(self, msg):

@property
def global_home(self):
return np.array([self._home_longitude, self._home_latitude, self._home_altitude], dtype=np.int32)
return np.array([self._home_longitude, self._home_latitude, self._home_altitude])

def _update_global_home(self, msg):
self._home_longitude = msg.longitude
Expand Down

0 comments on commit cf6942b

Please sign in to comment.