Skip to content

Fix: Use $FW_TARGETDIR/ instead of firmware/ #400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Acuadros95 merged 1 commit into from
Oct 19, 2021
Merged

Fix: Use $FW_TARGETDIR/ instead of firmware/ #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/build_firmware.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion scripts/configure_firmware.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/flash_firmware.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down