mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

deep standby led blink, if timer set

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@742 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 512593b3c9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-09-02 (Thu, 02 Sep 2010)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2010-09-02 17:03:05 +00:00
parent f45f49a142
commit ba3d0665a6
6 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/locale/english.locale
View File

@@ -463,12 +463,13 @@ lcdmenu.statusline.playtime playtime
lcdmenu.statusline.volume volume
ledcontroler.menu Power Button LED<45>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

4
src/neutrino.cpp
View File

@@ -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;

4
src/neutrino_menue.cpp
View File

@@ -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);

1
src/system/locals.h
View File

@@ -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,

1
src/system/locals_intern.h
View File

@@ -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",

1
src/system/settings.h
View File

@@ -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))