30 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
7433c83b9b refactor(base_move): improve arc turn control and distance calculation
- Implement time compensation for different turn angles
- Adjust rotation thresholds and speed factors for better control
- Fix distance calculation and variable naming in go_straight function
- Enhance observation and debugging output
2025-05-18 07:57:15 +00:00
18248d7ad9 删除当前图像文件,优化 main.py 中的恢复站立逻辑,新增 lie_down 和 stand_up 方法到 BaseMsg 类,更新 task_1.py 以使用新的移动和休息功能。 2025-05-17 11:27:39 +08:00
6779c93888 task-1 #5 2025-05-15 16:43:36 +08:00
4135f8c31a refactor(base_move): 优化移动控制逻辑和校准流程
- 修改 move_to_hori_line 函数中的超时设置和停止命令发送方式
- 在主程序中初始化和销毁 ROS 2 上下文
- 增加校准相关变量和逻辑,提高定位精度
- 优化 ImageProcessor 和 MarkerRunner 类的实现
2025-05-15 08:09:59 +00:00
f77cada464 增加 MarkerRunner 支持,优化标记放置功能
- 在 Robot_Ctrl 类中初始化 MarkerRunner,并在运行时调用其方法
- 在移动到横向线的函数中添加标记放置功能,分别在起点和终点放置绿色和红色标记
- 增强错误处理,确保 MarkerRunner 正确销毁
2025-05-15 11:19:24 +08:00
6996a3459f task-1 #3 2025-05-14 14:50:50 +00:00
6be89617e7 重构主程序,移除图像处理器实例化,简化任务1函数参数,删除无用的测试文件,优化代码结构。 2025-05-14 19:35:29 +08:00
aa4621ed55 task-1 #1 2025-05-14 11:25:44 +00:00
9ec783b8b1 更新主程序以启用任务5的执行,并修改turn_degree函数以支持相对角度旋转。 2025-05-13 18:27:47 +08:00
fb95c8ae45 feat(robot): add odometry functionality and update control logic
- Add odometry thread and message handler for localization data
- Update main control loop to incorporate odometry information
- Remove task 5 execution from main function
- Refactor task 5 implementation to be more modular
2025-05-13 10:12:57 +00:00
49a6a10f63 feat(task_1): implement new robot movements and behaviors
- Add new functions for turning, going straight, and circling
- Implement standing up and lying down movements
- Update task_1 to use new movement functions
- Decode QR code information from image processor
- Refactor main.py to run task_5 instead of task_1
2025-05-12 08:06:08 +00:00
33bd61ddb9 优化主程序异常处理,添加资源清理逻辑;在图像处理器中引入多线程支持,改进图像订阅的运行机制。 2025-05-12 01:04:51 +08:00
c9686a84e1 feat(utils): add QR code decoding functionality
- Integrate QReader for QR code detection and decoding
- Implement decode_qrcode method in ImageProcessor class
- Uncomment run_task_1 function call in main.py
2025-05-11 16:22:21 +00:00
4d924d889a 重构代码,删除不再使用的LCM类型定义文件,更新导入路径,添加图像处理功能到主程序和任务1中,并在适当位置调用图像处理器的销毁方法。 2025-05-12 00:05:54 +08:00
db35c7a282 🎉 2025-05-11 15:44:54 +00:00