Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/drivers/lights_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

static IO_t lightsIO = DEFIO_IO(NONE);

bool lightsHardwareInit()
bool lightsHardwareInit(void)
{
lightsIO = IOGetByTag(IO_TAG(LIGHTS_PIN));

Expand Down
2 changes: 1 addition & 1 deletion src/main/drivers/lights_io.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#ifdef USE_LIGHTS


bool lightsHardwareInit();
bool lightsHardwareInit(void);
void lightsHardwareSetStatus(bool status);

#endif /* USE_LIGHTS */
5 changes: 5 additions & 0 deletions src/main/fc/fc_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,9 @@ void disarm(disarmReason_t disarmReason)

statsOnDisarm();
logicConditionReset();
#ifdef USE_PROGRAMMING_FRAMEWORK
programmingPidReset();
#endif
beeper(BEEPER_DISARMING); // emit disarm tone
}
}
Expand Down Expand Up @@ -492,7 +494,10 @@ void tryArm(void)
//It is required to inform the mixer that arming was executed and it has to switch to the FORWARD direction
ENABLE_STATE(SET_REVERSIBLE_MOTORS_FORWARD);
logicConditionReset();

#ifdef USE_PROGRAMMING_FRAMEWORK
programmingPidReset();
#endif
headFreeModeHold = DECIDEGREES_TO_DEGREES(attitude.values.yaw);

resetHeadingHoldTarget(DECIDEGREES_TO_DEGREES(attitude.values.yaw));
Expand Down
2 changes: 1 addition & 1 deletion src/main/io/lights.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void lightsUpdate(timeUs_t currentTimeUs)
lightsSetStatus(IS_RC_MODE_ACTIVE(BOXLIGHTS), currentTimeUs);
}

void lightsInit()
void lightsInit(void)
{
lightsHardwareInit();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/io/lights.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ typedef struct lightsConfig_s {
PG_DECLARE(lightsConfig_t, lightsConfig);

void lightsUpdate(timeUs_t currentTimeUs);
void lightsInit();
void lightsInit(void);

#endif /* USE_LIGHTS */