added wave gesture
This commit is contained in:
+44
-24
@@ -18,7 +18,6 @@ class NaoTeleop:
|
|||||||
self.video_client = None
|
self.video_client = None
|
||||||
self.running = True
|
self.running = True
|
||||||
|
|
||||||
# Head position tracking
|
|
||||||
self.head_yaw = 0.0
|
self.head_yaw = 0.0
|
||||||
self.head_pitch = 0.0
|
self.head_pitch = 0.0
|
||||||
|
|
||||||
@@ -26,14 +25,14 @@ class NaoTeleop:
|
|||||||
|
|
||||||
pygame.init()
|
pygame.init()
|
||||||
self.screen = pygame.display.set_mode((320, 240))
|
self.screen = pygame.display.set_mode((320, 240))
|
||||||
pygame.display.set_caption("NAO Teleop - Head Control IJKL")
|
pygame.display.set_caption("NAO Teleop - Wave on 1")
|
||||||
self.clock = pygame.time.Clock()
|
self.clock = pygame.time.Clock()
|
||||||
|
|
||||||
def _init_video_maxfps(self):
|
def _init_video_maxfps(self):
|
||||||
try:
|
try:
|
||||||
self.video = self.session.service("ALVideoDevice")
|
self.video = self.session.service("ALVideoDevice")
|
||||||
self.video_client = self.video.subscribeCamera("TeleopCam", 0, 0, 11, 25)
|
self.video_client = self.video.subscribeCamera("TeleopCam", 0, 0, 11, 25)
|
||||||
print("✅ Camera ready (MAX FPS)")
|
print("✅ Camera ready")
|
||||||
except:
|
except:
|
||||||
print("Camera not available")
|
print("Camera not available")
|
||||||
|
|
||||||
@@ -51,30 +50,46 @@ class NaoTeleop:
|
|||||||
pass
|
pass
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
def wave_gesture(self):
|
||||||
|
print("🤚 Waving...")
|
||||||
|
try:
|
||||||
|
# Simple friendly wave with right arm
|
||||||
|
self.motion.setStiffnesses("RArm", 1.0)
|
||||||
|
|
||||||
|
# Wave motion
|
||||||
|
names = ["RShoulderPitch", "RShoulderRoll", "RElbowYaw", "RElbowRoll", "RWristYaw"]
|
||||||
|
angles = [
|
||||||
|
[-0.3, -0.3, -0.3], # ShoulderPitch
|
||||||
|
[0.0, 0.3, 0.0], # ShoulderRoll
|
||||||
|
[0.0, 1.0, 0.0], # ElbowYaw
|
||||||
|
[0.0, -1.0, 0.0], # ElbowRoll
|
||||||
|
[0.0, 1.5, 0.0] # WristYaw
|
||||||
|
]
|
||||||
|
times = [[1.0, 1.8, 2.6], [1.0, 1.8, 2.6], [1.0, 1.8, 2.6], [1.0, 1.8, 2.6], [1.0, 1.8, 2.6]]
|
||||||
|
|
||||||
|
self.motion.angleInterpolation(names, angles, times, True)
|
||||||
|
|
||||||
|
# Return to neutral
|
||||||
|
self.motion.setAngles("RArm", [0.0]*5, 0.4)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Wave error: {e}")
|
||||||
|
|
||||||
def handle_head_movement(self):
|
def handle_head_movement(self):
|
||||||
keys = pygame.key.get_pressed()
|
keys = pygame.key.get_pressed()
|
||||||
speed = 0.3 # Head movement speed (radians)
|
speed = 0.3
|
||||||
|
|
||||||
changed = False
|
changed = False
|
||||||
|
if keys[pygame.K_i]:
|
||||||
if keys[pygame.K_i]: # Head Up
|
self.head_pitch = max(self.head_pitch - speed, -0.5); changed = True
|
||||||
self.head_pitch = max(self.head_pitch - speed, -0.5)
|
if keys[pygame.K_k]:
|
||||||
changed = True
|
self.head_pitch = min(self.head_pitch + speed, 0.5); changed = True
|
||||||
if keys[pygame.K_k]: # Head Down
|
if keys[pygame.K_j]:
|
||||||
self.head_pitch = min(self.head_pitch + speed, 0.5)
|
self.head_yaw = min(self.head_yaw + speed, 2.0); changed = True
|
||||||
changed = True
|
if keys[pygame.K_l]:
|
||||||
if keys[pygame.K_j]: # Head Left
|
self.head_yaw = max(self.head_yaw - speed, -2.0); changed = True
|
||||||
self.head_yaw = min(self.head_yaw + speed, 2.0)
|
|
||||||
changed = True
|
|
||||||
if keys[pygame.K_l]: # Head Right
|
|
||||||
self.head_yaw = max(self.head_yaw - speed, -2.0)
|
|
||||||
changed = True
|
|
||||||
|
|
||||||
if changed:
|
if changed:
|
||||||
try:
|
|
||||||
self.motion.setAngles(["HeadYaw", "HeadPitch"], [self.head_yaw, self.head_pitch], 0.3)
|
self.motion.setAngles(["HeadYaw", "HeadPitch"], [self.head_yaw, self.head_pitch], 0.3)
|
||||||
except:
|
|
||||||
pass
|
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
self.motion.wakeUp()
|
self.motion.wakeUp()
|
||||||
@@ -82,13 +97,19 @@ class NaoTeleop:
|
|||||||
|
|
||||||
print("🎮 Controls:")
|
print("🎮 Controls:")
|
||||||
print(" WASD / Arrows = Walk")
|
print(" WASD / Arrows = Walk")
|
||||||
print(" I J K L = Head (Up, Left, Down, Right)")
|
print(" I J K L = Head movement")
|
||||||
|
print(" 1 = Wave gesture")
|
||||||
print(" ESC = Quit")
|
print(" ESC = Quit")
|
||||||
|
|
||||||
while self.running:
|
while self.running:
|
||||||
for event in pygame.event.get():
|
for event in pygame.event.get():
|
||||||
if event.type == pygame.QUIT or (event.type == pygame.KEYDOWN and event.key == pygame.K_ESCAPE):
|
if event.type == pygame.QUIT:
|
||||||
self.running = False
|
self.running = False
|
||||||
|
elif event.type == pygame.KEYDOWN:
|
||||||
|
if event.key == pygame.K_ESCAPE:
|
||||||
|
self.running = False
|
||||||
|
elif event.key == pygame.K_1: # Number key 1
|
||||||
|
self.wave_gesture()
|
||||||
|
|
||||||
# Walking
|
# Walking
|
||||||
keys = pygame.key.get_pressed()
|
keys = pygame.key.get_pressed()
|
||||||
@@ -103,7 +124,6 @@ class NaoTeleop:
|
|||||||
else:
|
else:
|
||||||
self.motion.stopMove()
|
self.motion.stopMove()
|
||||||
|
|
||||||
# Head control
|
|
||||||
self.handle_head_movement()
|
self.handle_head_movement()
|
||||||
|
|
||||||
# Camera
|
# Camera
|
||||||
@@ -116,7 +136,7 @@ class NaoTeleop:
|
|||||||
self.screen.fill((10, 10, 30))
|
self.screen.fill((10, 10, 30))
|
||||||
|
|
||||||
pygame.display.flip()
|
pygame.display.flip()
|
||||||
self.clock.tick(0) # Max speed
|
self.clock.tick(0)
|
||||||
|
|
||||||
# Shutdown
|
# Shutdown
|
||||||
print("Shutting down...")
|
print("Shutting down...")
|
||||||
|
|||||||
Reference in New Issue
Block a user