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

Fix compiler warnings when #define use_lights, fix F3 targets compilation #6692

Merged
merged 7 commits into from
Mar 9, 2021
Merged

Fix compiler warnings when #define use_lights, fix F3 targets compilation #6692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0c1bc8d
Update lights_io.c
Tygrys-1 Mar 9, 2021
2ab79e0
Update lights_io.h
Tygrys-1 Mar 9, 2021
3be64a3
Update lights.c
Tygrys-1 Mar 9, 2021
3a40460
Update lights.h
Tygrys-1 Mar 9, 2021
a6cef5e
Update fc_core.c
Tygrys-1 Mar 9, 2021
d769ddb
Update fc_core.c
Tygrys-1 Mar 9, 2021
a4f84a5
Merge pull request #1 from Tygrys-1/Tygrys-1-patch-1
Tygrys-1 Mar 9, 2021
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 */