106 Commits

Author SHA1 Message Date
hav
3f6f558473 Update 820 2025-08-20 22:17:26 +08:00
hav
0aa9da9327 :tad: 2025-08-18 11:06:42 +08:00
0979d10415 Refactor main execution flow by enabling task execution based on arrow direction detection. Adjust max_time parameter in centering function for improved responsiveness. Update task 5's movement commands and section handling for clarity and consistency. 2025-05-31 13:53:54 +00:00
8ef996ee94 🐛 Add support for additional detection function versions in horizontal line alignment. Implement version checks for functions 3 and 4, and handle errors for unspecified detection versions. Improve code clarity and maintainability. 2025-05-31 12:53:50 +00:00
1ce0f9e7bf Update centering functionality in dual track control by adding new parameters for detection height and interval. Adjust message life count handling and improve variable management in task execution. Refactor related functions for enhanced clarity and performance. 2025-05-31 09:46:46 +00:00
e399c8c837 Enhance dual track centering functionality by adding an estimated track distance parameter for improved deviation calculations. Update the logic for converting pixel deviation to actual distance, optimizing the centering process. Refactor detection and movement commands for better responsiveness and accuracy. 2025-05-31 07:30:18 +00:00
122aea619b Enhance dual track centering functionality by adding a new method for centering and following dual tracks. Update parameters for improved control and response. Adjust detection region in dual track line detection for better accuracy. 2025-05-31 06:05:55 +00:00
f9b1b74b8b nothing 2025-05-31 10:07:37 +08:00
6dfa9101cf Refactor main.py and task_3.py: Re-enable task execution logic by restoring arrow direction handling and task function calls. Update max_iterations in pass_up_down function for improved safety. Add enhanced go_straight_with_enhanced_calibration function in task_4.py for better navigation on stone paths. 2025-05-31 01:28:03 +00:00
b65b3e5b2e Remove Gait_Params_up_full.toml file and update task_3.py and task_4.py to enhance navigation and control. Integrate go_lateral function for lateral movement, improve task execution with center_on_dual_tracks, and streamline file publishing for gait parameters. Update detection logic for horizontal lines and adjust iteration thresholds for better performance. 2025-05-30 16:12:10 +00:00
ba0994a82b Add go_lateral function for lateral movement control and update task_4.py to utilize it for improved navigation. Cleaned up main.py by removing unnecessary lines and added comments for clarity. 2025-05-30 11:34:56 +00:00
d56b922f6a Refactor main.py and task_4.py: Removed deprecated turn_degree_v2 call in main.py and updated task_4.py to utilize center_on_dual_tracks for improved navigation. Deleted test_center_on_tracks.py and test_offline_centering.py files to streamline the codebase. Enhanced dual track detection capabilities by integrating detect_furthest_horizontal_intersection in move_base_hori_line.py, allowing for more accurate alignment to horizontal lines. 2025-05-28 16:17:53 +00:00
cc2a6ac41e 更新日志文件,增加双轨迹线检测的详细调试信息和结果记录,同时删除过时的图像文件以优化存储。增强了对不同路况的处理能力,提升了检测准确性。 2025-05-28 23:07:58 +08:00
91a6ef0d36 Enhance main.py and task_4: Added go_to_y_v2 function to main.py for improved navigation. Updated go_straight function in go_straight.py to accept additional parameters for mode, gait_id, and step_height, allowing for more flexible movement control. Integrated follow_dual_tracks function in task_4 to enhance task execution by enabling dual track following capabilities. 2025-05-28 13:18:27 +00:00
53b04a6a74 Refactor main.py and enhance go_straight_with_qrcode function in go_straight.py. Commented out unused code in main.py for clarity and added QR code scanning functionality to go_straight_with_qrcode, improving robot navigation and task execution. Updated run_task_5 to utilize the new function for better integration of QR code scanning during movement. 2025-05-28 09:56:35 +00:00
477511f291 Merge branch 'task-3' into main 2025-05-28 07:11:49 +00:00
918f5f20c5 新增go_to_x_v2函数以支持机器人移动到指定x坐标,更新task_3.py以引入新函数并调整稳定性检测参数,优化代码逻辑和文件处理。 2025-05-28 04:52:38 +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
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
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
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
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
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
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
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
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
924a8e07c6 🎏 task-1 v0.2 2025-05-22 05:27:13 +00: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
2793daf8fe 优化 go_straight 函数中的方向计算逻辑,使用 IMU 数据来确定角度偏差,提升了机器人在前进和后退时的运动精度。 2025-05-20 10:04:14 +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
f77b7edb13 在 move_base_hori_line.py 中优化了 align_to_horizontal_line 函数,添加了累积角度跟踪和动态补偿机制,增强了校准过程的稳定性和准确性。同时在 turn_degree.py 中引入了精确模式,改进了旋转控制逻辑,提升了旋转的精度和稳定性,确保机器人在执行旋转时能够更好地适应不同的情况。 2025-05-18 23:44:09 +08:00
26527e7775 在 move_base_hori_line.py 中新增 follow_left_side_track 函数,实现机器狗沿左侧黄色轨迹线移动的控制逻辑。同时在 detect_track.py 中添加 detect_left_side_track 函数,用于检测左侧轨迹线,增强了机器狗的轨迹跟随能力和稳定性。更新了相关参数和日志记录功能,提升了调试信息的可读性。 2025-05-18 16:59:56 +08:00
8ee1f5b5d8 优化 arc_turn_around_hori_line 函数,调整参数和逻辑以支持负角度表示右转,增强代码可读性和可维护性。同时更新 task_1.py 中的调用方式,确保一致性和清晰性。 2025-05-18 16:26:20 +08:00