From 84d1cbb68df3976978be02811134a546f1c77797 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 21 Sep 2021 17:46:51 +0100 Subject: [PATCH] Update --- Control/Jetson/main.py | 2 +- Control/Pi/dronekit_class.py | 2 +- Control/Pi/pallet_proximity_sensor.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Control/Jetson/main.py b/Control/Jetson/main.py index 3d3b1c2..22e79cb 100755 --- a/Control/Jetson/main.py +++ b/Control/Jetson/main.py @@ -230,7 +230,7 @@ def queue_executor_thread(): executor_logger.warning("DO_DROPOFF_CARGO flag is false, skipping dropping off cargo") if DO_REVERSE_TURN: - reverse_turn = reverse_turn(FORKLIFT) + reverse_turn = __reverse_turn(FORKLIFT) if not reverse_turn: executor_logger.critical("Problem with reverse turn, check logs !") FORKLIFT.set_state("OTHER_ERROR") diff --git a/Control/Pi/dronekit_class.py b/Control/Pi/dronekit_class.py index aec53c8..8baedd8 100644 --- a/Control/Pi/dronekit_class.py +++ b/Control/Pi/dronekit_class.py @@ -363,12 +363,12 @@ class DroneInterface: if self.verify_state_for("NAVIGATING_TO_POINT_GPS"): approaching = True while approaching: + current_heading = self.get_heading() if target_heading - 7 <= current_heading <= target_heading + 7: approaching = False self.log.info(f"Heading {target_heading} reached") self.override_stop() return True - current_heading = self.get_heading() error = target_heading - current_heading self.log.error(f"Angle: {error} deg.") if error > 180: diff --git a/Control/Pi/pallet_proximity_sensor.py b/Control/Pi/pallet_proximity_sensor.py index c5f4175..ac65988 100644 --- a/Control/Pi/pallet_proximity_sensor.py +++ b/Control/Pi/pallet_proximity_sensor.py @@ -24,7 +24,7 @@ class PalletProximity: self.ser.flushInput() # time.sleep(0.05) readings = 0 - for _ in range(2): + for _ in range(3): raw = str(self.ser.readline()) raw2 = int(raw.split("|")[1]) readings += raw2