Skip to content

Commit 864e769

Browse files
mossmaurice-apexaihomalozoamickeyouyou
authored
Forward port changes from galactic to master and adaptions for Blueberry release (v2.0.0) (#75)
* Add include header <stdexcept> (#59) 1. <stdexcept> is needed by std::runtime_error Signed-off-by: Homalozoa <xuhaiwang@xiaomi.com> * Fix Python support by using C type support for message name lookup (#70) Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai> * Add gid support (#72) * Implement rmw_compare_gids_equal() Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai> * Use UniquePortId from iceoryx Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai> * Remove typo in function name and simplify array passing Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai> * Implement `rmw_qos_profile_check_compatible` (#73) * Implement rmw_qos_profile_check_compatible Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai> * Move comments to article on iceoryx.io Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai> * Remove the ROS 2 bridge as discussed in #56 (#71) Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai> * fix demo codes pod_loaded_msg by sample codes (#44) https://github.com/ros2/demos/blob/master/demo_nodes_cpp/src/topics/talker_loaned_message.cpp Signed-off-by: zongbao feng <mickeyouou@gmail.com> * Fix code example in main README.md (#74) Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai> * Adapt GID generation to Blueberry API Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai> * Added empty implementations for new rmw API Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai> Co-authored-by: Homalozoa X <21300069+homalozoa@users.noreply.github.com> Co-authored-by: Zongbao Feng <mickeyouou@gmail.com>
1 parent 6a0a31e commit 864e769

28 files changed

+210
-1018
lines changed

.github/workflows/lint.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,3 @@ jobs:
1818
linter: ${{ matrix.linter }}
1919
package-name: |
2020
rmw_iceoryx_cpp
21-
iceoryx_ros2_bridge

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Build & Test
2323
uses: ros-tooling/action-ros-ci@master
2424
with:
25-
package-name: rmw_iceoryx_cpp iceoryx_ros2_bridge
25+
package-name: rmw_iceoryx_cpp
2626
target-ros2-distro: rolling
2727
vcs-repo-file-url: |
2828
https://raw.githubusercontent.com/ros2/ros2/master/ros2.repos

README.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ An application using these new features is shown in the code snippet below.
104104
For a fully working implementation, please have a look at [this demo node](https://github.com/ros2/demos/blob/master/demo_nodes_cpp/src/topics/talker_loaned_message.cpp).
105105

106106
```c++
107-
auto pub = node->create_publisher<std_msgs::msg::String>("/chatter", 1);
107+
auto non_pod_pub_ = node->create_publisher<std_msgs::msg::String>("/chatter", 1);
108108
// Ask the publisher to loan a String message
109-
auto loaned_msg = pub_->borrow_loaned_message();
110-
pod_loaned_msg.get().data = "Hello World";
109+
auto non_pod_loaned_msg = non_pod_pub_->borrow_loaned_message();
110+
non_pod_loaned_msg.get().data = "Hello World";
111111
// Return ownership of that string message
112-
pod_pub_->publish(std::move(pod_loaned_msg));
112+
non_pod_pub_->publish(std::move(non_pod_loaned_msg));
113113
```
114114
115115
The code above has one problem though: How can the middleware allocate enough memory for the string message?
@@ -125,9 +125,9 @@ The message definition shown on the right size is not made for zero copy transpo
125125
Thus, in order to make our demo work with zero copy, we can alternatively send a float64, as its size is clearly defined.
126126
127127
```c++
128-
auto pub = node->create_publisher<std_msgs::msg::Float64>("/float", 1);
128+
auto pod_pub_ = node->create_publisher<std_msgs::msg::Float64>("/float", 1);
129129
// Ask the publisher to loan a Float64 message
130-
auto loaned_msg = pub_->borrow_loaned_message();
130+
auto pod_loaned_msg = pod_pub_->borrow_loaned_message();
131131
pod_loaned_msg.get().data = 123.456f;
132132
// Return ownership of that Float64 message
133133
pod_pub_->publish(std::move(pod_loaned_msg));
@@ -162,5 +162,4 @@ Unfortunately, not all features are yet fully fleshed out.
162162
| `ros2 bag` | :grey_question: |
163163
| urdf | :grey_question: |
164164
| tf2 | :grey_question: |
165-
| ROS 2 bridge | :grey_question: |
166165
| RMW Pub/Sub Events | :x: |

iceoryx_ros2_bridge/CMakeLists.txt

Lines changed: 0 additions & 64 deletions
This file was deleted.

iceoryx_ros2_bridge/package.xml

Lines changed: 0 additions & 28 deletions
This file was deleted.

iceoryx_ros2_bridge/src/command_line_parser.hpp

Lines changed: 0 additions & 74 deletions
This file was deleted.

iceoryx_ros2_bridge/src/generic_publisher.cpp

Lines changed: 0 additions & 49 deletions
This file was deleted.

iceoryx_ros2_bridge/src/generic_publisher.hpp

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)