diff --git a/README.md b/README.md index 9f0606ff..67387a90 100755 --- a/README.md +++ b/README.md @@ -122,7 +122,7 @@ Then `$ cd RoboBuggy2` - Go to docker container `$ docker_exec` - Open foxglove and do local connection to “ws://192.168.1.217/8765” -- Roslauch in docker container by `$ roslaunch buggy main.launch` +- Roslauch in docker container by `$ roslaunch buggy sc-main.launch` (or `$ roslaunch buggy nand-main.launch` for NAND) (wait until no longer prints “waiting for covariance to be better”) When shutting down the buggy: diff --git a/rb_ws/src/buggy/launch/nand-main.launch b/rb_ws/src/buggy/launch/nand-main.launch new file mode 100755 index 00000000..08593c00 --- /dev/null +++ b/rb_ws/src/buggy/launch/nand-main.launch @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rb_ws/src/buggy/launch/main.launch b/rb_ws/src/buggy/launch/sc-main.launch similarity index 86% rename from rb_ws/src/buggy/launch/main.launch rename to rb_ws/src/buggy/launch/sc-main.launch index a51b212d..0b1ee767 100755 --- a/rb_ws/src/buggy/launch/main.launch +++ b/rb_ws/src/buggy/launch/sc-main.launch @@ -32,11 +32,11 @@ - + - + diff --git a/rb_ws/src/buggy/scripts/auton/controller.py b/rb_ws/src/buggy/scripts/auton/controller.py index cf7120f8..08be1013 100755 --- a/rb_ws/src/buggy/scripts/auton/controller.py +++ b/rb_ws/src/buggy/scripts/auton/controller.py @@ -19,11 +19,15 @@ class Controller(ABC): NAND_WHEELBASE = 1.3 SC_WHEELBASE = 1.104 - WHEELBASE = SC_WHEELBASE current_traj_index = 0 def __init__(self, start_index, buggy_name) -> None: self.buggy_name = buggy_name + if buggy_name.upper() == 'NAND': + Controller.WHEELBASE = self.NAND_WHEELBASE + else: + Controller.WHEELBASE = self.SC_WHEELBASE + # self.trajectory_forward_1 = rospy.Publisher( # buggy_name + "/auton/debug/forward1_navsat", NavSatFix, queue_size=1 # )