Fix service server example (#128) (#130)

mergify[bot] · pablogs9 · web-flow · commit d0e6604aa637 · 2022-02-10T09:28:52.000+01:00
* Fix service server example Signed-off-by: Pablo Garrido <pablogs9@gmail.com> * Fix define Signed-off-by: Pablo Garrido <pablogs9@gmail.com> (cherry picked from commit eb6b9b7) Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
diff --git a/examples/addtwoints_server/main/main.c b/examples/addtwoints_server/main/main.c
@@ -13,8 +13,13 @@
 #include <rcl/error_handling.h>
 #include <rclc/rclc.h>
 #include <rclc/executor.h>
+
 #include "example_interfaces/srv/add_two_ints.h"
 
+#ifdef CONFIG_MICRO_ROS_ESP_XRCE_DDS_MIDDLEWARE
+#include <rmw_microros/rmw_microros.h>
+#endif
+
 #define RCCHECK(fn) { rcl_ret_t temp_rc = fn; if((temp_rc != RCL_RET_OK)){printf("Failed status on line %d: %d. Aborting.\n",__LINE__,(int)temp_rc);}}
 #define RCSOFTCHECK(fn) { rcl_ret_t temp_rc = fn; if((temp_rc != RCL_RET_OK)){printf("Failed status on line %d: %d. Continuing.\n",__LINE__,(int)temp_rc);}}
 
@@ -79,7 +84,7 @@ void micro_ros_task(void * arg)
 
 void app_main(void)
 {
-#ifdef CONFIG_MICRO_ROS_ESP_NETIF_WLAN || CONFIG_MICRO_ROS_ESP_NETIF_ENET
+#if defined(CONFIG_MICRO_ROS_ESP_NETIF_WLAN) || defined(CONFIG_MICRO_ROS_ESP_NETIF_ENET)
     ESP_ERROR_CHECK(uros_network_interface_initialize());
 #endif
 
diff --git a/examples/int32_sub_pub/main/main.c b/examples/int32_sub_pub/main/main.c
@@ -115,7 +115,7 @@ void micro_ros_task(void * arg)
 
 void app_main(void)
 {
-#ifdef CONFIG_MICRO_ROS_ESP_NETIF_WLAN || CONFIG_MICRO_ROS_ESP_NETIF_ENET
+#if defined(CONFIG_MICRO_ROS_ESP_NETIF_WLAN) || defined(CONFIG_MICRO_ROS_ESP_NETIF_ENET)
     ESP_ERROR_CHECK(uros_network_interface_initialize());
 #endif
 
diff --git a/examples/low_consumption/main/main.c b/examples/low_consumption/main/main.c
@@ -110,7 +110,7 @@ void micro_ros_task(void * arg)
 
 void app_main(void)
 {
-#ifdef CONFIG_MICRO_ROS_ESP_NETIF_WLAN || CONFIG_MICRO_ROS_ESP_NETIF_ENET
+#if defined(CONFIG_MICRO_ROS_ESP_NETIF_WLAN) || defined(CONFIG_MICRO_ROS_ESP_NETIF_ENET)
     ESP_ERROR_CHECK(uros_network_interface_initialize());
 #endif
 
diff --git a/examples/multithread_publisher/main/main.c b/examples/multithread_publisher/main/main.c
@@ -111,7 +111,7 @@ void micro_ros_task(void * arg)
 
 void app_main(void)
 {
-#ifdef CONFIG_MICRO_ROS_ESP_NETIF_WLAN || CONFIG_MICRO_ROS_ESP_NETIF_ENET
+#if defined(CONFIG_MICRO_ROS_ESP_NETIF_WLAN) || defined(CONFIG_MICRO_ROS_ESP_NETIF_ENET)
     ESP_ERROR_CHECK(uros_network_interface_initialize());
 #endif
 
diff --git a/examples/ping_pong/main/main.c b/examples/ping_pong/main/main.c
@@ -176,7 +176,7 @@ void micro_ros_task(void * arg)
 
 void app_main(void)
 {
-#ifdef CONFIG_MICRO_ROS_ESP_NETIF_WLAN || CONFIG_MICRO_ROS_ESP_NETIF_ENET
+#if defined(CONFIG_MICRO_ROS_ESP_NETIF_WLAN) || defined(CONFIG_MICRO_ROS_ESP_NETIF_ENET)
     ESP_ERROR_CHECK(uros_network_interface_initialize());
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ void micro_ros_task(void * arg)`
`115`	`115`
`116`	`116`	`void app_main(void)`
`117`	`117`	`{`
`118`		`-#ifdef CONFIG_MICRO_ROS_ESP_NETIF_WLAN \|\| CONFIG_MICRO_ROS_ESP_NETIF_ENET`
	`118`	`+#if defined(CONFIG_MICRO_ROS_ESP_NETIF_WLAN) \|\| defined(CONFIG_MICRO_ROS_ESP_NETIF_ENET)`
`119`	`119`	`ESP_ERROR_CHECK(uros_network_interface_initialize());`
`120`	`120`	`#endif`
`121`	`121`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ void micro_ros_task(void * arg)`
`110`	`110`
`111`	`111`	`void app_main(void)`
`112`	`112`	`{`
`113`		`-#ifdef CONFIG_MICRO_ROS_ESP_NETIF_WLAN \|\| CONFIG_MICRO_ROS_ESP_NETIF_ENET`
	`113`	`+#if defined(CONFIG_MICRO_ROS_ESP_NETIF_WLAN) \|\| defined(CONFIG_MICRO_ROS_ESP_NETIF_ENET)`
`114`	`114`	`ESP_ERROR_CHECK(uros_network_interface_initialize());`
`115`	`115`	`#endif`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ void micro_ros_task(void * arg)`
`111`	`111`
`112`	`112`	`void app_main(void)`
`113`	`113`	`{`
`114`		`-#ifdef CONFIG_MICRO_ROS_ESP_NETIF_WLAN \|\| CONFIG_MICRO_ROS_ESP_NETIF_ENET`
	`114`	`+#if defined(CONFIG_MICRO_ROS_ESP_NETIF_WLAN) \|\| defined(CONFIG_MICRO_ROS_ESP_NETIF_ENET)`
`115`	`115`	`ESP_ERROR_CHECK(uros_network_interface_initialize());`
`116`	`116`	`#endif`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ void micro_ros_task(void * arg)`
`176`	`176`
`177`	`177`	`void app_main(void)`
`178`	`178`	`{`
`179`		`-#ifdef CONFIG_MICRO_ROS_ESP_NETIF_WLAN \|\| CONFIG_MICRO_ROS_ESP_NETIF_ENET`
	`179`	`+#if defined(CONFIG_MICRO_ROS_ESP_NETIF_WLAN) \|\| defined(CONFIG_MICRO_ROS_ESP_NETIF_ENET)`
`180`	`180`	`ESP_ERROR_CHECK(uros_network_interface_initialize());`
`181`	`181`	`#endif`
`182`	`182`