caperren/osurc_mars_rover_2017_2018
1
0
Fork 0
mirror of https://github.com/OSURoboticsClub/Rover_2017_2018.git synced 2025-11-09 02:31:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

IRIS is back. Still driving on backups. Made modifications for OMSI.

Browse Source
This commit is contained in:
Corwin Perren
2018-06-14 14:15:51 -07:00
parent d89685a156
commit f132bb38d4
5 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
software/ros_packages/rover_control/src/control_coordinators/drive_coordinator.py
View File

@@ -91,10 +91,10 @@ class DriveCoordinator(object):
sleep(max(self.wait_time - time_diff, 0))
def process_drive_commands(self):
# if not self.drive_command_data["iris"]["message"].ignore_drive_control:
# self.send_drive_control_command(self.drive_command_data["iris"])
# else:
self.send_drive_control_command(self.drive_command_data["ground_station"])
if not self.drive_command_data["iris"]["message"].ignore_drive_control:
self.send_drive_control_command(self.drive_command_data["iris"])
else:
self.send_drive_control_command(self.drive_command_data["ground_station"])
def send_drive_control_command(self, drive_command_data):