X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FNimManager.py;h=7f7dd5c4d91b40f81fc5647ccb82cbe9a9e2f967;hb=d6c029c9f46709fb51b3dee340a088c0260b90b4;hp=79099ecb2dbe027ab2f20ff8b51c55d7304496f4;hpb=aed83aaddeb4782046a204d7a6884c3a9bdf47a3;p=vuplus_dvbapp

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 79099ec..7f7dd5c 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -10,7 +10,7 @@ from enigma import eDVBSatelliteEquipmentControl as secClass, \
 	eDVBSatelliteDiseqcParameters as diseqcParam, \
 	eDVBSatelliteSwitchParameters as switchParam, \
 	eDVBSatelliteRotorParameters as rotorParam, \
-	eDVBResourceManager, eDVBDB
+	eDVBResourceManager, eDVBDB, eEnv
 
 from time import localtime, mktime
 from datetime import datetime
@@ -150,7 +150,7 @@ class SecConfigure:
 
 		for slot in nim_slots:
 			if slot.type is not None:
-				used_nim_slots.append((slot.slot, slot.description, slot.config.configMode.value != "nothing" and True or False, slot.isCompatible("DVB-S2")))
+				used_nim_slots.append((slot.slot, slot.description, slot.config.configMode.value != "nothing" and True or False, slot.isCompatible("DVB-S2"), slot.frontend_id is None and -1 or slot.frontend_id))
 		eDVBResourceManager.getInstance().setFrontendSlotInformations(used_nim_slots)
 
 		for slot in nim_slots:
@@ -390,6 +390,7 @@ class SecConfigure:
 
 					if currLnb.diseqcMode.value == "1_0":
 						currCO = currLnb.commandOrder1_0.value
+						sec.setRepeats(0)
 					else:
 						currCO = currLnb.commandOrder.value
 
@@ -481,7 +482,7 @@ class SecConfigure:
 		self.update()
 
 class NIM(object):
-	def __init__(self, slot, type, description, has_outputs = True, internally_connectable = None, multi_type = {}, frontend_id = None):
+	def __init__(self, slot, type, description, has_outputs = True, internally_connectable = None, multi_type = {}, frontend_id = None, i2c = None, is_empty = False):
 		self.slot = slot
 
 		if type not in ("DVB-S", "DVB-C", "DVB-T", "DVB-S2", None):
@@ -493,7 +494,9 @@ class NIM(object):
 		self.has_outputs = has_outputs
 		self.internally_connectable = internally_connectable
 		self.multi_type = multi_type
+		self.i2c = i2c
 		self.frontend_id = frontend_id
+		self.__is_empty = is_empty
 
 	def isCompatible(self, what):
 		if not self.isSupported():
@@ -530,6 +533,9 @@ class NIM(object):
 	def getSlotID(self):
 		return chr(ord('A') + self.slot)
 	
+	def getI2C(self):
+		return self.i2c
+	
 	def hasOutputs(self):
 		return self.has_outputs
 	
@@ -549,8 +555,12 @@ class NIM(object):
 	def isMultiType(self):
 		return (len(self.multi_type) > 0)
 	
+	def isEmpty(self):
+		return self.__is_empty
+	
+	# empty tuners are supported!
 	def isSupported(self):
-		return (self.frontend_id is not None)
+		return (self.frontend_id is not None) or self.__is_empty
 	
 	# returns dict {<slotid>: <type>}
 	def getMultiTypeList(self):
@@ -695,8 +705,10 @@ class NimManager:
 				entries[current_slot] = {}
 			elif line.strip().startswith("Type:"):
 				entries[current_slot]["type"] = str(line.strip()[6:])
+				entries[current_slot]["isempty"] = False
 			elif line.strip().startswith("Name:"):
 				entries[current_slot]["name"] = str(line.strip()[6:])
+				entries[current_slot]["isempty"] = False
 			elif line.strip().startswith("Has_Outputs:"):
 				input = str(line.strip()[len("Has_Outputs:") + 1:])
 				entries[current_slot]["has_outputs"] = (input == "yes")
@@ -714,9 +726,13 @@ class NimManager:
 				modes = entries[current_slot].get("multi_type", {})
 				modes[split2[1]] = split[1].strip()
 				entries[current_slot]["multi_type"] = modes
+			elif line.strip().startswith("I2C_Device:"):
+				input = int(line.strip()[len("I2C_Device:") + 1:])
+				entries[current_slot]["i2c"] = input
 			elif line.strip().startswith("empty"):
 				entries[current_slot]["type"] = None
 				entries[current_slot]["name"] = _("N/A")
+				entries[current_slot]["isempty"] = True
 		nimfile.close()
 		
 		from os import path
@@ -725,6 +741,8 @@ class NimManager:
 			if not (entry.has_key("name") and entry.has_key("type")):
 				entry["name"] =  _("N/A")
 				entry["type"] = None
+			if not (entry.has_key("i2c")):
+				entry["i2c"] = None
 			if not (entry.has_key("has_outputs")):
 				entry["has_outputs"] = True
 			if entry.has_key("frontend_device"): # check if internally connectable
@@ -736,7 +754,7 @@ class NimManager:
 				entry["frontend_device"] = entry["internally_connectable"] = None
 			if not (entry.has_key("multi_type")):
 				entry["multi_type"] = {}
-			self.nim_slots.append(NIM(slot = id, description = entry["name"], type = entry["type"], has_outputs = entry["has_outputs"], internally_connectable = entry["internally_connectable"], multi_type = entry["multi_type"], frontend_id = entry["frontend_device"]))
+			self.nim_slots.append(NIM(slot = id, description = entry["name"], type = entry["type"], has_outputs = entry["has_outputs"], internally_connectable = entry["internally_connectable"], multi_type = entry["multi_type"], frontend_id = entry["frontend_device"], i2c = entry["i2c"], is_empty = entry["isempty"]))
 
 	def hasNimType(self, chktype):
 		for slot in self.nim_slots:
@@ -758,6 +776,9 @@ class NimManager:
 	
 	def getNim(self, slotid):
 		return self.nim_slots[slotid]
+	
+	def getI2CDevice(self, slotid):
+		return self.nim_slots[slotid].getI2C()
 
 	def getNimListOfType(self, type, exception = -1):
 		# returns a list of indexes for NIMs compatible to the given type, except for 'exception'
@@ -1062,7 +1083,7 @@ def InitNimManager(nimmgr):
 
 	unicablelnbproducts = {}
 	unicablematrixproducts = {}
-	doc = xml.etree.cElementTree.parse("/usr/share/enigma2/unicable.xml")
+	doc = xml.etree.cElementTree.parse(eEnv.resolve("${datadir}/enigma2/unicable.xml"))
 	root = doc.getroot()
 
 	entry = root.find("lnb")