Skip to content

Commit ab34dec

Browse files
pokitozmergify[bot]
authored andcommitted
Update deprecated timer function to rclc_timer_init_default2 (#286)
* examples: Use rclc_timer_init_default2 instead of deprecated Signed-off-by: Florian Depraz <florian.depraz@outlook.com> * Fix comment in example (2 instead of 3 seconds timer) Signed-off-by: Florian Depraz <florian.depraz@outlook.com> --------- Signed-off-by: Florian Depraz <florian.depraz@outlook.com> (cherry picked from commit c8dd76e)
1 parent 31ae212 commit ab34dec

File tree

8 files changed

+24
-16
lines changed

8 files changed

+24
-16
lines changed

examples/handle_static_types/main/main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,12 @@ void micro_ros_task(void * arg)
7373
// create timer,
7474
rcl_timer_t timer;
7575
const unsigned int timer_timeout = 1000;
76-
RCCHECK(rclc_timer_init_default(
76+
RCCHECK(rclc_timer_init_default2(
7777
&timer,
7878
&support,
7979
RCL_MS_TO_NS(timer_timeout),
80-
timer_callback));
80+
timer_callback,
81+
true));
8182

8283
// create executor
8384
rclc_executor_t executor;

examples/int32_publisher/main/main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,12 @@ void micro_ros_task(void * arg)
6767
// create timer,
6868
rcl_timer_t timer;
6969
const unsigned int timer_timeout = 1000;
70-
RCCHECK(rclc_timer_init_default(
70+
RCCHECK(rclc_timer_init_default2(
7171
&timer,
7272
&support,
7373
RCL_MS_TO_NS(timer_timeout),
74-
timer_callback));
74+
timer_callback,
75+
true));
7576

7677
// create executor
7778
rclc_executor_t executor;

examples/int32_publisher_custom_transport/main/main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,12 @@ void micro_ros_task(void * arg)
5555
// create timer,
5656
rcl_timer_t timer;
5757
const unsigned int timer_timeout = 1000;
58-
RCCHECK(rclc_timer_init_default(
58+
RCCHECK(rclc_timer_init_default2(
5959
&timer,
6060
&support,
6161
RCL_MS_TO_NS(timer_timeout),
62-
timer_callback));
62+
timer_callback,
63+
true));
6364

6465
// create executor
6566
rclc_executor_t executor;

examples/int32_publisher_embeddedrtps/main/main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,12 @@ void micro_ros_task(void * arg)
5555
// create timer,
5656
rcl_timer_t timer;
5757
const unsigned int timer_timeout = 1000;
58-
RCCHECK(rclc_timer_init_default(
58+
RCCHECK(rclc_timer_init_default2(
5959
&timer,
6060
&support,
6161
RCL_MS_TO_NS(timer_timeout),
62-
timer_callback));
62+
timer_callback,
63+
true));
6364

6465
// create executor
6566
rclc_executor_t executor;

examples/int32_sub_pub/main/main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,12 @@ void micro_ros_task(void * arg)
8282
// Create timer.
8383
rcl_timer_t timer = rcl_get_zero_initialized_timer();
8484
const unsigned int timer_timeout = 1000;
85-
RCCHECK(rclc_timer_init_default(
85+
RCCHECK(rclc_timer_init_default2(
8686
&timer,
8787
&support,
8888
RCL_MS_TO_NS(timer_timeout),
89-
timer_callback));
89+
timer_callback,
90+
true));
9091

9192
// Create executor.
9293
rclc_executor_t executor = rclc_executor_get_zero_initialized_executor();

examples/low_consumption/main/main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,12 @@ void micro_ros_task(void * arg)
8383
// create timer,
8484
rcl_timer_t timer;
8585
const unsigned int timer_timeout = 1000;
86-
RCCHECK(rclc_timer_init_default(
86+
RCCHECK(rclc_timer_init_default2(
8787
&timer,
8888
&support,
8989
RCL_MS_TO_NS(timer_timeout),
90-
timer_callback));
90+
timer_callback,
91+
true));
9192

9293
// create executor
9394
rclc_executor_t executor;

examples/parameters/main/main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,12 @@ void micro_ros_task(void * arg)
7979

8080
// create timer,
8181
rcl_timer_t timer;
82-
rclc_timer_init_default(
82+
RCCHECK(rclc_timer_init_default2(
8383
&timer,
8484
&support,
8585
RCL_MS_TO_NS(1000),
86-
timer_callback);
86+
timer_callback,
87+
true));
8788

8889
// Create executor
8990
rclc_executor_t executor;

examples/ping_pong/main/main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,10 @@ void micro_ros_task(void * arg)
131131
ROSIDL_GET_MSG_TYPE_SUPPORT(std_msgs, msg, Header), "/microROS/pong"));
132132

133133

134-
// Create a 3 seconds ping timer timer,
134+
// Create a 2 seconds ping timer timer,
135135
rcl_timer_t timer;
136-
RCCHECK(rclc_timer_init_default(&timer, &support, RCL_MS_TO_NS(2000), ping_timer_callback));
136+
RCCHECK(rclc_timer_init_default2(&timer, &support, RCL_MS_TO_NS(2000),
137+
ping_timer_callback, true));
137138

138139

139140
// Create executor

0 commit comments

Comments
 (0)