Skip to content

Commit 1dd9cd9

Browse files
authored
Merge pull request #151 from Pitt-RAS/fix-issues
fix issues
2 parents 194e800 + 0ac1ea3 commit 1dd9cd9

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/iarc7_motion/iarc_task_action_server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from iarc_tasks.joystick_velocity_task import JoystickVelocityTask
2121
from iarc_tasks.go_to_roomba_task import GoToRoombaTask
2222

23-
class IarcTaskActionServer:
23+
class IarcTaskActionServer(object):
2424
def __init__(self):
2525
self._action_name = "motion_planner_server"
2626

src/iarc7_motion/motion_command_coordinator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
from iarc_tasks.abstract_task import AbstractTask
3636

37-
class MotionCommandCoordinator:
37+
class MotionCommandCoordinator(object):
3838

3939
def __init__(self, action_server):
4040
# action server for getting requests from AI
@@ -205,7 +205,7 @@ def run(self):
205205
self._task_command_handler.send_timeout(avoid_twist, acceleration=acceleration)
206206
rospy.logwarn_throttle(1.0, 'Task running timeout. Running obstacle avoider')
207207

208-
rate.sleep()
208+
rate.sleep()
209209

210210
# fills out the Intermediary State for the task
211211
def _get_current_transition(self):

src/iarc7_motion/state_monitor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class RobotStates(Enum):
4141
FATAL = 7
4242
SAFETY_ACTIVE = 8
4343

44-
class StateMonitor:
44+
class StateMonitor(object):
4545

4646
def __init__(self):
4747
# state data
@@ -138,7 +138,7 @@ def set_last_task_end_state(self, state):
138138
# to perform
139139
elif isinstance(state, task_states.TaskCanceled):
140140
# assumes that canceling land results in velocity mode
141-
if isinstance(self._last_task, LandTask):
141+
if isinstance(self._last_task, LandTask):
142142
self._state = RobotStates.NORMAL
143143
# Takeoff needs to take the drone above the safe height
144144
# Hit roomba if canceled might not have taken the drone back up

src/iarc7_motion/task_command_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
from iarc7_motion.linear_motion_profile_generator import LinearMotionProfileGenerator
2424

25-
class TaskCommandHandler:
25+
class TaskCommandHandler(object):
2626

2727
def __init__(self):
2828
# class state

0 commit comments

Comments
 (0)