Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions setup/start_rover.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#!/bin/bash
source ~/gstreamer/setupGstreamer.sh
source /opt/ros/humble/setup.bash
source /opt/ros/humble/cprt_setup.bash
sudo enablecan.sh
ros2 launch rosbridge_server rosbridge_websocket_launch.xml

echo "Starting the container launcher..."

docker run --rm \
-v /var/run/docker.sock:/var/run/docker.sock \
-p 8080:8080 \
cprtsoftware/container-launcher:latest
1 change: 0 additions & 1 deletion src/Bringup/launch/arm.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@ def generate_launch_description():
SetEnvironmentVariable("ROS_LOG_LEVEL", "WARN")
launch_files = [
("arm_srdf", "servo.launch.py"),
("arm_srdf", "talon.launch.py"),
]
return LaunchDescription(get_included_launch_descriptions(launch_files))
30 changes: 0 additions & 30 deletions src/Bringup/launch/arm_tasks.launch.py

This file was deleted.

27 changes: 0 additions & 27 deletions src/Bringup/launch/basic_drive.launch.py

This file was deleted.

15 changes: 11 additions & 4 deletions src/Bringup/launch/core.launch.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from launch import LaunchDescription
from launch_ros.substitutions import FindPackageShare
from launch.launch_description_sources import PythonLaunchDescriptionSource
from launch_xml.launch_description_sources import XMLLaunchDescriptionSource
from launch.actions import IncludeLaunchDescription, SetEnvironmentVariable
import os

Expand All @@ -10,16 +11,22 @@ def get_included_launch_descriptions(launch_files):
for pkg, file in launch_files:
pkg_share = FindPackageShare(pkg).find(pkg)
file_path = os.path.join(pkg_share, "launch", file)
included_launches.append(
IncludeLaunchDescription(PythonLaunchDescriptionSource(file_path))
)

if file.endswith(".py"):
source = PythonLaunchDescriptionSource(file_path)
elif file.endswith(".xml"):
source = XMLLaunchDescriptionSource(file_path)
else:
raise ValueError(f"Unsupported launch file format: {file}")

included_launches.append(IncludeLaunchDescription(source))
return included_launches


def generate_launch_description():
SetEnvironmentVariable("ROS_LOG_LEVEL", "WARN")
launch_files = [
("joystick_control", "controller.launch.py"),
("servo_pkg", "usb_servo_launch.launch.py"),
("rosbridge_server", "rosbridge_websocket_launch.xml"),
]
return LaunchDescription(get_included_launch_descriptions(launch_files))
30 changes: 0 additions & 30 deletions src/Bringup/launch/localization.launch.py

This file was deleted.

35 changes: 0 additions & 35 deletions src/Bringup/launch/navigation.launch.py

This file was deleted.

30 changes: 0 additions & 30 deletions src/Bringup/launch/science.launch.py

This file was deleted.

1 change: 1 addition & 0 deletions src/Bringup/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<description>TODO: Package description</description>
<maintainer email="connor.needham2015@gmail.com">connor</maintainer>
<license>TODO: License declaration</license>
<depend>rosbridge_server</depend>

<test_depend>ament_copyright</test_depend>
<test_depend>ament_flake8</test_depend>
Expand Down