caperren/osurc_mars_rover_2017_2018
1
0
Fork 0
mirror of https://github.com/OSURoboticsClub/Rover_2017_2018.git synced 2025-11-08 18:21:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Back to defaults after OMSI. IRIS fully working again.

Browse Source
This commit is contained in:
Corwin Perren
2018-06-29 17:26:31 -07:00
parent 1a29881d5e
commit 8a83b6f140
4 changed files with 61 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
software/ros_packages/rover_main/launch/rover.launch
View File

@@ -9,7 +9,7 @@
<include file="$(find rover_main)/launch/rover/status.launch"/>
<!-- ########## Start Nimbro Topic Transport Nodes ########## -->
<!--<include file="$(find rover_main)/launch/rover/topic_transport_senders.launch"/>-->
<!--<include file="$(find rover_main)/launch/rover/topic_transport_receivers.launch"/>-->
<include file="$(find rover_main)/launch/rover/topic_transport_senders.launch"/>
<include file="$(find rover_main)/launch/rover/topic_transport_receivers.launch"/>
</launch>

26
software/ros_packages/rover_main/launch/rover/cameras.launch
View File

@@ -1,24 +1,24 @@
<launch>
<group ns="cameras">
<!-- Start Undercarriage Camera -->
<!--<node name="undercarriage" pkg="rover_camera" type="rover_camera" launch-prefix="taskset -c 1" respawn="true" output="screen">-->
<!--<param name="device_path" value="/dev/rover/camera_undercarriage"/>-->
<!--</node>-->
<node name="undercarriage" pkg="rover_camera" type="rover_camera" launch-prefix="taskset -c 1" respawn="true" output="screen">
<param name="device_path" value="/dev/rover/camera_undercarriage"/>
</node>
<!--&lt;!&ndash; Start Main Navigation Camera &ndash;&gt;-->
<!--<node name="main_navigation" pkg="rover_camera" type="rover_camera" launch-prefix="taskset -c 2" respawn="true" output="screen" >-->
<!--<param name="device_path" value="/dev/rover/camera_main_navigation" />-->
<!--</node>-->
<node name="main_navigation" pkg="rover_camera" type="rover_camera" launch-prefix="taskset -c 2" respawn="true" output="screen" >
<param name="device_path" value="/dev/rover/camera_main_navigation" />
</node>
<!--&lt;!&ndash; Start Chassis Camera &ndash;&gt;-->
<!--<node name="chassis" pkg="rover_camera" type="rover_camera" launch-prefix="taskset -c 3" respawn="true" output="screen" >-->
<!--<param name="device_path" value="/dev/rover/camera_chassis" />-->
<!--</node>-->
<node name="chassis" pkg="rover_camera" type="rover_camera" launch-prefix="taskset -c 3" respawn="true" output="screen" >
<param name="device_path" value="/dev/rover/camera_chassis" />
</node>
<!--&lt;!&ndash; Start End Effector Camera &ndash;&gt;-->
<!--<node name="end_effector" pkg="rover_camera" type="rover_camera" launch-prefix="taskset -c 4" respawn="true" output="screen" >-->
<!--<param name="is_rtsp_camera" value="True" />-->
<!--<param name="device_path" value="rtsp://192.168.1.11" />-->
<!--</node>-->
<node name="end_effector" pkg="rover_camera" type="rover_camera" launch-prefix="taskset -c 4" respawn="true" output="screen" >
<param name="is_rtsp_camera" value="True" />
<param name="device_path" value="rtsp://192.168.1.11" />
</node>
</group>
</launch>