Skip to content

core: services: ardupilot_manager: Return none if board path is gone #4351

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.

Sign up for GitHub

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

Open
patrickelectric wants to merge 1 commit into
base: master
Choose a base branch
from
Open

core: services: ardupilot_manager: Return none if board path is gone #4351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion core/services/ardupilot_manager/api/v1/routers/index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ async def install_firmware_from_file(
)
@index_to_http_exception
def get_board() -> Any:
return autopilot.current_board
return autopilot.current_board_sanitized


@index_router_v1.post("/board", summary="Set board to be used.")
Expand Down
7 changes: 7 additions & 0 deletions core/services/ardupilot_manager/autopilot_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,13 @@ async def start_mavlink_manager_watchdog(self) -> None:
def current_board(self) -> Optional[FlightController]:
return self._current_board

@property
def current_board_sanitized(self) -> Optional[FlightController]:
board = self._current_board
if board and board.path and not pathlib.Path(board.path).exists():
return None
return board

@property
def current_sitl_frame(self) -> SITLFrame:
return self._current_sitl_frame
Expand Down