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

remove AP_MotorsMatrixTS #15020

Merged
merged 2 commits into from Sep 8, 2020
Merged

Conversation

kd0aij
Copy link
Contributor

@kd0aij kd0aij commented Aug 9, 2020

there were only two frame types unique to copter tailsitters, and the simplified implementation of function AP_MotorsMatrixTS::output_armed_stabilizing appears to be unnecessary

@rmackay9 This just absorbs support for the 2 quad-no-yaw-torque frame types used by copter tailsitters into AP_MotorsMatrix, and should have no functional impact on any other frame type.

@kd0aij kd0aij requested a review from IamPete1 August 9, 2020 15:12
@kd0aij kd0aij requested a review from rmackay9 August 9, 2020 20:45
@rmackay9
Copy link
Contributor

rmackay9 commented Aug 9, 2020

Hi, do we need any changes for the parameter descriptions or is that all done on the Plane side?

@kd0aij
Copy link
Contributor Author

kd0aij commented Aug 9, 2020

I should have been saying frame_type above, instead of frame_class.
The two frame_types created for copter tailsitters are in the description for the quadplane parameter, but not in the frame_type description for Copter. Perhaps leaving them out in Copter would address Pete's concern above?
At present, the quadplane description is missing frame_type=18 and Copter is missing frame_type=16 and 17

@rmackay9
Copy link
Contributor

@kd0aij, Probably both leaving it out of the parameter description and making it unavailable for the Copter firmware makes sense.

@kd0aij
Copy link
Contributor Author

kd0aij commented Aug 10, 2020

Would you prefer a pre-arm check or the #if approach in MotorsMatrix?

@rmackay9
Copy link
Contributor

@kd0aij, I think if some #ifs are added then an existing pre-arm check will catch that the motor driver hasn't been initialised successfully.

@kd0aij kd0aij force-pushed the pr-delete-AP_MotorsMatrixTS branch from 8aa3f1b to 1698dde Compare August 10, 2020 03:30
@kd0aij
Copy link
Contributor Author

kd0aij commented Aug 10, 2020

Restricted frame_types 17,18 to ArduPlane builds

@tridge tridge merged commit bcdd160 into ArduPilot:master Sep 8, 2020
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

5 participants