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
This commit is contained in:
parent
268d52155d
commit
ea2e5d132a
10
main.py
10
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)
|
||||
|
||||
|
26
task_4/task_4.py
Normal file
26
task_4/task_4.py
Normal file
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user