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

Winch and Gripper plugins #545

Merged
merged 5 commits into from
Mar 7, 2024
Merged

Conversation

potaito
Copy link
Contributor

@potaito potaito commented Jan 20, 2023

Related PRs

Description

Adds the winch and gripper plugins also to MAVSDK-Python.

The example scripts are a bit tricky, since there is currently no simulation counterpart against which they can be used. They work in the sense that they send the corresponding commands, but MAVSDK will not receive an ACK if there is no winch or gripper component connected to MAVSDK. I don't know how we want to handle this for example scripts.

TODO

After updating the proto submodule and regenerating the python part, I got quite a lot of changes across the board and I'm not sure what needs to be committed:

 mavsdk/action.py                |   8 +++++
 mavsdk/action_pb2.py            |  14 ++++-----
 mavsdk/follow_me.py             | 142 ++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------
 mavsdk/follow_me_pb2.py         |  94 +++++++++++++++++++++++++++++----------------------------
 mavsdk/geofence.py              | 275 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
 mavsdk/geofence_pb2.py          |  71 +++++++++++++++++++++++++++++--------------
 mavsdk/geofence_pb2_grpc.py     |   4 +--
 mavsdk/gimbal.py                |   2 +-
 mavsdk/info.py                  |  92 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 mavsdk/info_pb2.py              |  19 +++++++-----
 mavsdk/log_files.py             |  46 ----------------------------
 mavsdk/log_files_pb2.py         |  42 ++++++++++----------------
 mavsdk/log_files_pb2_grpc.py    |  34 ---------------------
 mavsdk/mission.py               | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 mavsdk/mission_pb2.py           |  39 +++++++++++++-----------
 mavsdk/mission_raw.py           | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 mavsdk/mission_raw_pb2.py       | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
 mavsdk/mission_raw_pb2_grpc.py  |  70 +++++++++++++++++++++++++++++++++++++++++++
 mavsdk/offboard.py              |   8 +++++
 mavsdk/offboard_pb2.py          |  10 +++----
 mavsdk/source/plugins/index.rst |   2 ++
 mavsdk/telemetry.py             | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 mavsdk/telemetry_pb2.py         | 460 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------
 mavsdk/telemetry_pb2_grpc.py    | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 mavsdk/transponder.py           |  54 ++++++++++++++++++++++++++++++++-
 mavsdk/transponder_pb2.py       |  26 +++++++++-------
 mavsdk/winch.py                 | 452 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 mavsdk/winch_pb2.py             | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
 mavsdk/winch_pb2_grpc.py        |  34 +++++++++++++++++++++
 29 files changed, 2205 insertions(+), 659 deletions(-)

I guess all changes need to be committed?

Please don't merge before I squashed the commits :)

@potaito potaito marked this pull request as draft January 20, 2023 10:46
@potaito potaito force-pushed the winch_plugin branch 3 times, most recently from 09b880c to ecfc5a8 Compare February 23, 2023 10:22
@potaito potaito marked this pull request as ready for review February 23, 2023 10:23
@potaito
Copy link
Contributor Author

potaito commented Feb 23, 2023

I cleaned up the commits and rebased on top of the main branch. The most recent MAVSDK Server version 1.14.12 was released just two weeks ago, but the Proto submodule used in it was not up to date. Currently there is no MAVSDK Server release that contains the gripper and winch additions from Proto.

TODO: Wait for new mavsdk server release and then update MAVSDK_SERVER_VERSION in this PR.

@potaito potaito marked this pull request as draft March 27, 2023 11:24
@JonasVautherin
Copy link
Collaborator

So this is meant to come with MAVSDK v2, right?

@julianoes
Copy link
Collaborator

julianoes commented Mar 30, 2023

Yes, it will be part of v2. Sorry for the wait, MAVSDK v2 is just what I do in my spare time.

@JonasVautherin
Copy link
Collaborator

Sure, I was just wondering if @potaito was expecting it in 1.4 or not 😅

@julianoes
Copy link
Collaborator

I guess this could now go in, now that we have 2.0.

@julianoes julianoes marked this pull request as ready for review March 7, 2024 03:32
Signed-off-by: Julian Oes <julian@oes.ch>
@julianoes julianoes merged commit 0d137ca into mavlink:main Mar 7, 2024
7 checks passed
@potaito potaito deleted the winch_plugin branch March 8, 2024 09:51
@potaito
Copy link
Contributor Author

potaito commented Mar 8, 2024

Great, thank you @julianoes :)

@julianoes
Copy link
Collaborator

Thank you 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants