[gigablue] move setrtcoffset to dreamboxhardware.py

lib/python/Components/NetworkTime.py

@@ -32,6 +32,11 @@ def ntp_sync(self):
 		if config.misc.SyncTimeUsing.value == "1":
 			print '[NTP]: Updating'
 			self.Console.ePopen('/usr/bin/ntpdate -s -u pool.ntp.org', self.update_schedule)
+		else:
+			nowTime = time()
+			print '[TransponderTime]: setting E2 time:',nowTime
+			eDVBLocalTimeHandler.getInstance().setUseDVBTime(True)
+			setRTCtime(nowTime)
 
 	def update_schedule(self, result = None, retval = None, extra_args = None):
 		nowTime = time()

lib/python/Tools/DreamboxHardware.py

@@ -24,7 +24,25 @@ def setFPWakeuptime(wutime):
 		except IOError:
 			print "setFPWakeupTime failed!"
 
+def setRTCoffset():
+	import time
+	if time.localtime().tm_isdst == 0:
+		forsleep = time.timezone
+	else:
+		forsleep = 3600-time.timezone
+
+	t_local = time.localtime(int(time.time()))
+	print "set RTC to %s (rtc_offset = %s sec.)" % (time.strftime("%Y/%m/%d %H:%M", t_local), forsleep)
+
+	# Set RTC OFFSET (diff. between UTC and Local Time)
+	try:
+		open("/proc/stb/fp/rtc_offset", "w").write(str(forsleep))
+	except IOError:
+		print "set RTC Offset failed!"
+
 def setRTCtime(wutime):
+	if boxtype.startswith('gb'):
+		setRTCoffset()
 	try:
 		open("/proc/stb/fp/rtc", "w").write(str(wutime))
 	except IOError:

mytest.py

@@ -517,16 +517,9 @@ def runNextScreen(session, screensToRun, *result):
 	config.misc.startCounter.save()
 
 	profile("wakeup")
-
-	try:
-		if config.misc.boxtype.value == 'gb800se' or config.misc.boxtype.value == 'gb800solo' or config.misc.boxtype.value == 'gb800ue' or config.misc.boxtype.value == 'gbquad':
-			from Plugins.SystemPlugins.VFDControl.plugin import SetTime
-			SetTime()
-	except:
-		print"Failed SetTime from VFDControl !!"
-
 	from time import time, strftime, localtime
-	from Tools.DreamboxHardware import setFPWakeuptime, getFPWakeuptime, setRTCtime
+	from Tools.DreamboxHardware import setFPWakeuptime, getFPWakeuptime, setRTCtime, setRTCoffset
+	setRTCoffset()
 	#get currentTime
 	nowTime = time()
 	wakeupList = [
@@ -543,7 +536,7 @@ def runNextScreen(session, screensToRun, *result):
 		if (startTime[0] - nowTime) < 270: # no time to switch box back on
 			wptime = nowTime + 30  # so switch back on in 30 seconds
 		else:
-			if config.misc.boxtype.value == 'gb800se' or config.misc.boxtype.value == 'gb800solo' or config.misc.boxtype.value == 'gb800ue' or config.misc.boxtype.value == 'gbquad':
+			if config.misc.boxtype.getValue().startswith("gb"):
 				wptime = startTime[0] - 120 # Gigaboxes already starts 2 min. before wakeup time
 			else:
 				wptime = startTime[0] - 240