Author: richard
Date: Sat Jan 17 06:50:06 2009
New Revision: 3870
URL: http://svn.slimdevices.com?rev=3870&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3863): richard | 2009-01-16 19:45:51 +0000
Bug: 10296
Description:
Fix a rebooting issue in jive 7.4 firmware, caused by a slow system clock when
the cpu speed is
reduced.
r3...@harrypotter (orig r3865): bklaas | 2009-01-16 21:12:10 +0000
Bug: n/a
Description: cull uuid checking code from Slideshow applet's hacked
SqueezeboxJiveApplet
r3...@harrypotter (orig r3867): richard | 2009-01-17 14:34:50 +0000
Bug: N/A
Description:
Makefile fix.
r3...@harrypotter (orig r3868): richard | 2009-01-17 14:36:58 +0000
Bug: 10714
Description:
Fix behaviour of the screen off screensaver.
r3...@harrypotter (orig r3869): richard | 2009-01-17 14:47:30 +0000
Bug: N/A
Description:
Fix SSH help text when multiple interfaces are available.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/Makefile.linux
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/SqueezeboxJiveApplet.lua
7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupSSH/SetupSSHApplet.lua
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Jan 17 06:50:06 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3856
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3857
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3869
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: 7.4/branches/pango/squeezeplay/src/Makefile.linux
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/Makefile.linux?rev=3870&root=Jive&r1=3869&r2=3870&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/Makefile.linux (original)
+++ 7.4/branches/pango/squeezeplay/src/Makefile.linux Sat Jan 17 06:50:06 2009
@@ -148,7 +148,7 @@
#
.PHONY: app portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_contrib squeezeplay_private freefont freefont-debian axtls
-app: portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_contrib freefont
+app: portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_contrib freefont axtls
# portaudio
portaudio_v19_1360/Makefile:
@@ -211,7 +211,7 @@
squeezeplay_private/Makefile:
cd squeezeplay_private; SDL_CONFIG=${SDL_CONFIG} ./configure
--prefix=${PREFIX}
-squeezeplay_private: axtls squeezeplay_private/Makefile
+squeezeplay_private: squeezeplay_private/Makefile
cd squeezeplay_private; make CFLAGS="${CFLAGS}
-I${SRC_DIR}/squeezeplay/src" PREFIX=${PREFIX} install
rm ${PREFIX}/lib/spprivate.*
cp squeezeplay_private/.libs/spprivate.so
${PREFIX}/lib/lua/5.1/spprivate.so
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua?rev=3870&root=Jive&r1=3869&r2=3870&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
Sat Jan 17 06:50:06 2009
@@ -52,10 +52,13 @@
function(event)
local type = event:getType()
if type == EVENT_WINDOW_ACTIVE then
- self:_getBrightness()
+ if not self.brightness then
+ self.brightness = self:_getBrightness()
+ end
self:_setBrightness(0)
else
self:_setBrightness(self.brightness)
+ self.brightness = nil
end
return EVENT_UNUSED
end,
@@ -85,7 +88,7 @@
function _getBrightness(self)
-- store existing brightness levels in self
- self.brightness = appletManager:callService("getBrightness")
+ return appletManager:callService("getBrightness")
end
function _setBrightness(self, brightness)
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=3870&root=Jive&r1=3869&r2=3870&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Sat Jan 17 06:50:06 2009
@@ -114,11 +114,14 @@
self.watchdog = Watchdog:open()
if self.watchdog then
-- allow 30 seconds to boot
+ log:info("watchdog timeout 30")
self.watchdog:setTimeout(30)
+
local timer = Timer(2000, -- 2 seconds
function()
- -- 10 second when running
+ -- allow 10 seconds after boot
if not self.watchdogRunning then
+ log:info("watchdog timeout 10")
self.watchdog:setTimeout(10)
self.watchdogRunning = true
end
@@ -585,6 +588,11 @@
if self.powerState == "active" then
self.powerTimer:restart()
else
+ -- the system clock drifts in sleep mode, reset it
+ if self.powerState == "sleep" or self.powerState == "suspend"
then
+ os.execute("hwclock -s")
+ end
+
self:setPowerState("active")
end
end
@@ -1058,6 +1066,15 @@
fh:write(speed)
fh:close()
+
+ -- the system clock runs slow in low power mode, so we need
+ -- to modify watchdog interval based on cpu speed
+ if self.watchdogRunning then
+ local timeout = fast and 10 or 30
+
+ log:info("watchdog timeout ", timeout)
+ self.watchdog:setTimeout(timeout)
+ end
end
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/SqueezeboxJiveApplet.lua?rev=3870&root=Jive&r1=3869&r2=3870&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/SqueezeboxJiveApplet.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay_jive/specialProjects/sbcPosSlideshow/SqueezeboxJiveApplet.lua
Sat Jan 17 06:50:06 2009
@@ -86,32 +86,6 @@
log:info("uuid=", uuid)
log:info("mac=", mac)
-
- if not uuid or string.match(mac, "^00:40:20") then
- local popup = Popup("errorWindow",
self:string("INVALID_MAC_TITLE"))
-
- popup:setAllowScreensaver(false)
- popup:setAlwaysOnTop(true)
- popup:setAutoHide(false)
-
- local text = Textarea("textarea",
self:string("INVALID_MAC_TEXT"))
- local menu = SimpleMenu("menu", {
- {
- text = self:string("INVALID_MAC_CONTINUE"),
- sound = "WINDOWHIDE",
- callback = function()
- window:hide()
- end
- },
- })
-
- popup:addWidget(text)
- popup:addWidget(menu)
- popup:show()
- end
-
-
- jnt:setUUID(uuid, mac)
-- watchdog timer
self.watchdog = Watchdog:open()
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupSSH/SetupSSHApplet.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupSSH/SetupSSHApplet.lua?rev=3870&root=Jive&r1=3869&r2=3870&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupSSH/SetupSSHApplet.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupSSH/SetupSSHApplet.lua
Sat Jan 17 06:50:06 2009
@@ -93,10 +93,12 @@
function _getIPAddress()
local ipaddr
- local cmd = io.popen("/sbin/ifconfig eth0")
+ local cmd = io.popen("/sbin/ifconfig")
for line in cmd:lines() do
ipaddr = string.match(line, "inet addr:([%d%.]+)")
- if ipaddr ~= nil then break end
+ if ipaddr ~= nil and not string.match(ipaddr, "127.") then
+ break
+ end
end
cmd:close()
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
