Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Collective tracking control #2469

Merged

Conversation

noether
Copy link
Member

@noether noether commented Oct 29, 2019

This code is quite old, and I polished it a bit.

It is the implementation of a tracking algorithm coming from this paper https://arxiv.org/abs/1810.00182 .

I have written some instructions in the wiki https://wiki.paparazziuav.org/wiki/Module/collective_tracking_control

For sure I am missing documentation. To be honest, I forgot exactly all the necessary doc items. So, if you do not mind, just tell me what is missing :P.

The "attached" Python simulation to tune the gains quickly is hardcoded for three aircraft + target. One day I should make it more general... but I believe it is easy to modify it by somebody if (s)he is interested in the algorithm.

conf/modules/collective_tracking_control.xml Outdated Show resolved Hide resolved
conf/modules/collective_tracking_control.xml Show resolved Hide resolved
float k2;
float alpha;
uint16_t timeout;
float p_centroid_x;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't forget that you can use the struct FloatVect2 and corresponding math operations from math/pprz_algebra.h and math/pprz_algebra_float.h to have a more compact code.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I totally forgot about it. I would prefer to do not touch this part of the code since it is working (validated).

I have another algorithm to implement later. I will use these libraries for sure.

@noether
Copy link
Member Author

noether commented Nov 1, 2019

Sure, it makes sense. Especially, to move to another directory the "multi" algorithms (yep, for the next PR).

I will write two functionalities more too:

  • I will add the option to set a fixed target from settings or from a waypoint (right now it is always another vehicle).
  • I will add a Python script to start the algorithm (send navigation block) simultaneously from the ground.

sw/airborne/modules/ctc/ctc.c Show resolved Hide resolved
sw/airborne/modules/ctc/ctc.c Outdated Show resolved Hide resolved
@noether
Copy link
Member Author

noether commented Nov 4, 2019

Do not look at these commits yet. I had to push them from my laptop because I had to stop coding (baby alarm :P). I work from two or three computers, so every push in my local repo shows up here, that is why.

Once I finish the changes, I will let you know to review them.

Thanks!

Copy link
Member

@gautierhattenberger gautierhattenberger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine. Don't forget to make a PR to move the file in multi directory when you have the time.

@gautierhattenberger
Copy link
Member

It seems you need to rebase or merge with master and remove conflicts before I can merge it

@gautierhattenberger gautierhattenberger added this to the v5.16 milestone Nov 15, 2019
Copy link
Member

@gautierhattenberger gautierhattenberger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks fine

@gautierhattenberger gautierhattenberger merged commit 5cf27ee into paparazzi:master Nov 15, 2019
@noether noether deleted the collective_tracking_control branch November 22, 2019 09:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants