fix: use FW_TARGETDIR instead of firmware (#400)

(cherry picked from commit 423bd6f)
micro-ROS · Oct 19, 2021 · 0312b68 · 0312b68
1 parent d27b83e
commit 0312b68
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/scripts/build_firmware.sh b/scripts/build_firmware.sh
@@ -47,9 +47,9 @@ export UROS_EXTRA_BUILD_ARGS
 # Checking if firmware exists
 if [ -d $FW_TARGETDIR ]; then
     RTOS=$(head -n1 $FW_TARGETDIR/PLATFORM)
-    PLATFORM=$(head -n2 firmware/PLATFORM | tail -n1)
+    PLATFORM=$(head -n2 $FW_TARGETDIR/PLATFORM | tail -n1)
     if [ -f $FW_TARGETDIR/TRANSPORT ]; then
-        TRANSPORT=$(head -n1 firmware/TRANSPORT)
+        TRANSPORT=$(head -n1 $FW_TARGETDIR/TRANSPORT)
     fi
 else
     echo "Firmware folder not found. Please use ros2 run micro_ros_setup create_firmware_ws.sh to create a new project."

diff --git a/scripts/configure_firmware.sh b/scripts/configure_firmware.sh
@@ -10,7 +10,7 @@ export PREFIX=$(ros2 pkg prefix micro_ros_setup)
 # Checking if firmware exists
 if [ -d $FW_TARGETDIR ]; then
     RTOS=$(head -n1 $FW_TARGETDIR/PLATFORM)
-    PLATFORM=$(head -n2 firmware/PLATFORM | tail -n1)
+    PLATFORM=$(head -n2 $FW_TARGETDIR/PLATFORM | tail -n1)
 else
     echo "Firmware folder not found. Please use ros2 run micro_ros_setup create_firmware_ws.sh to create a new project."
     exit 1

diff --git a/scripts/flash_firmware.sh b/scripts/flash_firmware.sh
@@ -10,7 +10,7 @@ PREFIX=$(ros2 pkg prefix micro_ros_setup)
 # Checking if firmware exists
 if [ -d $FW_TARGETDIR ]; then
     RTOS=$(head -n1 $FW_TARGETDIR/PLATFORM)
-    PLATFORM=$(head -n2 firmware/PLATFORM | tail -n1)
+    PLATFORM=$(head -n2 $FW_TARGETDIR/PLATFORM | tail -n1)
 else
     echo "Firmware folder not found. Please use ros2 run micro_ros_setup create_firmware_ws.sh to create a new project."
     exit 1