Skip to content

Commit

Permalink
Merge pull request #8329 from JulioCesarMatias/RenameFunction
Browse files Browse the repository at this point in the history
[fc_core.c] Rename annexCode void
  • Loading branch information
DzikuVx committed Sep 3, 2022
2 parents dced609 + 751c22b commit 17430a4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/main/fc/fc_core.c
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

0 comments on commit 17430a4

Please sign in to comment.