mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 00:11:14 +02:00
- use g_info.hw_caps->has_fan; remove old g_info.has_fan
This commit is contained in:
@@ -326,7 +326,7 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general)
|
|||||||
ms_general->addItem(mc);
|
ms_general->addItem(mc);
|
||||||
|
|
||||||
//fan speed
|
//fan speed
|
||||||
if (g_info.has_fan)
|
if (g_info.hw_caps->has_fan)
|
||||||
{
|
{
|
||||||
CMenuOptionNumberChooser * mn = new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 1, 14, fanNotifier, CRCInput::RC_nokey, NULL, 0, 0, LOCALE_OPTIONS_OFF);
|
CMenuOptionNumberChooser * mn = new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 1, 14, fanNotifier, CRCInput::RC_nokey, NULL, 0, 0, LOCALE_OPTIONS_OFF);
|
||||||
mn->setHint("", LOCALE_MENU_HINT_FAN_SPEED);
|
mn->setHint("", LOCALE_MENU_HINT_FAN_SPEED);
|
||||||
|
@@ -2153,13 +2153,9 @@ TIMER_START();
|
|||||||
|
|
||||||
cpuFreq = new cCpuFreqManager();
|
cpuFreq = new cCpuFreqManager();
|
||||||
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
|
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
|
||||||
#if HAVE_COOL_HARDWARE
|
|
||||||
/* only SAT-hd1 before rev 8 has fan */
|
|
||||||
g_info.has_fan = (cs_get_revision() < 8 && CFEManager::getInstance()->getFE(0)->hasSat());
|
|
||||||
#endif
|
|
||||||
dprintf(DEBUG_NORMAL, "g_info.has_fan: %d\n", g_info.has_fan);
|
|
||||||
//fan speed
|
//fan speed
|
||||||
if (g_info.has_fan)
|
if (g_info.hw_caps->has_fan)
|
||||||
CFanControlNotifier::setSpeed(g_settings.fan_speed);
|
CFanControlNotifier::setSpeed(g_settings.fan_speed);
|
||||||
|
|
||||||
dvbsub_init();
|
dvbsub_init();
|
||||||
@@ -3661,7 +3657,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
|
|||||||
delete g_RCInput;
|
delete g_RCInput;
|
||||||
my_system("/etc/init.d/rcK");
|
my_system("/etc/init.d/rcK");
|
||||||
//fan speed
|
//fan speed
|
||||||
if (g_info.has_fan) {
|
if (g_info.hw_caps->has_fan) {
|
||||||
CFanControlNotifier::setSpeed(0);
|
CFanControlNotifier::setSpeed(0);
|
||||||
}
|
}
|
||||||
//CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_MAINMENU_REBOOT));
|
//CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_MAINMENU_REBOOT));
|
||||||
@@ -3869,7 +3865,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
|
|||||||
cpuFreq->SetCpuFreq(g_settings.standby_cpufreq * 1000 * 1000);
|
cpuFreq->SetCpuFreq(g_settings.standby_cpufreq * 1000 * 1000);
|
||||||
|
|
||||||
//fan speed
|
//fan speed
|
||||||
if (g_info.has_fan)
|
if (g_info.hw_caps->has_fan)
|
||||||
CFanControlNotifier::setSpeed(1);
|
CFanControlNotifier::setSpeed(1);
|
||||||
|
|
||||||
frameBuffer->setActive(false);
|
frameBuffer->setActive(false);
|
||||||
@@ -3898,7 +3894,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
|
|||||||
}
|
}
|
||||||
frameBuffer->setActive(true);
|
frameBuffer->setActive(true);
|
||||||
//fan speed
|
//fan speed
|
||||||
if (g_info.has_fan)
|
if (g_info.hw_caps->has_fan)
|
||||||
CFanControlNotifier::setSpeed(g_settings.fan_speed);
|
CFanControlNotifier::setSpeed(g_settings.fan_speed);
|
||||||
|
|
||||||
puts("[neutrino.cpp] executing " NEUTRINO_LEAVE_STANDBY_SCRIPT ".");
|
puts("[neutrino.cpp] executing " NEUTRINO_LEAVE_STANDBY_SCRIPT ".");
|
||||||
|
@@ -927,7 +927,6 @@ struct SglobalInfo
|
|||||||
{
|
{
|
||||||
unsigned char box_Type;
|
unsigned char box_Type;
|
||||||
delivery_system_t delivery_system;
|
delivery_system_t delivery_system;
|
||||||
bool has_fan;
|
|
||||||
hw_caps_t *hw_caps;
|
hw_caps_t *hw_caps;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user