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

Use pwm esc unconditionally #829

Merged
merged 1 commit into from
Dec 16, 2024
Merged

Use pwm esc unconditionally #829

merged 1 commit into from
Dec 16, 2024

Conversation

haitomatic
Copy link

@haitomatic haitomatic commented Dec 2, 2024

  • Drop pwm_out_sim
  • Enable pwm_esc for HITL mode
  • Allow pwm_esc to be used at the same with UAVCAN ESC

Tested on saluki v3 HIITL mode with mc, fw and vtol

@haitomatic haitomatic marked this pull request as draft December 2, 2024 10:08
@haitomatic haitomatic force-pushed the use_pwm_esc_unconditionally branch 4 times, most recently from f0d7ffd to 0a46375 Compare December 3, 2024 10:13
@haitomatic haitomatic marked this pull request as ready for review December 3, 2024 10:31
@haitomatic haitomatic force-pushed the use_pwm_esc_unconditionally branch from 0a46375 to b85fec8 Compare December 3, 2024 10:35
@haitomatic
Copy link
Author

Since actuator_output max, min and disarmed default values have been changed for HITL (similar to real drone), the flight behavior of supported HITL models might be different, previous default HITL actuator_output max, min and disarmed values have been added to HITL configs in ssrc_config to preserve expected model behavior for now. Complete adaption (asimilation HITL model to real drone) will be done latter in a separate PR.

@haitomatic haitomatic force-pushed the use_pwm_esc_unconditionally branch 2 times, most recently from da3a5e7 to 7f913a6 Compare December 3, 2024 11:23
@@ -31,9 +31,9 @@
*
****************************************************************************/

/**
/**const uint32_t reversible_outputs = _mixing_output.reversibleOutputs();
Copy link

Choose a reason for hiding this comment

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

leftovers inside comment?

Copy link
Author

Choose a reason for hiding this comment

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

ah, that's dropped there by mistake. I will clean up

@@ -31,19 +31,13 @@
#
############################################################################

if(${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL} STREQUAL "px4_sitl")
Copy link

Choose a reason for hiding this comment

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

do we actually need to make any modifications to pwm_out_sim, if we are not using the component?

Copy link
Author

Choose a reason for hiding this comment

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

hmm, so maybe i should leave it untouched ? so that the module is still in sync with upstream.

@haitomatic haitomatic force-pushed the use_pwm_esc_unconditionally branch 4 times, most recently from 0a96618 to 61452ac Compare December 3, 2024 16:37
@haitomatic haitomatic requested a review from jlaitine December 4, 2024 04:59
@haitomatic haitomatic force-pushed the use_pwm_esc_unconditionally branch 2 times, most recently from 4838f0c to b99b7cd Compare December 16, 2024 08:52
@haitomatic haitomatic force-pushed the use_pwm_esc_unconditionally branch from b99b7cd to 9f65415 Compare December 16, 2024 09:02
@haitomatic haitomatic merged commit f613cb5 into main Dec 16, 2024
27 checks passed
@haitomatic haitomatic deleted the use_pwm_esc_unconditionally branch December 16, 2024 09:23
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.

2 participants