Author: titmuss
Date: Fri Apr 4 06:57:14 2008
New Revision: 2170
URL: http://svn.slimdevices.com?rev=2170&root=Jive&view=rev
Log:
Bug: 7153
Description:
Add an option in Settings > Advanced Settings > Factory Test > Power Management
to disable
the wlan power save. This can be disable to help test router problems.
Modified:
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveMeta.lua
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt
Modified:
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=2170&root=Jive&r1=2169&r2=2170&view=diff
==============================================================================
---
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Fri Apr 4 06:57:14 2008
@@ -879,7 +879,7 @@
sleepOptions,
function(obj, selectedIndex)
settings.sleepTimeout =
sleepOptions[selectedIndex] * 1000
- log:warn("sleepTimeout = ",
settings.sleepTimeout)
+ log:info("sleepTimeout=",
settings.sleepTimeout)
end,
sleepIndex
)
@@ -891,7 +891,7 @@
suspendOptions,
function(obj, selectedIndex)
settings.suspendTimeout =
suspendOptions[selectedIndex] * 1000
- log:warn("suspendTimeout = ",
settings.suspendTimeout)
+ log:info("suspendTimeout=",
settings.suspendTimeout)
end,
suspendIndex
)
@@ -902,7 +902,7 @@
"checkbox",
function(obj, isSelected)
settings.suspendEnabled =
isSelected
- log:warn("suspendEnalbed = ",
settings.suspendEnabled)
+ log:info("suspendEnabled=",
settings.suspendEnabled)
end,
settings.suspendEnabled
)
@@ -913,13 +913,26 @@
"checkbox",
function(obj, isSelected)
settings.suspendWake = isSelected
and 30 or nil
- log:warn("suspendWake = ",
settings.suspendWake)
+ log:info("suspendWake=",
settings.suspendWake)
end,
settings.suspendWake ~= nil
)
},
+ {
+ text = self:string("WLAN_POWER_SAVE"),
+ icon = Checkbox(
+ "checkbox",
+ function(obj, isSelected)
+ settings.wlanPSEnabled =
isSelected
+ log:info("wlanPSEnabled=",
settings.wlanPSEnabled)
+ self:_wlanPowerSave()
+ end,
+ settings.wlanPSEnabled
+ )
+ },
})
+ window:addWidget(Textarea("help",
self:string("POWER_MANAGEMENT_SETTINGS_HELP")))
window:addWidget(menu)
window:addListener(EVENT_WINDOW_POP,
@@ -955,6 +968,12 @@
if active ~= nil then
-- update the network active state
self.networkActive = active
+ end
+
+ local settings = self:getSettings()
+ if not settings.wlanPSEnabled then
+ self.wireless:powerSave(false)
+ return
end
if self._wlanPowerSaveTimer == nil then
Modified:
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveMeta.lua
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveMeta.lua?rev=2170&root=Jive&r1=2169&r2=2170&view=diff
==============================================================================
---
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveMeta.lua
(original)
+++
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveMeta.lua
Fri Apr 4 06:57:14 2008
@@ -25,7 +25,8 @@
suspendTimeout = 3600000, -- 1 hour
suspendEnabled = true,
suspendWake = nil,
- dimmedAC = false
+ dimmedAC = false,
+ wlanPSEnabled = true,
}
end
@@ -45,7 +46,7 @@
jiveMain:addItem(meta:menuItem('backlightSetting', 'screenSettings',
"BSP_BACKLIGHT_TIMER", function(applet, ...)
applet:settingsBacklightTimerShow(...) end))
jiveMain:addItem(meta:menuItem('brightnessSetting', 'screenSettings',
"BSP_BRIGHTNESS", function(applet, ...) applet:settingsBrightnessShow(...) end))
jiveMain:addItem(meta:menuItem('powerDown', 'advancedSettings',
"POWER_DOWN", function(applet, ...) applet:settingsPowerDown(...) end))
- jiveMain:addItem(meta:menuItem('powerDown', 'factoryTest', "Suspend
Test Settings", function(applet, ...) applet:settingsTestSuspend(...) end))
+ jiveMain:addItem(meta:menuItem('suspendTest', 'factoryTest',
"POWER_MANAGEMENT_SETTINGS", function(applet, ...)
applet:settingsTestSuspend(...) end))
end
Modified:
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt?rev=2170&root=Jive&r1=2169&r2=2170&view=diff
==============================================================================
---
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt
(original)
+++
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt
Fri Apr 4 06:57:14 2008
@@ -254,3 +254,25 @@
INVALID_MAC_CONTINUE
EN Continue
+
+
+POWER_MANAGEMENT_SETTINGS
+ EN Power management
+
+SLEEP_TIMEOUT
+ EN Sleep Timeout
+
+SUSPEND_TIMEOUT
+ EN Suspend Timeout
+
+SUSPEND_ENABLED
+ EN Suspend Enabled
+
+SUSPEND_WAKE
+ EN Suspend Wake
+
+WLAN_POWER_SAVE
+ EN Wireless Power Save
+
+POWER_MANAGEMENT_SETTINGS_HELP
+ EN Power management test settings. Changing these settings may
reduce your battery life.
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
