rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7553 from etracer65/osd_profile_switch_msp_cms 

Add OSD profile switching to MSP and CMS
This commit is contained in:
Michael Keller 2019-02-10 12:55:55 +13:00 committed by GitHub
parent 640b6803c4 1d6f86d234
commit d63878aebc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/cms/cms_menu_osd.c
View File

@ -250,8 +250,16 @@ static uint8_t displayPortProfileMax7456_blackBrightness;
static uint8_t displayPortProfileMax7456_whiteBrightness;
#endif
#ifdef USE_OSD_PROFILES
static uint8_t osdConfig_osdProfileIndex;
#endif
static long cmsx_menuOsdOnEnter(void)
{
#ifdef USE_OSD_PROFILES
osdConfig_osdProfileIndex = osdConfig()->osdProfileIndex;
#endif
#ifdef USE_MAX7456
displayPortProfileMax7456_invert = displayPortProfileMax7456()->invert;
displayPortProfileMax7456_blackBrightness = displayPortProfileMax7456()->blackBrightness;
@ -265,6 +273,11 @@ static long cmsx_menuOsdOnExit(const OSD_Entry *self)
{
UNUSED(self);
#ifdef USE_OSD_PROFILES
osdConfigMutable()->osdProfileIndex = osdConfig_osdProfileIndex;
setOsdProfile(osdConfig()->osdProfileIndex);
#endif
#ifdef USE_MAX7456
displayPortProfileMax7456Mutable()->invert = displayPortProfileMax7456_invert;
displayPortProfileMax7456Mutable()->blackBrightness = displayPortProfileMax7456_blackBrightness;
@ -277,6 +290,9 @@ static long cmsx_menuOsdOnExit(const OSD_Entry *self)
OSD_Entry cmsx_menuOsdEntries[] =
{
{"---OSD---", OME_Label, NULL, NULL, 0},
#ifdef USE_OSD_PROFILES
{"OSD PROFILE", OME_UINT8, NULL, &(OSD_UINT8_t){&osdConfig_osdProfileIndex, 1, 3, 1}, 0},
#endif
#ifdef USE_EXTENDED_CMS_MENUS
{"ACTIVE ELEM", OME_Submenu, cmsMenuChange, &menuOsdActiveElems, 0},
{"TIMERS", OME_Submenu, cmsMenuChange, &menuTimers, 0},

1
src/main/msp/msp.c
View File

@ -2672,6 +2672,7 @@ static mspResult_e mspCommonProcessInCommand(uint8_t cmdMSP, sbuf_t *src, mspPos
// selected OSD profile
#ifdef USE_OSD_PROFILES
osdConfigMutable()->osdProfileIndex = sbufReadU8(src);
setOsdProfile(osdConfig()->osdProfileIndex);
#else
sbufReadU8(src);
#endif // USE_OSD_PROFILES