Merge branch 'master' of git.opendreambox.org:/git/enigma2

12 files changed, 869 insertions, 68 deletions

diff --git a/lib/python/Components/Makefile.am b/lib/python/Components/Makefile.am
index fda58bf3..67cec18d 100644
--- a/lib/python/Components/Makefile.am
+++ b/lib/python/Components/Makefile.am
@@ -18,4 +18,4 @@ install_PYTHON = \
 	MultiContent.py MediaPlayer.py TunerInfo.py VideoWindow.py ChoiceList.py \
 	Element.py Playlist.py ParentalControl.py ParentalControlList.py \
 	Ipkg.py SelectionList.py Scanner.py SystemInfo.py DreamInfoHandler.py \
-	Task.py language_cache.py Console.py
+	Task.py language_cache.py Console.py ResourceManager.py TuneTest.py
diff --git a/lib/python/Components/ResourceManager.py b/lib/python/Components/ResourceManager.py
new file mode 100644
index 00000000..fb6be4a8
--- /dev/null
+++ b/lib/python/Components/ResourceManager.py
@@ -0,0 +1,23 @@
+class ResourceManager:
+	def __init__(self):
+		self.resourceList = {}
+		
+	def addResource(self, name, resource):
+		print "adding Resource", name
+		self.resourceList[name] = resource
+		print "resources:", self.resourceList
+		
+		
+	def getResource(self, name):
+		if not self.hasResource(name):
+			return None
+		return self.resourceList[name]
+	
+	def hasResource(self, name):
+		return self.resourceList.has_key(name)
+	
+	def removeResource(self, name):
+		if self.hasResource(name):
+			del self.resourceList[name]
+		
+resourcemanager = ResourceManager()
\ No newline at end of file
diff --git a/lib/python/Components/Sources/Progress.py b/lib/python/Components/Sources/Progress.py
index b96065b3..d57a6179 100644
--- a/lib/python/Components/Sources/Progress.py
+++ b/lib/python/Components/Sources/Progress.py
@@ -12,5 +12,12 @@ class Progress(Source):
 	def setValue(self, value):
 		self.__value = value
 		self.changed((self.CHANGED_ALL,))
+		
+	def setRange(self, range = 100):
+		self.range = range
+		self.changed((self.CHANGED_ALL,))
+
+	def getRange(self):
+		return self.range
 
 	value = property(getValue, setValue)
diff --git a/lib/python/Components/TuneTest.py b/lib/python/Components/TuneTest.py
new file mode 100644
index 00000000..422036cd
--- /dev/null
+++ b/lib/python/Components/TuneTest.py
@@ -0,0 +1,227 @@
+from enigma import eDVBFrontendParametersSatellite, eDVBFrontendParameters, eDVBResourceManager, eTimer
+
+class Tuner:
+	def __init__(self, frontend):
+		self.frontend = frontend
+	
+	# transponder = (frequency, symbolrate, polarisation, fec, inversion, orbpos, system, modulation)
+	#                    0         1             2         3       4         5       6        7
+	def tune(self, transponder):
+		if self.frontend:
+			print "tuning to transponder with data", transponder
+			parm = eDVBFrontendParametersSatellite()
+			parm.frequency = transponder[0] * 1000
+			parm.symbol_rate = transponder[1] * 1000
+			parm.polarisation = transponder[2]
+			parm.fec = transponder[3]
+			parm.inversion = transponder[4]
+			parm.orbital_position = transponder[5]
+			parm.system = 0  # FIXMEE !! HARDCODED DVB-S (add support for DVB-S2)
+			parm.modulation = 1 # FIXMEE !! HARDCODED QPSK 
+			feparm = eDVBFrontendParameters()
+			feparm.setDVBS(parm)
+			self.lastparm = feparm
+			self.frontend.tune(feparm)
+	
+	def retune(self):
+		if self.frontend:
+			self.frontend.tune(self.lastparm)
+
+# tunes a list of transponders and checks, if they lock and optionally checks the onid/tsid combination
+# 1) add transponders with addTransponder()
+# 2) call run(<checkPIDs = True>)
+# 3) finishedChecking() is called, when the run is finished
+class TuneTest:
+	def __init__(self, feid, stopOnSuccess = -1, stopOnError = -1):
+		self.stopOnSuccess = stopOnSuccess
+		self.stopOnError = stopOnError
+		self.feid = feid
+		self.transponderlist = []
+		self.currTuned = None
+		print "TuneTest for feid %d" % self.feid
+		if not self.openFrontend():
+			self.oldref = self.session.nav.getCurrentlyPlayingServiceReference()
+			self.session.nav.stopService() # try to disable foreground service
+			if not self.openFrontend():
+				if self.session.pipshown: # try to disable pip
+					self.session.pipshown = False
+					del self.session.pip
+					if not self.openFrontend():
+						self.frontend = None # in normal case this should not happen
+		self.tuner = Tuner(self.frontend)
+		self.timer = eTimer()
+		self.timer.callback.append(self.updateStatus)
+		
+	def gotTsidOnid(self, tsid, onid):
+		print "******** got tsid, onid:", tsid, onid
+		if tsid is not None and onid is not None:
+			self.pidStatus = self.INTERNAL_PID_STATUS_SUCCESSFUL
+			self.tsid = tsid
+			self.onid = onid
+		else:
+			self.pidStatus = self.INTERNAL_PID_STATUS_FAILED
+			self.tsid = -1
+			self.onid = -1
+		self.timer.start(100, True)
+			
+	def updateStatus(self):
+		dict = {}
+		self.frontend.getFrontendStatus(dict)
+		stop = False
+		
+		print "status:", dict
+		if dict["tuner_state"] == "TUNING":
+			print "TUNING"
+			self.timer.start(100, True)
+			self.progressCallback((self.getProgressLength(), self.tuningtransponder, self.STATUS_TUNING, self.currTuned))
+		elif self.checkPIDs and self.pidStatus == self.INTERNAL_PID_STATUS_NOOP:
+			print "2nd choice"
+			if dict["tuner_state"] == "LOCKED":
+				print "acquiring TSID/ONID"
+				self.raw_channel.requestTsidOnid(self.gotTsidOnid)
+				self.pidStatus = self.INTERNAL_PID_STATUS_WAITING
+			else:
+				self.pidStatus = self.INTERNAL_PID_STATUS_FAILED
+		elif self.checkPIDs and self.pidStatus == self.INTERNAL_PID_STATUS_WAITING:
+			print "waiting for pids"			
+		else:
+			if dict["tuner_state"] == "LOSTLOCK" or dict["tuner_state"] == "FAILED":
+				self.tuningtransponder = self.nextTransponder()
+				self.failedTune.append([self.currTuned, self.oldTuned, "tune_failed"])
+				if self.stopOnError != -1 and self.stopOnError <= len(self.failedTune):
+					stop = True
+			elif dict["tuner_state"] == "LOCKED":
+				pidsFailed = False
+				if self.checkPIDs:
+					if self.currTuned is not None:
+						if self.tsid != self.currTuned[8] or self.onid != self.currTuned[9]:
+							self.failedTune.append([self.currTuned, self.oldTuned, "pids_failed", {"real": (self.tsid, self.onid), "expected": (self.currTuned[8], self.currTuned[9])}])
+							pidsFailed = True
+						else:
+							self.successfullyTune.append([self.currTuned, self.oldTuned])
+							if self.stopOnSuccess != -1 and self.stopOnSuccess <= len(self.successfullyTune):
+								stop = True
+				elif not self.checkPIDs or (self.checkPids and not pidsFailed):  
+					self.successfullyTune.append([self.currTuned, self.oldTuned])
+					if self.stopOnSuccess != -1 and self.stopOnSuccess <= len(self.successfullyTune):
+								stop = True
+				self.tuningtransponder = self.nextTransponder()
+			else:
+				print "************* tuner_state:", dict["tuner_state"]
+				
+			self.progressCallback((self.getProgressLength(), self.tuningtransponder, self.STATUS_NOOP, self.currTuned))
+			
+			if not stop:
+				self.tune()
+		if self.tuningtransponder < len(self.transponderlist) and not stop:
+			if self.pidStatus != self.INTERNAL_PID_STATUS_WAITING:
+				self.timer.start(100, True)
+				print "restart timer"
+			else:
+				print "not restarting timers (waiting for pids)"
+		else:
+			self.progressCallback((self.getProgressLength(), len(self.transponderlist), self.STATUS_DONE, self.currTuned))
+			print "finishedChecking"
+			self.finishedChecking()
+				
+	def firstTransponder(self):
+		print "firstTransponder:"
+		index = 0
+		if self.checkPIDs:
+			print "checkPIDs-loop"
+			# check for tsid != -1 and onid != -1 
+			print "index:", index
+			print "len(self.transponderlist):", len(self.transponderlist)
+			while (index < len(self.transponderlist) and (self.transponderlist[index][8] == -1 or self.transponderlist[index][9] == -1)):
+			 	index += 1
+		print "FirstTransponder final index:", index
+		return index
+	
+	def nextTransponder(self):
+		print "getting next transponder", self.tuningtransponder
+		index = self.tuningtransponder + 1
+		if self.checkPIDs:
+			print "checkPIDs-loop"
+			# check for tsid != -1 and onid != -1 
+			print "index:", index
+			print "len(self.transponderlist):", len(self.transponderlist)
+			while (index < len(self.transponderlist) and (self.transponderlist[index][8] == -1 or self.transponderlist[index][9] == -1)):
+			 	index += 1
+
+		print "next transponder index:", index
+		return index
+	
+	def finishedChecking(self):
+		print "finished testing"
+		print "successfull:", self.successfullyTune
+		print "failed:", self.failedTune
+	
+	def openFrontend(self):
+		res_mgr = eDVBResourceManager.getInstance()
+		if res_mgr:
+			self.raw_channel = res_mgr.allocateRawChannel(self.feid)
+			if self.raw_channel:
+				self.frontend = self.raw_channel.getFrontend()
+				if self.frontend:
+					return True
+				else:
+					print "getFrontend failed"
+			else:
+				print "getRawChannel failed"
+		else:
+			print "getResourceManager instance failed"
+		return False
+
+	def tune(self):
+		print "tuning to", self.tuningtransponder
+		if self.tuningtransponder < len(self.transponderlist):
+			self.pidStatus = self.INTERNAL_PID_STATUS_NOOP
+			self.oldTuned = self.currTuned
+			self.currTuned = self.transponderlist[self.tuningtransponder]
+			self.tuner.tune(self.transponderlist[self.tuningtransponder])		
+
+	INTERNAL_PID_STATUS_NOOP = 0
+	INTERNAL_PID_STATUS_WAITING = 1
+	INTERNAL_PID_STATUS_SUCCESSFUL = 2
+	INTERNAL_PID_STATUS_FAILED = 3
+	
+	def run(self, checkPIDs = False):
+		self.checkPIDs = checkPIDs
+		self.pidStatus = self.INTERNAL_PID_STATUS_NOOP
+		self.failedTune = []
+		self.successfullyTune = []
+		self.tuningtransponder = self.firstTransponder()
+		self.tune()
+		self.progressCallback((self.getProgressLength(), self.tuningtransponder, self.STATUS_START, self.currTuned))
+		self.timer.start(100, True)
+	
+	# transponder = (frequency, symbolrate, polarisation, fec, inversion, orbpos, <system>, <modulation>, <tsid>, <onid>)
+	#                    0         1             2         3       4         5       6        7              8      9
+	def addTransponder(self, transponder):
+		self.transponderlist.append(transponder)
+		
+	def clearTransponder(self):
+		self.transponderlist = []
+		
+	def getProgressLength(self):
+		count = 0
+		if self.stopOnError == -1:
+			count = len(self.transponderlist)
+		else:
+			if count < self.stopOnError:
+				count = self.stopOnError
+		if self.stopOnSuccess == -1:
+			count = len(self.transponderlist)
+		else:
+			if count < self.stopOnSuccess:
+				count = self.stopOnSuccess
+		return count
+		
+	STATUS_START = 0
+	STATUS_TUNING = 1
+	STATUS_DONE = 2
+	STATUS_NOOP = 3
+	# can be overwritten
+	# progress = (range, value, status, transponder)
+	def progressCallback(self, progress):
+		pass
\ No newline at end of file
diff --git a/lib/python/Plugins/SystemPlugins/DiseqcTester/Makefile.am b/lib/python/Plugins/SystemPlugins/DiseqcTester/Makefile.am
new file mode 100644
index 00000000..cd72696a
--- /dev/null
+++ b/lib/python/Plugins/SystemPlugins/DiseqcTester/Makefile.am
@@ -0,0 +1,5 @@
+installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/DiseqcTester
+
+install_PYTHON =	\
+	__init__.py \
+	plugin.py
\ No newline at end of file
diff --git a/lib/python/Plugins/SystemPlugins/DiseqcTester/__init__.py b/lib/python/Plugins/SystemPlugins/DiseqcTester/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/lib/python/Plugins/SystemPlugins/DiseqcTester/__init__.py
diff --git a/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py b/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
new file mode 100644
index 00000000..2c8c5c38
--- /dev/null
+++ b/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
@@ -0,0 +1,527 @@
+from Screens.Satconfig import NimSelection
+from Screens.Screen import Screen
+from Screens.TextBox import TextBox
+
+from Plugins.Plugin import PluginDescriptor
+
+from Components.ActionMap import ActionMap, NumberActionMap
+from Components.NimManager import nimmanager
+from Components.ResourceManager import resourcemanager
+from Components.Sources.FrontendStatus import FrontendStatus
+from Components.TuneTest import TuneTest
+from Components.Sources.List import List
+from Components.Sources.Progress import Progress
+from Components.Sources.StaticText import StaticText
+from Components.ConfigList import ConfigListScreen
+from Components.config import getConfigListEntry, ConfigSelection
+
+import random
+
+# always use:
+# setResultType(type)
+# setResultParameter(parameter)
+# getTextualResult()
+class ResultParser:
+	def __init__(self):
+		pass
+	
+	TYPE_BYORBPOS = 0
+	TYPE_BYINDEX = 1
+	TYPE_ALL = 2
+	def setResultType(self, type):
+		self.type = type
+		
+	def setResultParameter(self, parameter):
+		if self.type == self.TYPE_BYORBPOS:
+			self.orbpos = parameter
+		elif self.type == self.TYPE_BYINDEX:
+			self.index = parameter
+			
+	def getTextualResultForIndex(self, index):
+		text = ""
+		text += "%s:\n" % self.getTextualIndexRepresentation(index)
+		
+		failed, successful = self.results[index]["failed"], self.results[index]["successful"]
+		countfailed = len(failed)
+		countsuccessful = len(successful)
+		countall = countfailed + countsuccessful
+		percentfailed = round(countfailed / float(countall + 0.0001) * 100)
+		percentsuccessful = round(countsuccessful / float(countall + 0.0001) * 100)
+		text += "Tested %d transponders\n%d (%d %%) transponders succeeded\n%d (%d %%) transponders failed\n" % (countall, countsuccessful, percentsuccessful, countfailed, percentfailed)
+		reasons = {}
+		if countfailed > 0:
+			for transponder in failed:
+				reasons[transponder[2]] = reasons.get(transponder[2], [])
+				reasons[transponder[2]].append(transponder)
+				if transponder[2] == "pids_failed":
+					print transponder[2], "-", transponder[3]
+				
+			text += "The %d unsuccessful tuning attempts failed for the following reasons:\n" % countfailed
+			
+			for reason in reasons.keys():
+				text += "%s: %d transponders failed\n" % (reason, len(reasons[reason]))
+			
+			for reason in reasons.keys():
+				text += "\n"
+				text += "%s previous planes:\n" % reason
+				for transponder in reasons[reason]:
+					if transponder[1] is not None:
+						text += self.getTextualIndexRepresentation(self.getIndexForTransponder(transponder[1]))
+					else:
+						text += "No transponder tuned"
+					text += " ==> " + self.getTextualIndexRepresentation(self.getIndexForTransponder(transponder[0]))
+					text += "\n"
+		if countsuccessful > 0:
+			text += "\n"
+			text += "Successfully tuned transponders' previous planes:\n" 
+			for transponder in successful:
+				if transponder[1] is not None:
+					text += self.getTextualIndexRepresentation(self.getIndexForTransponder(transponder[1]))
+				else:
+					text += "No transponder tuned"
+				text += " ==> " + self.getTextualIndexRepresentation(self.getIndexForTransponder(transponder[0]))
+				text += "\n"
+		return text
+
+	def getTextualResult(self):
+		text = ""
+		if self.type == self.TYPE_BYINDEX:
+			text += self.getTextualResultForIndex(self.index)
+		elif self.type == self.TYPE_BYORBPOS:
+			for index in self.results.keys():
+				if index[2] == self.orbpos:
+					text += self.getTextualResultForIndex(index)
+					text += "\n-----------------------------------------------------\n"
+				
+		return text
+
+class DiseqcTester(Screen, TuneTest, ResultParser):
+	skin = """
+		<screen position="90,100" size="520,400" title="DiSEqC Tester" >
+		<!--ePixmap pixmap="skin_default/icons/dish_scan.png" position="5,25" zPosition="0" size="119,110" transparent="1" alphatest="on" />
+		<widget source="Frontend" render="Label" position="190,10" zPosition="2" size="260,20" font="Regular;19" halign="center" valign="center" transparent="1">
+			<convert type="FrontendInfo">SNRdB</convert>
+		</widget>
+		<eLabel name="snr" text="SNR:" position="120,35" size="60,22" font="Regular;21" halign="right" transparent="1" />
+		<widget source="Frontend" render="Progress" position="190,35" size="260,20" pixmap="skin_default/bar_snr.png" borderWidth="2" borderColor="#cccccc">
+			<convert type="FrontendInfo">SNR</convert>
+		</widget>
+		<widget source="Frontend" render="Label" position="460,35" size="60,22" font="Regular;21">
+			<convert type="FrontendInfo">SNR</convert>
+		</widget>
+		<eLabel name="agc" text="AGC:" position="120,60" size="60,22" font="Regular;21" halign="right" transparent="1" />
+		<widget source="Frontend" render="Progress" position="190,60" size="260,20" pixmap="skin_default/bar_snr.png" borderWidth="2" borderColor="#cccccc">
+			<convert type="FrontendInfo">AGC</convert>
+		</widget>
+		<widget source="Frontend" render="Label" position="460,60" size="60,22" font="Regular;21">
+			<convert type="FrontendInfo">AGC</convert>
+		</widget>
+		<eLabel name="ber" text="BER:" position="120,85" size="60,22" font="Regular;21" halign="right" transparent="1" />
+		<widget source="Frontend" render="Progress" position="190,85" size="260,20" pixmap="skin_default/bar_ber.png" borderWidth="2" borderColor="#cccccc">
+			<convert type="FrontendInfo">BER</convert>
+		</widget>
+		<widget source="Frontend" render="Label" position="460,85" size="60,22" font="Regular;21">
+			<convert type="FrontendInfo">BER</convert>
+		</widget>
+		<eLabel name="lock" text="Lock:" position="120,115" size="60,22" font="Regular;21" halign="right" />
+		<widget source="Frontend" render="Pixmap" pixmap="skin_default/icons/lock_on.png" position="190,110" zPosition="1" size="38,31" alphatest="on">
+			<convert type="FrontendInfo">LOCK</convert>
+			<convert type="ConditionalShowHide" />
+		</widget>
+		<widget source="Frontend" render="Pixmap" pixmap="skin_default/icons/lock_off.png" position="190,110" zPosition="1" size="38,31" alphatest="on">
+			<convert type="FrontendInfo">LOCK</convert>
+			<convert type="ConditionalShowHide">Invert</convert>
+		</widget-->
+		<widget source="progress_list" render="Listbox" position="0,0" size="510,150" scrollbarMode="showOnDemand">
+			<convert type="TemplatedMultiContent">
+				{"template": [
+						MultiContentEntryText(pos = (10, 0), size = (330, 25), flags = RT_HALIGN_LEFT, text = 1), # index 1 is the index name,
+						MultiContentEntryText(pos = (330, 0), size = (150, 25), flags = RT_HALIGN_RIGHT, text = 2) # index 2 is the status,
+					],
+				 "fonts": [gFont("Regular", 20)],
+				 "itemHeight": 25
+				}
+			</convert>
+		</widget>
+		<eLabel name="overall_progress" text="Overall progress:" position="20,162" size="480,22" font="Regular;21" halign="center" transparent="1" />
+		<widget source="overall_progress" render="Progress" position="20,192" size="480,20" borderWidth="2" backgroundColor="#254f7497" />
+		<eLabel name="overall_progress" text="Progress:" position="20,222" size="480,22" font="Regular;21" halign="center" transparent="1" />
+		<widget source="sub_progress" render="Progress" position="20,252" size="480,20" borderWidth="2" backgroundColor="#254f7497" />
+		
+		<eLabel name="" text="Failed:" position="20,282" size="140,22" font="Regular;21" halign="left" transparent="1" />
+		<widget source="failed_counter" render="Label" position="160,282" size="100,20" font="Regular;21" />
+		
+		<eLabel name="" text="Succeeded:" position="20,312" size="140,22" font="Regular;21" halign="left" transparent="1" />
+		<widget source="succeeded_counter" render="Label" position="160,312" size="100,20" font="Regular;21" />
+		
+		<eLabel name="" text="With errors:" position="20,342" size="140,22" font="Regular;21" halign="left" transparent="1" />
+		<widget source="witherrors_counter" render="Label" position="160,342" size="100,20" font="Regular;21" />
+		
+		<eLabel name="" text="Not tested:" position="20,372" size="140,22" font="Regular;21" halign="left" transparent="1" />
+		<widget source="untestable_counter" render="Label" position="160,372" size="100,20" font="Regular;21" />
+		
+		<widget source="CmdText" render="Label" position="300,282" size="180,200" font="Regular;21" />
+		</screen>"""
+		
+	TEST_TYPE_QUICK = 0
+	TEST_TYPE_RANDOM = 1
+	TEST_TYPE_COMPLETE = 2
+	def __init__(self, session, feid, test_type = TEST_TYPE_QUICK, loopsfailed = 3, loopssuccessful = 1):
+		Screen.__init__(self, session)
+		self.feid = feid
+		self.test_type = test_type
+		self.loopsfailed = loopsfailed
+		self.loopssuccessful = loopssuccessful
+		
+		self["actions"] = NumberActionMap(["SetupActions"],
+		{
+			"ok": self.select,
+			"cancel": self.keyCancel,
+		}, -2)
+		
+		TuneTest.__init__(self, feid, stopOnSuccess = self.loopssuccessful, stopOnError = self.loopsfailed)
+		#self["Frontend"] = FrontendStatus(frontend_source = lambda : self.frontend, update_interval = 100)
+		self["overall_progress"] = Progress()
+		self["sub_progress"] = Progress()
+		
+		self["failed_counter"] = StaticText("0")
+		self["succeeded_counter"] = StaticText("0")
+		self["witherrors_counter"] = StaticText("0")
+		self["untestable_counter"] = StaticText("0")
+		
+		self.list = []
+		self["progress_list"] = List(self.list)
+		self["progress_list"].onSelectionChanged.append(self.selectionChanged)
+		
+		self["CmdText"] = StaticText(_("Please wait while scanning is in progress..."))
+				
+		self.indexlist = {}
+		self.readTransponderList()
+		
+		self.running = False
+		
+		self.results = {}
+		self.resultsstatus = {}
+		
+		self.onLayoutFinish.append(self.go)
+		
+	def getProgressListComponent(self, index, status):
+		return (index, self.getTextualIndexRepresentation(index), status)
+	
+	def clearProgressList(self):
+		self.list = []
+		self["progress_list"].list = self.list
+	
+	def addProgressListItem(self, index):
+		if index in self.indexlist:
+			for entry in self.list:
+				if entry[0] == index:
+					self.changeProgressListStatus(index, "working")
+					return
+			self.list.append(self.getProgressListComponent(index, _("working")))
+			self["progress_list"].list = self.list
+			self["progress_list"].setIndex(len(self.list) - 1)
+
+	def changeProgressListStatus(self, index, status):
+		self.newlist = []
+		count = 0
+		indexpos = 0
+		for entry in self.list:
+			if entry[0] == index:
+				self.newlist.append(self.getProgressListComponent(index, status))
+				indexpos = count
+			else:
+				self.newlist.append(entry)
+			count += 1
+		self.list = self.newlist
+		self["progress_list"].list = self.list
+		self["progress_list"].setIndex(indexpos)
+
+	def readTransponderList(self):
+		for sat in nimmanager.getSatListForNim(self.feid):
+			for transponder in nimmanager.getTransponders(sat[0]):
+				#print transponder
+				mytransponder = (transponder[1] / 1000, transponder[2] / 1000, transponder[3], transponder[4], transponder[5], sat[0], None, None, transponder[10], transponder[11])
+				self.analyseTransponder(mytransponder)
+
+	def getIndexForTransponder(self, transponder):
+		
+		if transponder[0] < 11700:
+			band = 1 # low
+		else:
+			band = 0 # high
+		
+		polarisation = transponder[2]
+		
+		sat = transponder[5]
+		
+		index = (band, polarisation, sat)
+		return index
+
+	# sort the transponder into self.transponderlist
+	def analyseTransponder(self, transponder):
+		index = self.getIndexForTransponder(transponder)
+		if index not in self.indexlist:
+			self.indexlist[index] = []
+		self.indexlist[index].append(transponder)
+		#print "self.indexlist:", self.indexlist
+	
+	# returns a string for the user representing a human readable output for index 
+	def getTextualIndexRepresentation(self, index):
+		print "getTextualIndexRepresentation:", index
+		text = ""
+		
+		text += nimmanager.getSatDescription(index[2]) + ", "
+		
+		if index[0] == 1:
+			text += "Low Band, "
+		else:
+			text += "High Band, "
+			
+		if index[1] == 0:
+			text += "H"
+		else:
+			text += "V"
+		return text
+	
+	def fillTransponderList(self):
+		self.clearTransponder()
+		print "----------- fillTransponderList"
+		print "index:", self.currentlyTestedIndex
+		keys = self.indexlist.keys()
+		if self.getContinueScanning():
+			print "index:", self.getTextualIndexRepresentation(self.currentlyTestedIndex)
+			for transponder in self.indexlist[self.currentlyTestedIndex]:
+				self.addTransponder(transponder)
+			print "transponderList:", self.transponderlist
+			return True
+		else:
+			return False
+		
+	def progressCallback(self, progress):
+		if progress[0] != self["sub_progress"].getRange():
+			self["sub_progress"].setRange(progress[0])
+		self["sub_progress"].setValue(progress[1])
+
+	# logic for scanning order of transponders
+	# on go getFirstIndex is called
+	def getFirstIndex(self):
+		# TODO use other function to scan more randomly
+		if self.test_type == self.TEST_TYPE_QUICK:
+			self.myindex = 0
+			keys = self.indexlist.keys()
+			keys.sort(key = lambda a: a[2]) # sort by orbpos
+			self["overall_progress"].setRange(len(keys))
+			self["overall_progress"].setValue(self.myindex)
+			return keys[0]
+		elif self.test_type == self.TEST_TYPE_RANDOM:
+			self.randomkeys = self.indexlist.keys()
+			random.shuffle(self.randomkeys)
+			self.myindex = 0
+			self["overall_progress"].setRange(len(self.randomkeys))
+			self["overall_progress"].setValue(self.myindex)
+			return self.randomkeys[0]
+		
+	# after each index is finished, getNextIndex is called to get the next index to scan 
+	def getNextIndex(self):
+		# TODO use other function to scan more randomly
+		if self.test_type == self.TEST_TYPE_QUICK:
+			self.myindex += 1
+			keys = self.indexlist.keys()
+			keys.sort(key = lambda a: a[2]) # sort by orbpos
+			
+			self["overall_progress"].setValue(self.myindex)
+			if self.myindex < len(keys):
+				return keys[self.myindex]
+			else:
+				return None
+		elif self.test_type == self.TEST_TYPE_RANDOM:
+			self.myindex += 1
+			keys = self.randomkeys
+			
+			self["overall_progress"].setValue(self.myindex)
+			if self.myindex < len(keys):
+				return keys[self.myindex]
+			else:
+				return None
+				
+	# after each index is finished and the next index is returned by getNextIndex
+	# the algorithm checks, if we should continue scanning
+	def getContinueScanning(self):
+		if self.test_type == self.TEST_TYPE_QUICK or self.test_type == self.TEST_TYPE_RANDOM:
+			return (self.myindex < len(self.indexlist.keys()))
+		
+	def addResult(self, index, status, failedTune, successfullyTune):
+		self.results[index] = self.results.get(index, {"failed": [], "successful": [], "status": None})
+		self.resultsstatus[status] = self.resultsstatus.get(status, [])
+		
+		self.results[index]["status"] = status
+		self.results[index]["failed"] = failedTune
+		self.results[index]["successful"] = successfullyTune
+		
+		self.resultsstatus[status].append(index)
+	
+	def finishedChecking(self):
+		print "finishedChecking"
+		TuneTest.finishedChecking(self)
+
+		if not self.results.has_key(self.currentlyTestedIndex):
+			self.results[self.currentlyTestedIndex] = {"failed": [], "successful": [], "status": None}
+		
+		if len(self.failedTune) > 0 and len(self.successfullyTune) > 0:
+			self.changeProgressListStatus(self.currentlyTestedIndex, "with errors")
+			self["witherrors_counter"].setText(str(int(self["witherrors_counter"].getText()) + 1))
+			self.addResult(self.currentlyTestedIndex, "with_errors", self.failedTune, self.successfullyTune)
+		elif len(self.failedTune) == 0 and len(self.successfullyTune) == 0:
+			self.changeProgressListStatus(self.currentlyTestedIndex, "not tested")
+			self["untestable_counter"].setText(str(int(self["untestable_counter"].getText()) + 1))
+			self.addResult(self.currentlyTestedIndex, "untestable", self.failedTune, self.successfullyTune)
+		elif len(self.failedTune) > 0:
+			self.changeProgressListStatus(self.currentlyTestedIndex, "failed")
+			self["failed_counter"].setText(str(int(self["failed_counter"].getText()) + len(self.failedTune)))
+			self.addResult(self.currentlyTestedIndex, "failed", self.failedTune, self.successfullyTune)
+		else:
+			self.changeProgressListStatus(self.currentlyTestedIndex, "successful")
+			self["succeeded_counter"].setText(str(int(self["succeeded_counter"].getText()) + len(self.successfullyTune)))
+			self.addResult(self.currentlyTestedIndex, "successful", self.failedTune, self.successfullyTune)
+			
+			
+		#self["failed_counter"].setText(str(int(self["failed_counter"].getText()) + len(self.failedTune)))
+		#self["succeeded_counter"].setText(str(int(self["succeeded_counter"].getText()) + len(self.successfullyTune)))
+		#if len(self.failedTune) == 0 and len(self.successfullyTune) == 0:
+			#self["untestable_counter"].setText(str(int(self["untestable_counter"].getText()) + 1))
+			
+		self.currentlyTestedIndex = self.getNextIndex()
+		self.addProgressListItem(self.currentlyTestedIndex)
+		
+		if self.fillTransponderList():
+			self.run(checkPIDs = True)
+		else:
+			self.running = False
+			self["progress_list"].setIndex(0)
+			print "results:", self.results
+			print "resultsstatus:", self.resultsstatus
+
+	def go(self):
+		self.running = True
+		self["failed_counter"].setText("0")
+		self["succeeded_counter"].setText("0")
+		self["untestable_counter"].setText("0")
+		self.currentlyTestedIndex = self.getFirstIndex()
+		
+		self.clearProgressList()
+		self.addProgressListItem(self.currentlyTestedIndex)
+		
+		if self.fillTransponderList():
+			self.run(True)
+
+	def keyCancel(self):
+		self.close()
+		
+	def select(self):
+		print "selectedIndex:", self["progress_list"].getCurrent()[0]
+		if not self.running:
+			index = self["progress_list"].getCurrent()[0]
+			#self.setResultType(ResultParser.TYPE_BYORBPOS)
+			#self.setResultParameter(index[2])
+			self.setResultType(ResultParser.TYPE_BYINDEX)
+			self.setResultParameter(index)
+			self.session.open(TextBox, self.getTextualResult())
+	
+	def selectionChanged(self):
+		print "selection changed"
+		if len(self.list) > 0 and not self.running:
+			self["CmdText"].setText(_("Press OK to get further details for %s") % str(self["progress_list"].getCurrent()[1]))
+
+class DiseqcTesterTestTypeSelection(Screen, ConfigListScreen):
+	skin = """<screen position="80,95" size="560,412" title="DiSEqC Tester Test Settings">
+		<widget name="config" position="10,10" size="540,402" scrollbarMode="showOnDemand" />
+	</screen>
+	"""
+	def __init__(self, session, feid):
+		Screen.__init__(self, session)
+		self.feid = feid
+		
+		self.list = []
+		ConfigListScreen.__init__(self, self.list)
+		
+		self["actions"] = ActionMap(["SetupActions"],
+		{
+			"cancel": self.keyCancel
+		}, -2)
+		
+		self.createSetup()
+		
+	def createSetup(self):
+		self.testtype = ConfigSelection(choices={"quick": _("Quick"), "random": _("Random")}, default = "quick")
+		self.testtypeEntry = getConfigListEntry(_("Test Type"), self.testtype)
+		self.list.append(self.testtypeEntry)
+		
+		self.loopsfailed = ConfigSelection(choices={"-1": "Every known", "1": "1", "2": "2", "3": "3", "4": "4", "5": "5", "6": "6", "7": "7", "8": "8"}, default = "3")
+		self.loopsfailedEntry = getConfigListEntry(_("Stop testing plane after # failed transponders"), self.loopsfailed)
+		self.list.append(self.loopsfailedEntry)
+		
+		self.loopssuccessful = ConfigSelection(choices={"-1": "Every known", "1": "1", "2": "2", "3": "3", "4": "4", "5": "5", "6": "6", "7": "7", "8": "8"}, default = "1")
+		self.loopssuccessfulEntry = getConfigListEntry(_("Stop testing plane after # successful transponders"), self.loopssuccessful)
+		self.list.append(self.loopssuccessfulEntry)
+		
+		self["config"].list = self.list
+		self["config"].l.setList(self.list)
+		
+	def keyOK(self):
+		print self.testtype.getValue()
+		testtype = DiseqcTester.TEST_TYPE_QUICK
+		if self.testtype.getValue() == "quick":
+			testtype = DiseqcTester.TEST_TYPE_QUICK
+		elif self.testtype.getValue() == "random":
+			testtype = DiseqcTester.TEST_TYPE_RANDOM
+		elif self.testtype.getValue() == "complete":
+			testtype = DiseqcTester.TEST_TYPE_COMPLETE
+		self.session.open(DiseqcTester, feid = self.feid, test_type = testtype, loopsfailed = int(self.loopsfailed.value), loopssuccessful = int(self.loopssuccessful.value))
+	
+	def keyCancel(self):
+		self.close()
+
+class DiseqcTesterNimSelection(NimSelection):
+	skin = """
+		<screen position="160,123" size="400,330" title="Choose Tuner">
+		<widget source="nimlist" render="Listbox" position="0,0" size="380,300" scrollbarMode="showOnDemand">
+			<convert type="TemplatedMultiContent">
+				{"template": [
+						MultiContentEntryText(pos = (10, 5), size = (360, 30), flags = RT_HALIGN_LEFT, text = 1), # index 1 is the nim name,
+						MultiContentEntryText(pos = (50, 30), size = (320, 30), font = 1, flags = RT_HALIGN_LEFT, text = 2), # index 2 is a description of the nim settings,
+					],
+				 "fonts": [gFont("Regular", 20), gFont("Regular", 15)],
+				 "itemHeight": 70
+				}
+			</convert>
+		</widget>
+	</screen>"""
+		
+	def __init__(self, session, args = None):
+		NimSelection.__init__(self, session)
+
+	def setResultClass(self):
+		#self.resultclass = DiseqcTester
+		self.resultclass = DiseqcTesterTestTypeSelection
+		
+	def showNim(self, nim):
+		nimConfig = nimmanager.getNimConfig(nim.slot)
+		if nim.isCompatible("DVB-S"):
+			if nimConfig.configMode.value in ["loopthrough", "equal", "satposdepends", "nothing"]:
+				return False
+			if nimConfig.configMode.value == "simple":
+				if nimConfig.diseqcMode.value == "positioner":
+					return True
+			return True
+		return False
+
+def DiseqcTesterMain(session, **kwargs):
+	session.open(DiseqcTesterNimSelection)
+	
+def autostart(reason, **kwargs):
+	resourcemanager.addResource("DiseqcTester", DiseqcTesterMain)
+
+def Plugins(**kwargs):
+	return [ PluginDescriptor(name="DiSEqC Tester", description=_("Test DiSEqC settings"), where = PluginDescriptor.WHERE_PLUGINMENU, fnc=DiseqcTesterMain),
+			PluginDescriptor(where = PluginDescriptor.WHERE_AUTOSTART, fnc = autostart)]
diff --git a/lib/python/Plugins/SystemPlugins/Makefile.am b/lib/python/Plugins/SystemPlugins/Makefile.am
index 36b4bde5..4491eafc 100644
--- a/lib/python/Plugins/SystemPlugins/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Makefile.am
@@ -1 +1 @@
-SUBDIRS = SoftwareUpdate FrontprocessorUpgrade PositionerSetup ConfigurationBackup Satfinder SkinSelector SatelliteEquipmentControl Videomode VideoTune Hotplug DefaultServicesScanner NFIFlash
+SUBDIRS = SoftwareUpdate FrontprocessorUpgrade PositionerSetup ConfigurationBackup Satfinder SkinSelector SatelliteEquipmentControl Videomode VideoTune Hotplug DefaultServicesScanner NFIFlash DiseqcTester
diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
index d61c1503..72982483 100644
--- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
@@ -12,33 +12,8 @@ from Components.ActionMap import ActionMap
 from Components.NimManager import nimmanager, getConfigSatlist
 from Components.MenuList import MenuList
 from Components.config import ConfigSelection, getConfigListEntry
+from Components.TuneTest import Tuner
 
-class Tuner:
-	def __init__(self, frontend):
-		self.frontend = frontend
-		
-	def tune(self, transponder):
-		if self.frontend:
-			print "tuning to transponder with data", transponder
-			parm = eDVBFrontendParametersSatellite()
-			parm.frequency = transponder[0] * 1000
-			parm.symbol_rate = transponder[1] * 1000
-			parm.polarisation = transponder[2]
-			parm.fec = transponder[3]
-			parm.inversion = transponder[4]
-			parm.orbital_position = transponder[5]
-			parm.system = transponder[6]
-			parm.modulation = transponder[7]
-			parm.rolloff = transponder[8]
-			parm.pilot = transponder[9]
-			feparm = eDVBFrontendParameters()
-			feparm.setDVBS(parm, True)
-			self.lastparm = feparm
-			self.frontend.tune(feparm)
-
-	def retune(self):
-		if self.frontend:
-			self.frontend.tune(self.lastparm)
 
 class Satfinder(ScanSetup):
 	def openFrontend(self):
diff --git a/lib/python/Screens/Makefile.am b/lib/python/Screens/Makefile.am
index a3cf70bb..cde2d6c3 100755
--- a/lib/python/Screens/Makefile.am
+++ b/lib/python/Screens/Makefile.am
@@ -13,5 +13,6 @@ install_PYTHON = \
 	TimerSelection.py PictureInPicture.py TimeDateInput.py \
 	SubtitleDisplay.py SubservicesQuickzap.py ParentalControlSetup.py NumericalTextInputHelpDialog.py \
 	SleepTimerEdit.py Ipkg.py RdsDisplay.py Globals.py DefaultWizard.py \
-	SessionGlobals.py LocationBox.py WizardLanguage.py TaskView.py Rc.py VirtualKeyBoard.py
+	SessionGlobals.py LocationBox.py WizardLanguage.py TaskView.py Rc.py VirtualKeyBoard.py \
+	TextBox.py
 
diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 5628926f..320bea84 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -384,18 +384,26 @@ class NimSelection(Screen):
 		self.list = [None] * nimmanager.getSlotCount()
 		self["nimlist"] = List(self.list)
 		self.updateList()
+		
+		self.setResultClass()
 
 		self["actions"] = ActionMap(["OkCancelActions"],
 		{
 			"ok": self.okbuttonClick ,
 			"cancel": self.close
 		}, -2)
+		
+	def setResultClass(self):
+		self.resultclass = NimSetup
 
 	def okbuttonClick(self):
 		nim = self["nimlist"].getCurrent()
 		nim = nim and nim[3]
 		if nim is not None and not nim.empty:
-			self.session.openWithCallback(self.updateList, NimSetup, nim.slot)
+			self.session.openWithCallback(self.updateList, self.resultclass, nim.slot)
+			
+	def showNim(self, nim):
+		return True
 
 	def updateList(self):
 		self.list = [ ]
@@ -403,42 +411,44 @@ class NimSelection(Screen):
 			slotid = x.slot
 			nimConfig = nimmanager.getNimConfig(x.slot)
 			text = nimConfig.configMode.value
-			if x.isCompatible("DVB-S"):
-				if nimConfig.configMode.value in ["loopthrough", "equal", "satposdepends"]:
-					text = { "loopthrough": _("loopthrough to"),
-							 "equal": _("equal to"),
-							 "satposdepends": _("second cable of motorized LNB") } [nimConfig.configMode.value]
-					text += " " + _("Tuner") + " " + ["A", "B", "C", "D"][int(nimConfig.connectedTo.value)]
-				elif nimConfig.configMode.value == "nothing":
-					text = _("nothing connected")
-				elif nimConfig.configMode.value == "simple":
-					if nimConfig.diseqcMode.value in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
-						text = _("Sats") + ": " 
-						if nimConfig.diseqcA.orbital_position != 3601:
-							text += nimmanager.getSatName(int(nimConfig.diseqcA.value))
-						if nimConfig.diseqcMode.value in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
-							if nimConfig.diseqcB.orbital_position != 3601:
-								text += "," + nimmanager.getSatName(int(nimConfig.diseqcB.value))
-						if nimConfig.diseqcMode.value == "diseqc_a_b_c_d":
-							if nimConfig.diseqcC.orbital_position != 3601:
-								text += "," + nimmanager.getSatName(int(nimConfig.diseqcC.value))
-							if nimConfig.diseqcD.orbital_position != 3601:
-								text += "," + nimmanager.getSatName(int(nimConfig.diseqcD.value))
-					elif nimConfig.diseqcMode.value == "positioner":
-						text = _("Positioner") + ":"
-						if nimConfig.positionerMode.value == "usals":
-							text += _("USALS")
-						elif nimConfig.positionerMode.value == "manual":
-							text += _("manual")
-					else:	
-						text = _("simple")
-				elif nimConfig.configMode.value == "advanced":
-					text = _("advanced")
-			elif x.isCompatible("DVB-T") or x.isCompatible("DVB-C"):
-				if nimConfig.configMode.value == "nothing":
-					text = _("nothing connected")
-				elif nimConfig.configMode.value == "enabled":
-					text = _("enabled")
-				
-			self.list.append((slotid, x.friendly_full_description, text, x))
+			if self.showNim(x):
+				if x.isCompatible("DVB-S"):
+					if nimConfig.configMode.value in ["loopthrough", "equal", "satposdepends"]:
+						text = { "loopthrough": _("loopthrough to"),
+								 "equal": _("equal to"),
+								 "satposdepends": _("second cable of motorized LNB") } [nimConfig.configMode.value]
+						text += " " + _("Tuner") + " " + ["A", "B", "C", "D"][int(nimConfig.connectedTo.value)]
+					elif nimConfig.configMode.value == "nothing":
+						text = _("nothing connected")
+					elif nimConfig.configMode.value == "simple":
+						if nimConfig.diseqcMode.value in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
+							text = _("Sats") + ": " 
+							if nimConfig.diseqcA.orbital_position != 3601:
+								text += nimmanager.getSatName(int(nimConfig.diseqcA.value))
+							if nimConfig.diseqcMode.value in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
+								if nimConfig.diseqcB.orbital_position != 3601:
+									text += "," + nimmanager.getSatName(int(nimConfig.diseqcB.value))
+							if nimConfig.diseqcMode.value == "diseqc_a_b_c_d":
+								if nimConfig.diseqcC.orbital_position != 3601:
+									text += "," + nimmanager.getSatName(int(nimConfig.diseqcC.value))
+								if nimConfig.diseqcD.orbital_position != 3601:
+									text += "," + nimmanager.getSatName(int(nimConfig.diseqcD.value))
+						elif nimConfig.diseqcMode.value == "positioner":
+							text = _("Positioner") + ":"
+							if nimConfig.positionerMode.value == "usals":
+								text += _("USALS")
+							elif nimConfig.positionerMode.value == "manual":
+								text += _("manual")
+						else:	
+							text = _("simple")
+					elif nimConfig.configMode.value == "advanced":
+						text = _("advanced")
+				elif x.isCompatible("DVB-T") or x.isCompatible("DVB-C"):
+					if nimConfig.configMode.value == "nothing":
+						text = _("nothing connected")
+					elif nimConfig.configMode.value == "enabled":
+						text = _("enabled")
+					
+				self.list.append((slotid, x.friendly_full_description, text, x))
+		self["nimlist"].setList(self.list)
 		self["nimlist"].updateList(self.list)
\ No newline at end of file
diff --git a/lib/python/Screens/TextBox.py b/lib/python/Screens/TextBox.py
new file mode 100644
index 00000000..44b8a3cf
--- /dev/null
+++ b/lib/python/Screens/TextBox.py
@@ -0,0 +1,26 @@
+from Screens.Screen import Screen
+
+from Components.ActionMap import ActionMap
+from Components.Sources.StaticText import StaticText
+from Components.ScrollLabel import ScrollLabel
+
+class TextBox(Screen):
+	def __init__(self, session, text = ""):
+		Screen.__init__(self, session)
+		
+		self.text = text
+		self["text"] = ScrollLabel(self.text)
+		
+		self["actions"] = ActionMap(["OkCancelActions", "DirectionActions"], 
+				{
+					"cancel": self.cancel,
+					"ok": self.ok,
+					"up": self["text"].pageUp,
+					"down": self["text"].pageDown,
+				}, -1)
+		
+	def ok(self):
+		self.close()
+	
+	def cancel(self):
+		self.close()