Skip to content

Commit

Permalink
updated comments and readme
Browse files Browse the repository at this point in the history
  • Loading branch information
klaxalk committed Mar 25, 2024
1 parent c5e8561 commit f4cbd69
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ For simulations:

* AprilTag detector
* [Landing Pad Estimator](./ros_packages/mrs_landing_pad_estimation)
* [Precise Landing Conroller](./ros_packages/mrs_precise_landing)
* [Precise Landing Controller](./ros_packages/mrs_precise_landing)
* [Gazebo Resources for testing](./ros_packages/mrs_precise_landing_gazebo)

## Example simulation
Expand All @@ -42,7 +42,7 @@ You will need to prepare:
* [config file](./ros_packages/mrs_precise_landing_gazebo/tmux/config/apriltag.yaml) for the april tag detector
* camera node name, camera topic name (such that `/$UAV_NAME/camera_node/camera_topic`)
* the ids of the AprilTags need to be filled in the custom config for the estimator, [estimator_config](./ros_packages/mrs_precise_landing_gazebo/tmux/config/landing_estimator.yaml)
* how should the heading be controlled, prepare the controller config, [controller_config](./ros_packages/mrs_precise_landing_gazebo/tmux/config/landing_controller.yaml)
* how should the heading be controlled?, prepare the controller config, [controller_config](./ros_packages/mrs_precise_landing_gazebo/tmux/config/landing_controller.yaml)

```bash
roslaunch mrs_precise_landing precise_landing.launch apriltag_config:=`rospack find mrs_landing_pad_estimation`/config/apriltag_recursive.yaml camera_node:=bluefox_optflow image_topic:=image_raw estimator_config:=<estimator_config> controller_config:=<controller_config>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
prediction_rate: 100.0 # [Hz]

# order by their embeddedness
# the first one is the smallest and the most embedded one
tag_ids: [0, 10] # [-]

# the estimation will happen in this frame of refernece
# (detections are transformed to this frame first)
estimation_frame: "fixed_origin"

# internal loop rate of the LKF
prediction_rate: 100.0 # [Hz]

# the node will stop fusing and outputing any data of detections are not coming for more than this
correction_timeout: 2.0 # [s]

# max relative distance to the landing tag
# anything detection beyond this distance (in the fcu frame) will be thrown away
max_relative_distance: 8.0

# parameters for the LKF estimator
# don't change
lkf:

# state matrix
Expand Down
10 changes: 7 additions & 3 deletions ros_packages/mrs_precise_landing/config/precise_landing.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# what controller will be used for the landing
controller: "Se3Controller"

# what tracker will be used for the landing
tracker: "MpcTracker"

# the frame id in which all the operations are conducted
# the frame in which all the operations are conducted
# (all the incoming data is transformed to this frame first)
frame_id: "fixed_origin"

desired_heading:
Expand All @@ -28,6 +31,7 @@ stages:

timeout: 15.0 # [s]

# the alignment criterion is relaxed as the time goes
criterion:

initial_radius: 0.03 # [m], +-
Expand All @@ -49,8 +53,8 @@ stages:
aborting:
height: 3.0 # [m]

# rate of publishing the trajectory
# rate of the feedback loop
rate: 10.0 # [Hz]

# sampling of the trajectory
# sampling rate of the outcoming trajectory
trajectory_dt: 0.20 # [s]

0 comments on commit f4cbd69

Please sign in to comment.