212 Commits

Author SHA1 Message Date
39f548a79d Refactor task_3.py: rename and restructure functions for clarity and improved execution flow. Introduced pass_up_down function and redefined run_task_3 to enhance task management. 2025-05-28 06:01:57 +00:00
af412c707e Update main.py: refine commented-out sleep statement for clarity in testing context 2025-05-28 05:52:08 +00:00
aaa5ee7215 更新task_3.py,增强爬坡和下坡阶段的监测功能,添加姿态判断参数,优化稳定性检测逻辑,使用滑动窗口记录高度和俯仰角,提升代码可读性和执行效率。 2025-05-28 13:05:02 +08:00
918f5f20c5 新增go_to_x_v2函数以支持机器人移动到指定x坐标,更新task_3.py以引入新函数并调整稳定性检测参数,优化代码逻辑和文件处理。 2025-05-28 04:52:38 +00:00
92b2d40826 重构task_3的文件路径处理,移除file_dir参数,简化文件读取逻辑。更新Gait_Params_up.toml和Gait_Def_up.toml的路径为相对路径,优化代码可读性。 2025-05-28 11:45:55 +08:00
b401ebd006 Merge branch 'task-3' of ssh://120.27.199.238:222/Havoc420mac/mi-task into task-3 2025-05-28 03:36:11 +00:00
82bb1056b3 delete(task_3): remove main-ori.py and robot_control_cmd_lcmt copy.py files
- Deleted main-ori.py as it is no longer needed for the project.
- Removed robot_control_cmd_lcmt copy.py to clean up unused LCM type definitions and streamline the codebase.
2025-05-28 03:36:09 +00:00
14517e9912 优化任务3的执行流程,更新转向函数,增强旋转控制精度,调整稳定性检测参数,清理冗余代码。 2025-05-28 11:14:39 +08:00
2e71879c25 refactor(main.py, base_move/turn_degree.py, task_3.py): update rotation functions and task execution flow
- Enabled execution of run_task_3 in main.py by uncommenting the function call.
- Updated turn_degree function to include a new version (turn_degree_v2) for enhanced rotation control.
- Adjusted the stable count threshold in turn_degree for improved stability detection.
- Replaced calls to turn_degree with turn_degree_v2 in task_3.py for better precision during rotations.
- Cleaned up commented-out code in task_3.py to streamline execution flow.
2025-05-28 03:13:48 +00:00
c7ab681c2a 在go_to_xy.py中添加go_to_y_v2函数,支持机器人移动到指定的y坐标位置,优化了移动控制的精确性和灵活性。 2025-05-28 11:13:19 +08:00
b4956329db Merge branch 'main' of ssh://120.27.199.238:222/Havoc420mac/mi-task 2025-05-28 11:06:55 +08:00
f3360e9b7d 修复turn_degree_twice_2函数中的调用,统一使用turn_degree函数以提高代码一致性和可读性。 2025-05-28 11:06:51 +08:00
0e08c5b572 更新任务3实现,优化步态文件处理和控制逻辑,增强稳定性检测功能,调整参数以支持下降阶段检查。 2025-05-28 11:05:29 +08:00
c083798042 Enhance navigation and movement functions in tasks
- Updated main.py to adjust task execution flow and added print statements for debugging.
- Refactored task_2.py to utilize go_to_xy_v2 for improved navigation accuracy and added an xy_flag parameter to run_task_2.
- Introduced go_to_xy_with_correction_v2 and go_to_xy_v2 in go_to_xy.py for enhanced movement control and precision.
- Modified task_2_5.py to incorporate turn_degree_v2 and added go_straight function for better maneuverability.
2025-05-28 03:02:24 +00:00
ea7c1d671a Merge branch 'main' of ssh://120.27.199.238:222/Havoc420mac/mi-task 2025-05-28 02:23:03 +08:00
3f35af954f 更新任务2和任务4,增强箭头检测功能
- 在task_2.py中引入异步箭头检测器,优化箭头方向检测流程,确保在关键路径点进行准确检测。
- 更新run_task_2函数以支持箭头方向的动态检测,并在任务执行中根据检测结果调整后续动作。
- 在task_4.py中添加run_task_4_back函数,确保机器人能够在不同方向的情况下顺利完成任务。
- 在main.py中整合新的任务调用,确保任务执行流程的连贯性和准确性。
2025-05-28 02:23:01 +08:00
852a948a6f Refactor task navigation and enhance movement parameters
- Updated task_1.py to improve navigation logic and streamline movement functions.
- Enhanced task_2.py with refined movement parameters for better execution and added logging for debugging.
- Adjusted function calls in main.py to reflect changes in task execution flow.
2025-05-27 18:17:59 +00:00
8e172759ac 更新任务4,添加直线前进至黄线的功能
- 在task_4.py中引入go_straight_until_hori_line函数,控制机器人直线前进直到检测到黄线并停在指定距离。
- 调整任务4的执行流程,确保机器人能够顺利完成新的移动任务。
- 优化了相关参数设置,以提高任务执行的准确性和稳定性。
2025-05-28 02:12:00 +08:00
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
d89aca3b7a refactor(main.py, task_3.py, task_test.py): update task execution flow and enhance control logic
- Commented out run_task_3 in main.py to prevent execution during testing.
- Modified turn_degree function to set precision to True for improved control.
- Removed the unnecessary task_3/main copy.py file.
- Updated run_task_3 in task_3.py to improve gait file handling and control logic.
- Adjusted parameters for stability detection and added checks for descending phases.
- Updated task_test.py to focus on straight movement while commenting out previous commands.
2025-05-26 11:37:50 +00:00
0af26d8c70 更新日志文件,添加横向边缘检测结果和原始图像保存信息;删除不再使用的步态参数文件 Gait_Params_up_full.toml;修正黄色赛道检测演示程序中的输入路径和函数调用。 2025-05-26 17:40:57 +08: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
7b106c03dc refactor(task_3): update gait processing and enhance control logic
- Refactored gait processing in main.py to load parameters from Gait_Params_up.toml and publish user gait files.
- Improved control logic in task_3.py to monitor Z-axis speed and detect climbing phases.
- Added functionality for straight movement after task completion.
- Cleaned up commented-out code and ensured consistent message handling.
2025-05-26 06:11:09 +00:00
fbc2d5a7cd delete(task_3): remove moonwalk gait definition and parameters files
- Deleted Gait_Def_moonwalk.toml, Gait_Params_moonwalk.toml, Gait_Params_moonwalk_full.toml, and Usergait_List.toml as they are no longer needed for the project.
2025-05-25 20:15:12 +00:00
952524dc63 refactor(task_3): remove unnecessary code and update functionality
- Remove redundant LCM initialization and file writing in main.py
- Update file paths in task_3.py to use relative paths
- Replace ctrl.Send_msg() with ctrl.Send_cmd(msg) for consistency
- Add import lcm in task_3.py
- Update main.py to focus on user gait list processing
2025-05-25 18:31:29 +00:00
0558ded36d 调整文件权限,将相关文件的模式从644更改为755,以确保可执行权限。 2025-05-26 02:19:59 +08:00
2734580d10 fix file 2025-05-26 02:08:12 +08:00
938b0f8a86 更新任务3实现:引入机器人命令字典,优化步态文件加载与发送逻辑,支持用户自定义步态切换。增加异常处理以应对中断情况。 2025-05-26 02:06:04 +08:00
5ab480d507 重构(main.py): 移除任务4并引入任务3
- 注释掉MarkerRunner相关代码
- 替换任务4为任务3的调用
- 在place_marker函数中添加返回None以避免错误
2025-05-26 01:52:30 +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