git.cweiske.de / enigma2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Revert "disable unicable for release 2.6"
[enigma2.git] / lib / python / Components / NimManager.py
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 7d148f3c0eddd1a32ba805767d8a3b2f4151a341..805be4df237dd158c0ab6aa2c818507a3e89887d 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -1,4 +1,5 @@
 from Tools.HardwareInfo import HardwareInfo
 from Tools.HardwareInfo import HardwareInfo
+from Tools.BoundFunction import boundFunction
 
 from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, \
        ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, \
 
 from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, \
        ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, \
@@ -13,6 +14,10 @@ from enigma import eDVBSatelliteEquipmentControl as secClass, \
 
 from time import localtime, mktime
 from datetime import datetime
 
 from time import localtime, mktime
 from datetime import datetime
+from Tools.BoundFunction import boundFunction
+
+from Tools import Directories
+import xml.etree.cElementTree
 
 def getConfigSatlist(orbpos, satlist):
        default_orbpos = None
 
 def getConfigSatlist(orbpos, satlist):
        default_orbpos = None
@@ -232,6 +237,20 @@ class SecConfigure:
                print "sec config completed"
 
        def updateAdvanced(self, sec, slotid):
                print "sec config completed"
 
        def updateAdvanced(self, sec, slotid):
+               try:
+                       if config.Nims[slotid].advanced.unicableconnected is not None:
+                               if config.Nims[slotid].advanced.unicableconnected.value == True:
+                                       config.Nims[slotid].advanced.unicableconnectedTo.save_forced = True
+                                       self.linkNIMs(sec, slotid, int(config.Nims[slotid].advanced.unicableconnectedTo.value))
+                                       connto = self.getRoot(slotid, int(config.Nims[slotid].advanced.unicableconnectedTo.value))
+                                       if not self.linked.has_key(connto):
+                                               self.linked[connto] = []
+                                       self.linked[connto].append(slotid)
+                               else:
+                                       config.Nims[slotid].advanced.unicableconnectedTo.save_forced = False
+               except:
+                       pass
+
                lnbSat = {}
                for x in range(1,37):
                        lnbSat[x] = []
                lnbSat = {}
                for x in range(1,37):
                        lnbSat[x] = []
@@ -274,24 +293,32 @@ class SecConfigure:
                                        sec.setLNBLOFH(10600000)
                                        sec.setLNBThreshold(11700000)
                                elif currLnb.lof.value == "unicable":
                                        sec.setLNBLOFH(10600000)
                                        sec.setLNBThreshold(11700000)
                                elif currLnb.lof.value == "unicable":
-                                       sec.setLNBLOFL(9750000)
-                                       sec.setLNBLOFH(10600000)
-                                       sec.setLNBThreshold(11700000)
+                                       def setupUnicable(configManufacturer, ProductDict):
+                                               manufacturer_name = configManufacturer.value
+                                               manufacturer = ProductDict[manufacturer_name]
+                                               product_name = manufacturer.product.value
+                                               sec.setLNBSatCR(manufacturer.scr[product_name].index)
+                                               sec.setLNBSatCRvco(manufacturer.vco[product_name][manufacturer.scr[product_name].index].value*1000)
+                                               sec.setLNBSatCRpositions(manufacturer.positions[product_name][0].value)
+                                               sec.setLNBLOFL(manufacturer.lofl[product_name][0].value * 1000)
+                                               sec.setLNBLOFH(manufacturer.lofh[product_name][0].value * 1000)
+                                               sec.setLNBThreshold(manufacturer.loft[product_name][0].value * 1000)
+                                               configManufacturer.save_forced = True
+                                               manufacturer.product.save_forced = True
+                                               manufacturer.vco[product_name][manufacturer.scr[product_name].index].save_forced = True
+
                                        if currLnb.unicable.value == "unicable_user":
                                        if currLnb.unicable.value == "unicable_user":
+#TODO satpositions for satcruser
+                                               sec.setLNBLOFL(currLnb.lofl.value * 1000)
+                                               sec.setLNBLOFH(currLnb.lofh.value * 1000)
+                                               sec.setLNBThreshold(currLnb.threshold.value * 1000)
                                                sec.setLNBSatCR(currLnb.satcruser.index)
                                                sec.setLNBSatCRvco(currLnb.satcrvcouser[currLnb.satcruser.index].value*1000)
                                                sec.setLNBSatCR(currLnb.satcruser.index)
                                                sec.setLNBSatCRvco(currLnb.satcrvcouser[currLnb.satcruser.index].value*1000)
+                                               sec.setLNBSatCRpositions(1)     #HACK
                                        elif currLnb.unicable.value == "unicable_matrix":
                                        elif currLnb.unicable.value == "unicable_matrix":
-                                               manufacturer_name = currLnb.unicableMatrixManufacturer.value
-                                               manufacturer = currLnb.unicableMatrix[manufacturer_name]
-                                               product_name = manufacturer.product.value
-                                               sec.setLNBSatCR(manufacturer.scr[product_name].index)
-                                               sec.setLNBSatCRvco(manufacturer.vco[product_name][manufacturer.scr[product_name].index].value*1000)
+                                               setupUnicable(currLnb.unicableMatrixManufacturer, currLnb.unicableMatrix)
                                        elif currLnb.unicable.value == "unicable_lnb":
                                        elif currLnb.unicable.value == "unicable_lnb":
-                                               manufacturer_name = currLnb.unicableLnbManufacturer.value
-                                               manufacturer = currLnb.unicableLnb[manufacturer_name]
-                                               product_name = manufacturer.product.value
-                                               sec.setLNBSatCR(manufacturer.scr[product_name].index)
-                                               sec.setLNBSatCRvco(manufacturer.vco[product_name][manufacturer.scr[product_name].index].value*1000)
+                                               setupUnicable(currLnb.unicableLnbManufacturer, currLnb.unicableLnb)
                                elif currLnb.lof.value == "c_band":
                                        sec.setLNBLOFL(5150000)
                                        sec.setLNBLOFH(5150000)
                                elif currLnb.lof.value == "c_band":
                                        sec.setLNBLOFL(5150000)
                                        sec.setLNBLOFH(5150000)
@@ -444,7 +471,7 @@ class SecConfigure:
                self.update()
 
 class NIM(object):
                self.update()
 
 class NIM(object):
-       def __init__(self, slot, type, description, has_outputs = True, internally_connectable = None):
+       def __init__(self, slot, type, description, has_outputs = True, internally_connectable = None, multi_type = {}):
                self.slot = slot
 
                if type not in ("DVB-S", "DVB-C", "DVB-T", "DVB-S2", None):
                self.slot = slot
 
                if type not in ("DVB-S", "DVB-C", "DVB-T", "DVB-S2", None):
@@ -455,6 +482,7 @@ class NIM(object):
                self.description = description
                self.has_outputs = has_outputs
                self.internally_connectable = internally_connectable
                self.description = description
                self.has_outputs = has_outputs
                self.internally_connectable = internally_connectable
+               self.multi_type = multi_type
 
        def isCompatible(self, what):
                compatible = {
 
        def isCompatible(self, what):
                compatible = {
@@ -466,6 +494,9 @@ class NIM(object):
                        }
                return what in compatible[self.type]
        
                        }
                return what in compatible[self.type]
        
+       def getType(self):
+               return self.type
+       
        def connectableTo(self):
                connectable = {
                                "DVB-S": ("DVB-S", "DVB-S2"),
        def connectableTo(self):
                connectable = {
                                "DVB-S": ("DVB-S", "DVB-S2"),
@@ -491,6 +522,13 @@ class NIM(object):
        
        def internallyConnectableTo(self):
                return self.internally_connectable
        
        def internallyConnectableTo(self):
                return self.internally_connectable
+       
+       def isMultiType(self):
+               return (len(self.multi_type) > 0)
+       
+       # returns dict {<slotid>: <type>}
+       def getMultiTypeList(self):
+               return self.multi_type
 
        slot_id = property(getSlotID)
 
 
        slot_id = property(getSlotID)
 
@@ -636,7 +674,15 @@ class NimManager:
                                entries[current_slot]["has_outputs"] = (input == "yes")
                        elif line.strip().startswith("Internally_Connectable:"):
                                input = int(line.strip()[len("Internally_Connectable:") + 1:])
                                entries[current_slot]["has_outputs"] = (input == "yes")
                        elif line.strip().startswith("Internally_Connectable:"):
                                input = int(line.strip()[len("Internally_Connectable:") + 1:])
-                               entries[current_slot]["internally_connectable"] = input 
+                               entries[current_slot]["internally_connectable"] = input
+                       elif  line.strip().startswith("Mode"):
+                               # "Mode 0: DVB-T" -> ["Mode 0", " DVB-T"]
+                               split = line.strip().split(":")
+                               # "Mode 0" -> ["Mode, "0"]
+                               split2 = split[0].split(" ")
+                               modes = entries[current_slot].get("multi_type", {})
+                               modes[split2[1]] = split[1].strip()
+                               entries[current_slot]["multi_type"] = modes
                        elif line.strip().startswith("empty"):
                                entries[current_slot]["type"] = None
                                entries[current_slot]["name"] = _("N/A")
                        elif line.strip().startswith("empty"):
                                entries[current_slot]["type"] = None
                                entries[current_slot]["name"] = _("N/A")
@@ -650,12 +696,17 @@ class NimManager:
                                entry["has_outputs"] = True
                        if not (entry.has_key("internally_connectable")):
                                entry["internally_connectable"] = None
                                entry["has_outputs"] = True
                        if not (entry.has_key("internally_connectable")):
                                entry["internally_connectable"] = None
-                       self.nim_slots.append(NIM(slot = id, description = entry["name"], type = entry["type"], has_outputs = entry["has_outputs"], internally_connectable = entry["internally_connectable"]))
+                       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"]))
 
        def hasNimType(self, chktype):
                for slot in self.nim_slots:
                        if slot.isCompatible(chktype):
                                return True
 
        def hasNimType(self, chktype):
                for slot in self.nim_slots:
                        if slot.isCompatible(chktype):
                                return True
+                       for type in slot.getMultiTypeList().values():
+                               if chktype == type:
+                                       return True
                return False
        
        def getNimType(self, slotid):
                return False
        
        def getNimType(self, slotid):
@@ -663,6 +714,9 @@ class NimManager:
        
        def getNimDescription(self, slotid):
                return self.nim_slots[slotid].friendly_full_description
        
        def getNimDescription(self, slotid):
                return self.nim_slots[slotid].friendly_full_description
+       
+       def getNimName(self, slotid):
+               return self.nim_slots[slotid].description
 
        def getNimListOfType(self, type, exception = -1):
                # returns a list of indexes for NIMs compatible to the given type, except for 'exception'
 
        def getNimListOfType(self, type, exception = -1):
                # returns a list of indexes for NIMs compatible to the given type, except for 'exception'
@@ -938,70 +992,78 @@ def InitSecParams():
 # the configElement should be only visible when diseqc 1.2 is disabled
 
 def InitNimManager(nimmgr):
 # the configElement should be only visible when diseqc 1.2 is disabled
 
 def InitNimManager(nimmgr):
-       InitSecParams()
        hw = HardwareInfo()
        hw = HardwareInfo()
+       addNimConfig = False
+       try:
+               config.Nims
+       except:
+               addNimConfig = True
 
 
-       config.Nims = ConfigSubList()
-       for x in range(len(nimmgr.nim_slots)):
-               config.Nims.append(ConfigSubsection())
+       if addNimConfig:
+               InitSecParams()
+               config.Nims = ConfigSubList()
+               for x in range(len(nimmgr.nim_slots)):
+                       config.Nims.append(ConfigSubsection())
 
        lnb_choices = {
                "universal_lnb": _("Universal LNB"),
 
        lnb_choices = {
                "universal_lnb": _("Universal LNB"),
-#              "unicable": _("Unicable"),
+               "unicable": _("Unicable"),
                "c_band": _("C-Band"),
                "user_defined": _("User defined")}
 
        lnb_choices_default = "universal_lnb"
 
                "c_band": _("C-Band"),
                "user_defined": _("User defined")}
 
        lnb_choices_default = "universal_lnb"
 
-       unicablelnbproducts = {
-               "Humax": {"150 SCR":("1210","1420","1680","2040")},
-               "Inverto": {"IDLP-40UNIQD+S":("1680","1420","2040","1210")},
-               "Kathrein": {"UAS481":("1400","1516","1632","1748")},
-               "Kreiling": {"KR1440":("1680","1420","2040","1210")},
-               "Radix": {"Unicable LNB":("1680","1420","2040","1210")},
-               "Wisi": {"OC 05":("1210","1420","1680","2040")}}
+       unicablelnbproducts = {}
+       unicablematrixproducts = {}
+       doc = xml.etree.cElementTree.parse("/usr/share/enigma2/unicable.xml")
+       root = doc.getroot()
+
+       entry = root.find("lnb")
+       for manufacturer in entry.getchildren():
+               m={}
+               for product in manufacturer.getchildren():
+                       scr=[]
+                       lscr=("scr1","scr2","scr3","scr4","scr5","scr6","scr7","scr8")
+                       for i in range(len(lscr)):
+                               scr.append(product.get(lscr[i],"0"))
+                       for i in range(len(lscr)):
+                               if scr[len(lscr)-i-1] == "0":
+                                       scr.pop()
+                               else:
+                                       break;
+                       lof=[]
+                       lof.append(int(product.get("positions",1)))
+                       lof.append(int(product.get("lofl",9750)))
+                       lof.append(int(product.get("lofh",10600)))
+                       lof.append(int(product.get("threshold",11700)))
+                       scr.append(tuple(lof))
+                       m.update({product.get("name"):tuple(scr)})
+               unicablelnbproducts.update({manufacturer.get("name"):m})
+
+       entry = root.find("matrix")
+       for manufacturer in entry.getchildren():
+               m={}
+               for product in manufacturer.getchildren():
+                       scr=[]
+                       lscr=("scr1","scr2","scr3","scr4","scr5","scr6","scr7","scr8")
+                       for i in range(len(lscr)):
+                               scr.append(product.get(lscr[i],"0"))
+                       for i in range(len(lscr)):
+                               if scr[len(lscr)-i-1] == "0":
+                                       scr.pop()
+                               else:
+                                       break;
+                       lof=[]
+                       lof.append(int(product.get("positions",1)))
+                       lof.append(int(product.get("lofl",9750)))
+                       lof.append(int(product.get("lofh",10600)))
+                       lof.append(int(product.get("threshold",11700)))
+                       scr.append(tuple(lof))
+                       m.update({product.get("name"):tuple(scr)})
+               unicablematrixproducts.update({manufacturer.get("name"):m})
+
        UnicableLnbManufacturers = unicablelnbproducts.keys()
        UnicableLnbManufacturers.sort()
        UnicableLnbManufacturers = unicablelnbproducts.keys()
        UnicableLnbManufacturers.sort()
-
-       unicablematrixproducts = {
-               "Ankaro": {
-                       "UCS 51440":("1400","1632","1284","1516"),
-                       "UCS 51820":("1400","1632","1284","1516","1864","2096","1748","1980"),
-                       "UCS 51840":("1400","1632","1284","1516","1864","2096","1748","1980"),
-                       "UCS 52240":("1400","1632"),
-                       "UCS 52420":("1400","1632","1284","1516"),
-                       "UCS 52440":("1400","1632","1284","1516"),
-                       "UCS 91440":("1400","1632","1284","1516"),
-                       "UCS 91820":("1400","1632","1284","1516","1864","2096","1748","1980"),
-                       "UCS 91840":("1400","1632","1284","1516","1864","2096","1748","1980"),
-                       "UCS 92240":("1400","1632"),
-                       "UCS 92420":("1400","1632","1284","1516"),
-                       "UCS 92440":("1400","1632","1284","1516")},
-               "DCT Delta": {
-                       "SUM518":("1284","1400","1516","1632","1748","1864","1980","2096"),
-                       "SUM918":("1284","1400","1516","1632","1748","1864","1980","2096"),
-                       "SUM928":("1284","1400","1516","1632","1748","1864","1980","2096")},
-               "Inverto": {
-                       "IDLP-UST11O-CUO1O-8PP":("1076","1178","1280","1382","1484","1586","1688","1790")},
-               "Kathrein": {
-                       "EXR501":("1400","1516","1632","1748"),
-                       "EXR551":("1400","1516","1632","1748"),
-                       "EXR552":("1400","1516")},
-               "ROTEK": {
-                       "EKL2/1":("1400","1516"),
-                       "EKL2/1E":("0","0","1632","1748")},
-               "Smart": {
-                       "DPA 51":("1284","1400","1516","1632","1748","1864","1980","2096")},
-               "Technisat": {
-                       "TechniRouter 5/1x8 G":("1284","1400","1516","1632","1748","1864","1980","2096"),
-                       "TechniRouter 5/1x8 K":("1284","1400","1516","1632","1748","1864","1980","2096"),
-                       "TechniRouter 5/2x4 G":("1284","1400","1516","1632"),
-                       "TechniRouter 5/2x4 K":("1284","1400","1516","1632")},
-               "Telstar": {
-                       "SCR 5/1x8 G":("1284","1400","1516","1632","1748","1864","1980","2096"),
-                       "SCR 5/1x8 K":("1284","1400","1516","1632","1748","1864","1980","2096"),
-                       "SCR 5/2x4 G":("1284","1400","1516","1632"),
-                       "SCR 5/2x4 K":("1284","1400","1516","1632")}}
        UnicableMatrixManufacturers = unicablematrixproducts.keys()
        UnicableMatrixManufacturers.sort()
 
        UnicableMatrixManufacturers = unicablematrixproducts.keys()
        UnicableMatrixManufacturers.sort()
 
@@ -1068,63 +1130,76 @@ def InitNimManager(nimmgr):
                                else:
                                        section.unicable = ConfigSelection(choices = {"unicable_user": _("User defined")}, default = "unicable_user")
 
                                else:
                                        section.unicable = ConfigSelection(choices = {"unicable_user": _("User defined")}, default = "unicable_user")
 
-                               if lnb < 3:
-                                       section.unicableMatrix = ConfigSubDict()
-                                       section.unicableMatrixManufacturer = ConfigSelection(choices = UnicableMatrixManufacturers, default = UnicableMatrixManufacturers[0])
-                                       for y in unicablematrixproducts:
-                                               products = unicablematrixproducts[y].keys()
+                               def fillUnicableConf(sectionDict, unicableproducts, vco_null_check):
+                                       for y in unicableproducts:
+                                               products = unicableproducts[y].keys()
                                                products.sort()
                                                tmp = ConfigSubsection()
                                                tmp.product = ConfigSelection(choices = products, default = products[0])
                                                tmp.scr = ConfigSubDict()
                                                tmp.vco = ConfigSubDict()
                                                products.sort()
                                                tmp = ConfigSubsection()
                                                tmp.product = ConfigSelection(choices = products, default = products[0])
                                                tmp.scr = ConfigSubDict()
                                                tmp.vco = ConfigSubDict()
+                                               tmp.lofl = ConfigSubDict()
+                                               tmp.lofh = ConfigSubDict()
+                                               tmp.loft = ConfigSubDict()
+                                               tmp.positions = ConfigSubDict()
                                                for z in products:
                                                        scrlist = []
                                                for z in products:
                                                        scrlist = []
-                                                       vcolist = unicablematrixproducts[y][z]
+                                                       vcolist = unicableproducts[y][z]
                                                        tmp.vco[z] = ConfigSubList()
                                                        tmp.vco[z] = ConfigSubList()
-                                                       for cnt in range(1,1+len(vcolist)):
+                                                       for cnt in range(1,1+len(vcolist)-1):
                                                                vcofreq = int(vcolist[cnt-1])
                                                                vcofreq = int(vcolist[cnt-1])
-                                                               if vcofreq == 0:
+                                                               if vcofreq == 0 and vco_null_check:
                                                                        scrlist.append(("%d" %cnt,"SCR %d " %cnt +_("not used")))
                                                                else:
                                                                        scrlist.append(("%d" %cnt,"SCR %d" %cnt))
                                                                tmp.vco[z].append(ConfigInteger(default=vcofreq, limits = (vcofreq, vcofreq)))
                                                                        scrlist.append(("%d" %cnt,"SCR %d " %cnt +_("not used")))
                                                                else:
                                                                        scrlist.append(("%d" %cnt,"SCR %d" %cnt))
                                                                tmp.vco[z].append(ConfigInteger(default=vcofreq, limits = (vcofreq, vcofreq)))
-                                                       tmp.scr[z] = ConfigSelection(choices = scrlist, default = scrlist[0][0])
-                                               section.unicableMatrix[y] = tmp
+                                                               tmp.scr[z] = ConfigSelection(choices = scrlist, default = scrlist[0][0])
+
+                                                               positions = int(vcolist[len(vcolist)-1][0])
+                                                               tmp.positions[z] = ConfigSubList()
+                                                               tmp.positions[z].append(ConfigInteger(default=positions, limits = (positions, positions)))
+
+                                                               lofl = vcolist[len(vcolist)-1][1]
+                                                               tmp.lofl[z] = ConfigSubList()
+                                                               tmp.lofl[z].append(ConfigInteger(default=lofl, limits = (lofl, lofl)))
+
+                                                               lofh = int(vcolist[len(vcolist)-1][2])
+                                                               tmp.lofh[z] = ConfigSubList()
+                                                               tmp.lofh[z].append(ConfigInteger(default=lofh, limits = (lofh, lofh)))
+
+                                                               loft = int(vcolist[len(vcolist)-1][3])
+                                                               tmp.loft[z] = ConfigSubList()
+                                                               tmp.loft[z].append(ConfigInteger(default=loft, limits = (loft, loft)))
+                                               sectionDict[y] = tmp
+
+                               if lnb < 3:
+                                       print "MATRIX"
+                                       section.unicableMatrix = ConfigSubDict()
+                                       section.unicableMatrixManufacturer = ConfigSelection(UnicableMatrixManufacturers, UnicableMatrixManufacturers[0])
+                                       fillUnicableConf(section.unicableMatrix, unicablematrixproducts, True)
 
                                if lnb < 2:
 
                                if lnb < 2:
+                                       print "LNB"
                                        section.unicableLnb = ConfigSubDict()
                                        section.unicableLnbManufacturer = ConfigSelection(UnicableLnbManufacturers, UnicableLnbManufacturers[0])
                                        section.unicableLnb = ConfigSubDict()
                                        section.unicableLnbManufacturer = ConfigSelection(UnicableLnbManufacturers, UnicableLnbManufacturers[0])
-                                       for y in unicablelnbproducts:
-                                               products = unicablelnbproducts[y].keys()
-                                               products.sort()
-                                               tmp = ConfigSubsection()
-                                               tmp.product = ConfigSelection(choices = products, default = products[0])
-                                               tmp.scr = ConfigSubDict()
-                                               tmp.vco = ConfigSubDict()
-                                               for z in products:
-                                                       scrlist = []
-                                                       vcolist = unicablelnbproducts[y][z]
-                                                       tmp.vco[z] = ConfigSubList()
-                                                       for cnt in range(1,1+len(vcolist)):
-                                                               scrlist.append(("%d" %cnt,"SCR %d" %cnt))
-                                                               vcofreq = int(vcolist[cnt-1])
-                                                               tmp.vco[z].append(ConfigInteger(default=vcofreq, limits = (vcofreq, vcofreq)))
-                                                       tmp.scr[z] = ConfigSelection(choices = scrlist, default = scrlist[0][0])
-                                               section.unicableLnb[y] = tmp
+                                       fillUnicableConf(section.unicableLnb, unicablelnbproducts, False)
 
 
+#TODO satpositions for satcruser
                                section.satcruser = ConfigSelection(advanced_lnb_satcruser_choices, default="1")
                                tmp = ConfigSubList()
                                section.satcruser = ConfigSelection(advanced_lnb_satcruser_choices, default="1")
                                tmp = ConfigSubList()
-                               tmp.append(ConfigInteger(default=1284, limits = (0, 9999)))
-                               tmp.append(ConfigInteger(default=1400, limits = (0, 9999)))
-                               tmp.append(ConfigInteger(default=1516, limits = (0, 9999)))
-                               tmp.append(ConfigInteger(default=1632, limits = (0, 9999)))
-                               tmp.append(ConfigInteger(default=1748, limits = (0, 9999)))
-                               tmp.append(ConfigInteger(default=1864, limits = (0, 9999)))
-                               tmp.append(ConfigInteger(default=1980, limits = (0, 9999)))
-                               tmp.append(ConfigInteger(default=2096, limits = (0, 9999)))
+                               tmp.append(ConfigInteger(default=1284, limits = (950, 2150)))
+                               tmp.append(ConfigInteger(default=1400, limits = (950, 2150)))
+                               tmp.append(ConfigInteger(default=1516, limits = (950, 2150)))
+                               tmp.append(ConfigInteger(default=1632, limits = (950, 2150)))
+                               tmp.append(ConfigInteger(default=1748, limits = (950, 2150)))
+                               tmp.append(ConfigInteger(default=1864, limits = (950, 2150)))
+                               tmp.append(ConfigInteger(default=1980, limits = (950, 2150)))
+                               tmp.append(ConfigInteger(default=2096, limits = (950, 2150)))
                                section.satcrvcouser = tmp 
 
                                section.satcrvcouser = tmp 
 
+                               nim.advanced.unicableconnected = ConfigYesNo(default=False)
+                               nim.advanced.unicableconnectedTo = ConfigSelection([(str(id), nimmgr.getNimDescription(id)) for id in nimmgr.getNimListOfType("DVB-S") if id != x])
+       
        def configDiSEqCModeChanged(configElement):
                section = configElement.section
                if configElement.value == "1_2" and isinstance(section.longitude, ConfigNothing):
        def configDiSEqCModeChanged(configElement):
                section = configElement.section
                if configElement.value == "1_2" and isinstance(section.longitude, ConfigNothing):
@@ -1133,7 +1208,7 @@ def InitNimManager(nimmgr):
                        section.latitude = ConfigFloat(default = [50,767], limits = [(0,359),(0,999)])
                        section.latitudeOrientation = ConfigSelection(latitude_orientation_choices, "north")
                        section.powerMeasurement = ConfigYesNo(default=True)
                        section.latitude = ConfigFloat(default = [50,767], limits = [(0,359),(0,999)])
                        section.latitudeOrientation = ConfigSelection(latitude_orientation_choices, "north")
                        section.powerMeasurement = ConfigYesNo(default=True)
-                       section.powerThreshold = ConfigInteger(default=hw.get_device_name() == "dm8000" and 15 or 50, limits=(0, 100))
+                       section.powerThreshold = ConfigInteger(default=hw.get_device_name() == "dm7025" and 50 or 15, limits=(0, 100))
                        section.turningSpeed = ConfigSelection(turning_speed_choices, "fast")
                        section.fastTurningBegin = ConfigDateTime(default=advanced_lnb_fast_turning_btime, formatstring = _("%H:%M"), increment = 600)
                        section.fastTurningEnd = ConfigDateTime(default=advanced_lnb_fast_turning_etime, formatstring = _("%H:%M"), increment = 600)
                        section.turningSpeed = ConfigSelection(turning_speed_choices, "fast")
                        section.fastTurningBegin = ConfigDateTime(default=advanced_lnb_fast_turning_btime, formatstring = _("%H:%M"), increment = 600)
                        section.fastTurningEnd = ConfigDateTime(default=advanced_lnb_fast_turning_etime, formatstring = _("%H:%M"), increment = 600)
@@ -1213,10 +1288,59 @@ def InitNimManager(nimmgr):
                                tmp.lnb = lnb
                                nim.advanced.sat[x] = tmp
 
                                tmp.lnb = lnb
                                nim.advanced.sat[x] = tmp
 
+       def toneAmplitudeChanged(configElement):
+               fe_id = configElement.fe_id
+               slot_id = configElement.slot_id
+               if nimmgr.nim_slots[slot_id].description == 'Alps BSBE2':
+                       open("/proc/stb/frontend/%d/tone_amplitude" %(fe_id), "w").write(configElement.value)
+                       
+       def tunerTypeChanged(nimmgr, configElement):
+               fe_id = configElement.fe_id
+               print "tunerTypeChanged feid %d to mode %s" % (fe_id, configElement.value)
+               try:
+                       oldvalue = open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "r").readline()
+                       open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "w").write("0")
+               except:
+                       print "[info] no /sys/module/dvb_core/parameters/dvb_shutdown_timeout available"
+               frontend = eDVBResourceManager.getInstance().allocateRawChannel(fe_id).getFrontend()
+               frontend.closeFrontend()
+               open("/proc/stb/frontend/%d/mode" % (fe_id), "w").write(configElement.value)
+               frontend.reopenFrontend()
+               try:
+                       open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "w").write(oldvalue)
+               except:
+                       print "[info] no /sys/module/dvb_core/parameters/dvb_shutdown_timeout available"
+               nimmgr.enumerateNIMs()
+       
+       empty_slots = 0
        for slot in nimmgr.nim_slots:
                x = slot.slot
                nim = config.Nims[x]
        for slot in nimmgr.nim_slots:
                x = slot.slot
                nim = config.Nims[x]
+               addMultiType = False
+               try:
+                       nim.multiType
+               except:
+                       addMultiType = True
+               if slot.isMultiType() and addMultiType:
+                       typeList = []
+                       for id in slot.getMultiTypeList().keys():
+                               type = slot.getMultiTypeList()[id]
+                               typeList.append((id, type))
+                       nim.multiType = ConfigSelection(typeList, "0")
+                       
+                       nim.multiType.fe_id = x - empty_slots
+                       nim.multiType.addNotifier(boundFunction(tunerTypeChanged, nimmgr))
+               
+       empty_slots = 0
+       for slot in nimmgr.nim_slots:
+               x = slot.slot
+               nim = config.Nims[x]
+
                if slot.isCompatible("DVB-S"):
                if slot.isCompatible("DVB-S"):
+                       nim.toneAmplitude = ConfigSelection([("9", "600mV"), ("8", "700mV"), ("7", "800mV"), ("6", "900mV"), ("5", "1100mV")], "7")
+                       nim.toneAmplitude.fe_id = x - empty_slots
+                       nim.toneAmplitude.slot_id = x
+                       nim.toneAmplitude.addNotifier(toneAmplitudeChanged)
                        nim.diseqc13V = ConfigYesNo(False)
                        nim.diseqcMode = ConfigSelection(diseqc_mode_choices, "diseqc_a_b")
                        nim.connectedTo = ConfigSelection([(str(id), nimmgr.getNimDescription(id)) for id in nimmgr.getNimListOfType("DVB-S") if id != x])
                        nim.diseqc13V = ConfigYesNo(False)
                        nim.diseqcMode = ConfigSelection(diseqc_mode_choices, "diseqc_a_b")
                        nim.connectedTo = ConfigSelection([(str(id), nimmgr.getNimDescription(id)) for id in nimmgr.getNimListOfType("DVB-S") if id != x])
@@ -1306,6 +1430,7 @@ def InitNimManager(nimmgr):
                        nim.terrestrial = ConfigSelection(choices = list)
                        nim.terrestrial_5V = ConfigOnOff()
                else:
                        nim.terrestrial = ConfigSelection(choices = list)
                        nim.terrestrial_5V = ConfigOnOff()
                else:
+                       empty_slots += 1
                        nim.configMode = ConfigSelection(choices = { "nothing": _("disabled") }, default="nothing");
                        if slot.type is not None:
                                print "pls add support for this frontend type!", slot.type
                        nim.configMode = ConfigSelection(choices = { "nothing": _("disabled") }, default="nothing");
                        if slot.type is not None:
                                print "pls add support for this frontend type!", slot.type
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources