d

rombie18 · May 3, 2023 · 5273b99 · 5273b99
1 parent ab77059
commit 5273b99
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Software/threads/main.py b/Software/threads/main.py
@@ -120,8 +120,8 @@ def __cycle_loop_motor(self):
         self.actuator_motor.throttle = self.motor_pid(self.velocity)
 
     def __cycle_loop_steering(self):
-        self.actuator_servo.angle = self.transform_centerangle_to_angle(self.servo_pid(
-            self.transform_angle_to_centerangle(self.transform_heading_to_angle(self.heading))))
+        self.actuator_servo.angle = self.pipe_imageprocessing["angle"]
+        #self.actuator_servo.angle = self.transform_centerangle_to_angle(self.servo_pid(self.transform_angle_to_centerangle(self.transform_heading_to_angle(self.heading))))
 
     ### Calculations ###
     def process_calculations(self):
@@ -212,12 +212,15 @@ def controller_process(self, key):
             if key.keytype == "Button" and key.number == 2 and key.raw_value == 1:
                 # Red circle button
                 # Safe stop
-                self.stop = True
+                self.safe_stop()
 
             if key.keytype == "Button" and key.number == 3 and key.raw_value == 1:
                 # Green triangle button
                 # Start
-                self.start = not self.start
+                if self.pause_event.is_set(): 
+                    self.pause_event.clear()
+                else:
+                    self.pause_event.set()
 
             if key.keytype == "Hat" and key.number == 0 and key.raw_value == 1:
                 # Left hat up