142 Commits

Author SHA1 Message Date
5502fa55d3 Merge branch 'task-3' of ssh://120.27.199.238:222/Havoc420mac/mi-task into task-3 2025-05-28 18:08:34 +08:00
578469ab9e 更新Gait_Params相关文件,调整步态参数以优化机器人运动表现,修改主程序以支持新步态配置,增强代码可读性和执行效率。 2025-05-28 18:08:32 +08:00
ca876fd733 Add go_until_yellow_area function to task_3.py for yellow area detection and control. Enhanced robot movement logic to stop upon detecting specified yellow area ratio, including temporary image handling and smooth stopping mechanism. 2025-05-28 07:02:58 +00:00
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
0e08c5b572 更新任务3实现,优化步态文件处理和控制逻辑,增强稳定性检测功能,调整参数以支持下降阶段检查。 2025-05-28 11:05:29 +08: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
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
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