Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Autonomous Landing Module #235

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
178b772
intial commit
ellyokes253 Dec 29, 2024
3954351
added files
ellyokes253 Dec 29, 2024
b80e668
removed old module
ellyokes253 Dec 29, 2024
8b822e0
made class
ellyokes253 Jan 11, 2025
fd8241f
made changes
ellyokes253 Jan 12, 2025
265cae9
added worker
ellyokes253 Jan 13, 2025
6fd5f9e
made changes
ellyokes253 Jan 14, 2025
8b1c536
issues commiting, now fixed
ellyokes253 Jan 14, 2025
876b714
made changes
ellyokes253 Jan 22, 2025
0b07de1
linter issues fixed
ellyokes253 Jan 22, 2025
38aad9b
fixing linter issues
ellyokes253 Jan 23, 2025
1c5b247
fixing code and linter issues
ellyokes253 Jan 23, 2025
398edaa
continuation of debugging
ellyokes253 Jan 23, 2025
dc81d8e
fixing linter issues
ellyokes253 Jan 23, 2025
af13347
fixing logger initialization
ellyokes253 Jan 24, 2025
6f4c829
fixing last linter issues
ellyokes253 Jan 24, 2025
224a7dc
last few linter issues
ellyokes253 Jan 24, 2025
c0af0dc
last few changes
ellyokes253 Jan 24, 2025
fb1e009
updated changes
ellyokes253 Jan 25, 2025
44656ad
fixing small linter issue
ellyokes253 Jan 25, 2025
619f8d7
fixed run()
ellyokes253 Jan 30, 2025
fbfcc79
pulling new commit changes in common
ellyokes253 Jan 30, 2025
3bca007
fixing linter error
ellyokes253 Jan 30, 2025
3ff8098
using first bbox
ellyokes253 Jan 31, 2025
7aa2f46
added AutoLandingInformation object
ellyokes253 Feb 3, 2025
a6b98e6
fixing small mistakes
ellyokes253 Feb 3, 2025
e2428ef
redefined AutoLandingInformation class
ellyokes253 Feb 5, 2025
dec4a18
results of new merge
ellyokes253 Feb 7, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file.
100 changes: 100 additions & 0 deletions modules/auto_landing/auto_landing.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
"""
Auto-landing script.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add calculates the parameters necessary for use with LANDING_TARGET MAVLink command

"""

import math

from pymavlink import mavutil
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm pretty sure you won't need this library

from ..common.modules.logger import logger
from .. import detections_and_time
maxlou05 marked this conversation as resolved.
Show resolved Hide resolved


class AutoLanding:
"""
Auto-landing script.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy new file docstring here

"""

__create_key = object()

@classmethod
def create(
cls,
fov_x: float,
fov_y: float,
im_h: float,
im_w: float,
maxlou05 marked this conversation as resolved.
Show resolved Hide resolved
local_logger: logger.Logger,
) -> "tuple [bool, AutoLanding | None ]":
"""
fov_x: The horizontal camera field of view in degrees.
fov_y: The vertical camera field of view in degrees.
im_w: Width of image.
im_h: Height of image.
height_agl: Height above ground level in meters.

Returns an AutoLanding object.
"""
vehicle = mavutil.mavlink_connection("tcp:localhost:14550")
try:
height_agl_mm = vehicle.messages[
"GLOBAL_POSITION_INT"
].relative_alt # copied from blue_only.py
height_agl = max(height_agl_mm / 1000, 0.0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we need altitude information, you cannot create another connection to the drone since FlightInterface already has one. You need to get the merged_odometry_detections.MergedOdometryDetections object from data merge worker. The altitude is agl which is the same as local altitude I think, so you can directly use that

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, this portion should also go into the run() function, as altitude will change as the drone lands, and is not constant

local_logger.info(f"Altitude AGL: {height_agl} ", True)
except (KeyError, AttributeError):
local_logger.error("No GLOBAL_POSITION_INT message received")
return False, None

return True, AutoLanding(
cls.__create_key, fov_x, fov_y, im_h, im_w, height_agl, local_logger
)

def __init__(
self,
class_private_create_key: object,
fov_x: float,
fov_y: float,
im_h: float,
im_w: float,
height_agl: float,
local_logger: logger.Logger,
) -> None:
"""
Private constructor, use create() method.
"""
assert class_private_create_key is AutoLanding.__create_key, "Use create() method"

self.fov_x = fov_x
self.fov_y = fov_y
self.im_h = im_h
self.im_w = im_w
self.height_agl = height_agl
self.__logger = local_logger

def run(
self, bounding_box: detections_and_time.Detection
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you'll be getting a MergedOdometryDetections object, which will have a list of Detection objects

) -> "tuple[bool, tuple[float, float, float]]":
"""
Calculates the angles in radians of the bounding box based on its center.

bounding_box: A detections and time object.

Return: Tuple of the x and y angles in radians respectively and the target distance in meters.
"""

x_center, y_center = bounding_box.get_centre()

angle_x = (x_center - self.im_w / 2) * (self.fov_x * (math.pi / 180)) / self.im_w
angle_y = (y_center - self.im_h / 2) * (self.fov_y * (math.pi / 180)) / self.im_h

self.__logger.info(f"X angle (rad): {angle_x}", True)
self.__logger.info(f"Y angle (rad): {angle_y}", True)

x_dist = math.tan(angle_x) * self.height_agl
y_dist = math.tan(angle_y) * self.height_agl
ground_hyp = (x_dist**2 + y_dist**2) ** 0.5
self.__logger.info(f"Required horizontal correction (m): {ground_hyp}", True)
target_to_vehicle_dist = (ground_hyp**2 + self.height_agl**2) ** 0.5
self.__logger.info(f"Distance from vehicle to target (m): {target_to_vehicle_dist}", True)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that instead of making 4 separate lines in the log, you can combine all of these into 1 line, so the timestamps look better (these calculations should be fast anyways)


return True, (angle_x, angle_y, target_to_vehicle_dist)
62 changes: 62 additions & 0 deletions modules/auto_landing/auto_landing_worker.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
"""
Auto-landing worker.
"""

import pathlib
import os

from utilities.workers import queue_proxy_wrapper
from utilities.workers import worker_controller
from . import auto_landing
from ..common.modules.logger import logger


def auto_landing_worker(
fov_x: float,
fov_y: float,
im_h: float,
im_w: float,
input_queue: queue_proxy_wrapper.QueueProxyWrapper,
output_queue: queue_proxy_wrapper.QueueProxyWrapper,
controller: worker_controller.WorkerController,
) -> None:
"""
Worker process.

input_queue and output_queue are data queues.
controller is how the main process communicates to this worker process.
"""

worker_name = pathlib.Path(__file__).stem
process_id = os.getpid()
result, local_logger = logger.Logger.create(f"{worker_name}_{process_id}", True)
if not result:
print("ERROR: Worker failed to create logger")
return

# Get Pylance to stop complaining
assert local_logger is not None

local_logger.info("Logger initialized", True)

result, auto_lander = auto_landing.AutoLanding.create(fov_x, fov_y, im_h, im_w, local_logger)

if not result:
local_logger.error("Worker failed to create class object", True)
return

# Get Pylance to stop complaining
assert auto_lander is not None

while not controller.is_exit_requested():
controller.check_pause()

input_data = input_queue.queue.get()
if input_data is None:
continue

result, value = auto_lander.run(input_data)
if not result:
continue

output_queue.queue.put(value)
2 changes: 1 addition & 1 deletion modules/common
Loading