Fix colcon.meta (micro-ROS#39)

* Initial * Refactor external transport
donRaphaco · Feb 9, 2021 · c0b5926 · c0b5926
1 parent 8d4d314
commit c0b5926
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/colcon.meta b/colcon.meta
@@ -24,7 +24,9 @@
         "microxrcedds_client": {
             "cmake-args": [
                 "-DUCLIENT_PIC=OFF",
-                "-DUCLIENT_PROFILE_DISCOVERY=ON"
+                "-DUCLIENT_PROFILE_DISCOVERY=ON",
+                "-DUCLIENT_EXTERNAL_SERIAL=ON",
+                "-DUCLIENT_PROFILE_TCP=OFF"
             ]
         },
         "rmw_microxrcedds": {

diff --git a/esp32_toolchain.cmake.in b/esp32_toolchain.cmake.in
@@ -23,6 +23,7 @@ add_definitions(-DLWIP_IPV4 -DLWIP_IPV6)
 
 include_directories(
         "@BUILD_CONFIG_DIR@"
+        ${idf_path}/components/soc/soc/include
         ${idf_path}/components/freertos/port/xtensa/include
         ${idf_path}/components/hal/${idf_target}/include
         ${idf_path}/components/hal/include

diff --git a/serial_transport_external/esp32_serial_transport.c b/serial_transport_external/esp32_serial_transport.c
@@ -16,10 +16,6 @@ bool uxr_init_serial_platform(struct uxrSerialPlatform* platform, int fd, uint8_
 
     if (fd == 0) {
         platform->uart_port = UART_NUM_0;
-    } else if (fd == 1) {
-        platform->uart_port = UART_NUM_1;
-    } else if (fd == 2) {
-        platform->uart_port = UART_NUM_2;
     } else {
         return false;
     }