X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/159a405b6c4eebe49e69b595310657ceda406c1c..39548963f2015ea82a8d490b19f4acb7adc7e7fb:/lib/python/Components/NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 9dafaf40..1d70580f 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -44,7 +44,7 @@ class SecConfigure:
 		sec.setLNBTunerMask(tunermask)
 		sec.setLNBLOFL(9750000)
 		sec.setLNBLOFH(10600000)
-		sec.setLNBThreshold(11750000)
+		sec.setLNBThreshold(11700000)
 		sec.setLNBIncreasedVoltage(lnbParam.OFF)
 		sec.setRepeats(0)
 		sec.setFastDiSEqC(0)
@@ -176,7 +176,7 @@ class SecConfigure:
 				if currentConfigSelectionElement(currLnb.lof) == "universal_lnb":
 					sec.setLNBLOFL(9750000)
 					sec.setLNBLOFH(10600000)
-					sec.setLNBThreshold(11750000)
+					sec.setLNBThreshold(11700000)
 				elif currentConfigSelectionElement(currLnb.lof) == "c_band":
 					sec.setLNBLOFL(5150000)
 					sec.setLNBLOFH(5150000)
@@ -434,7 +434,6 @@ class NimManager:
 	def getTerrestrialFlags(self, nim):
 		return self.terrestrialsList[config.Nims[nim].terrestrial.value][1]
 
-
 	def getConfiguredSats(self):
 		return self.sec.getSatList()
 
@@ -487,7 +486,7 @@ class NimManager:
 				self.nimSocketCount += 1
 			elif line.strip().startswith("Type:"):
 				self.nimTypes[lastsocket] = str(line.strip()[6:])
-				self.nimTypes[lastsocket] = str("DVB-T")
+				#self.nimTypes[lastsocket] = str("DVB-T")
 			elif line.strip().startswith("Name:"):
 				self.nimNames[lastsocket] = str(line.strip()[6:])
 			elif line.strip().startswith("empty"):
@@ -571,6 +570,9 @@ class NimManager:
 
 	def getNimConfigMode(self, slotid):
 		return currentConfigSelectionElement(config.Nims[slotid].configMode)
+	
+	def getSatList(self):
+		return self.satList
 
 	def getSatListForNim(self, slotid):
 		list = []
@@ -597,6 +599,28 @@ class NimManager:
 						list.append(x)
 		return list
 
+	def getRotorSatListForNim(self, slotid):
+		list = []
+		if (self.getNimType(slotid) == self.nimType["DVB-S"]):
+			#print "slotid:", slotid
+
+			#print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.value]
+			#print "diseqcA:", config.Nims[slotid].diseqcA.value
+			configMode = currentConfigSelectionElement(config.Nims[slotid].configMode)
+			if configMode == "simple":
+				if (config.Nims[slotid].diseqcMode.value == 4):
+					for x in self.satList:
+						list.append(x)
+			elif configMode == "advanced":
+				for x in self.satList:
+					nim = config.Nims[slotid]
+					lnbnum = nim.advanced.sat[x[1]].lnb.value
+					if lnbnum != 0:
+						lnb = nim.advanced.lnb[lnbnum]
+						if lnb.diseqcMode.value == 3: # diseqc 1.2
+							list.append(x)
+		return list
+
 	def nimDiseqcModeChanged(self, slotid, mode):
 		#print "nimDiseqcModeChanged set to " + str(mode)
 		pass
@@ -718,7 +742,7 @@ def InitNimManager(nimmgr):
 				nim.advanced.lnb[x].lof = configElement(cname + "advanced.lnb" + str(x) + ".lof", configSelection, 0, (("universal_lnb", _("Universal LNB")), ("c_band", _("C-Band")), ("user_defined", _("User defined"))), False)
 				nim.advanced.lnb[x].lofl = configElement(cname + "advanced.lnb" + str(x) + ".lofl", configSequence, [9750], configsequencearg.get("INTEGER", (0, 99999)), False)
 				nim.advanced.lnb[x].lofh = configElement(cname + "advanced.lnb" + str(x) + ".lofh", configSequence, [10600], configsequencearg.get("INTEGER", (0, 99999)), False)
-				nim.advanced.lnb[x].threshold = configElement(cname + "advanced.lnb" + str(x) + ".threshold", configSequence, [11750], configsequencearg.get("INTEGER", (0, 99999)), False)
+				nim.advanced.lnb[x].threshold = configElement(cname + "advanced.lnb" + str(x) + ".threshold", configSequence, [11700], configsequencearg.get("INTEGER", (0, 99999)), False)
 				nim.advanced.lnb[x].output_12v = configElement(cname + "advanced.lnb" + str(x) + ".output_12v", configSelection, 0, (("0V", _("0 V")), ("12V", _("12 V"))), False)
 				nim.advanced.lnb[x].increased_voltage = configElement(cname + "advanced.lnb" + str(x) + ".increased_voltage", configSelection, 0, (("no", _("No")), ("yes", _("Yes"))), False)
 				nim.advanced.lnb[x].toneburst = configElement(cname + "advanced.lnb" + str(x) + ".toneburst", configSelection, 0, (("none", _("None")), ("A", _("A")), ("B", _("B"))), False)