From d9a68d408d33209233e69c66f1c8ee3e85c260df Mon Sep 17 00:00:00 2001
From: bmy <2583236812@qq.com>
Date: Sat, 15 Jun 2024 10:42:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=BD=AC=E5=A1=94?=
 =?UTF-8?q?=E5=8A=A8=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 majtask.py |  6 +++---
 subtask.py | 12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/majtask.py b/majtask.py
index 5337cd8..bd30810 100644
--- a/majtask.py
+++ b/majtask.py
@@ -62,9 +62,9 @@ class main_task():
             error_abs = abs(self.lane_error)
 
             if error_abs > 50:
-                speed = 15
+                speed = 11
             elif error_abs > 45:
-                speed = 15
+                speed = 13
             elif error_abs > 35:
                 speed = 15
             elif error_abs > 25:
@@ -94,7 +94,7 @@ class main_task():
             # pid_out = self.pid1.get(self.lane_error*0.65)
             pid_out = self.pid1.get(self.lane_error)
             # pid_out = -pid_out
-            logger.debug(f"err={self.lane_error}, pwm out={pid_out}")
+            # logger.debug(f"err={self.lane_error}, pwm out={pid_out}")
             self.by_cmd.send_speed_omega(pid_out)
             
         self.socket.send_string("")
diff --git a/subtask.py b/subtask.py
index f4cfc46..171d624 100644
--- a/subtask.py
+++ b/subtask.py
@@ -523,16 +523,20 @@ class up_tower():
     def exec(self):
         logger.info("找到塔")
         car_stop()
+        time.sleep(1)
         calibrate_new(tlabel.TOWER, offset = 27, run = True)
-        by_cmd.send_light(1)
-        time.sleep(0.5)
-        by_cmd.send_light(0)
+        time.sleep(1)
         # calibrate(tlabel.TOWER, 27, False, 6)
         by_cmd.send_distance_x(-10, 130)
         time.sleep(1)
         by_cmd.send_distance_y(-10, 50)
         time.sleep(3)
-        
+        by_cmd.send_angle_zhuan(10)
+        time.sleep(9)
+        by_cmd.send_distance_y(10, 50)
+        time.sleep(1)
+        by_cmd.send_angle_zhuan(0)
+        time.sleep(1)
         # while True:
         #     pass
         # 下一动作预备位置