Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rclrs/logging_demo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ edition = "2021"

[dependencies]
rclrs = "0.7"
example_interfaces = "*"
ros-env = "0.1"
1 change: 1 addition & 0 deletions rclrs/logging_demo/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use rclrs::*;
use ros_env::*;
use std::time::Duration;

fn main() -> Result<(), RclrsError> {
Expand Down
8 changes: 3 additions & 5 deletions rclrs/message_demo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ path = "src/message_demo.rs"

[dependencies]
anyhow = {version = "1", features = ["backtrace"]}
rclrs = "0.7"
rclrs = { version = "0.7", features = ["serde"] }
# TODO (SP) This shouldn't need the serde feature once the next version of rclrs is released
ros-env = {path = "/home/sam/rust_ws/src/ros-env", features = ["serde"]}
rosidl_runtime_rs = "0.6"
rclrs_example_msgs = { version = "0.5", features = ["serde"] }
serde_json = "1.0"

# This specific version is compatible with Rust 1.75
backtrace = "=0.3.74"
1 change: 1 addition & 0 deletions rclrs/message_demo/src/message_demo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use anyhow::{Error, Result};
use rosidl_runtime_rs::{seq, BoundedSequence, Message, Sequence};

use rclrs::*;
use ros_env::*;

fn check_default_values() {
let msg = rclrs_example_msgs::msg::rmw::VariousTypes::default();
Expand Down
5 changes: 1 addition & 4 deletions rclrs/minimal_client_service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,4 @@ path = "src/minimal_service.rs"
anyhow = {version = "1", features = ["backtrace"]}
tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread", "time"] }
rclrs = "0.7"
example_interfaces = "*"

# This specific version is compatible with Rust 1.75
backtrace = "=0.3.74"
ros-env = "0.1"
2 changes: 1 addition & 1 deletion rclrs/minimal_client_service/src/minimal_client.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use anyhow::{Error, Result};
use example_interfaces::srv::*;
use rclrs::*;
use ros_env::example_interfaces::srv::*;

fn main() -> Result<(), Error> {
let mut executor = Context::default_from_env()?.create_basic_executor();
Expand Down
2 changes: 1 addition & 1 deletion rclrs/minimal_client_service/src/minimal_client_async.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use anyhow::{Error, Result};
use example_interfaces::srv::*;
use rclrs::*;
use ros_env::example_interfaces::srv::*;

#[tokio::main]
async fn main() -> Result<(), Error> {
Expand Down
2 changes: 1 addition & 1 deletion rclrs/minimal_client_service/src/minimal_service.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use anyhow::{Error, Result};
use example_interfaces::srv::*;
use rclrs::*;
use ros_env::example_interfaces::srv::*;

fn handle_service(request: AddTwoInts_Request, info: ServiceInfo) -> AddTwoInts_Response {
let timestamp = info
Expand Down
5 changes: 1 addition & 4 deletions rclrs/minimal_pub_sub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@ path = "src/zero_copy_publisher.rs"
[dependencies]
anyhow = {version = "1", features = ["backtrace"]}
rclrs = "0.7"
example_interfaces = "*"

# This specific version is compatible with Rust 1.75
backtrace = "=0.3.74"
ros-env = "0.1"

[package.metadata.ros]
install_to_share = ["launch"]
1 change: 1 addition & 0 deletions rclrs/minimal_pub_sub/src/minimal_publisher.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use anyhow::{Error, Result};
use rclrs::*;
use ros_env::*;

fn main() -> Result<(), Error> {
let context = Context::default_from_env()?;
Expand Down
1 change: 1 addition & 0 deletions rclrs/minimal_pub_sub/src/minimal_subscriber.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use anyhow::{Error, Result};
use rclrs::*;
use ros_env::*;

fn main() -> Result<(), Error> {
let context = Context::default_from_env()?;
Expand Down
1 change: 1 addition & 0 deletions rclrs/minimal_pub_sub/src/minimal_two_nodes.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use rclrs::*;
use ros_env::*;
use std::sync::Arc;

use anyhow::{Error, Result};
Expand Down
1 change: 1 addition & 0 deletions rclrs/minimal_pub_sub/src/zero_copy_publisher.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use anyhow::{Error, Result};
use rclrs::*;
use ros_env::*;

fn main() -> Result<(), Error> {
let context = Context::default_from_env()?;
Expand Down
1 change: 1 addition & 0 deletions rclrs/minimal_pub_sub/src/zero_copy_subscriber.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use anyhow::{Error, Result};
use rclrs::*;
use ros_env::*;

fn main() -> Result<(), Error> {
let mut executor = Context::default_from_env()?.create_basic_executor();
Expand Down
2 changes: 1 addition & 1 deletion rclrs/parameter_demo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ edition = "2021"

[dependencies]
rclrs = "0.7"
example_interfaces = "*"
ros-env = "0.1"
1 change: 1 addition & 0 deletions rclrs/parameter_demo/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use rclrs::*;
use ros_env::*;
use std::sync::Arc;

fn main() -> Result<(), RclrsError> {
Expand Down
4 changes: 2 additions & 2 deletions rclrs/rust_pubsub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ name="simple_subscriber"
path="src/simple_subscriber.rs"

[dependencies]
rclrs = "*"
std_msgs = "*"
rclrs = "0.7.0"
ros-env = "0.1"
2 changes: 1 addition & 1 deletion rclrs/rust_pubsub/src/simple_publisher.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use rclrs::*;
use ros_env::std_msgs::msg::String as StringMsg;
use std::{thread, time::Duration};
use std_msgs::msg::String as StringMsg;

struct SimplePublisherNode {
publisher: Publisher<StringMsg>,
Expand Down
2 changes: 1 addition & 1 deletion rclrs/rust_pubsub/src/simple_subscriber.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use rclrs::*;
use ros_env::std_msgs::msg::String as StringMsg;
use std::{thread, time::Duration};
use std_msgs::msg::String as StringMsg;

pub struct SimpleSubscriptionNode {
#[allow(unused)]
Expand Down
2 changes: 1 addition & 1 deletion rclrs/worker_demo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ edition = "2021"

[dependencies]
rclrs = "0.7"
example_interfaces = "*"
ros-env = "0.1"
13 changes: 5 additions & 8 deletions rclrs/worker_demo/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use rclrs::*;
use ros_env::*;
use std::time::Duration;

fn main() -> Result<(), RclrsError> {
Expand All @@ -17,16 +18,12 @@ fn main() -> Result<(), RclrsError> {

// Use this timer-based implementation when timers are available instead
// of using std::thread::spawn.
let _timer = worker.create_timer_repeating(
Duration::from_secs(1),
move |data: &mut String| {
let msg = example_interfaces::msg::String {
data: data.clone()
};
let _timer =
worker.create_timer_repeating(Duration::from_secs(1), move |data: &mut String| {
let msg = example_interfaces::msg::String { data: data.clone() };

publisher.publish(msg).ok();
}
)?;
})?;

println!(
"Beginning repeater... \n >> \
Expand Down