Skip to content

Commit 706d150

Browse files
committed
Add more image topics
- `/booster_camera_bridge/StereoNetNode/rectified_right_image` -> `booster/rectified_right_image` - `/booster_camera_bridge/StereoNetNode/stereonet_depth` -> `booster/stereonet_depth` - `/booster_camera_bridge/StereoNetNode/stereonet_visual` -> `booster/stereonet_visual` - `/booster_camera_bridge/image_right_raw` -> `booster/image_right_raw` - `/booster_camera_bridge/image_right_raw/camera_info` -> `booster/image_left_raw/camera_info`
1 parent 7896205 commit 706d150

File tree

1 file changed

+55
-2
lines changed

1 file changed

+55
-2
lines changed

crates/zenoh_bridge/src/main.rs

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,21 @@ async fn main() -> Result<()> {
158158
"rectified_image",
159159
MessageTypeName::new("sensor_msgs", "Image"),
160160
);
161+
let rectified_right_image_subscriber: Subscription<Image> = node.subscribe(
162+
"/booster_camera_bridge/StereoNetNode",
163+
"rectified_right_image",
164+
MessageTypeName::new("sensor_msgs", "Image"),
165+
);
166+
let stereonet_depth_subscriber: Subscription<Image> = node.subscribe(
167+
"/booster_camera_bridge/StereoNetNode",
168+
"stereonet_depth",
169+
MessageTypeName::new("sensor_msgs", "Image"),
170+
);
171+
let stereonet_visual_subscriber: Subscription<Image> = node.subscribe(
172+
"/booster_camera_bridge/StereoNetNode",
173+
"stereonet_visual",
174+
MessageTypeName::new("sensor_msgs", "Image"),
175+
);
161176
let image_left_raw_subscriber: Subscription<Image> = node.subscribe(
162177
"/booster_camera_bridge",
163178
"image_left_raw",
@@ -168,6 +183,16 @@ async fn main() -> Result<()> {
168183
"camera_info",
169184
MessageTypeName::new("sensor_msgs", "CameraInfo"),
170185
);
186+
let image_right_raw_subscriber: Subscription<Image> = node.subscribe(
187+
"/booster_camera_bridge",
188+
"image_right_raw",
189+
MessageTypeName::new("sensor_msgs", "Image"),
190+
);
191+
let image_right_raw_camera_info_subscriber: Subscription<CameraInfo> = node.subscribe(
192+
"/booster_camera_bridge/image_right_raw",
193+
"camera_info",
194+
MessageTypeName::new("sensor_msgs", "CameraInfo"),
195+
);
171196
let low_command_publisher: Publisher<LowCommand> = node.publisher(
172197
"/",
173198
"joint_ctrl",
@@ -186,6 +211,15 @@ async fn main() -> Result<()> {
186211
let rectified_image_forwarder = session
187212
.forward_from_subscriber(rectified_image_subscriber, "rectified_image")
188213
.fuse();
214+
let rectified_right_image_forwarder = session
215+
.forward_from_subscriber(rectified_right_image_subscriber, "rectified_right_image")
216+
.fuse();
217+
let stereonet_depth_forwarder = session
218+
.forward_from_subscriber(stereonet_depth_subscriber, "stereonet_depth")
219+
.fuse();
220+
let stereonet_visual_forwarder = session
221+
.forward_from_subscriber(stereonet_visual_subscriber, "stereonet_visual")
222+
.fuse();
189223
let image_left_raw_forwarder = session
190224
.forward_from_subscriber(image_left_raw_subscriber, "image_left_raw")
191225
.fuse();
@@ -195,6 +229,15 @@ async fn main() -> Result<()> {
195229
"image_left_raw/camera_info",
196230
)
197231
.fuse();
232+
let image_right_raw_forwarder = session
233+
.forward_from_subscriber(image_right_raw_subscriber, "image_right_raw")
234+
.fuse();
235+
let image_right_raw_camera_info_forwarder = session
236+
.forward_from_subscriber(
237+
image_right_raw_camera_info_subscriber,
238+
"image_right_raw/camera_info",
239+
)
240+
.fuse();
198241
let low_command_forwarder = session
199242
.forward_to_publisher(low_command_publisher, "low_command")
200243
.fuse();
@@ -203,19 +246,29 @@ async fn main() -> Result<()> {
203246
pin_mut!(fall_down_state_forwarder);
204247
pin_mut!(low_state_forwarder);
205248
pin_mut!(low_command_forwarder);
249+
pin_mut!(rectified_image_forwarder);
250+
pin_mut!(rectified_right_image_forwarder);
251+
pin_mut!(stereonet_depth_forwarder);
252+
pin_mut!(stereonet_visual_forwarder);
206253
pin_mut!(image_left_raw_forwarder);
207254
pin_mut!(image_left_raw_camera_info_forwarder);
208-
pin_mut!(rectified_image_forwarder);
255+
pin_mut!(image_right_raw_forwarder);
256+
pin_mut!(image_right_raw_camera_info_forwarder);
209257

210258
// If no errors occur, none of these futures will complete
211259
let result = select! {
212260
result = button_event_forwarder => result,
213261
result = fall_down_state_forwarder => result,
214262
result = low_state_forwarder => result,
215263
result = low_command_forwarder => result,
264+
result = rectified_image_forwarder => result,
265+
result = rectified_right_image_forwarder => result,
266+
result = stereonet_depth_forwarder => result,
267+
result = stereonet_visual_forwarder => result,
216268
result = image_left_raw_forwarder => result,
217269
result = image_left_raw_camera_info_forwarder => result,
218-
result = rectified_image_forwarder => result,
270+
result = image_right_raw_forwarder => result,
271+
result = image_right_raw_camera_info_forwarder => result,
219272
};
220273
result.wrap_err("forwarder error occurred")?;
221274

0 commit comments

Comments
 (0)