From ea2e5d132a6db831354379cc17e6d72e6b602997 Mon Sep 17 00:00:00 2001 From: havoc420ubuntu <2993167370@qq.com> Date: Sun, 25 May 2025 08:45:49 +0000 Subject: [PATCH] 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 --- main.py | 10 +++---- task_4/task_4.py | 26 +++++++++++++++++++ .../detect_arrow_direction.py | 0 {task_5 => task_arrow_test}/task_5.py | 2 +- task_test/task_test.py | 15 ----------- 5 files changed, 30 insertions(+), 23 deletions(-) create mode 100644 task_4/task_4.py rename {task_5 => task_arrow_test}/detect_arrow_direction.py (100%) rename {task_5 => task_arrow_test}/task_5.py (96%) delete mode 100644 task_test/task_test.py diff --git a/main.py b/main.py index 595143a..71f58cf 100644 --- a/main.py +++ b/main.py @@ -22,9 +22,7 @@ from utils.base_msg import BaseMsg from task_1.task_1 import run_task_1 from task_2_5.task_2_5 import run_task_2_5 -from task_5.task_5 import run_task_5 - -from task_test.task_test import run_task_test +from task_4.task_4 import run_task_4 pass_marker = True @@ -42,11 +40,9 @@ def main(): # time.sleep(100) # TEST # run_task_1(Ctrl, msg) - run_task_2_5(Ctrl, msg) + # run_task_2_5(Ctrl, msg) - # run_task_5(Ctrl, msg) - - # run_task_test(Ctrl, msg) + run_task_4(Ctrl, msg) # time.sleep(100) diff --git a/task_4/task_4.py b/task_4/task_4.py new file mode 100644 index 0000000..c79d362 --- /dev/null +++ b/task_4/task_4.py @@ -0,0 +1,26 @@ +import time +import sys +import os + +# 添加父目录到路径,以便能够导入utils +sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +from base_move.turn_degree import turn_degree +from base_move.go_straight import go_straight +from utils.log_helper import LogHelper, get_logger, section, info, debug, warning, error, success, timing + +# 创建本模块特定的日志记录器 +logger = get_logger("任务5") + +def run_task_4(ctrl, msg): + """ + 参数: + ctrl: Robot_Ctrl对象 + msg: 控制消息对象 + image_processor: 可选的图像处理器实例 + """ + + turn_degree(ctrl, msg, 90, absolute=90) + + go_straight(ctrl, msg, distance=10) + diff --git a/task_5/detect_arrow_direction.py b/task_arrow_test/detect_arrow_direction.py similarity index 100% rename from task_5/detect_arrow_direction.py rename to task_arrow_test/detect_arrow_direction.py diff --git a/task_5/task_5.py b/task_arrow_test/task_5.py similarity index 96% rename from task_5/task_5.py rename to task_arrow_test/task_5.py index 01aad70..c0c6f82 100644 --- a/task_5/task_5.py +++ b/task_arrow_test/task_5.py @@ -5,7 +5,7 @@ import os # 添加父目录到路径,以便能够导入utils sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from task_5.detect_arrow_direction import ArrowDetector +from task_arrow_test.detect_arrow_direction import ArrowDetector from base_move.turn_degree import turn_degree from utils.log_helper import LogHelper, get_logger, section, info, debug, warning, error, success, timing diff --git a/task_test/task_test.py b/task_test/task_test.py deleted file mode 100644 index eec073a..0000000 --- a/task_test/task_test.py +++ /dev/null @@ -1,15 +0,0 @@ -import time -import sys -import os - -# 添加父目录到路径,以便能够导入utils -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) - -from task_5.detect_arrow_direction import ArrowDetector -from base_move.turn_degree import turn_degree - -def run_task_test(ctrl, msg): - ctrl.base_msg.stop() - turn_degree(ctrl, msg, 90) - turn_degree(ctrl, msg, 90) -