From 1d6f86d2347a34d461d6a463222a3626e6c58397 Mon Sep 17 00:00:00 2001
From: Bruce Luckcuck <github@etracer.net>
Date: Fri, 8 Feb 2019 13:26:48 -0500
Subject: [PATCH] Add OSD profile switching to MSP and CMS Update the active
 OSD profile based on the MSP message. Makes the OSD show the selected profile
 immediately when the drop-down is changed in the Configurator. All other
 elements have "live" updates so this should a well.

Add CMS menu to select the OSD profile.
---
 src/main/cms/cms_menu_osd.c | 16 ++++++++++++++++
 src/main/msp/msp.c          |  1 +
 2 files changed, 17 insertions(+)

diff --git a/src/main/cms/cms_menu_osd.c b/src/main/cms/cms_menu_osd.c
index 930f10bbf..70a015a5b 100644
--- a/src/main/cms/cms_menu_osd.c
+++ b/src/main/cms/cms_menu_osd.c
@@ -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},
diff --git a/src/main/msp/msp.c b/src/main/msp/msp.c
index cecff7ada..daab75ec4 100644
--- a/src/main/msp/msp.c
+++ b/src/main/msp/msp.c
@@ -2655,6 +2655,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