From 1adbe77812dae3c04047a51bd845e84dfaa18ffe Mon Sep 17 00:00:00 2001 From: David Jablonski Date: Mon, 18 Oct 2021 16:35:53 +0200 Subject: [PATCH] fix: use FW_TARGETDIR instead of firmware --- scripts/build_firmware.sh | 4 ++-- scripts/configure_firmware.sh | 2 +- scripts/flash_firmware.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/build_firmware.sh b/scripts/build_firmware.sh index 804fa8cf..a570b232 100755 --- 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 index e8c79153..dca58e16 100755 --- 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 index 7f257cad..23b080f2 100755 --- 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