diff --git a/data/locale/english.locale b/data/locale/english.locale index db0d8c605..713bdd597 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -463,12 +463,13 @@ lcdmenu.statusline.playtime playtime lcdmenu.statusline.volume volume ledcontroler.menu Power Button LEDīs ledcontroler.mode.tv TV Mode -ledcontroler.mode.deepstandby DeepStandby +ledcontroler.mode.deepstandby Deep Standby ledcontroler.mode.standby Standby ledcontroler.off Led1 & Led2 off ledcontroler.on.all Led1 & Led2 on ledcontroler.on.led1 Led1 on ledcontroler.on.led2 Led2 on +ledcontroler.blink Blink in deep standby, if timer set mainmenu.audioplayer Audioplayer mainmenu.games Games mainmenu.head Main Menu diff --git a/src/neutrino.cpp b/src/neutrino.cpp index f66da4a8d..d3322d866 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -812,6 +812,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.led_tv_mode = configfile.getInt32( "led_tv_mode", 1); g_settings.led_standby_mode = configfile.getInt32( "led_standby_mode", 1); g_settings.led_deep_mode = configfile.getInt32( "led_deep_mode", 1); + g_settings.led_blink = configfile.getInt32( "led_blink", 1); g_settings.hdd_fs = configfile.getInt32( "hdd_fs", 0); g_settings.hdd_sleep = configfile.getInt32( "hdd_sleep", 120); @@ -1346,6 +1347,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32( "led_tv_mode", g_settings.led_tv_mode); configfile.setInt32( "led_standby_mode", g_settings.led_standby_mode); configfile.setInt32( "led_deep_mode", g_settings.led_deep_mode); + configfile.setInt32( "led_blink", g_settings.led_blink); //misc configfile.setInt32( "power_standby", g_settings.power_standby); @@ -3769,6 +3771,8 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode) default: break; } + if(leds && g_settings.led_blink && fp_timer) + leds |= 0x80; standby.brightness = g_settings.lcd_setting[SNeutrinoSettings::LCD_DEEPSTANDBY_BRIGHTNESS]; standby.flags = leds; diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index a4951a151..dc7e250ab 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -2715,8 +2715,10 @@ void CNeutrinoApp::InitLcdSettings(CMenuWidget &lcdSettings) addMenueIntroItems(*ledMenu); ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_MODE_TV, &g_settings.led_tv_mode, LEDMENU_OPTIONS, LEDMENU_OPTION_COUNT, true, new CLedControlNotifier())); ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_MODE_STANDBY, &g_settings.led_standby_mode, LEDMENU_OPTIONS, LEDMENU_OPTION_COUNT, true)); - if(cs_get_revision() > 7) + if(cs_get_revision() > 7) { ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_MODE_DEEPSTANDBY, &g_settings.led_deep_mode, LEDMENU_OPTIONS, LEDMENU_OPTION_COUNT, true)); + ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_BLINK, &g_settings.led_blink, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + } lcdSettings.addItem(new CMenuForwarder(LOCALE_LEDCONTROLER_MENU, true, NULL, ledMenu, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); lcdSettings.addItem(GenericMenuSeparatorLine); diff --git a/src/system/locals.h b/src/system/locals.h index 590d1ddb3..40613a7c5 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -501,6 +501,7 @@ typedef enum { LOCALE_LEDCONTROLER_ON_ALL, LOCALE_LEDCONTROLER_ON_LED1, LOCALE_LEDCONTROLER_ON_LED2, + LOCALE_LEDCONTROLER_BLINK, LOCALE_MAINMENU_AUDIOPLAYER, LOCALE_MAINMENU_CLEARSECTIONSD, LOCALE_MAINMENU_GAMES, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 3084e4cbc..8c38f191c 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -501,6 +501,7 @@ const char *locale_real_names[] = { "ledcontroler.on.all", "ledcontroler.on.led1", "ledcontroler.on.led2", + "ledcontroler.blink", "mainmenu.audioplayer", "mainmenu.clearsectionsd", "mainmenu.games", diff --git a/src/system/settings.h b/src/system/settings.h index 09a0b040d..94cce9f67 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -397,6 +397,7 @@ struct SNeutrinoSettings int led_tv_mode; int led_standby_mode; int led_deep_mode; + int led_blink; #define FILESYSTEM_ENCODING_TO_UTF8(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::Latin1_to_UTF8(a).c_str()) #define UTF8_TO_FILESYSTEM_ENCODING(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::UTF8_to_Latin1(a).c_str()) #define FILESYSTEM_ENCODING_TO_UTF8_STRING(a) (g_settings.filesystem_is_utf8 ? (a) : Latin1_to_UTF8(a))