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

Update master in rmw_iceoryx for rolling #55

Merged
merged 9 commits into from
Aug 9, 2021

Conversation

mossmaurice
Copy link
Collaborator

Bring changes from #42 and #54 to master, which works with ROS 2 rolling.

ZhenshengLee and others added 9 commits July 27, 2021 17:11
…s2#42)

* 1. Refactor code with cpp api, alter the interface for iceoryx 1.0.0.
2. Refactor iceoryx_ros2_bridge code left with a listener-adding work to do.
3. Update the workflow description file according to the work in master branch.
4. (done)Leaving waitset function to be done.
5. (done )Leaving listener function issue#707 to be solved by iceoryx team.
6. (commented the error msg)Remain waitset error msgs to debug.
7. (commented the error msg)Remain some other todo tags to be done.

Signed-off-by: VictorLee <lzs_1993@qq.com>

* Rework changes from ZhenshengLee

* Fix by-copy capture in lambda
* Fix ChunkHeader and UserPayload mixup
* Replace cxx::string usage

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
Co-authored-by: Johannes Jeising <Johannes.Jeising@de.bosch.com>

* Remove unnecessary casts

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Remove dummy receiver in rmw_wait_set and IceoryxWaitSet wrapper class

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Add SubscriberOptions to introspection subscriber

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Remove gcc warnings

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Replace IceoryxGuardCondition with popo::UserTrigger

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Fix rmw_wait

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Unify todo's and add copyright header

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Add limitation table and add some more todo's

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Run ament_uncrustify over all files

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Clarify iceoryx v2.0 features

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* add support to rqt tools.

Signed-off-by: VictorLee <lzs_1993@qq.com>

* add more feature states in readme doc

Signed-off-by: VictorLee <lzs_1993@qq.com>

* Update copyright header.
Co-authored-by: Simon Hoinkis <simon@hoinkis.info>

Signed-off-by: VictorLee <lzs_1993@qq.com>

* fix lint and get ci work.

Signed-off-by: VictorLee <lzs_1993@qq.com>

Co-authored-by: Simon Hoinkis <simon.hoinkis@apex.ai>
Co-authored-by: Johannes Jeising <Johannes.Jeising@de.bosch.com>
…upstream ROS 2

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
… handling and reset error

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
@mossmaurice mossmaurice added the enhancement New feature or request label Jul 30, 2021
@mossmaurice mossmaurice self-assigned this Jul 30, 2021
Copy link
Contributor

@ZhenshengLee ZhenshengLee left a comment

Choose a reason for hiding this comment

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

OK

@mossmaurice mossmaurice merged commit 97f9d56 into ros2:master Aug 9, 2021
xlla pushed a commit to xlla/rmw_iceoryx that referenced this pull request May 9, 2022
* Refactor the code with cpp api for iceoryx release Almond(1.0.1). (ros2#42)

* 1. Refactor code with cpp api, alter the interface for iceoryx 1.0.0.
2. Refactor iceoryx_ros2_bridge code left with a listener-adding work to do.
3. Update the workflow description file according to the work in master branch.
4. (done)Leaving waitset function to be done.
5. (done )Leaving listener function issue#707 to be solved by iceoryx team.
6. (commented the error msg)Remain waitset error msgs to debug.
7. (commented the error msg)Remain some other todo tags to be done.

Signed-off-by: VictorLee <lzs_1993@qq.com>

* Rework changes from ZhenshengLee

* Fix by-copy capture in lambda
* Fix ChunkHeader and UserPayload mixup
* Replace cxx::string usage

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
Co-authored-by: Johannes Jeising <Johannes.Jeising@de.bosch.com>

* Remove unnecessary casts

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Remove dummy receiver in rmw_wait_set and IceoryxWaitSet wrapper class

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Add SubscriberOptions to introspection subscriber

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Remove gcc warnings

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Replace IceoryxGuardCondition with popo::UserTrigger

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Fix rmw_wait

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Unify todo's and add copyright header

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Add limitation table and add some more todo's

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Run ament_uncrustify over all files

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* Clarify iceoryx v2.0 features

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* add support to rqt tools.

Signed-off-by: VictorLee <lzs_1993@qq.com>

* add more feature states in readme doc

Signed-off-by: VictorLee <lzs_1993@qq.com>

* Update copyright header.
Co-authored-by: Simon Hoinkis <simon@hoinkis.info>

Signed-off-by: VictorLee <lzs_1993@qq.com>

* fix lint and get ci work.

Signed-off-by: VictorLee <lzs_1993@qq.com>

Co-authored-by: Simon Hoinkis <simon.hoinkis@apex.ai>
Co-authored-by: Johannes Jeising <Johannes.Jeising@de.bosch.com>

* ros2#48 Remove additional repos file as iceoryx is now available in upstream ROS 2

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* ros2#48 Adhere rmw_iceoryx to galactic APIs

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* ros2#48 Wrap get_message_typesupport_handle(), remove duplicate error handling and reset error

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* ros2#48 Add empty implementations for new rmw galactic API calls

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* ros2#48 Update copyright info in headers

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* ros2#48 Try to fix CI build

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* ros2#48 Remove empty line in license header

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

* ros2#48 Add missing include for std::pair

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

Co-authored-by: VictorLee <lzs_1993@qq.com>
Co-authored-by: Johannes Jeising <Johannes.Jeising@de.bosch.com>
Signed-off-by: xlla <xllacyx@hotmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants