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

Refine extended CMS menu toggles (#3601)

This commit is contained in:
Dan Nixon 2018-03-21 11:07:53 +00:00 committed by Michael Keller
parent 5558174d33
commit bc283cf5b9
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/cms/cms_menu_imu.c
View File

@ -415,7 +415,7 @@ static CMS_Menu cmsx_menuFilterPerProfile = {
.entries = cmsx_menuFilterPerProfileEntries, .entries = cmsx_menuFilterPerProfileEntries,
}; };
#ifdef USE_COPY_PROFILE_CMS_MENU #ifdef USE_EXTENDED_CMS_MENUS
static uint8_t cmsx_dstPidProfile; static uint8_t cmsx_dstPidProfile;
static uint8_t cmsx_dstControlRateProfile; static uint8_t cmsx_dstControlRateProfile;
@ -500,9 +500,9 @@ static OSD_Entry cmsx_menuImuEntries[] =
{"RATE", OME_Submenu, cmsMenuChange, &cmsx_menuRateProfile, 0}, {"RATE", OME_Submenu, cmsMenuChange, &cmsx_menuRateProfile, 0},
{"FILT GLB", OME_Submenu, cmsMenuChange, &cmsx_menuFilterGlobal, 0}, {"FILT GLB", OME_Submenu, cmsMenuChange, &cmsx_menuFilterGlobal, 0},
#ifdef USE_COPY_PROFILE_CMS_MENU #ifdef USE_EXTENDED_CMS_MENUS
{"COPY PROF", OME_Submenu, cmsMenuChange, &cmsx_menuCopyProfile, 0}, {"COPY PROF", OME_Submenu, cmsMenuChange, &cmsx_menuCopyProfile, 0},
#endif #endif /* USE_EXTENDED_CMS_MENUS */
{"BACK", OME_Back, NULL, NULL, 0}, {"BACK", OME_Back, NULL, NULL, 0},
{NULL, OME_END, NULL, NULL, 0} {NULL, OME_END, NULL, NULL, 0}

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

@ -39,7 +39,7 @@
#include "io/displayport_max7456.h" #include "io/displayport_max7456.h"
#include "io/osd.h" #include "io/osd.h"
#ifndef DISABLE_EXTENDED_CMS_OSD_MENU #ifdef USE_EXTENDED_CMS_MENUS
static uint16_t osdConfig_item_pos[OSD_ITEM_COUNT]; static uint16_t osdConfig_item_pos[OSD_ITEM_COUNT];
static long menuOsdActiveElemsOnEnter(void) static long menuOsdActiveElemsOnEnter(void)
@ -208,7 +208,7 @@ CMS_Menu menuTimers = {
.onExit = menuTimersOnExit, .onExit = menuTimersOnExit,
.entries = menuTimersEntries, .entries = menuTimersEntries,
}; };
#endif /* DISABLE_EXTENDED_CMS_OSD_MENU */ #endif /* USE_EXTENDED_CMS_MENUS */
#ifdef USE_MAX7456 #ifdef USE_MAX7456
static bool displayPortProfileMax7456_invert; static bool displayPortProfileMax7456_invert;
@ -243,7 +243,7 @@ static long cmsx_menuOsdOnExit(const OSD_Entry *self)
OSD_Entry cmsx_menuOsdEntries[] = OSD_Entry cmsx_menuOsdEntries[] =
{ {
{"---OSD---", OME_Label, NULL, NULL, 0}, {"---OSD---", OME_Label, NULL, NULL, 0},
#ifndef DISABLE_EXTENDED_CMS_OSD_MENU #ifdef USE_EXTENDED_CMS_MENUS
{"ACTIVE ELEM", OME_Submenu, cmsMenuChange, &menuOsdActiveElems, 0}, {"ACTIVE ELEM", OME_Submenu, cmsMenuChange, &menuOsdActiveElems, 0},
{"TIMERS", OME_Submenu, cmsMenuChange, &menuTimers, 0}, {"TIMERS", OME_Submenu, cmsMenuChange, &menuTimers, 0},
{"ALARMS", OME_Submenu, cmsMenuChange, &menuAlarms, 0}, {"ALARMS", OME_Submenu, cmsMenuChange, &menuAlarms, 0},

6
src/main/cms/cms_menu_vtx_smartaudio.c
View File

@ -325,6 +325,7 @@ static long saCmsConfigOpmodelByGvar(displayPort_t *pDisp, const void *self)
return 0; return 0;
} }
#ifdef USE_EXTENDED_CMS_MENUS
static const char * const saCmsDeviceStatusNames[] = { static const char * const saCmsDeviceStatusNames[] = {
"OFFL", "OFFL",
"ONL V1", "ONL V1",
@ -356,6 +357,7 @@ static CMS_Menu saCmsMenuStats = {
.onExit = NULL, .onExit = NULL,
.entries = saCmsMenuStatsEntries .entries = saCmsMenuStatsEntries
}; };
#endif /* USE_EXTENDED_CMS_MENUS */
static OSD_TAB_t saCmsEntBand = { &saCmsBand, VTX_SMARTAUDIO_BAND_COUNT, vtx58BandNames }; static OSD_TAB_t saCmsEntBand = { &saCmsBand, VTX_SMARTAUDIO_BAND_COUNT, vtx58BandNames };
@ -567,7 +569,9 @@ static OSD_Entry saCmsMenuConfigEntries[] = {
{ "FSEL MODE", OME_TAB, saCmsConfigFreqModeByGvar, &saCmsEntFselMode, DYNAMIC }, { "FSEL MODE", OME_TAB, saCmsConfigFreqModeByGvar, &saCmsEntFselMode, DYNAMIC },
{ "PIT FMODE", OME_TAB, saCmsConfigPitFModeByGvar, &saCmsEntPitFMode, 0 }, { "PIT FMODE", OME_TAB, saCmsConfigPitFModeByGvar, &saCmsEntPitFMode, 0 },
{ "POR FREQ", OME_Submenu, (CMSEntryFuncPtr)saCmsORFreqGetString, &saCmsMenuPORFreq, OPTSTRING }, { "POR FREQ", OME_Submenu, (CMSEntryFuncPtr)saCmsORFreqGetString, &saCmsMenuPORFreq, OPTSTRING },
#ifdef USE_EXTENDED_CMS_MENUS
{ "STATX", OME_Submenu, cmsMenuChange, &saCmsMenuStats, 0 }, { "STATX", OME_Submenu, cmsMenuChange, &saCmsMenuStats, 0 },
#endif /* USE_EXTENDED_CMS_MENUS */
{ "BACK", OME_Back, NULL, NULL, 0 }, { "BACK", OME_Back, NULL, NULL, 0 },
{ NULL, OME_END, NULL, NULL, 0 } { NULL, OME_END, NULL, NULL, 0 }
@ -636,7 +640,9 @@ static OSD_Entry saCmsMenuOfflineEntries[] =
{ "- VTX SMARTAUDIO -", OME_Label, NULL, NULL, 0 }, { "- VTX SMARTAUDIO -", OME_Label, NULL, NULL, 0 },
{ "", OME_Label, NULL, saCmsStatusString, DYNAMIC }, { "", OME_Label, NULL, saCmsStatusString, DYNAMIC },
#ifdef USE_EXTENDED_CMS_MENUS
{ "STATX", OME_Submenu, cmsMenuChange, &saCmsMenuStats, 0 }, { "STATX", OME_Submenu, cmsMenuChange, &saCmsMenuStats, 0 },
#endif /* USE_EXTENDED_CMS_MENUS */
{ "BACK", OME_Back, NULL, NULL, 0 }, { "BACK", OME_Back, NULL, NULL, 0 },
{ NULL, OME_END, NULL, NULL, 0 } { NULL, OME_END, NULL, NULL, 0 }

2
src/main/target/SPRACINGF3EVO/target.h
View File

@ -165,7 +165,7 @@
#define CURRENT_METER_ADC_PIN PA5 #define CURRENT_METER_ADC_PIN PA5
#endif #endif
#define DISABLE_EXTENDED_CMS_OSD_MENU #undef USE_EXTENDED_CMS_MENUS
#define USE_OSD_OVER_MSP_DISPLAYPORT #define USE_OSD_OVER_MSP_DISPLAYPORT
#define USE_MSP_CURRENT_METER #define USE_MSP_CURRENT_METER

1
src/main/target/common_fc_pre.h
View File

@ -137,6 +137,7 @@
#define USE_CAMERA_CONTROL #define USE_CAMERA_CONTROL
#define USE_CMS #define USE_CMS
#define USE_COPY_PROFILE_CMS_MENU #define USE_COPY_PROFILE_CMS_MENU
#define USE_EXTENDED_CMS_MENUS
#define USE_DSHOT_DMAR #define USE_DSHOT_DMAR
#define USE_GYRO_OVERFLOW_CHECK #define USE_GYRO_OVERFLOW_CHECK
#define USE_HUFFMAN #define USE_HUFFMAN