135 Commits

Author SHA1 Message Date
6c55201f73 重构任务4,更新通过栏杆的功能
- 将任务5中的run_task_5函数重命名为pass_bar,并调整其实现以适应新的步态参数文件路径。
- 在task_4.py中添加通过栏杆的步骤,并更新相关的步态参数文件路径。
- 优化了任务4的执行流程,确保机器人能够顺利通过栏杆并继续后续任务。
2025-05-28 02:03:41 +08:00
bffcd973e0 Refactor task 1 and task 2 to incorporate new turn_degree_v2 function
- Updated task_1.py to replace turn_degree_twice calls with turn_degree_v2 for improved rotation accuracy.
- Modified task_2.py to utilize turn_degree_v2 for enhanced turning capabilities and adjusted movement parameters for better path execution.
- Refined go_to_xy parameters in task_2 to optimize navigation and added additional logging for debugging purposes.
2025-05-27 17:53:11 +00:00
e778530503 Enhance task 2 functionality and add backtracking capability
- Introduced run_task_2_back function to facilitate reverse navigation.
- Updated main.py to include calls to run_task_2_back alongside run_task_2 for improved task execution.
- Adjusted movement parameters in run_task_2 for better path accuracy and control.
- Added new movement functions for enhanced maneuverability in task 2.
2025-05-27 07:00:25 +00:00
d1356fc330 优化任务2中的移动和旋转参数
- 调整go_to_xy函数的y坐标参数,从0.2修改为0.25,以改善路径精度。
- 更新turn_degree函数的角度参数,从0修改为0.8,以增强转向控制。
- 修改方向列表中的多个参数,以提高机器人在复杂路径中的行驶表现。
2025-05-27 10:07:29 +08:00
c2b29f18f3 重构任务4和任务5,更新任务流程和参数
- 在main.py中注释掉run_task_2函数,确保任务执行流程的简化。
- 在task_4.py中添加go_straight_until_sky_ratio_below函数以实现基于灰色天空比例的直线移动。
- 更新README.md以反映任务4和任务5的最新描述,合并相关内容。
- 删除task_5中的多个不再使用的文件,优化代码结构。
2025-05-27 01:18:10 +08:00
7517ce61f0 Merge branch 'main' of ssh://120.27.199.238:222/Havoc420mac/mi-task 2025-05-27 01:03:11 +08:00
47cfa56ff0 新增任务1和任务2.5的返回功能,包含多个移动和旋转步骤以完成任务回程。优化了机器人在任务中的动作流程,确保更流畅的执行。 2025-05-27 01:03:08 +08:00
92c6026536 refactor(main, task_2): comment out MarkerRunner and adjust turn_degree call
- Comment out MarkerRunner initialization and execution in main.py to simplify control flow.
- Modify turn_degree call in task_2.py to remove unnecessary observe parameter for cleaner function usage.
- Add a placeholder return statement in place_marker method for future implementation.
2025-05-26 15:45:32 +00:00
a1e9121761 refactor(main, task_2, task_test): update navigation functions and parameters
- Comment out run_go_to_xy_example in main.py to streamline execution flow.
- Adjust target coordinates in run_go_to_xy_example for improved navigation accuracy.
- Refactor run_task_2 to include calls to go_to_xy and turn_degree for enhanced movement control.
2025-05-26 15:32:45 +00:00
55491ae859 Merge branch 'task-2' into main 2025-05-26 15:06:37 +00:00
ce369bf718 refactor(main): integrate go_to_xy_example function for coordinate navigation
- Add run_go_to_xy_example function call in main.py for enhanced navigation capabilities.
- Comment out run_task_1 to streamline task execution flow.
2025-05-26 15:06:08 +00:00
c5cd4a4091 🎏 add task-5 model 2025-05-26 13:12:28 +00:00
88f72b3722 refactor(detect_track): enhance edge detection and improve track following logic
- Update detect_horizontal_track_edge_v3 function for better edge detection accuracy.
- Refine parameters in follow_left_side_track function to improve stability and responsiveness.
- Adjust logging for clarity and maintainability.
2025-05-26 12:29:48 +00:00
e9ff362b01 refactor(main, base_move, task_1): update task execution and enhance track detection
- Uncomment run_task_1 in main.py to enable task execution.
- Comment out run_task_test in main.py to prevent test execution.
- Introduce turn_degree_twice function in turn_degree.py for improved rotation control.
- Update task_1.py to utilize turn_degree_twice and adjust movement parameters for better task execution.
- Modify detect_func_version in task_2_5.py to use the latest detection algorithm.
- Add detect_horizontal_track_edge_v3 function in detect_track.py for enhanced edge detection capabilities.
2025-05-26 09:34:32 +00:00
401ab3d37f 新增对task_2的支持,调用run_task_2函数并注释掉run_task_test函数,以便于后续测试和功能扩展。 2025-05-26 14:21:05 +08:00
3de4bb8485 refactor(base_move): improve left side track following algorithm
- Update function signature: replace target_distance with min_distance and max_distance
- Remove unused error_threshold variable
- Adjust logging messages for better readability
- Modify success condition to check within range of min_distance and max_distance
- Update task_left_line.py to turn 90 degrees before following left side track
2025-05-25 17:38:07 +00:00
76c00337ed 优化follow_left_side_track函数,调整最大时间参数至30秒,增强轨迹跟随的稳定性和响应速度;改进检测逻辑,确保在未检测到轨迹线时能够继续使用上一次控制命令;更新速度计算方式,确保更平滑的调整和停止过程。 2025-05-26 01:16:20 +08:00
612256c525 refactor(base_move): adjust parameters and fix issues in left side track following
- Reduce max_time parameter from 30 to 3 in follow_left_side_track function
- Fix side velocity sign in follow_left_side_track function
- Uncomment and update run_task_test in main.py
- Update initial heading in task_left_line.py
2025-05-25 16:51:07 +00:00
0a031c4142 Merge branch 'main' of ssh://120.27.199.238:222/Havoc420mac/mi-task into main 2025-05-25 16:45:16 +00:00
e869b4d891 fix(base_move): correct side velocity direction in follow_left_side_track
- Reverse the sign of side_velocity to move in the correct direction
- Uncomment run_task_1 and comment out run_task_test in main.py
- Update task_left_line.py to turn 90 degrees before following the left side track
2025-05-25 16:45:15 +00:00
5fd630c27b 优化follow_left_side_track函数,调整目标距离参数至540像素,增强稳定性和响应速度;更新滤波队列大小至7以提高稳定性;改进速度计算逻辑,确保更平滑的调整和停止过程;更新左侧轨迹线检测演示程序的输入路径。 2025-05-26 00:44:24 +08:00
e77d5655ae 新增go_straight_until_bar函数以控制机器人沿直线行走至检测到栏杆;优化follow_left_side_track函数的PID参数和稳定性要求,增强响应速度和稳定性;调整detect_left_side_track函数的搜索区域和评分逻辑,以提高线段检测的准确性和灵活性。 2025-05-25 19:55:35 +08:00
009b8e616a Merge branch 'main' of ssh://120.27.199.238:222/Havoc420mac/mi-task 2025-05-25 19:43:48 +08:00
250754ea25 优化黄色赛道检测演示程序,更新输入输出路径,替换边缘检测函数以提升准确性,并增强线段选择逻辑。 2025-05-25 19:43:31 +08:00
cb002c5b9f test(left_line): update image saving path and remove unused tasks
- Update image saving path in ImageSubscriber class
- Remove unused imports and code related to task_4 and arrow detection
- Add import for run_task_test
- Comment out run_task_4 and uncomment run_task_test in main function
2025-05-25 11:37:24 +00:00
30c63ce2e5 refactor(task_4): adjust movement parameters and image save path
- Modify go_straight distance from 10 to 6 in task 4
- Update image save path in rgb-camera test
2025-05-25 08:53:13 +00:00
ea2e5d132a refactor(main): update task execution order and remove unused imports
- Remove imports for task_5 and task_test
- Add import for task_4
- Comment out task_2_5 execution
- Uncomment and execute task_4
2025-05-25 08:45:49 +00:00
268d52155d refactor(task_2_5): simplify and restructure task execution
- Remove unused imports and simplify code structure
- Add direction parameter to run_task_2_5 function for flexibility
- Adjust turn_degree parameters for better accuracy
- Comment out unused alternative execution paths
2025-05-25 08:34:13 +00:00
09790e5921 Merge branch 'main' of ssh://120.27.199.238:222/Havoc420mac/mi-task 2025-05-24 22:35:24 +08:00
1c3c07d68a 更新黄色赛道检测演示程序的输入输出路径,替换边缘检测函数为新版本以提高检测准确性,并优化线段合并和选择逻辑,增强了对中上部线段的偏好。 2025-05-24 22:34:27 +08:00
85defc7811 feat(base_move): implement version 2 of horizontal line detection
- Add support for two versions of horizontal line detection functions
- Update move_base_hori_line.py to use the selected detection version
- Modify example_robot_log.py and test/main.py to use the new detection version
- Update image saving path in rgb-camera/img-raw-get.py
- Improve logging and error handling in detect_track.py
2025-05-23 06:56:15 +00:00
13f7e30e69 move test files 2025-05-22 05:32:16 +00:00
924a8e07c6 🎏 task-1 v0.2 2025-05-22 05:27:13 +00:00
c47213e8a3 Merge branch 'main' of ssh://120.27.199.238:222/Havoc420mac/mi-task 2025-05-22 12:35:18 +08:00
968471471f 删除测试图像结果文件,并在黄色赛道检测演示程序中更新输入和输出路径,同时在边缘检测算法中引入新的检测函数以提升检测准确性和稳定性。 2025-05-22 12:35:14 +08:00
1d18ec1e56 test(task_1): adjust go_straight parameters and comment out angle correction
- Comment out angle correction logic in go_straight function
- Adjust go_straight parameters in task_1
- Add success message for horizontal line calibration
- Update main function to include task_test
- Modify marker request response format
2025-05-22 04:27:22 +00:00
1ff2d22d4f Merge branch 'main' of ssh://120.27.199.238:222/Havoc420mac/mi-task into main 2025-05-20 10:31:21 +00:00
a781b77b42 pre merge 2025-05-20 10:31:14 +00:00
2793daf8fe 优化 go_straight 函数中的方向计算逻辑,使用 IMU 数据来确定角度偏差,提升了机器人在前进和后退时的运动精度。 2025-05-20 10:04:14 +08:00
4a2ab00f8d 更新日志文件,增加了边缘检测过程中的调试信息和结果记录;修改了黄色赛道检测演示程序的输入路径;在边缘检测算法中引入了线段质量评分机制,优化了线段选择逻辑,提升了检测的准确性和稳定性。 2025-05-20 09:24:54 +08:00
1d0ca47e3b Merge branch 'main' of ssh://120.27.199.238:222/Havoc420mac/mi-task into main 2025-05-19 12:53:18 +00:00
234e11eadc add save ori 2025-05-19 12:53:12 +00:00
e08c8b15a9 更新黄色赛道检测演示程序的输入路径为测试图像,并在边缘检测功能中增加了对上下边缘线的处理逻辑,优化了截断线的修正机制,提升了检测的准确性和稳定性。 2025-05-19 20:52:38 +08:00
c3fe5e69d1 back turn degree 2025-05-19 15:32:24 +08:00
1146bdc4ef 在 move_base_hori_line.py 中添加了对横向线校准的改进,增加了对小幅度摇头的 TODO 注释。同时在 turn_degree.py 中重构了旋转逻辑,优化了旋转速度和方向的计算,增强了旋转过程的稳定性和精确度,确保机器人在执行旋转时能够更好地适应不同的情况。 2025-05-19 15:16:03 +08:00
28254f23c1 refactor(base_move): improve horizontal line alignment and task 1 execution
- Simplify the horizontal line alignment process in move_base_hori_line.py
- Update task_1.py to use the improved alignment function for better accuracy
2025-05-19 06:30:11 +00:00
5d586c2999 Merge branch 'main' of ssh://120.27.199.238:222/Havoc420mac/mi-task into main 2025-05-19 06:26:54 +00:00
405fb116ec nothing 2025-05-19 06:26:45 +00:00
6b15e9be90 在 move_base_hori_line.py 中优化了 align_to_horizontal_line 函数,简化了代码逻辑,调整了旋转角度的计算和限制,增强了校准过程的稳定性。同时,改进了日志记录信息,提升了调试的可读性和准确性。 2025-05-19 14:26:24 +08:00
8782fdc092 refactor(main.py): implement pass flag functionality for MarkerRunner
- Add pass_marker variable to main.py
- Update MarkerRunner initialization in Robot_Ctrl class
- Modify MarkerRunner class to accept pass_flag parameter
- Implement pass flag logic in MarkerRunner's send_request method
- Initialize ROS 2 context in main function
2025-05-19 06:08:30 +00:00