glcdsetup: rename and auto-count clock options struct

Origin commit data
------------------
Commit: dea8208e32
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-06-15 (Mon, 15 Jun 2020)

Origin message was:
------------------
- glcdsetup: rename and auto-count clock options struct
This commit is contained in:
vanhofen
2020-06-15 12:03:20 +02:00
parent a550b7d210
commit a7739cbd67

View File

@@ -219,13 +219,13 @@ bool GLCD_Menu::changeNotify (const neutrino_locale_t OptionName, void *Data)
return true; return true;
} }
#define ONOFFSEC_OPTION_COUNT 3 static const CMenuOptionChooser::keyval GLCD_CLOCK_OPTIONS[] = {
static const CMenuOptionChooser::keyval ONOFFSEC_OPTIONS[ONOFFSEC_OPTION_COUNT] = {
{ nGLCD::CLOCK_OFF, LOCALE_OPTIONS_OFF }, { nGLCD::CLOCK_OFF, LOCALE_OPTIONS_OFF },
{ nGLCD::CLOCK_DIGITAL_HM, LOCALE_GLCD_CLOCK_DIGITAL_HM }, { nGLCD::CLOCK_DIGITAL_HM, LOCALE_GLCD_CLOCK_DIGITAL_HM },
// { nGLCD::CLOCK_DIGITAL_HMS, LOCALE_GLCD_CLOCK_DIGITAL_HMS }, // { nGLCD::CLOCK_DIGITAL_HMS, LOCALE_GLCD_CLOCK_DIGITAL_HMS },
{ nGLCD::CLOCK_ANALOG, LOCALE_GLCD_CLOCK_ANALOG } { nGLCD::CLOCK_ANALOG, LOCALE_GLCD_CLOCK_ANALOG }
}; };
#define GLCD_CLOCK_OPTIONS_COUNT (sizeof(GLCD_CLOCK_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
void GLCD_Menu::GLCD_Menu_Settings() void GLCD_Menu::GLCD_Menu_Settings()
{ {
@@ -272,7 +272,7 @@ void GLCD_Menu::GLCD_Menu_Settings()
&g_settings.glcd_brightness, true, 0, 100, this)); &g_settings.glcd_brightness, true, 0, 100, this));
m.addItem(GenericMenuSeparatorLine); m.addItem(GenericMenuSeparatorLine);
m.addItem(new CMenuOptionChooser(LOCALE_GLCD_TIME_IN_STANDBY, &g_settings.glcd_time_in_standby, m.addItem(new CMenuOptionChooser(LOCALE_GLCD_TIME_IN_STANDBY, &g_settings.glcd_time_in_standby,
ONOFFSEC_OPTIONS, ONOFFSEC_OPTION_COUNT, true, this, GLCD_CLOCK_OPTIONS, GLCD_CLOCK_OPTIONS_COUNT, true, this,
CRCInput::convertDigitToKey(shortcut++))); CRCInput::convertDigitToKey(shortcut++)));
m.addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_TIME_STANDBY, m.addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_TIME_STANDBY,
&g_settings.glcd_percent_time_standby, true, 0, 100, this)); &g_settings.glcd_percent_time_standby, true, 0, 100, this));