Sentry mode added
This commit is contained in:
parent
9b8f4d60c0
commit
133c16e474
|
@ -15,7 +15,7 @@ class BBoxProcessor:
|
|||
new_boxes = self.process_next(new_boxes)
|
||||
closest_box = self.get_box_closest_to_center(new_boxes)
|
||||
if closest_box == []:
|
||||
return [0, 0]
|
||||
return None
|
||||
print("Closest box: ", closest_box, "All: ", new_boxes)
|
||||
return self.get_normalized_box_position(closest_box)
|
||||
|
||||
|
|
|
@ -66,7 +66,7 @@ class URModbusServer:
|
|||
packet_signs = self.modbusTCP.read_holding_registers(320, quantity=6)
|
||||
|
||||
if (packet is None) or (packet_signs is None):
|
||||
time.sleep(0.05)
|
||||
time.sleep(0.01)
|
||||
print(f"Modbus Error #{tries}: retrying")
|
||||
return self.get_joint_angles(tries+1)
|
||||
else:
|
||||
|
@ -95,7 +95,7 @@ class URModbusServer:
|
|||
packet = self.modbusTCP.read_holding_registers(280, quantity=6)
|
||||
|
||||
if (packet is None):
|
||||
time.sleep(0.05)
|
||||
time.sleep(0.01)
|
||||
print(f"Modbus Error #{tries}: retrying")
|
||||
return self.get_joint_speeds(tries+1)
|
||||
else:
|
||||
|
|
135
URSentry.py
135
URSentry.py
|
@ -7,8 +7,9 @@ import threading
|
|||
class URSentry:
|
||||
def __init__(self, host):
|
||||
self.robot = URRobot(host)
|
||||
self.sentry_pose = [1.571, -1.571, 0.785, -0.785, -1.571, 1.318]
|
||||
self.forward_pose = [1.571, -1.949, 1.974, -2.844, -1.571, 1.318]
|
||||
self.sentry_pose = [-0.0, -2.094, 0.96, -0.436, -1.571, 1.318]
|
||||
self.forward_pose = [1.571, -1.949, 1.974, -2.548, -1.571, 1.318]
|
||||
self.imposing_pose = [1.571, -1.41, 1.411, -2.754, -1.604, 1.406]
|
||||
self.robot_speed = [0, 0, 0, 0, 0, 0]
|
||||
self.detections = []
|
||||
|
||||
|
@ -18,9 +19,19 @@ class URSentry:
|
|||
|
||||
self.send_to_zero_on_stop = False
|
||||
|
||||
self.has_detected_once = False
|
||||
|
||||
self.none_input_ticks = 0
|
||||
self.is_on_sentry_mode = True
|
||||
self.has_initialized = False
|
||||
|
||||
# Smooth stopping
|
||||
self.smooth_stop_delayed_call = None
|
||||
|
||||
def initialize_pose(self):
|
||||
self.await_stop = True
|
||||
self.sentry_position()
|
||||
|
||||
def get_joint_angles(self) -> "list[float]":
|
||||
"""
|
||||
Get the current joint angles of the robot in degrees
|
||||
|
@ -28,16 +39,19 @@ class URSentry:
|
|||
return self.robot.get_joint_angles_degrees()
|
||||
|
||||
def sentry_position(self, a=0.5, v=1.5):
|
||||
"""
|
||||
Return the robot to the sentry position
|
||||
"""
|
||||
self.robot.movej(self.sentry_pose, a=0.5, v=1.5)
|
||||
|
||||
def forward_position(self, a=0.5, v=1.5):
|
||||
self.robot.movej(self.forward_pose, a, v)
|
||||
self.robot.movej(self.imposing_pose, a, v)
|
||||
|
||||
def update_detections(self, detections):
|
||||
self.detections = detections
|
||||
|
||||
def forward_position_to_base_angle_degrees(self, base_angle, a=0.5, v=1.5):
|
||||
pose = self.forward_pose
|
||||
pose = self.imposing_pose
|
||||
pose[0] = math.radians(base_angle)
|
||||
self.robot.movej(pose, a, v)
|
||||
|
||||
|
@ -54,7 +68,81 @@ class URSentry:
|
|||
def lerp(self, a, b, t):
|
||||
return a + t * (b - a)
|
||||
|
||||
def move_robot_base(self, joystick_pos_x: float):
|
||||
|
||||
def control_robot(self, joystick_pos: list[float] | None):
|
||||
"""
|
||||
Control the robot based on a joystick input.
|
||||
"""
|
||||
|
||||
# Check for flags that would block control due to things happening
|
||||
|
||||
# Initialize robot if it hasn't already
|
||||
if not self.has_initialized:
|
||||
self.initialize_pose()
|
||||
self.has_initialized = True
|
||||
return
|
||||
|
||||
# If we are awaiting a stop, we do not control the robot until it remains at a standstill for a certain amount of ticks
|
||||
ticks_to_wait = 3
|
||||
if self.await_stop:
|
||||
joint_speeds = self.robot.get_joint_speeds()
|
||||
print("Awaiting stop -------------------- speeds: ", joint_speeds)
|
||||
if all([speed == 0 for speed in joint_speeds]):
|
||||
self.await_stop_ticks += 1
|
||||
if self.await_stop_ticks >= ticks_to_wait:
|
||||
self.await_stop = False
|
||||
self.await_stop_ticks = 0
|
||||
return
|
||||
|
||||
# If we are awaiting a stop to send to zero, we do so right after it passes the await_stop check
|
||||
if self.send_to_zero_on_stop:
|
||||
print("Sending to zero --------------------")
|
||||
self.await_stop = True
|
||||
self.send_to_zero_on_stop = False
|
||||
self.forward_position_to_base_angle_degrees(0)
|
||||
return
|
||||
|
||||
# If the joystick is None, we return to sentry mode after a certain amount of ticks
|
||||
# We only do this if we have detected something at least once, as the camera gets buggy after fast movements
|
||||
ticks_for_return_to_sentry = 50
|
||||
if joystick_pos is None:
|
||||
if self.has_detected_once and not self.is_on_sentry_mode:
|
||||
self.none_input_ticks += 1
|
||||
print("None input ticks: ", self.none_input_ticks, " / ", ticks_for_return_to_sentry)
|
||||
if self.none_input_ticks > ticks_for_return_to_sentry:
|
||||
self.none_input_ticks = 0
|
||||
self.is_on_sentry_mode = True
|
||||
self.await_stop = True
|
||||
self.sentry_position()
|
||||
return
|
||||
|
||||
# If we have detected something, we reset the none input ticks
|
||||
|
||||
# If all flags are clear, we can control the robot
|
||||
if self.is_on_sentry_mode:
|
||||
self.awake_from_sentry_mode(joystick_pos[0], joystick_pos[1])
|
||||
self.has_detected_once = False
|
||||
else:
|
||||
# is on forward mode
|
||||
self.move_robot_base(joystick_pos[0], joystick_pos[1])
|
||||
self.has_detected_once = True
|
||||
self.none_input_ticks = 0
|
||||
|
||||
|
||||
def awake_from_sentry_mode(self, joystick_pos_x: float, joystick_pos_y: float):
|
||||
if joystick_pos_x == 0 and joystick_pos_y == 0:
|
||||
return
|
||||
|
||||
theta_rad = math.atan2(joystick_pos_x, -joystick_pos_y)
|
||||
theta_deg = math.degrees(theta_rad)
|
||||
print("Theta: ", theta_deg)
|
||||
|
||||
self.await_stop = True
|
||||
self.forward_position_to_base_angle_degrees(-theta_deg)
|
||||
self.is_on_sentry_mode = False
|
||||
|
||||
|
||||
def move_robot_base(self, joystick_pos_x: float, joystick_pos_y: float = 0):
|
||||
"""
|
||||
Move the robot based on a joystick input,
|
||||
where the the center is (0, 0) and the bottom right corner is (1, 1).
|
||||
|
@ -75,27 +163,12 @@ class URSentry:
|
|||
If flag await_stop is set True, we check if the current speed is 0 wait until all joints are stopped before moving again.
|
||||
|
||||
"""
|
||||
|
||||
joystick_pos_x = -joystick_pos_x
|
||||
# We omit all processing until the robot has stopped moving for a certain amount of calls ('ticks')
|
||||
|
||||
# print("Base Speed: ", self.robot_speed[0])
|
||||
|
||||
ticks_to_wait = 3
|
||||
if self.await_stop:
|
||||
print("Awaiting stop --------------------")
|
||||
joint_speeds = self.robot.get_joint_speeds()
|
||||
if all([speed == 0 for speed in joint_speeds]):
|
||||
self.await_stop_ticks += 1
|
||||
if self.await_stop_ticks > ticks_to_wait:
|
||||
self.await_stop = False
|
||||
self.await_stop_ticks = 0
|
||||
return
|
||||
|
||||
if self.send_to_zero_on_stop:
|
||||
print("Sending to zero --------------------")
|
||||
self.await_stop = True
|
||||
self.send_to_zero_on_stop = False
|
||||
self.forward_position_to_base_angle_degrees(0)
|
||||
return
|
||||
|
||||
# Cancel smooth stopping due to no input
|
||||
if self.smooth_stop_delayed_call is not None:
|
||||
|
@ -157,7 +230,7 @@ class URSentry:
|
|||
)
|
||||
self.smooth_stop_delayed_call.start()
|
||||
|
||||
print("Base speed: ", self.robot_speed[0], " Joystick: ", joystick_pos_x)
|
||||
#print("Base speed: ", self.robot_speed[0], " Joystick: ", joystick_pos_x)
|
||||
self.robot.speedj(self.robot_speed, base_acceleration, 1)
|
||||
|
||||
|
||||
|
@ -166,13 +239,15 @@ if __name__ == "__main__":
|
|||
sentry = URSentry(host)
|
||||
#sentry.sentry_position()
|
||||
# sleep(3)
|
||||
sentry.forward_position()
|
||||
sleep(3)
|
||||
sentry.robot.speedj([0.8, 0, 0, 0, 0, 0], 0.5, 3)
|
||||
sleep(2)
|
||||
sentry.smooth_stop()
|
||||
sleep(2)
|
||||
sentry.forward_position_to_base_angle_degrees(45)
|
||||
# sentry.forward_position()
|
||||
# sleep(3)
|
||||
# sentry.robot.speedj([0.8, 0, 0, 0, 0, 0], 0.5, 3)
|
||||
# sleep(2)
|
||||
# sentry.smooth_stop()
|
||||
# sleep(2)
|
||||
# sentry.forward_position_to_base_angle_degrees(45)
|
||||
|
||||
print(sentry.robot.get_joint_angles())
|
||||
|
||||
# while True:
|
||||
# print(sentry.robot.get_joint_speeds()[0])
|
||||
|
|
5
main.py
5
main.py
|
@ -61,12 +61,11 @@ camera_joystick.start()
|
|||
joystick_scheduler = JoystickScheduler(joystick_queue)
|
||||
joystick_scheduler.start()
|
||||
|
||||
ur.await_stop = True
|
||||
ur.forward_position()
|
||||
ur.initialize_pose()
|
||||
|
||||
while True:
|
||||
try:
|
||||
ur.move_robot_base(-current_joystick[0])
|
||||
ur.control_robot(current_joystick)
|
||||
#print("Setting robot base velocity to: ", current_joystick[0])
|
||||
time.sleep(0.2)
|
||||
except KeyboardInterrupt:
|
||||
|
|
Loading…
Reference in New Issue