Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b36e527
更改了文件结构,使目录更清晰
manayume Dec 18, 2025
6a5d1b2
Merge branch 'OpenHUTB:main' into main
manayume Dec 18, 2025
a06e6c6
Merge branch 'OpenHUTB:main' into main
manayume Dec 18, 2025
b65d3c1
修改概述:
manayume Dec 18, 2025
01c0362
删除了错误的模型文件,优化了目录结构,更新了README文件中的启动流程和文件目录
manayume Dec 18, 2025
073c89a
Merge branch 'OpenHUTB:main' into main
manayume Dec 18, 2025
a989876
Merge branch 'OpenHUTB:main' into main
manayume Dec 18, 2025
436db46
Merge branch 'OpenHUTB:main' into main
manayume Dec 18, 2025
2bc6795
Merge branch 'OpenHUTB:main' into main
manayume Dec 18, 2025
66065b8
修复了视角卡顿的问题,调整了视角跟随高度角度
manayume Dec 18, 2025
fa06246
Merge branch 'OpenHUTB:main' into main
manayume Dec 19, 2025
856e574
新增了可调参数,可以改变路径显示的颜色和亮度,减少“光污染”
manayume Dec 19, 2025
1a9a29b
修复了更换起点后车辆朝向错误的问题
manayume Dec 19, 2025
4e94a0d
Merge branch 'OpenHUTB:main' into main
manayume Dec 19, 2025
d4519a9
Finish merging manually
manayume Dec 19, 2025
879bf5d
Merge branch 'OpenHUTB:main' into main
manayume Dec 19, 2025
deab24c
使用ros封装项目,将原python文件放入python文件夹
manayume Dec 19, 2025
0ac0daa
Revert "使用ros封装项目,将原python文件放入python文件夹"
manayume Dec 20, 2025
4ba61c5
Merge branch 'OpenHUTB:main' into main
manayume Dec 20, 2025
9877a06
Merge branch 'OpenHUTB:main' into main
manayume Dec 20, 2025
64a9fa1
将代码封装为ros节点
manayume Dec 20, 2025
cc409bc
Merge branch 'OpenHUTB:main' into main
manayume Dec 20, 2025
25edb1e
Merge branch 'OpenHUTB:main' into main
manayume Dec 21, 2025
d1636a9
修复了ros控制端输入命令服务端无法接收到命令的问题
manayume Dec 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,131 +1,199 @@
#!/usr/bin/env python3
"""
CARLA控制客户端 - 用于手动控制或外部控制
CARLA控制客户端 - 修复版
"""

import rospy
from std_msgs.msg import String, Float32
import sys
import select
import tty
import termios
from std_msgs.msg import String
from geometry_msgs.msg import Twist
from carla_autonomous.srv import StartEpisode, Reset, Stop

# 尝试导入自定义服务,如果失败使用标准服务
try:
from carla_autonomous.srv import StartEpisode, Reset, Stop
USE_CUSTOM_SERVICES = True
except ImportError:
from std_srvs.srv import Empty, Trigger
USE_CUSTOM_SERVICES = False
rospy.logwarn("使用标准ROS服务")

class CarlaControlClient:
def __init__(self):
rospy.init_node('carla_control_client')

# 服务代理
self.start_episode = rospy.ServiceProxy('/carla/start_episode', StartEpisode)
self.reset = rospy.ServiceProxy('/carla/reset', Reset)
self.stop = rospy.ServiceProxy('/carla/stop', Stop)
rospy.init_node('carla_control_client', anonymous=True)

# 控制发布器
self.control_pub = rospy.Publisher('/carla/control_cmd', Twist, queue_size=10)

# 等待服务可用
rospy.loginfo("等待服务...")

if USE_CUSTOM_SERVICES:
rospy.wait_for_service('/carla/start_episode')
rospy.wait_for_service('/carla/reset')
rospy.wait_for_service('/carla/stop')

self.start_episode = rospy.ServiceProxy('/carla/start_episode', StartEpisode)
self.reset = rospy.ServiceProxy('/carla/reset', Reset)
self.stop = rospy.ServiceProxy('/carla/stop', Stop)
else:
rospy.wait_for_service('/carla/start_episode')
rospy.wait_for_service('/carla/reset')
rospy.wait_for_service('/carla/stop')

self.start_episode = rospy.ServiceProxy('/carla/start_episode', Trigger)
self.reset = rospy.ServiceProxy('/carla/reset', Empty)
self.stop = rospy.ServiceProxy('/carla/stop', Trigger)

rospy.loginfo("CARLA控制客户端已启动")

def get_key(self):
"""获取单个按键"""
fd = sys.stdin.fileno()
old_settings = termios.tcgetattr(fd)
try:
tty.setraw(sys.stdin.fileno())
if select.select([sys.stdin], [], [], 0.1)[0]:
key = sys.stdin.read(1)
else:
key = None
finally:
termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
return key

def manual_control(self):
"""手动控制模式"""
rospy.loginfo("进入手动控制模式")
rospy.loginfo("使用键盘控制车辆:")
rospy.loginfo(" W/S: 前进/后退")
rospy.loginfo(" A/D: 左转/右转")
rospy.loginfo(" Space: 刹车")
rospy.loginfo(" Q: 退出")
rospy.loginfo(" Q: 退出手动模式")

print("\n开始控制(按Q退出)...")

try:
import curses
stdscr = curses.initscr()
curses.noecho()
curses.cbreak()
stdscr.keypad(True)

while not rospy.is_shutdown():
key = stdscr.getch()
key = self.get_key()

if key is None:
continue

control_msg = Twist()

if key == ord('w'):
if key == 'w' or key == 'W':
control_msg.linear.x = 0.5 # 前进
elif key == ord('s'):
print("前进", end='\r')
elif key == 's' or key == 'S':
control_msg.linear.x = -0.3 # 后退
elif key == ord('a'):
print("后退", end='\r')
elif key == 'a' or key == 'A':
control_msg.angular.z = 0.5 # 左转
elif key == ord('d'):
print("左转", end='\r')
elif key == 'd' or key == 'D':
control_msg.angular.z = -0.5 # 右转
elif key == ord(' '):
print("右转", end='\r')
elif key == ' ':
control_msg.linear.z = 1.0 # 刹车
elif key == ord('q'):
print("刹车", end='\r')
elif key == 'q' or key == 'Q':
print("退出手动模式")
break
else:
continue

self.control_pub.publish(control_msg)

except ImportError:
rospy.logwarn("curses模块未安装,无法使用键盘控制")
# 添加延迟防止过度发布
rospy.sleep(0.05)

except Exception as e:
rospy.logerr(f"手动控制出错: {e}")
finally:
try:
curses.nocbreak()
stdscr.keypad(False)
curses.echo()
curses.endwin()
except:
pass

def start_autonomous_episode(self):
"""启动自主驾驶episode"""
try:
response = self.start_episode()
if response.success:
rospy.loginfo(f"启动成功: {response.message}")
if USE_CUSTOM_SERVICES:
if response.success:
rospy.loginfo(f"启动成功: {response.message}")
else:
rospy.logwarn(f"启动失败: {response.message}")
else:
rospy.logwarn(f"启动失败: {response.message}")
if response.success:
rospy.loginfo(f"启动成功: {response.message}")
else:
rospy.logwarn(f"启动失败: {response.message}")
except rospy.ServiceException as e:
rospy.logerr(f"服务调用失败: {e}")

def reset_environment(self):
"""重置环境"""
try:
response = self.reset()
rospy.loginfo("环境重置成功")
if USE_CUSTOM_SERVICES:
response = self.reset()
rospy.loginfo("环境重置成功")
else:
self.reset()
rospy.loginfo("环境重置成功")
except rospy.ServiceException as e:
rospy.logerr(f"重置服务调用失败: {e}")

def stop_all(self):
"""停止所有"""
try:
response = self.stop()
rospy.loginfo("停止成功")
if USE_CUSTOM_SERVICES:
if response.success:
rospy.loginfo(f"停止成功: {response.message}")
else:
rospy.logwarn(f"停止失败: {response.message}")
else:
if response.success:
rospy.loginfo(f"停止成功: {response.message}")
else:
rospy.logwarn(f"停止失败: {response.message}")
except rospy.ServiceException as e:
rospy.logerr(f"停止服务调用失败: {e}")

def run(self):
"""运行客户端"""
rospy.loginfo("控制命令:")
rospy.loginfo(" 1: 启动自主驾驶")
rospy.loginfo(" 2: 手动控制")
rospy.loginfo(" 3: 重置环境")
rospy.loginfo(" 4: 停止")
rospy.loginfo(" 0: 退出")
print("\n" + "="*50)
print("CARLA自动驾驶控制客户端")
print("="*50)
print("\n控制命令:")
print(" 1: 启动自主驾驶")
print(" 2: 手动控制")
print(" 3: 重置环境")
print(" 4: 停止")
print(" 0: 退出")
print("="*50)

try:
while not rospy.is_shutdown():
command = input("请输入命令: ")

if command == '1':
self.start_autonomous_episode()
elif command == '2':
self.manual_control()
elif command == '3':
self.reset_environment()
elif command == '4':
self.stop_all()
elif command == '0':
rospy.loginfo("退出客户端")
try:
command = input("\n请输入命令: ")

if command == '1':
self.start_autonomous_episode()
elif command == '2':
self.manual_control()
elif command == '3':
self.reset_environment()
elif command == '4':
self.stop_all()
elif command == '0':
rospy.loginfo("退出客户端")
break
else:
print("未知命令,请输入 0-4")

except EOFError:
break
else:
rospy.logwarn("未知命令")
except Exception as e:
rospy.logerr(f"命令处理出错: {e}")

except KeyboardInterrupt:
rospy.loginfo("客户端已停止")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#!/usr/bin/env python3
"""
测试ROS服务
"""

import rospy
from carla_autonomous.srv import StartEpisode, Reset, Stop

def test_services():
rospy.init_node('test_client')

# 等待服务可用
rospy.loginfo("等待服务...")
rospy.wait_for_service('/carla/start_episode')
rospy.wait_for_service('/carla/reset')
rospy.wait_for_service('/carla/stop')

try:
# 测试重置服务
reset_service = rospy.ServiceProxy('/carla/reset', Reset)
response = reset_service()
rospy.loginfo(f"重置服务响应: {response}")

# 测试开始episode服务
start_service = rospy.ServiceProxy('/carla/start_episode', StartEpisode)
response = start_service()
rospy.loginfo(f"开始episode响应: {response.success}, {response.message}")

# 等待5秒
rospy.sleep(5)

# 测试停止服务
stop_service = rospy.ServiceProxy('/carla/stop', Stop)
response = stop_service()
rospy.loginfo(f"停止服务响应: {response.success}, {response.message}")

except rospy.ServiceException as e:
rospy.logerr(f"服务调用失败: {e}")

if __name__ == '__main__':
test_services()
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env python
from distutils.core import setup
from catkin_pkg.python_setup import generate_distutils_setup

# fetch values from package.xml
setup_args = generate_distutils_setup(
packages=['carla_autonomous'],
package_dir={'': 'src'},
)

setup(**setup_args)
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# CARLA Autonomous Driving ROS package
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}

# 当前使用的轨迹
CURRENT_TRAJECTORY = "test_trajectory"
CURRENT_TRAJECTORY = "custom_trajectory"

def get_current_trajectory():
"""获取当前轨迹配置"""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
# 请求部分(空)
---
# 响应部分
std_msgs/Float32MultiArray state
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# 请求部分(空)
---
# 响应部分
bool success
string message
---
string message
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# 请求部分(空)
---
# 响应部分
bool success
string message
Loading