diff --git a/main.py b/main.py index 5cdf2bd..b4687d3 100644 --- a/main.py +++ b/main.py @@ -17,7 +17,7 @@ from utils.robot_control_cmd_lcmt import robot_control_cmd_lcmt from utils.robot_control_response_lcmt import robot_control_response_lcmt from utils.localization_lcmt import localization_lcmt from utils.image_raw import ImageProcessor -from utils.marker_client import MarkerRunner +# from utils.marker_client import MarkerRunner from utils.base_msg import BaseMsg from task_1.task_1 import run_task_1 @@ -80,7 +80,7 @@ class Robot_Ctrl(object): self.odo_msg = localization_lcmt() self.image_processor = ImageProcessor() # DEBUG - self.marker_runner = MarkerRunner(pass_flag=pass_marker) + # self.marker_runner = MarkerRunner(pass_flag=pass_marker) self.send_lock = Lock() self.delay_cnt = 0 self.mode_ok = 0 @@ -100,7 +100,7 @@ class Robot_Ctrl(object): self.rec_thread.start() self.odo_thread.start() self.image_processor.run() - self.marker_runner.run() + # self.marker_runner.run() def msg_handler(self, channel, data): self.rec_msg = robot_control_response_lcmt().decode(data) @@ -166,6 +166,7 @@ class Robot_Ctrl(object): self.send_lock.release() def place_marker(self, x, y, z, color, observe=False): + return None """调用 MarkerRunner 放置标志物""" if self.marker_runner is None or self.marker_runner.marker_client is None: print("MarkerRunner 未初始化,无法放置标志物") diff --git a/task_2/task_2.py b/task_2/task_2.py index 1587abb..6a43d36 100644 --- a/task_2/task_2.py +++ b/task_2/task_2.py @@ -18,7 +18,7 @@ def run_task_2(ctrl, msg): # 微调 xy 和角度 go_to_xy(ctrl, msg, 0.9, 0.2, speed=0.5, observe=True) - turn_degree(ctrl, msg, 0, absolute=True, observe=True) + turn_degree(ctrl, msg, 0, absolute=True) # print("Recovery stand") # Ctrl.base_msg.stand_up()