diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 66a09a32b..564ecf643 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -627,6 +627,7 @@ languagesetup.head Spracheinstellungen languagesetup.osd Menüsprache languagesetup.select Sprache lcdcontroler.brightness normale Helligkeit +lcdcontroler.brightnessdeepstandby DeepStandby Helligkeit lcdcontroler.brightnessstandby Standby Helligkeit lcdcontroler.contrast Kontrast lcdmenu.autodimm Automatisch dimmen diff --git a/data/locale/english.locale b/data/locale/english.locale index 563028b14..f69be3136 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -449,6 +449,7 @@ languagesetup.head International settings languagesetup.osd OSD Language languagesetup.select OSD Language lcdcontroler.brightness normal Brightness +lcdcontroler.brightnessdeepstandby DeepStandby Brightness lcdcontroler.brightnessstandby Standby Brightness lcdcontroler.contrast Contrast lcdmenu.autodimm Auto dimm diff --git a/src/driver/vfd.cpp b/src/driver/vfd.cpp index 9219959b8..8c256f304 100644 --- a/src/driver/vfd.cpp +++ b/src/driver/vfd.cpp @@ -161,7 +161,7 @@ void CVFD::setlcdparameter(void) { if(!has_lcd) return; last_toggle_state_power = g_settings.lcd_setting[SNeutrinoSettings::LCD_POWER]; - setlcdparameter((mode == MODE_STANDBY) ? g_settings.lcd_setting[SNeutrinoSettings::LCD_STANDBY_BRIGHTNESS] : g_settings.lcd_setting[SNeutrinoSettings::LCD_BRIGHTNESS], + setlcdparameter((mode == MODE_STANDBY) ? g_settings.lcd_setting[SNeutrinoSettings::LCD_STANDBY_BRIGHTNESS] : (mode == MODE_SHUTDOWN) ? g_settings.lcd_setting[SNeutrinoSettings::LCD_DEEPSTANDBY_BRIGHTNESS] : g_settings.lcd_setting[SNeutrinoSettings::LCD_BRIGHTNESS], last_toggle_state_power); } @@ -480,6 +480,22 @@ int CVFD::getBrightnessStandby() return g_settings.lcd_setting[SNeutrinoSettings::LCD_STANDBY_BRIGHTNESS]; } +void CVFD::setBrightnessDeepStandby(int bright) +{ + if(!has_lcd) return; + + g_settings.lcd_setting[SNeutrinoSettings::LCD_DEEPSTANDBY_BRIGHTNESS] = bright; + setlcdparameter(); +} + +int CVFD::getBrightnessDeepStandby() +{ + //FIXME for old neutrino.conf + if(g_settings.lcd_setting[SNeutrinoSettings::LCD_DEEPSTANDBY_BRIGHTNESS] > 15) + g_settings.lcd_setting[SNeutrinoSettings::LCD_DEEPSTANDBY_BRIGHTNESS] = 15; + return g_settings.lcd_setting[SNeutrinoSettings::LCD_DEEPSTANDBY_BRIGHTNESS]; +} + void CVFD::setPower(int /*power*/) { if(!has_lcd) return; @@ -498,7 +514,7 @@ void CVFD::togglePower(void) if(!has_lcd) return; last_toggle_state_power = 1 - last_toggle_state_power; - setlcdparameter((mode == MODE_STANDBY) ? g_settings.lcd_setting[SNeutrinoSettings::LCD_STANDBY_BRIGHTNESS] : g_settings.lcd_setting[SNeutrinoSettings::LCD_BRIGHTNESS], + setlcdparameter((mode == MODE_STANDBY) ? g_settings.lcd_setting[SNeutrinoSettings::LCD_STANDBY_BRIGHTNESS] : (mode == MODE_SHUTDOWN) ? g_settings.lcd_setting[SNeutrinoSettings::LCD_DEEPSTANDBY_BRIGHTNESS] : g_settings.lcd_setting[SNeutrinoSettings::LCD_BRIGHTNESS], last_toggle_state_power); } diff --git a/src/driver/vfd.h b/src/driver/vfd.h index 91de14913..37dfd8985 100644 --- a/src/driver/vfd.h +++ b/src/driver/vfd.h @@ -123,6 +123,8 @@ class CVFD void setBrightnessStandby(int); int getBrightnessStandby(); + void setBrightnessDeepStandby(int); + int getBrightnessDeepStandby(); void setPower(int); int getPower(); diff --git a/src/gui/widget/vfdcontroler.cpp b/src/gui/widget/vfdcontroler.cpp index 71cfd167b..01c2f9121 100644 --- a/src/gui/widget/vfdcontroler.cpp +++ b/src/gui/widget/vfdcontroler.cpp @@ -47,6 +47,7 @@ #include #include +#include #define BRIGHTNESSFACTOR 0.15 // 0 - 15 @@ -63,25 +64,29 @@ CVfdControler::CVfdControler(const neutrino_locale_t Name, CChangeObserver* Obse lwidth = g_Font[font_info]->getRenderWidth(g_Locale->getText (LOCALE_LCDCONTROLER_BRIGHTNESSSTANDBY)); int tmpwidth = g_Font[font_info]->getRenderWidth(g_Locale->getText (LOCALE_LCDCONTROLER_BRIGHTNESS)); - if (tmpwidth > lwidth) { - lwidth = tmpwidth; - } + lwidth = std::max(tmpwidth,lwidth); + tmpwidth = g_Font[font_info]->getRenderWidth(g_Locale->getText (LOCALE_LCDCONTROLER_BRIGHTNESSDEEPSTANDBY)); + lwidth = std::max(tmpwidth,lwidth); + neo_hw = (cs_get_revision() > 7) ? true:false; + // reuse tmpwidth as dummy tmpwidth = g_Font[font_info]->getRenderWidth("15"); width = w_max((15 + lwidth + 15 + 120 + 10 + tmpwidth + 10 + 15), 0); - height = h_max(hheight+ mheight* 3+ +mheight/2, 0); + height = h_max(hheight+ mheight* (3+neo_hw)+ +mheight/2, 0); x = frameBuffer->getScreenX() + ((frameBuffer->getScreenWidth()-width) >> 1); y = frameBuffer->getScreenY() + ((frameBuffer->getScreenHeight()-height)>>1); brightness = CVFD::getInstance()->getBrightness(); brightnessstandby = CVFD::getInstance()->getBrightnessStandby(); + brightnessdeepstandby = CVFD::getInstance()->getBrightnessDeepStandby(); } void CVfdControler::setVfd() { CVFD::getInstance()->setBrightness(brightness); CVFD::getInstance()->setBrightnessStandby(brightnessstandby); + CVFD::getInstance()->setBrightnessDeepStandby(brightnessdeepstandby); } int CVfdControler::exec(CMenuTarget* parent, const std::string &) @@ -90,7 +95,7 @@ int CVfdControler::exec(CMenuTarget* parent, const std::string &) neutrino_msg_data_t data; int selected, res = menu_return::RETURN_REPAINT; - unsigned int brightness_alt, brightnessstandby_alt; + unsigned int brightness_alt, brightnessstandby_alt,brightnessdeepstandby_alt; if (parent) { @@ -98,6 +103,8 @@ int CVfdControler::exec(CMenuTarget* parent, const std::string &) } brightness_alt = CVFD::getInstance()->getBrightness(); brightnessstandby_alt = CVFD::getInstance()->getBrightnessStandby(); + brightnessdeepstandby_alt = CVFD::getInstance()->getBrightnessDeepStandby(); + selected = 0; setVfd(); @@ -118,10 +125,12 @@ int CVfdControler::exec(CMenuTarget* parent, const std::string &) switch ( msg ) { case CRCInput::RC_down: - if(selected < 2) // max entries + if(selected < (2+neo_hw)) // max entries { paintSlider(x + 10, y + hheight , brightness , BRIGHTNESSFACTOR, LOCALE_LCDCONTROLER_BRIGHTNESS , false); paintSlider(x + 10, y + hheight + mheight, brightnessstandby, BRIGHTNESSFACTOR, LOCALE_LCDCONTROLER_BRIGHTNESSSTANDBY, false); + if(neo_hw) + paintSlider(x + 10, y + hheight + mheight*2, brightnessdeepstandby, BRIGHTNESSFACTOR, LOCALE_LCDCONTROLER_BRIGHTNESSDEEPSTANDBY, false); selected++; switch (selected) { case 0: @@ -132,8 +141,14 @@ int CVfdControler::exec(CMenuTarget* parent, const std::string &) CVFD::getInstance()->setMode(CVFD::MODE_STANDBY); break; case 2: - frameBuffer->paintBoxRel(x, y+hheight+mheight*2+mheight/2, width, mheight, COL_MENUCONTENTSELECTED_PLUS_0, RADIUS_LARGE); - g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10, y+hheight+mheight*3+mheight/2, width, g_Locale->getText(LOCALE_OPTIONS_DEFAULT), COL_MENUCONTENTSELECTED, 0, true); // UTF-8 + if(neo_hw){ + paintSlider(x+ 10, y+ hheight+ mheight*2, brightnessdeepstandby, BRIGHTNESSFACTOR, LOCALE_LCDCONTROLER_BRIGHTNESSDEEPSTANDBY, true); + CVFD::getInstance()->setMode(CVFD::MODE_SHUTDOWN); + break; + } + case 3: + frameBuffer->paintBoxRel(x, y+hheight+mheight*(2+neo_hw)+mheight/2, width, mheight, COL_MENUCONTENTSELECTED_PLUS_0, RADIUS_LARGE); + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10, y+hheight+mheight*(3+neo_hw)+mheight/2, width, g_Locale->getText(LOCALE_OPTIONS_DEFAULT), COL_MENUCONTENTSELECTED, 0, true); // UTF-8 break; } } @@ -143,6 +158,8 @@ int CVfdControler::exec(CMenuTarget* parent, const std::string &) if (selected > 0) { paintSlider(x + 10, y + hheight , brightness , BRIGHTNESSFACTOR, LOCALE_LCDCONTROLER_BRIGHTNESS , false); paintSlider(x + 10, y + hheight + mheight, brightnessstandby, BRIGHTNESSFACTOR, LOCALE_LCDCONTROLER_BRIGHTNESSSTANDBY, false); + if(neo_hw) + paintSlider(x + 10, y + hheight + mheight*2, brightnessdeepstandby, BRIGHTNESSFACTOR, LOCALE_LCDCONTROLER_BRIGHTNESSDEEPSTANDBY, false); selected--; switch (selected) { case 0: @@ -152,10 +169,20 @@ int CVfdControler::exec(CMenuTarget* parent, const std::string &) case 1: paintSlider(x+10, y+hheight+mheight, brightnessstandby, BRIGHTNESSFACTOR, LOCALE_LCDCONTROLER_BRIGHTNESSSTANDBY, true); CVFD::getInstance()->setMode(CVFD::MODE_STANDBY); - frameBuffer->paintBoxRel(x, y+hheight+mheight*2+mheight/2, width, mheight, COL_MENUCONTENT_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM); - g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10, y+hheight+mheight*3+mheight/2, width, g_Locale->getText(LOCALE_OPTIONS_DEFAULT), COL_MENUCONTENT, 0, true); // UTF-8 + if(!neo_hw){ + frameBuffer->paintBoxRel(x, y+hheight+mheight*2+mheight/2, width, mheight, COL_MENUCONTENT_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM); + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10, y+hheight+mheight*3+mheight/2, width, g_Locale->getText(LOCALE_OPTIONS_DEFAULT), COL_MENUCONTENT, 0, true); // UTF-8 + } break; case 2: + if(neo_hw){ + paintSlider(x+10, y+hheight+mheight*2, brightnessdeepstandby, BRIGHTNESSFACTOR, LOCALE_LCDCONTROLER_BRIGHTNESSDEEPSTANDBY, true); + CVFD::getInstance()->setMode(CVFD::MODE_SHUTDOWN); + frameBuffer->paintBoxRel(x, y+hheight+mheight*(2+neo_hw)+mheight/2, width, mheight, COL_MENUCONTENT_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM); + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10, y+hheight+mheight*(3+neo_hw)+mheight/2, width, g_Locale->getText(LOCALE_OPTIONS_DEFAULT), COL_MENUCONTENT, 0, true); // UTF-8 + } + break; + case 3: break; } } @@ -177,6 +204,13 @@ int CVfdControler::exec(CMenuTarget* parent, const std::string &) setVfd(); } break; + case 2: + if (neo_hw && brightnessdeepstandby < 15) { + brightnessdeepstandby ++; + paintSlider(x+10, y+hheight+mheight*2, brightnessdeepstandby, BRIGHTNESSFACTOR, LOCALE_LCDCONTROLER_BRIGHTNESSDEEPSTANDBY, true); + setVfd(); + } + break; } break; @@ -196,24 +230,33 @@ int CVfdControler::exec(CMenuTarget* parent, const std::string &) setVfd(); } break; + case 2: + if (neo_hw && brightnessdeepstandby > 0) { + brightnessdeepstandby--; + paintSlider(x+10, y+hheight+mheight*2, brightnessdeepstandby, BRIGHTNESSFACTOR, LOCALE_LCDCONTROLER_BRIGHTNESSDEEPSTANDBY, true); + setVfd(); + } + break; } break; case CRCInput::RC_home: - if ( ((brightness != brightness_alt) || (brightnessstandby != brightnessstandby_alt) ) && + if ( ((brightness != brightness_alt) || (brightnessstandby != brightnessstandby_alt) || (brightnessdeepstandby != brightnessdeepstandby_alt)) && (ShowLocalizedMessage(name, LOCALE_MESSAGEBOX_DISCARD, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbCancel) == CMessageBox::mbrCancel)) break; brightness = brightness_alt; brightnessstandby = brightnessstandby_alt; + brightnessdeepstandby = brightnessdeepstandby_alt; setVfd(); loop = false; break; case CRCInput::RC_ok: - if (selected==2) { + if (selected==(2+neo_hw)) { brightness = DEFAULT_VFD_BRIGHTNESS; brightnessstandby = DEFAULT_VFD_STANDBYBRIGHTNESS; + brightnessdeepstandby = DEFAULT_VFD_STANDBYBRIGHTNESS; selected = 0; setVfd(); paint(); @@ -260,9 +303,11 @@ void CVfdControler::paint() paintSlider(x+10, y+hheight, brightness, BRIGHTNESSFACTOR, LOCALE_LCDCONTROLER_BRIGHTNESS, true); paintSlider(x+10, y+hheight+mheight, brightnessstandby, BRIGHTNESSFACTOR, LOCALE_LCDCONTROLER_BRIGHTNESSSTANDBY, false); + if(neo_hw) + paintSlider(x+10, y+hheight+mheight*2, brightnessdeepstandby, BRIGHTNESSFACTOR, LOCALE_LCDCONTROLER_BRIGHTNESSDEEPSTANDBY, false); - frameBuffer->paintHLineRel(x+10, width-20, y+hheight+mheight*2+mheight/4, COL_MENUCONTENT_PLUS_3); - g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10, y+hheight+mheight*3+mheight/2, width, g_Locale->getText(LOCALE_OPTIONS_DEFAULT), COL_MENUCONTENT, 0, true); // UTF-8 + frameBuffer->paintHLineRel(x+10, width-20, y+hheight+mheight*(2+neo_hw)+mheight/4, COL_MENUCONTENT_PLUS_3); + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10, y+hheight+mheight*(3+neo_hw)+mheight/2, width, g_Locale->getText(LOCALE_OPTIONS_DEFAULT), COL_MENUCONTENT, 0, true); // UTF-8 } void CVfdControler::paintSlider(int px, int py, unsigned int spos, float factor, const neutrino_locale_t text, bool selected) @@ -275,7 +320,7 @@ void CVfdControler::paintSlider(int px, int py, unsigned int spos, float factor, frameBuffer->paintIcon(selected ? NEUTRINO_ICON_VOLUMESLIDER2BLUE : NEUTRINO_ICON_VOLUMESLIDER2, (int)(px + (startx+3)+(spos / factor)), py+mheight/4); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(px, py+mheight, width, g_Locale->getText(text), COL_MENUCONTENT, 0, true); // UTF-8 - sprintf(wert, "%3d", spos); // UTF-8 encoded + snprintf(wert, sizeof(wert), "%3d", spos); // UTF-8 encoded frameBuffer->paintBoxRel(px + startx + 120 + 10, py, 50, mheight, COL_MENUCONTENT_PLUS_0); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(px + startx + 120 + 10, py+mheight, width, wert, COL_MENUCONTENT, 0, true); // UTF-8 } diff --git a/src/gui/widget/vfdcontroler.h b/src/gui/widget/vfdcontroler.h index 9bb5e2e6d..af25dd249 100644 --- a/src/gui/widget/vfdcontroler.h +++ b/src/gui/widget/vfdcontroler.h @@ -54,6 +54,7 @@ class CVfdControler : public CMenuTarget unsigned char brightness; unsigned char brightnessstandby; + unsigned char brightnessdeepstandby; neutrino_locale_t name; @@ -62,7 +63,7 @@ class CVfdControler : public CMenuTarget void paint(); void setVfd(); void paintSlider(int x, int y, unsigned int spos, float factor, const neutrino_locale_t text, bool selected); - + bool neo_hw; public: CVfdControler(const neutrino_locale_t Name, CChangeObserver* Observer = NULL); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index b75002bed..33f3ea13f 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -77,7 +77,6 @@ #include "gui/widget/messagebox.h" #include "gui/widget/hintbox.h" #include "gui/widget/icons.h" -#include "gui/widget/lcdcontroler.h" #include "gui/widget/vfdcontroler.h" #include "gui/widget/progressbar.h" #include "gui/widget/rgbcsynccontroler.h" @@ -718,7 +717,8 @@ const lcd_setting_struct_t lcd_setting[LCD_SETTING_COUNT] = {"lcd_power" , DEFAULT_LCD_POWER }, {"lcd_inverse" , DEFAULT_LCD_INVERSE }, {"lcd_show_volume" , DEFAULT_LCD_SHOW_VOLUME }, - {"lcd_autodimm" , DEFAULT_LCD_AUTODIMM } + {"lcd_autodimm" , DEFAULT_LCD_AUTODIMM }, + {"lcd_deepbrightness" , DEFAULT_VFD_STANDBYBRIGHTNESS } }; /************************************************************************************** @@ -3730,7 +3730,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode) fp_timer = (timer_minutes - mtime)/60; printf("now: %ld, timer %ld, FP timer %ld\n", mtime/60, timer_minutes/60, fp_timer);fflush(stdout); - standby.brightness = g_settings.lcd_setting[SNeutrinoSettings::LCD_STANDBY_BRIGHTNESS]; + standby.brightness = g_settings.lcd_setting[SNeutrinoSettings::LCD_DEEPSTANDBY_BRIGHTNESS]; standby.flags = 0x40; standby.current_hour = tmtime->tm_hour; standby.current_minute = tmtime->tm_min; diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index f3e89f703..77f8dfe5e 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -75,7 +75,6 @@ #include "gui/widget/messagebox.h" #include "gui/widget/hintbox.h" #include "gui/widget/icons.h" -#include "gui/widget/lcdcontroler.h" #include "gui/widget/vfdcontroler.h" #include "gui/widget/rgbcsynccontroler.h" #include "gui/widget/keychooser.h" @@ -1700,7 +1699,7 @@ void CNeutrinoApp::InitMiscSettings(CMenuWidget &miscSettings) miscSettingsChannellist->addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_EXTENDED, &g_settings.channellist_extended, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); miscSettingsChannellist->addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_HDLIST, &g_settings.make_hd_list, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); miscSettingsChannellist->addItem(new CMenuOptionChooser(LOCALE_EXTRA_ZAP_CYCLE, &g_settings.zap_cycle, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); - miscSettings.addItem( new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, miscSettingsChannellist, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW) ); + miscSettings.addItem( new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, miscSettingsChannellist, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN) ); //EPGSettings CMenuWidget *miscSettingsEPGSettings = new CMenuWidget(LOCALE_MISCSETTINGS_EPG_HEAD, NEUTRINO_ICON_SETTINGS); @@ -1716,7 +1715,7 @@ void CNeutrinoApp::InitMiscSettings(CMenuWidget &miscSettings) CStringInput * miscSettings_epg_max_events = new CStringInput(LOCALE_MISCSETTINGS_EPG_MAX_EVENTS, &g_settings.epg_max_events, 5,LOCALE_MISCSETTINGS_EPG_MAX_EVENTS_HINT1, LOCALE_MISCSETTINGS_EPG_MAX_EVENTS_HINT2 , "0123456789 ", sectionsdConfigNotifier); miscSettingsEPGSettings->addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_MAX_EVENTS, true, g_settings.epg_max_events, miscSettings_epg_max_events)); miscSettingsEPGSettings->addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_DIR, true, g_settings.epg_dir, this, "epgdir")); - miscSettings.addItem( new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_HEAD, true, NULL, miscSettingsEPGSettings, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN) ); + miscSettings.addItem( new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_HEAD, true, NULL, miscSettingsEPGSettings, NULL, CRCInput::RC_yellow,NEUTRINO_ICON_BUTTON_YELLOW ) ); //end of EPGSettings #if 0 @@ -2659,7 +2658,7 @@ void CNeutrinoApp::InitLcdSettings(CMenuWidget &lcdSettings) lcdSettings.addItem(new CMenuForwarder(LOCALE_LCDMENU_DIM_BRIGHTNESS,true, g_settings.lcd_setting_dim_brightness,dim_brightness)); lcdSettings.addItem(GenericMenuSeparatorLine); - lcdSettings.addItem(new CMenuForwarder(LOCALE_LCDMENU_LCDCONTROLER, true, NULL, lcdsliders)); + lcdSettings.addItem(new CMenuForwarder(LOCALE_LCDMENU_LCDCONTROLER, true, NULL, lcdsliders, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); lcdSettings.addItem(GenericMenuSeparatorLine); CMenuOptionChooser* oj = new CMenuOptionChooser(LOCALE_LCDMENU_STATUSLINE, &g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME], LCDMENU_STATUSLINE_OPTIONS, LCDMENU_STATUSLINE_OPTION_COUNT, true); diff --git a/src/system/locals.h b/src/system/locals.h index e7b2b0b39..864f3f236 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -479,6 +479,7 @@ typedef enum { LOCALE_LANGUAGESETUP_OSD, LOCALE_LANGUAGESETUP_SELECT, LOCALE_LCDCONTROLER_BRIGHTNESS, + LOCALE_LCDCONTROLER_BRIGHTNESSDEEPSTANDBY, LOCALE_LCDCONTROLER_BRIGHTNESSSTANDBY, LOCALE_LCDCONTROLER_CONTRAST, LOCALE_LCDMENU_AUTODIMM, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index a85711ee9..95dcb7d97 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -479,6 +479,7 @@ const char *locale_real_names[] = { "languagesetup.osd", "languagesetup.select", "lcdcontroler.brightness", + "lcdcontroler.brightnessdeepstandby", "lcdcontroler.brightnessstandby", "lcdcontroler.contrast", "lcdmenu.autodimm", diff --git a/src/system/settings.h b/src/system/settings.h index bd964640f..2d21f4fd2 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -378,7 +378,7 @@ struct SNeutrinoSettings }; // lcdd -#define LCD_SETTING_COUNT 7 +#define LCD_SETTING_COUNT 8 enum LCD_SETTINGS { LCD_BRIGHTNESS = 0, LCD_STANDBY_BRIGHTNESS = 1, @@ -386,7 +386,8 @@ struct SNeutrinoSettings LCD_POWER = 3, LCD_INVERSE = 4, LCD_SHOW_VOLUME = 5, - LCD_AUTODIMM = 6 + LCD_AUTODIMM = 6, + LCD_DEEPSTANDBY_BRIGHTNESS = 7 }; int lcd_setting[LCD_SETTING_COUNT];