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

Got point and shoot control working. Needs zooming. Backup scale node added. Lots of random things, super tired.

Browse Source
This commit is contained in:
Corwin Perren
2018-08-11 07:12:06 -07:00
parent 12ed32ef54
commit 03cdd2e3a6
27 changed files with 768 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
software/ros_packages/rover_main/launch/ground_station/topic_transport_senders.launch
View File

@@ -24,7 +24,8 @@
{name: "/cameras/main_navigation/camera_control", compress: false, rate: 5.0},
{name: "/cameras/end_effector/camera_control", compress: false, rate: 5.0},
{name: "/rover_status/update_requested", compress: false, rate: 5.0},
{name: "/rover_arm/control/absolute", compress: true, rate: 5.0}]
{name: "/rover_arm/control/absolute", compress: true, rate: 5.0},
{name: "/rover_control/camera/control", compress: true, rate: 5.0}]
</rosparam>
</node>
</group>

7
software/ros_packages/rover_main/launch/rover/control.launch
View File

@@ -35,8 +35,11 @@
<node name="chassis_pan_tilt" pkg="rover_control" type="chassis_pan_tilt_control.py" respawn="true" output="screen"/>
<!--<node name="effectors" pkg="rover_control" type="effectors_control.py" respawn="true" output="screen">-->
<node name="effectors" pkg="rover_control" type="effectors_control.py" respawn="true" output="screen">
<!--<param name="port" value="/dev/rover/ttyARM"/>-->
<!--</node>-->
</node>
<node name="scale" pkg="rover_control" type="emergency_scale.py" respawn="true" output="screen">
</node>
</group>
</launch>

2
software/ros_packages/rover_main/launch/rover/topic_transport_senders.launch
View File

@@ -158,7 +158,7 @@
{name: "/rover_control/mining/status", compress: false, rate: 5.0},
{name: "/rover_control/gripper/status", compress: false, rate: 5.0},
{name: "/rover_science/rdf/data", compress: false, rate: 50.0},
{name: "/rover_science/soil_probe/data", compress: false, rate: 50.0}
{name: "/rover_control/scale/measurement", compress: false, rate: 20.0}
]
</rosparam>
</node>