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.

Sign up for GitHub

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

Jump to bottom

[fc_core.c] Rename annexCode void #8329

Merged
merged 2 commits into from Sep 3, 2022
Merged

[fc_core.c] Rename annexCode void #8329

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04057b0
[fc_core.c] Rename annexCode void
JulioCesarMatias Aug 16, 2022
751c22b
to static
JulioCesarMatias Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/fc/fc_core.c
View file
Open in desktop
Expand Up @@ -389,7 +389,7 @@ static bool emergencyArmingIsEnabled(void)
return emergencyArmingIsTriggered() && emergencyArmingCanOverrideArmingDisabled();
}

void annexCode(float dT)
static void processPilotAndFailSafeActions(float dT)
{
if (failsafeShouldApplyControlInput()) {
// Failsafe will apply rcCommand for us
Expand Down Expand Up @@ -436,8 +436,6 @@ void annexCode(float dT)
rcCommand[PITCH] = rcCommand_PITCH;
}
}

updateArmingStatus();
}

void disarm(disarmReason_t disarmReason)
Expand Down Expand Up @@ -883,7 +881,9 @@ void taskMainPidLoop(timeUs_t currentTimeUs)
imuUpdateAccelerometer();
imuUpdateAttitude(currentTimeUs);

annexCode(dT);
processPilotAndFailSafeActions(dT);

updateArmingStatus();

if (rxConfig()->rcFilterFrequency) {
rcInterpolationApply(isRXDataNew, currentTimeUs);
Expand Down