Merge pull request #9518 from Asizon/cmsImprovements

REBOOT_REQUIRED flag to cms power options, unified confirm page options
This commit is contained in:
Michael Keller 2020-03-01 22:17:40 +13:00 committed by GitHub
commit 86b81baa18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View File

@ -100,8 +100,8 @@ static const OSD_Entry cmsx_menuPowerEntries[] =
{
{ "-- POWER --", OME_Label, NULL, NULL, 0},
{ "V METER", OME_TAB, NULL, &(OSD_TAB_t){ &batteryConfig_voltageMeterSource, VOLTAGE_METER_COUNT - 1, voltageMeterSourceNames }, 0 },
{ "I METER", OME_TAB, NULL, &(OSD_TAB_t){ &batteryConfig_currentMeterSource, CURRENT_METER_COUNT - 1, currentMeterSourceNames }, 0 },
{ "V METER", OME_TAB, NULL, &(OSD_TAB_t){ &batteryConfig_voltageMeterSource, VOLTAGE_METER_COUNT - 1, voltageMeterSourceNames }, REBOOT_REQUIRED },
{ "I METER", OME_TAB, NULL, &(OSD_TAB_t){ &batteryConfig_currentMeterSource, CURRENT_METER_COUNT - 1, currentMeterSourceNames }, REBOOT_REQUIRED },
{ "VBAT CLMAX", OME_UINT16, NULL, &(OSD_UINT16_t) { &batteryConfig_vbatmaxcellvoltage, VBAT_CELL_VOTAGE_RANGE_MIN, VBAT_CELL_VOTAGE_RANGE_MAX, 1 }, 0 },

View File

@ -680,7 +680,7 @@ static const OSD_Entry saCmsMenuCommenceEntries[] = {
{ "YES", OME_Funcall, saCmsCommence, NULL, 0 },
{ "BACK", OME_Back, NULL, NULL, 0 },
{ "NO", OME_Back, NULL, NULL, 0 },
{ NULL, OME_END, NULL, NULL, 0 }
};

View File

@ -232,7 +232,7 @@ static const void *trampCmsOnEnter(void)
static const OSD_Entry trampCmsMenuCommenceEntries[] = {
{ "CONFIRM", OME_Label, NULL, NULL, 0 },
{ "YES", OME_Funcall, trampCmsCommence, NULL, 0 },
{ "BACK", OME_Back, NULL, NULL, 0 },
{ "NO", OME_Back, NULL, NULL, 0 },
{ NULL, OME_END, NULL, NULL, 0 }
};