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

2 files changed, 12 insertions, 4 deletions

diff --git a/lib/python/Components/TuneTest.py b/lib/python/Components/TuneTest.py
index e3b7d9e3..f9ab3edb 100644
--- a/lib/python/Components/TuneTest.py
+++ b/lib/python/Components/TuneTest.py
@@ -95,7 +95,7 @@ class TuneTest:
 		else:
 			if dict["tuner_state"] == "LOSTLOCK" or dict["tuner_state"] == "FAILED":
 				self.tuningtransponder = self.nextTransponder()
-				self.failedTune.append([self.currTuned, self.oldTuned, "tune_failed"])
+				self.failedTune.append([self.currTuned, self.oldTuned, "tune_failed", dict])  # last parameter is the frontend status)
 				if self.stopOnError != -1 and self.stopOnError <= len(self.failedTune):
 					stop = True
 			elif dict["tuner_state"] == "LOCKED":
@@ -103,14 +103,14 @@ class TuneTest:
 				if self.checkPIDs:
 					if self.currTuned is not None:
 						if self.tsid != self.currTuned[10] or self.onid != self.currTuned[11]:
-							self.failedTune.append([self.currTuned, self.oldTuned, "pids_failed", {"real": (self.tsid, self.onid), "expected": (self.currTuned[10], self.currTuned[11])}])
+							self.failedTune.append([self.currTuned, self.oldTuned, "pids_failed", {"real": (self.tsid, self.onid), "expected": (self.currTuned[10], self.currTuned[11])}, dict])  # last parameter is the frontend status
 							pidsFailed = True
 						else:
-							self.successfullyTune.append([self.currTuned, self.oldTuned])
+							self.successfullyTune.append([self.currTuned, self.oldTuned, dict])  # 3rd parameter is the frontend status
 							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])
+					self.successfullyTune.append([self.currTuned, self.oldTuned, dict]) # 3rd parameter is the frontend status
 					if self.stopOnSuccess != -1 and self.stopOnSuccess <= len(self.successfullyTune):
 								stop = True
 				self.tuningtransponder = self.nextTransponder()
diff --git a/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py b/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
index bb4df74a..71ae50b6 100644
--- a/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
@@ -51,8 +51,10 @@ class ResultParser:
 		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 = {}
+		completelist = []
 		if countfailed > 0:
 			for transponder in failed:
+				completelist.append({"transponder": transponder[0], "fedata": transponder[-1]})
 				reasons[transponder[2]] = reasons.get(transponder[2], [])
 				reasons[transponder[2]].append(transponder)
 				if transponder[2] == "pids_failed":
@@ -90,12 +92,18 @@ class ResultParser:
 			text += "\n"
 			text += "Successfully tuned transponders' previous planes:\n" 
 			for transponder in successful:
+				completelist.append({"transponder": transponder[0], "fedata": transponder[-1]})
 				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"
+		
+		text += "------------------------------------------------\n"
+		text += "complete transponderlist:\n"
+		for entry in completelist:
+			text += str(entry["transponder"]) + " -- " + str(entry["fedata"]) + "\n"
 		return text
 
 	def getTextualResult(self):