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

AP_ICEngine: don't allow engine run with safety on #118

Merged
merged 1 commit into from
Mar 19, 2024

Conversation

Pradeep-Carbonix
Copy link
Contributor

Cherry-pick source:

  • AP_ICEngine: don't allow engine run with safety on : e070848
  • AP_EFI: fixed ignition while disarmed : 2956810

Cherry-pick was not sufficient, since the code has changed since 4.3.25. This code is tested after changes.

@Pradeep-Carbonix Pradeep-Carbonix requested review from robertlong13, Jono453 and a user March 18, 2024 02:34
@Pradeep-Carbonix
Copy link
Contributor Author

Cherry-pick source:

  • AP_ICEngine: don't allow engine run with safety on : e070848
  • AP_EFI: fixed ignition while disarmed : 2956810

Cherry-pick was not sufficient, since the code has changed since 4.3.25. This code is tested after changes.

Testing on PMU test unit: (Test by sending the crank signal from joystick) :

  • Toggle safety switch - OFF : PMU START and PMU_EN LEDs are OFF
  • Toggle safety switch - ON : PMU START and PMU_EN LEDs are ON

Copy link
Contributor

@loki077 loki077 left a comment

Choose a reason for hiding this comment

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

Logic looks correct to me. If the test results are confirmed by @LachlanConn then I am good.

allow_throttle = ice->allow_throttle_disarmed();
}
}
request_was_sent = (allow_throttle) ? send_target_values(new_throttle) : false;
Copy link
Contributor

Choose a reason for hiding this comment

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

why this is set to false on failure and not calling the function which will set the throttle 0 like in master.
As I am not sure if calling send_target_values(0) could have any other impact

    if (allow_throttle) {
        request_was_sent = send_target_values(new_throttle);
    } else {
        request_was_sent = send_target_values(0);
    }

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agreed,
Reverted it back to original, since we do not have more time to test it fully

Cherry-pick source:
 - AP_ICEngine: don't allow engine run with safety on : e070848
 - AP_EFI: fixed ignition while disarmed : 2956810

Cherry-pick was not sufficient, since the code has changed since 4.3.25. This code is tested after changes.
@Pradeep-Carbonix Pradeep-Carbonix force-pushed the feature/SW-122-engine-safety-check-cherry-pick branch from 28c56b6 to f67aaee Compare March 19, 2024 03:54
@loki077 loki077 merged commit 23e5c97 into CxPilot Mar 19, 2024
62 checks passed
@robertlong13 robertlong13 deleted the feature/SW-122-engine-safety-check-cherry-pick branch June 17, 2024 07:09
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.

3 participants