Skip to content

Commit 94c3e90

Browse files
authored
Update branches (#101)
Signed-off-by: acuadros95 <[email protected]>
1 parent 93e0b0c commit 94c3e90

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ This package support the usage of micro-ROS on top of two different middlewares:
5858
6. Execute the static library generation tool. Compiler flags will retrieved automatically from your `Makefile` and user will be prompted to check if they are correct.
5959

6060
```bash
61-
docker pull microros/micro_ros_static_library_builder:rolling
62-
docker run -it --rm -v $(pwd):/project --env MICROROS_LIBRARY_FOLDER=micro_ros_stm32cubemx_utils/microros_static_library microros/micro_ros_static_library_builder:rolling
61+
docker pull microros/micro_ros_static_library_builder:iron
62+
docker run -it --rm -v $(pwd):/project --env MICROROS_LIBRARY_FOLDER=micro_ros_stm32cubemx_utils/microros_static_library microros/micro_ros_static_library_builder:iron
6363
```
6464

6565
1. Modify your `main.c` to use micro-ROS. An example application can be found in `sample_main.c`.
@@ -77,7 +77,7 @@ micro-ROS can be used with SMT32CubeIDE following these steps:
7777
2. Go to `Project -> Settings -> C/C++ Build -> Settings -> Build Steps Tab` and in `Pre-build steps` add:
7878

7979
```bash
80-
docker pull microros/micro_ros_static_library_builder:rolling && docker run --rm -v ${workspace_loc:/${ProjName}}:/project --env MICROROS_LIBRARY_FOLDER=micro_ros_stm32cubemx_utils/microros_static_library_ide microros/micro_ros_static_library_builder:rolling
80+
docker pull microros/micro_ros_static_library_builder:iron && docker run --rm -v ${workspace_loc:/${ProjName}}:/project --env MICROROS_LIBRARY_FOLDER=micro_ros_stm32cubemx_utils/microros_static_library_ide microros/micro_ros_static_library_builder:iron
8181
```
8282

8383
3. Add micro-ROS include directory. In `Project -> Settings -> C/C++ Build -> Settings -> Tool Settings Tab -> MCU GCC Compiler -> Include paths` add `micro_ros_stm32cubemx_utils/microros_static_library_ide/libmicroros/include`

microros_static_library/library_generation/library_generation.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ros2 run micro_ros_setup create_firmware_ws.sh generate_lib
1919
pushd firmware/mcu_ws > /dev/null
2020

2121
# Workaround: Copy just tf2_msgs
22-
git clone -b rolling https://github.com/ros2/geometry2
22+
git clone -b iron https://github.com/ros2/geometry2
2323
cp -R geometry2/tf2_msgs ros2/tf2_msgs
2424
rm -rf geometry2
2525

microros_static_library_ide/library_generation/library_generation.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ros2 run micro_ros_setup create_firmware_ws.sh generate_lib
3838
pushd firmware/mcu_ws > /dev/null
3939

4040
# Workaround: Copy just tf2_msgs
41-
git clone -b rolling https://github.com/ros2/geometry2
41+
git clone -b iron https://github.com/ros2/geometry2
4242
cp -R geometry2/tf2_msgs ros2/tf2_msgs
4343
rm -rf geometry2
4444

0 commit comments

Comments
 (0)