From 8d3271f97a5b2bb6a5f78aa18ffa294c68d032dc Mon Sep 17 00:00:00 2001 From: Matthew Nice Date: Sat, 12 Nov 2022 23:14:23 +0000 Subject: [PATCH 1/7] Created update script --- update_explicit.sh | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100755 update_explicit.sh diff --git a/update_explicit.sh b/update_explicit.sh new file mode 100755 index 0000000..4a835ec --- /dev/null +++ b/update_explicit.sh @@ -0,0 +1,51 @@ +#!/bin/bash +# Author: Matt Bunting + +echo "Running libpanda's update.sh" + +if [[ $EUID == 0 ]]; + then echo "Do NOT run this script as root" + exit +fi + +source /opt/ros/noetic/setup.bash + +cd /home/circles/libpanda # likely unnecessary +git pull + +INSTALLED_LIBPANDA_GIT_VERSION=$(cat /etc/libpanda.d/libpanda_version) +CURRENT_LIBPANDA_GIT_VERSION=$(git rev-parse HEAD | tr -d "\n\r") + +if [ "$INSTALLED_LIBPANDA_GIT_VERSION" = "$CURRENT_LIBPANDA_GIT_VERSION" ]; +then + echo "Software stack is already up to date!" + exit 1 +fi + +echo "Update needed, Git hash mismatch: $INSTALLED_LIBPANDA_GIT_VERSION != $CURRENT_LIBPANDA_GIT_VERSION" + + +echo "Stopping can_to_ros..." +sudo systemctl stop rosnodeChecker +sudo systemctl stop can +sudo sh -c "echo 'ROS has been stopped for update!' > /etc/libpanda.d/logMessage" + +echo "Updating libpanda..." +./install.sh + +cd scripts +echo "Executing installMVTRosPackages..." +./installMVTRosPackages.sh + +echo "Executing install_explicit_cruise_planner" +./install_explicit_cruise_planner.sh + +# Do the following at the end of installs to ensure all other processes completed +echo "Saving current pandaversion to /etc/libpanda.d/libpanda_version" +sudo sh -c "pandaversion > /etc/libpanda.d/libpanda_version" + +echo "Starting can_to_ros..." +sudo systemctl start can +sudo systemctl start rosnodeChecker + +echo "libpanda update.sh done." From 3c2156c2e455de56d42421a622343f59294664b7 Mon Sep 17 00:00:00 2001 From: Matthew Nice Date: Sat, 12 Nov 2022 23:29:48 +0000 Subject: [PATCH 2/7] Updated can file on rosResositories.csv --- scripts/rosRepositories.csv | 2 +- update_explicit.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/rosRepositories.csv b/scripts/rosRepositories.csv index 8517f2e..4b7fa87 100644 --- a/scripts/rosRepositories.csv +++ b/scripts/rosRepositories.csv @@ -1,4 +1,4 @@ -jmscslgroup, can_to_ros, 5aab934cf35dafe0a4ba12e84d42138d34da6fae +jmscslgroup, can_to_ros, eee44a39432ed128e06b4f9978f1d74e25646eee jmscslgroup, setpointreader, bf9116d7e7a8284527e1d94537de1228c2b3abb8 jmscslgroup, live_tracker, a974d92748f4137b2bf1d083cebf6ac974b5bf49 CIRCLES-consortium, algos-stack, f95d26f78ffed06cd21fa73fcf414d5d5e5042a2 diff --git a/update_explicit.sh b/update_explicit.sh index 4a835ec..eb5e84a 100755 --- a/update_explicit.sh +++ b/update_explicit.sh @@ -15,6 +15,7 @@ git pull INSTALLED_LIBPANDA_GIT_VERSION=$(cat /etc/libpanda.d/libpanda_version) CURRENT_LIBPANDA_GIT_VERSION=$(git rev-parse HEAD | tr -d "\n\r") +CURRENT_LIBPANDA_GIT_VERSION=00000 if [ "$INSTALLED_LIBPANDA_GIT_VERSION" = "$CURRENT_LIBPANDA_GIT_VERSION" ]; then From 004e08a4e941f44e58db88eb606ba5cf10001b1a Mon Sep 17 00:00:00 2001 From: ahayat16 <61722512+ahayat16@users.noreply.github.com> Date: Mon, 14 Nov 2022 01:47:32 +0100 Subject: [PATCH 3/7] Publish planner --- scripts/circlesplanner/speed-planner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/circlesplanner/speed-planner.sh b/scripts/circlesplanner/speed-planner.sh index 826531c..6f1fdaf 100644 --- a/scripts/circlesplanner/speed-planner.sh +++ b/scripts/circlesplanner/speed-planner.sh @@ -27,6 +27,6 @@ do source /opt/ros/noetic/setup.bash # now that we have a new file, re-calculate our speed - #/usr/local/sbin/publish-speed-plan.py + /usr/local/sbin/publish-speed-plan.py done From 73978d7ceeb4fd86ccd52012d2a1d0a7f3f39b77 Mon Sep 17 00:00:00 2001 From: ahayat16 <61722512+ahayat16@users.noreply.github.com> Date: Tue, 15 Nov 2022 00:03:14 +0100 Subject: [PATCH 4/7] publish transferred to onnx --- scripts/circlesplanner/speed-planner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/circlesplanner/speed-planner.sh b/scripts/circlesplanner/speed-planner.sh index 6f1fdaf..1ee5ec6 100644 --- a/scripts/circlesplanner/speed-planner.sh +++ b/scripts/circlesplanner/speed-planner.sh @@ -27,6 +27,6 @@ do source /opt/ros/noetic/setup.bash # now that we have a new file, re-calculate our speed - /usr/local/sbin/publish-speed-plan.py + # /usr/local/sbin/publish-speed-plan.py done From 76ca29eb7229eafedb44536d7fca8264793157fb Mon Sep 17 00:00:00 2001 From: ahayat16 <61722512+ahayat16@users.noreply.github.com> Date: Tue, 15 Nov 2022 03:15:05 +0100 Subject: [PATCH 5/7] Update pre-merge --- scripts/rosRepositories.csv | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/rosRepositories.csv b/scripts/rosRepositories.csv index 4b7fa87..8edea77 100644 --- a/scripts/rosRepositories.csv +++ b/scripts/rosRepositories.csv @@ -1,4 +1,4 @@ -jmscslgroup, can_to_ros, eee44a39432ed128e06b4f9978f1d74e25646eee +jmscslgroup, can_to_ros, edde9fc9cf1f9472c78a9c11f354917c83fd2da4 jmscslgroup, setpointreader, bf9116d7e7a8284527e1d94537de1228c2b3abb8 -jmscslgroup, live_tracker, a974d92748f4137b2bf1d083cebf6ac974b5bf49 -CIRCLES-consortium, algos-stack, f95d26f78ffed06cd21fa73fcf414d5d5e5042a2 +jmscslgroup, live_tracker, a974d92748f4137b2bf1d083cebf6ac974b5bf49 +CIRCLES-consortium, algos-stack, ac49f55792960554eb975eb5d67f3e55a775b460 From 5bcbfa03e8b014b1c00f80998b0d8a8369c0ac06 Mon Sep 17 00:00:00 2001 From: ahayat16 <61722512+ahayat16@users.noreply.github.com> Date: Tue, 15 Nov 2022 14:54:05 +0100 Subject: [PATCH 6/7] good hash from Jonny --- scripts/rosRepositories.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/rosRepositories.csv b/scripts/rosRepositories.csv index 60caab6..ed2136d 100644 --- a/scripts/rosRepositories.csv +++ b/scripts/rosRepositories.csv @@ -1,4 +1,4 @@ jmscslgroup, can_to_ros, 7e64fd3782a4f82ee865b14d11df0ffed9c31390 jmscslgroup, setpointreader, bf9116d7e7a8284527e1d94537de1228c2b3abb8 jmscslgroup, live_tracker, 4ea455311941b8f5195a4ff1fbe6a981939014e8 -CIRCLES-consortium, algos-stack, f2d400558b502647236791c37fb80ddc3b6f1665 +CIRCLES-consortium, algos-stack, 2785ca215b3148372496cd2ba64fd0cecfae1931 From db8a45d3106c16027006671bddaa6d357f7802ea Mon Sep 17 00:00:00 2001 From: ahayat16 <61722512+ahayat16@users.noreply.github.com> Date: Tue, 15 Nov 2022 22:03:55 +0100 Subject: [PATCH 7/7] pre-merge 2 --- scripts/rosRepositories.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/rosRepositories.csv b/scripts/rosRepositories.csv index ed2136d..6a4f902 100644 --- a/scripts/rosRepositories.csv +++ b/scripts/rosRepositories.csv @@ -1,4 +1,4 @@ -jmscslgroup, can_to_ros, 7e64fd3782a4f82ee865b14d11df0ffed9c31390 +jmscslgroup, can_to_ros, 8ce25c9e70e24d6c7da8002df9591c4027301513 jmscslgroup, setpointreader, bf9116d7e7a8284527e1d94537de1228c2b3abb8 jmscslgroup, live_tracker, 4ea455311941b8f5195a4ff1fbe6a981939014e8 -CIRCLES-consortium, algos-stack, 2785ca215b3148372496cd2ba64fd0cecfae1931 +CIRCLES-consortium, algos-stack, a7cc3580ecb0e0b65b0e42a7f867a16d1c0daea2