fix: path for library generation and add install file for stm32cube i…

…de and mx
dotX-Automation · Aug 5, 2024 · 2d64011 · 2d64011
1 parent 615305d
commit 2d64011
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/bin/library_generation/library_generation.sh b/bin/library_generation/library_generation.sh
@@ -44,7 +44,7 @@ if [[ "$(pwd)" != "/home/neo/workspace" ]]; then
 fi
 
 # Setup environment
-export MICROROS_LIBRARY_FOLDER=micro_ros_stm32cubemx_utils/microros_static_library
+export MICROROS_LIBRARY_FOLDER=/home/neo/workspace/tools/micro_ros_stm32cubemx_utils/microros_static_library
 export BASE_PATH=$MICROROS_LIBRARY_FOLDER
 unset RMW_IMPLEMENTATION
 
@@ -82,7 +82,7 @@ pushd firmware/mcu_ws > /dev/null
 popd > /dev/null
 
 # Try to retrieve CFLAGS from Makefile
-pushd "$1" > /dev/null
+pushd "/home/neo/workspace/$1" > /dev/null
   ret_cflags=$(make print_cflags)
   RET_CODE=$?
   export RET_CFLAGS=$ret_cflags

diff --git a/docker/container-x86-cudev/Dockerfile b/docker/container-x86-cudev/Dockerfile
@@ -66,6 +66,20 @@ RUN . /opt/ros/humble/setup.sh && \
   apt-get update && \
   rosdep init && \
   rosdep update
+
+# Install stm32 cube ide and cube mx
+WORKDIR /opt
+RUN wget -U "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:128.0) Gecko/20100101 Firefox/128.0" -O stm32cubemx.zip "https://www.st.com/content/ccc/resource/technical/software/sw_development_suite/group1/6c/0c/a3/4c/ed/09/48/21/stm32cubemx-lin-v6-12-0/files/stm32cubemx-lin-v6-12-0.zip/jcr:content/translations/en.stm32cubemx-lin-v6-12-0.zip"
+RUN unzip stm32cubemx.zip && \
+    rm stm32cubemx.zip
+RUN chmod +x SetupSTM32CubeMX-6.12.0
+
+RUN wget -U "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:128.0) Gecko/20100101 Firefox/128.0" -O stm32cubeide.zip "https://www.st.com/content/ccc/resource/technical/software/sw_development_suite/group1/f0/75/4c/32/97/a0/4d/48/stm32cubeide-deb/files/st-stm32cubeide_1.16.0_21983_20240628_1741_amd64.deb_bundle.sh.zip/jcr:content/translations/en.st-stm32cubeide_1.16.0_21983_20240628_1741_amd64.deb_bundle.sh.zip"
+RUN unzip stm32cubeide.zip && \
+    rm stm32cubeide.zip
+RUN chmod +x st-stm32cubeide_1.16.0_21983_20240628_1741_amd64.deb_bundle.sh && \
+    ./st-stm32cubeide_1.16.0_21983_20240628_1741_amd64.deb_bundle.sh 
+WORKDIR /root
 # micro-ROS-STM32 end #
 # IMAGE SETUP END #