Skip to content

Commit

Permalink
[*] Minor navigation updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Cadart Nicolas committed Feb 23, 2019
1 parent e4cdb3a commit 07bcaf2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/flight_manager_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ class STATE(IntEnum):

# Flight parameters
TAKEOFF_ALLOWED = True # if False, no takeoff order will be sent (Test mode)
FLIGHT_ALTITUDE = 0.8 # [m] general altitude of flight for the drone
FLIGHT_PRECISION = 0.30 # [m] tolerance to reach specified target
FLIGHT_ALTITUDE = 1. # [m] general altitude of flight for the drone
FLIGHT_PRECISION = 0.20 # [m] tolerance to reach specified target

LANDING_FACTOR = 0.8 # at each iteration, the drone multiply its distance to target by this factor
LANDING_MIN_ALTITUDE = 0.20 # [m] below this altitude, the drone stops flying and tries to land
Expand Down
10 changes: 5 additions & 5 deletions src/navigation_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
FRAME_ARDRONE = 'ardrone_base_link'
FRAME_FIXED = 'odom'

LOOP_RATE = 20. #  [Hz] rate of the ROS node loop
LOOP_RATE = 30. #  [Hz] rate of the ROS node loop

TARGET_THRESHOLD_POSE = 0.2 # [m]
TARGET_THRESHOLD_POSE = 0.15 # [m]
TARGET_THRESHOLD_ORIENTATION = 10 * np.pi / 180. # [rad]
TARGET_THRESHOLD_SPEED = 0.1 # [m/s]

Expand Down Expand Up @@ -67,9 +67,9 @@ def __init__(self):
'rot_z': 0.7}

# init PID gains
self.pid_gains = {'trans_x': {'P': 0.25, 'I': 0., 'D': 0.1},
'trans_y': {'P': 0.25, 'I': 0., 'D': 0.1},
'trans_z': {'P': 3., 'I': 0., 'D': 0.0},
self.pid_gains = {'trans_x': {'P': 0.15, 'I': 0.01, 'D': 0.05},
'trans_y': {'P': 0.15, 'I': 0.01, 'D': 0.05},
'trans_z': {'P': 3., 'I': 0.01, 'D': 0.05},
'rot_z': {'P': 0., 'I': 0., 'D': 0.}}

# init PID controllers
Expand Down

0 comments on commit 07bcaf2

Please sign in to comment.