Skip to content

Mcav feature branch #799

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

Jump to bottom
Open
wants to merge 168 commits into
base: master
Choose a base branch
from
Open

Mcav feature branch #799

wants to merge 168 commits into from

Conversation

Credit3
Copy link

@Credit3 Credit3 commented May 8, 2025

General

Please consider the guidelines from CONTRIBUTING.md before you open a pull request.

New Examples

If you propose adding a new example, make sure that your new example has:

  • The correct folder structure (described in the main README.md)
  • Example has doc/README.rst with description
  • Detailed commands how to run an example
  • Output examples of CLI commands
  • Screenshots with expected visualizations (if applicable)

christophfroehlich and others added 30 commits April 28, 2023 15:59
@christophfroehlich
Cleanup workflow files
b76e969
@christophfroehlich
Add humble workflow + repos files
864f789
@mergify @christophfroehlich
Fix docs format (ros-controls#280) (ros-controls#281)
4608584 
(cherry picked from commit 836ec5d)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
@mergify @christophfroehlich
[Example 4+5] Fix tool link and slowdown (ros-controls#266) (ros-cont…
0e315d9 
…rols#283)

* Fix slowdown of hw interface of example_4

* Readd missing joints for tool_link

(cherry picked from commit f5ccac1)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
@mergify @christophfroehlich
Fix github links on control.ros.org (ros-controls#284) (ros-controls#288
0b39d73 
)

(cherry picked from commit a4ffefd)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
@mergify @christophfroehlich
Use branch name substitution for all links (ros-controls#286) (ros-co…
9c817ee 
…ntrols#289)

(cherry picked from commit c1beb07)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
@mergify @saikishor
enable ReflowComments to also use ColumnLimit on comments (ros-contro…
97f54bd 
…ls#290) (ros-controls#291)

(cherry picked from commit 296e235)

Co-authored-by: Sai Kishor Kothakota <saisastra3@gmail.com>
@mergify @ARK3r
Add ros2launch as dependency (ros-controls#293) (ros-controls#294)
86de7b1 
(cherry picked from commit eb60429)

Co-authored-by: Reza Kermani <kermani.areza@gmail.com>
@mergify @ARK3r
Add xacro as exec depend (ros-controls#295) (ros-controls#296)
8297ec1 
(cherry picked from commit 1c17ea2)

Co-authored-by: Reza Kermani <kermani.areza@gmail.com>
@mergify @christophfroehlich
Use {REPOS_FILE_BRANCH} also in github_url (ros-controls#299) (ros-co…
f893e83 
…ntrols#302)

(cherry picked from commit 1a69548)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
@mergify @olivier-stasse
@haider8645 @destogl
Add gazebo classic example (backport ros-controls#307) (ros-controls#311
c4f1ec5 
)


Co-authored-by: Olivier Stasse <olivier.stasse@laas.fr>
Co-authored-by: Haider Lodhi <haider_lodhi@hotmail.com>
Co-authored-by: Denis Štogl <denis@stogl.de>
@mergify @ARK3r
Readme: fix url of example 9 (ros-controls#313) (ros-controls#314)
aa0e130 
(cherry picked from commit a1ab06c)

Co-authored-by: Reza Kermani <kermani.areza@gmail.com>
@mergify @ARK3r @christophfroehlich
added docker (backport ros-controls#298) (ros-controls#319)
7bb5a05 
* [Docker] Add docker setup file and docs how to use base example with it (ros-controls#298)

Co-authored-by: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Co-authored-by: Alex Moriarty <alex.moriarty@picknik.ai>
Co-authored-by: Dr. Denis <denis@stoglrobotics.de>
(cherry picked from commit a7dd59a)

* Use humble instead of rolling

---------

Co-authored-by: Reza Kermani <kermani.areza@gmail.com>
Co-authored-by: Christoph Froehlich <christoph.froehlich@ait.ac.at>
@mergify @christophfroehlich
Remove rrbot_base.launch.py from example folders (ros-controls#268) (r…
ec9e565 
…os-controls#320)

* Example 3: remove rrbot_base launch file

* Example 4: remove rrbot_base launch file

* Example 5: remove rrbot_base launch file

* Example 6: remove rrbot_base launch file

* Example 8: remove rrbot_base launch file

(cherry picked from commit fa1c2e4)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
@mergify @christophfroehlich
Install ros2_control framework from binary packages (ros-controls#308) (
b3b5ced 
ros-controls#321)

* Install ros2_control framework from binary packages

* User symlink install

(cherry picked from commit 8081073)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
@mergify @christophfroehlich
Move installation instructions to RST and update docker usage instruc…
ba54f20 
…tions (backport ros-controls#309) (ros-controls#322)

* Move installation instructions to RST and update docker usage instructions (ros-controls#309)

Co-authored-by: Reza Kermani <kermani.areza@gmail.com>
(cherry picked from commit 815e05e)

* Use humble instead of rolling branch in docs

---------

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
Co-authored-by: Christoph Froehlich <christoph.froehlich@ait.ac.at>
@mergify @christophfroehlich
Touchup Dockerfile and create a workflow building it (backport ros-co…
ae0a7d3 
…ntrols#323) (ros-controls#324)


Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
Co-authored-by: Christoph Froehlich <christoph.froehlich@ait.ac.at>
@mergify @mauricesvp
Fix typo in docker description (ros-controls#325) (ros-controls#326)
051ad6f 
(cherry picked from commit 36b3a5f)

Co-authored-by: maurice <maurice@walny.de>
@mergify @pac48
[Example 7] Full example for 6 revolute joint robot (ros-controls#201) (
83eaa4f 
ros-controls#333)

This change adds an minimal example to control a custom 6 DOF robot with ros2_control. The README acts as a tutorial for intermediate ROS 2 users.

---------

Co-authored-by: Christoph Froehlich <christoph.froehlich@ait.ac.at>
(cherry picked from commit 09b357a)

Co-authored-by: Paul Gesel <paulgesel@gmail.com>
@mergify @saikishor
[Example 12] Controller chaining example (backport ros-controls#318) (r…
7b62ee3 
…os-controls#335)

* [Example 12] Controller chaining example (ros-controls#318)

Co-authored-by: Christoph Froehlich <christoph.froehlich@ait.ac.at>
(cherry picked from commit 2968016)

* remove the arguments from update_reference_from_subscribers to backport to humble (ros-controls#336)

---------

Co-authored-by: Sai Kishor Kothakota <sai.kishor@pal-robotics.com>
@mergify @christophfroehlich
Fix 6dof robot links (ros-controls#337) (ros-controls#338)
6890818 
(cherry picked from commit 57a561e)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
@mergify @ARK3r @christophfroehlich
add a dependency (partial backport ros-controls#305) (ros-controls#306)
8bf64ea 
* add a dependency; fix deprecation warning (ros-controls#305)

(cherry picked from commit 71764d9)

* Revert remapping

---------

Co-authored-by: Reza Kermani <kermani.areza@gmail.com>
Co-authored-by: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
@mergify @christophfroehlich
Update dependency order (ros-controls#310) (ros-controls#347)
f25bffd 
Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
@mergify @christophfroehlich
Extract robot description into global package (again) (ros-controls#339…
66c2c23 
…) (ros-controls#346)

* Use global rrbot_description in all examples
* Move diffbot description to description package
* Move r6bot into description package

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
@mergify
Docs: Make unique headings (ros-controls#341) (ros-controls#348)
54a3ae4
@mergify @christophfroehlich
Add info about ROS 2 distro (backport ros-controls#345) (ros-controls…
90b9e9f 
…#349)

* Add info about ROS 2 distro (ros-controls#345)

(cherry picked from commit b8dd69e)

# Conflicts:
#	doc/index.rst

* Update index.rst

---------

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
@mergify @emereum
Fix diffbot position integration (ros-controls#350) (ros-controls#352)
546eb21 
(cherry picked from commit 43c9e9e)

Co-authored-by: Mike Emery <emerym@canva.com>
@mergify @christophfroehlich
Fix link (ros-controls#354) (ros-controls#355)
f99ff56 
(cherry picked from commit 35dd6af)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
@mergify @christophfroehlich
Add example 7+12 to workflow files (ros-controls#340) (ros-controls#364)
e1cd6f3 
(cherry picked from commit 98f88e9)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
@mergify @olivier-stasse
Minor fixes in documentation (example_1 and example_12) (ros-controls…
a94ac75 
…#361) (ros-controls#363)

* [example_1/doc] Specify that step 1 is optional.
Two in

* [example_12/README.md] Fix wrong title in README.md

---------

Co-authored-by: Olivier Stasse <olivier.stasse@laas.fr>
(cherry picked from commit 40b92dd)

Co-authored-by: Olivier Stasse <ostasse@laas.fr>
Credit3 added 18 commits May 4, 2025 21:11
@Credit3
My changes to submodule
64610c2
@Credit3
Added a flight controller comms header file
5b11a1e
@Credit3
Added a test comment
316fdc9
@Credit3
Added mavlink_subscriber_node that will send to flight controller fro…
6afae85 
…m hardware interface
@Credit3
Deleted many of the other example packages as they aren't needed. Add…
f2132ba 
…ed a mavlink header file, but getting lots of warnings
@Credit3
Added a mavlink_message_t declaration
3614d5f
@Credit3
Added libmavconn to package.xml file
70c5f0d
@Credit3
Got the serial.hpp package to at least be defined in the node file
e9a9435
@Credit3
Added a serial opener in the code
08a6057
@Credit3
About to see if my dialout permission is good
2959cf9
@Credit3
Changed USB to ACM1
53effdf
@Credit3
Started populating the mavlink_msg data struct
7a7a81a
@Credit3
Calling the send_message function
1295784
@Credit3
Added a pwm_command_node.cpp in an attempt to change the PWM channel …
8b3cf8a 
…values
@Credit3
Got the channel value to change. All of the details are in pwm_comman…
37d65f6 
…d_node.cpp
@Credit3
Code to manually spin the wheel
6bf5cb4
@Credit3
Trying to get teleop to work
8a035a2
@Credit3
Add/update pwm_command_node.cpp
6adc994
@mergify Mergify
Copy link
Contributor

mergify bot commented May 8, 2025

This pull request is in conflict. Could you fix it @Credit3?

@christophfroehlich
Copy link
Contributor

what is this about? 220 changed files, no description at all?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ARK3r ARK3r Awaiting requested review from ARK3r

@bmagyar bmagyar Awaiting requested review from bmagyar

@christophfroehlich christophfroehlich Awaiting requested review from christophfroehlich

@livanov93 livanov93 Awaiting requested review from livanov93

@moriarty moriarty Awaiting requested review from moriarty

@peterdavidfagan peterdavidfagan Awaiting requested review from peterdavidfagan

@qiayuanl qiayuanl Awaiting requested review from qiayuanl

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Credit3 @christophfroehlich @ozanpali