- properly ignore transponders without values for tsid/onid in the diseqc tester

- add some log file output for pids_failed case (real tsid/onid and expected tsid/onid)

3 files changed, 13 insertions, 4 deletions

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 110cedd8..e4d9ad22 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -839,7 +839,7 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
 			PyDict_SetItem(tp_dict, sat_pos, tplist);
 			for (ElementConstIterator it(sat_elements.begin()); it != sat_elements.end(); ++it)
 			{
-//				eDebug("\telement: %s", (*it)->name().c_str());
+				//eDebug("\telement: %s", (*it)->name().c_str());
 				const AttributeList &tp_attributes = (*it)->getAttributeList();
 				AttributeConstIterator end = tp_attributes.end();
 				modulation = eDVBFrontendParametersSatellite::Modulation_QPSK;
@@ -856,8 +856,8 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
 
 				for (AttributeConstIterator it(tp_attributes.begin()); it != end; ++it)
 				{
-					//eDebug("\t\tattr: %s", at->name().c_str());
 					at = *it;
+					//eDebug("\t\tattr: %s", at->name().c_str());
 					name = at->name();
 					if (name == "modulation") dest = &modulation;
 					else if (name == "system") dest = &system;
@@ -872,6 +872,7 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
 					else if (name == "onid") dest = &onid;
 					if (dest)
 					{
+						//eDebug("\t\t\tvalue: %s", at->value().c_str());
 						tmp = strtol(at->value().c_str(), &end_ptr, 10);
 						if (!*end_ptr)
 							*dest = tmp;
diff --git a/lib/python/Components/TuneTest.py b/lib/python/Components/TuneTest.py
index 8e8644e3..e3b7d9e3 100644
--- a/lib/python/Components/TuneTest.py
+++ b/lib/python/Components/TuneTest.py
@@ -140,7 +140,7 @@ class TuneTest:
 			# 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)):
+			while (index < len(self.transponderlist) and (self.transponderlist[index][10] == -1 or self.transponderlist[index][11] == -1)):
 			 	index += 1
 		print "FirstTransponder final index:", index
 		return index
@@ -153,7 +153,7 @@ class TuneTest:
 			# 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)):
+			while (index < len(self.transponderlist) and (self.transponderlist[index][10] == -1 or self.transponderlist[index][11] == -1)):
 			 	index += 1
 
 		print "next transponder index:", index
diff --git a/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py b/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
index a4793949..bb4df74a 100644
--- a/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
@@ -78,6 +78,14 @@ class ResultParser:
 						text += " ==> "
 						text += str(transponder[0])
 						text += "\n"
+					if reason == "pids_failed":
+						text += "(tsid, onid): "
+						text += str(transponder[3]['real'])
+						text += "(read from sat) != "
+						text += str(transponder[3]['expected'])
+						text += "(read from file)"
+						text += "\n"
+					text += "\n"
 		if countsuccessful > 0:
 			text += "\n"
 			text += "Successfully tuned transponders' previous planes:\n"