=== squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua ================================================================== --- squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua (revision 7749) +++ squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua (local) @@ -515,9 +515,7 @@ end log:debug('date sync: local: ', chunk.data.date, ' utc: ', chunk.data.date_utc) if chunk.data.date_utc then - self:setDate(chunk.data.date_utc, true) - else - self:setDate(chunk.data.date, false) + self:setDate(chunk.data.date_utc) end end @@ -542,22 +540,17 @@ end -function setDate(self, date, is_utc) - -- matches date format 2007-09-08T20:40:42+00:00 +function setDate(self, date) + -- matches date format 2007-09-08T20:40:42+00:00, expects UTC local CCYY, MM, DD, hh, mm, ss, TZ = string.match(date, "(%d%d%d%d)%-(%d%d)%-(%d%d)T(%d%d):(%d%d):(%d%d)([-+]%d%d:%d%d)") - log:debug("CCYY=", CCYY, " MM=", MM, " DD=", DD, " hh=", hh, " mm=", mm, " ss=", ss, " TZ=", TZ, " is_utc=", is_utc) + log:debug("CCYY=", CCYY, " MM=", MM, " DD=", DD, " hh=", hh, " mm=", mm, " ss=", ss, " TZ=", TZ) - local utcflag = "" - if is_utc then - utcflag = " -u " - end - -- set system date - os.execute("/bin/date " .. utcflag .. MM..DD..hh..mm..CCYY.."."..ss) + os.execute("/bin/date -u " .. MM..DD..hh..mm..CCYY.."."..ss) -- set RTC to system time - os.execute("hwclock -w" .. utcflag) + os.execute("hwclock -w -u") iconbar:update() end === squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeboxFab4/SqueezeboxFab4Applet.lua ================================================================== --- squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeboxFab4/SqueezeboxFab4Applet.lua (revision 7749) +++ squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeboxFab4/SqueezeboxFab4Applet.lua (local) @@ -266,9 +266,7 @@ end log:debug('date sync: local: ', chunk.data.date, ' utc: ', chunk.data.date_utc) if chunk.data.date_utc then - self:setDate(chunk.data.date_utc, true) - else - self:setDate(chunk.data.date, false) + self:setDate(chunk.data.date_utc) end end @@ -293,19 +291,14 @@ end -function setDate(self, date, is_utc) - -- matches date format 2007-09-08T20:40:42+00:00 +function setDate(self, date) + -- matches date format 2007-09-08T20:40:42+00:00, expects UTC time local CCYY, MM, DD, hh, mm, ss, TZ = string.match(date, "(%d%d%d%d)%-(%d%d)%-(%d%d)T(%d%d):(%d%d):(%d%d)([-+]%d%d:%d%d)") - log:debug("CCYY=", CCYY, " MM=", MM, " DD=", DD, " hh=", hh, " mm=", mm, " ss=", ss, " TZ=", TZ, " is_utc=", is_utc) + log:debug("CCYY=", CCYY, " MM=", MM, " DD=", DD, " hh=", hh, " mm=", mm, " ss=", ss, " TZ=", TZ) - local utcflag = "" - if is_utc then - utcflag = " -u " - end - -- set system date - os.execute("/bin/date " .. utcflag .. MM..DD..hh..mm..CCYY.."."..ss) + os.execute("/bin/date -u " .. MM..DD..hh..mm..CCYY.."."..ss) iconbar:update() end === squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua ================================================================== --- squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua (revision 7749) +++ squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua (local) @@ -261,9 +261,7 @@ end log:debug('date sync: local: ', chunk.data.date, ' utc: ', chunk.data.date_utc) if chunk.data.date_utc then - self:setDate(chunk.data.date_utc, true) - else - self:setDate(chunk.data.date, false) + self:setDate(chunk.data.date_utc) end end @@ -289,22 +287,17 @@ end -function setDate(self, date, is_utc) - -- matches date format 2007-09-08T20:40:42+00:00 +function setDate(self, date) + -- matches date format 2007-09-08T20:40:42+00:00, expects UTC local CCYY, MM, DD, hh, mm, ss, TZ = string.match(date, "(%d%d%d%d)%-(%d%d)%-(%d%d)T(%d%d):(%d%d):(%d%d)([-+]%d%d:%d%d)") - log:debug("CCYY=", CCYY, " MM=", MM, " DD=", DD, " hh=", hh, " mm=", mm, " ss=", ss, " TZ=", TZ, " is_utc=", is_utc) + log:debug("CCYY=", CCYY, " MM=", MM, " DD=", DD, " hh=", hh, " mm=", mm, " ss=", ss, " TZ=", TZ) - local utcflag = "" - if is_utc then - utcflag = " -u " - end - -- set system date - os.execute("/bin/date " .. utcflag .. MM..DD..hh..mm..CCYY.."."..ss) + os.execute("/bin/date -u " .. MM..DD..hh..mm..CCYY.."."..ss) -- set RTC to system time - os.execute("hwclock -w" .. utcflag) + os.execute("hwclock -w -u") iconbar:update() end