From bb567e0f3bb0114688e80a14f28618334bdee36f Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Thu, 2 Sep 2021 08:55:46 +0200 Subject: [PATCH 1/2] Update standalone build tools section (#380) * Update standalone build tools section * Upd * Updates (cherry picked from commit e13e64d3b698695c213166377e7f90dfca98d192) # Conflicts: # README.md --- README.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8892d6ea..ccd3e076 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This ROS 2 package is the entry point for building micro-ROS apps for different embedded platforms. - [Supported platforms](#supported-platforms) - - [Secondary build system tools](#secondary-build-system-tools) + - [Standalone build system tools](#standalone-build-system-tools) - [Dependencies](#dependencies) - [Building](#building) - [Creating micro-ROS firmware](#creating-micro-ros-firmware) @@ -42,16 +42,24 @@ This package is the **official build system for micro-ROS**. It provides tools a *3 a valid CMake toolchain with custom crosscompilation definition is required* +<<<<<<< HEAD ## Secondary build system tools +======= +## Standalone build system tools +>>>>>>> e13e64d (Update standalone build tools section (#380)) micro-ROS also offers some other ways to crosscompile it for different platforms. These other options are secondary tools and may not have full support for all features. Currently micro-ROS is also available as: +- a standalone **[micro-ROS component for Renesas e2 studio and RA6M5](https://github.com/micro-ROS/micro_ros_renesas2estudio_component)**: this package enables the integration of micro-ROS in Renesas e2 studio and RA6M5 MCU family. - a standalone **[micro-ROS component for ESP-IDF](https://github.com/micro-ROS/micro_ros_espidf_component)**: this package enables the integration of micro-ROS in any Espressif ESP32 IDF project. - a standalone **[micro-ROS module for Zephyr RTOS](https://github.com/micro-ROS/micro_ros_zephyr_module)**: this package enables the integration of micro-ROS in any Zephyr RTOS workspace. - a standalone **[micro-ROS module for Mbed RTOS](https://github.com/micro-ROS/micro_ros_mbed)**: this package enables the integration of micro-ROS in any Mbed RTOS workspace. - a standalone **[micro-ROS module for NuttX RTOS](https://github.com/micro-ROS/micro_ros_nuttx_app)**: this package enables the integration of micro-ROS in any NuttX RTOS workspace. +- a standalone **[micro-ROS module for Microsoft Azure RTOS](https://github.com/micro-ROS/micro_ros_azure_rtos_app)**: this package enables the integration of micro-ROS in a Microsoft Azure RTOS workspace. +- a set of **[micro-ROS utils for STM32CubeMX and STM32CubeIDE](https://github.com/micro-ROS/micro_ros_stm32cubemx_utils)**: this package enables the integration of micro-ROS in STM32CubeMX and STM32CubeIDE. - a precompiled set of **[Arduino IDE libraries](https://github.com/micro-ROS/micro_ros_arduino)**: this package enables the integration of micro-ROS in the Arduino IDE for some hardware platforms. +- a precompiled set of **[Raspberry Pi Pico SDK libraries](https://github.com/micro-ROS/micro_ros_raspberrypi_pico_sdk)**: this package enables the integration of micro-ROS in the Raspberry Pi Pico SDK. # Dependencies @@ -59,6 +67,11 @@ This package targets the **ROS 2** installation. ROS 2 supported distributions a | ROS 2 Distro | State | Branch | | ------------ | --------- | ---------- | +<<<<<<< HEAD +======= +| Crystal | EOL | `crystal` | +| Dashing | EOL | `dashing` | +>>>>>>> e13e64d (Update standalone build tools section (#380)) | Foxy | Supported | `foxy` | | Galactic | Supported | `galactic` | | Rolling | Supported | `main` | @@ -131,7 +144,11 @@ In summary, the supported configurations for transports are: | ST B-L475E-IOT01A | - | USB, UART, Network | UART | | Crazyflie 2.1 | Custom Radio Link | - | - | | Espressif ESP32 | UART, WiFI UDP | - | - | +<<<<<<< HEAD | ST Nucleo F446RE 1 | UART | - | - | +======= +| ST Nucleo F446RE 1 | UART | UART | - | +>>>>>>> e13e64d (Update standalone build tools section (#380)) | ST Nucleo F446ZE 1 | UART | - | - | | ST Nucleo H743ZI 1 | - | UART | - | | ST Nucleo F746ZG 1 | UART | UART | - | From 28d25991dbaca8473d7ea8caed2df2a281df3911 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Thu, 2 Sep 2021 08:59:52 +0200 Subject: [PATCH 2/2] Update --- README.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/README.md b/README.md index ccd3e076..26e2220b 100644 --- a/README.md +++ b/README.md @@ -42,12 +42,7 @@ This package is the **official build system for micro-ROS**. It provides tools a *3 a valid CMake toolchain with custom crosscompilation definition is required* -<<<<<<< HEAD - -## Secondary build system tools -======= ## Standalone build system tools ->>>>>>> e13e64d (Update standalone build tools section (#380)) micro-ROS also offers some other ways to crosscompile it for different platforms. These other options are secondary tools and may not have full support for all features. Currently micro-ROS is also available as: @@ -67,11 +62,8 @@ This package targets the **ROS 2** installation. ROS 2 supported distributions a | ROS 2 Distro | State | Branch | | ------------ | --------- | ---------- | -<<<<<<< HEAD -======= | Crystal | EOL | `crystal` | | Dashing | EOL | `dashing` | ->>>>>>> e13e64d (Update standalone build tools section (#380)) | Foxy | Supported | `foxy` | | Galactic | Supported | `galactic` | | Rolling | Supported | `main` | @@ -144,11 +136,7 @@ In summary, the supported configurations for transports are: | ST B-L475E-IOT01A | - | USB, UART, Network | UART | | Crazyflie 2.1 | Custom Radio Link | - | - | | Espressif ESP32 | UART, WiFI UDP | - | - | -<<<<<<< HEAD | ST Nucleo F446RE 1 | UART | - | - | -======= -| ST Nucleo F446RE 1 | UART | UART | - | ->>>>>>> e13e64d (Update standalone build tools section (#380)) | ST Nucleo F446ZE 1 | UART | - | - | | ST Nucleo H743ZI 1 | - | UART | - | | ST Nucleo F746ZG 1 | UART | UART | - |