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

Add missing OSD alarm settings from CLI #3182

Merged

Conversation

Projects
None yet
2 participants
@shellixyz
Copy link
Collaborator

commented May 7, 2018

No description provided.

@shellixyz shellixyz force-pushed the shellixyz:add_missing_osd_alarm_settings branch from 72b26af to 498aee9 May 7, 2018

@@ -158,7 +158,7 @@ static displayPort_t *osdDisplayPort;
#define AH_SIDEBAR_WIDTH_POS 7
#define AH_SIDEBAR_HEIGHT_POS 3

PG_REGISTER_WITH_RESET_FN(osdConfig_t, osdConfig, PG_OSD_CONFIG, 1);
PG_REGISTER_WITH_RESET_FN(osdConfig_t, osdConfig, PG_OSD_CONFIG, 2);

This comment has been minimized.

Copy link
@fiam

fiam May 7, 2018

Member

No need to increase the version here, since you didn't touch osdConfig_t, just exposed its already existing fields. Doesn't matter because this is going to be split into 2 groups (elements and settings) before 2.0 and we'll need to increase the version anyway, so no harm in increasing it in this PR.

This comment has been minimized.

Copy link
@shellixyz

shellixyz May 7, 2018

Author Collaborator

Oops it was not for this branch

@fiam

This comment has been minimized.

Copy link
Member

commented May 7, 2018

Good catch! We should add them in CMS too after this is merged.

@fiam fiam merged commit c20466a into iNavFlight:development May 14, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@fiam fiam added this to the 2.0 milestone Jun 8, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.