From 211d64893b9615b29866f80efe82fd25db4f47cc Mon Sep 17 00:00:00 2001 From: Mehul Goel Date: Mon, 13 Jan 2025 20:24:19 -0500 Subject: [PATCH] fixed according to saransh --- rb_ws/src/buggy/scripts/controller/controller_node.py | 2 +- rb_ws/src/buggy/scripts/path_planner/path_planner.py | 4 ++-- setup.bash | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 setup.bash diff --git a/rb_ws/src/buggy/scripts/controller/controller_node.py b/rb_ws/src/buggy/scripts/controller/controller_node.py index e52fb4b..438cd6f 100755 --- a/rb_ws/src/buggy/scripts/controller/controller_node.py +++ b/rb_ws/src/buggy/scripts/controller/controller_node.py @@ -33,7 +33,7 @@ def __init__(self): self.declare_parameter("traj_name", "buggycourse_safe.json") traj_name = self.get_parameter("traj_name").value - self.cur_traj = Trajectory(json_filepath=os.environ["TRAJPATH"] + traj_name) #TODO: Fixed filepath, not good + self.cur_traj = Trajectory(json_filepath=os.environ["TRAJPATH"] + traj_name) start_index = self.cur_traj.get_index_from_distance(start_dist) diff --git a/rb_ws/src/buggy/scripts/path_planner/path_planner.py b/rb_ws/src/buggy/scripts/path_planner/path_planner.py index b43d40a..2f27706 100755 --- a/rb_ws/src/buggy/scripts/path_planner/path_planner.py +++ b/rb_ws/src/buggy/scripts/path_planner/path_planner.py @@ -52,7 +52,7 @@ def __init__(self) -> None: #Parameters self.declare_parameter("traj_name", "buggycourse_safe.json") traj_name = self.get_parameter("traj_name").value - self.nominal_traj = Trajectory(json_filepath=os.environ["TRAJPATH"] + traj_name) #TODO: Fixed filepath, not good + self.nominal_traj = Trajectory(json_filepath=os.environ["TRAJPATH"] + traj_name) self.declare_parameter("curb_name", "") curb_name = self.get_parameter("curb_name").value @@ -60,7 +60,7 @@ def __init__(self) -> None: if curb_name is None: self.left_curb = None else: - self.left_curb = Trajectory(json_filepath=os.environ["TRAJPATH"] + curb_name) #TODO: Fixed filepath, not good + self.left_curb = Trajectory(json_filepath=os.environ["TRAJPATH"] + curb_name) #Publishers self.other_buggy_xtrack_publisher = self.create_publisher(Float64, "debug/other_buggy_xtrack", 10) diff --git a/setup.bash b/setup.bash deleted file mode 100644 index 5cf7476..0000000 --- a/setup.bash +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -export ROOT_DIR="/rb_ws" -export SCRIPTS_DIR="$ROOT_DIR/src/buggy/buggy" \ No newline at end of file