-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Hybrid guidance code for hybrid drones #1769
Conversation
</section> | ||
|
||
<section name="SIMULATOR" prefix="NPS_"> | ||
<define name="ACTUATOR_NAMES" value="{"front_motor", "back_motor", "right_motor", "left_motor"}"/> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please use the type="string[]"
attribute like in the other up-to-date airframe files...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
or remove it completely if the NPS target is not working...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will do.
Please remove the high_speed_logger_spi_link.xml module, it has been renamed to logger_spi_link in c12546a |
<!DOCTYPE settings SYSTEM "../settings.dtd"> | ||
<settings> | ||
<dl_settings> | ||
<dl_settings NAME="indi"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why add this when we already have stabilization_indi.xml?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a duplicate (old version) that was accidentally included during the merge process. Will remove it (nice catch :) )
please run |
* the Free Software Foundation, 59 Temple Place - Suite 330, | ||
* Boston, MA 02111-1307, USA. | ||
*/ | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please add a doxygen file header
Thanks for the great peer-review! Will add your suggestions. |
@@ -338,7 +338,7 @@ def run(): | |||
VEHICLE_QUATS = [["AHRS_REF_QUAT", 6, "Estimate", True], ["AHRS_REF_QUAT", 2, "Reference", True]] | |||
BAR_VALUES = [["ROTORCRAFT_RADIO_CONTROL", 5, "Throttle (%%) %i", 0, 100, 100]] | |||
window_title = "Attitude_Viz" | |||
rotate_theta = -90 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if you change the default, please update the help accordingly...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@EwoudSmeur Not sure about this one, can you look into it please?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have not used the visualizer recently on master, but it used to be rotated by 90 degrees wrt. the quadshot attitude... Not sure what help you mean
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the help text that is printed a few lines below should of course reflect the actual default in the code....
…luded in airframe file, and not part of default rotorcraft configuration
2a48159
to
9ff319e
Compare
@flixr Happy with the changes, can this be merged to Master? Please let me know if I should change anything else, and thanks again for the excellent review. |
Do the added airframe files really all compile? |
… quadshot in the examples folder
@flixr Done. I did not know about the quadshot file in the examples folder, so it should be good now. Also, I removed the high_speed_logger_spi_link.xml file as requested. |
This pull request is for the guidance algorithms used to control hybrid drones like the Quadshot and MavShot. It supports autonomous waypoint navigation as well as "forward-flight". The code was flight tested in autonomous waypoint navigation mode, including autonomous landing (using sonar).