aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Components/NimManager.py182
-rwxr-xr-xlib/python/Components/config.py3
-rw-r--r--lib/python/Screens/Satconfig.py15
3 files changed, 137 insertions, 63 deletions
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index c68e9404..663ec16d 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -16,6 +16,9 @@ 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
for x in satlist:
@@ -234,6 +237,20 @@ class SecConfigure:
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] = []
@@ -276,24 +293,40 @@ class SecConfigure:
sec.setLNBLOFH(10600000)
sec.setLNBThreshold(11700000)
elif currLnb.lof.value == "unicable":
- sec.setLNBLOFL(9750000)
- sec.setLNBLOFH(10600000)
- sec.setLNBThreshold(11700000)
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.setLNBSatCRpositions(1) #HACK
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)
+ 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)
+ currLnb.unicableMatrixManufacturer.save_forced = True
+ manufacturer.product.save_forced = True
+ manufacturer.vco[product_name][manufacturer.scr[product_name].index].save_forced = True
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)
+ 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)
+ currLnb.unicableLnbManufacturer.save_forced = True
+ manufacturer.product.save_forced = True
+ manufacturer.vco[product_name][manufacturer.scr[product_name].index].save_forced = True
elif currLnb.lof.value == "c_band":
sec.setLNBLOFL(5150000)
sec.setLNBLOFH(5150000)
@@ -988,55 +1021,57 @@ def InitNimManager(nimmgr):
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(product.get("positions","1"))
+ lof.append(product.get("lofl","9750"))
+ lof.append(product.get("lofh","10600"))
+ lof.append(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(product.get("positions","1"))
+ lof.append(product.get("lofl","9750"))
+ lof.append(product.get("lofh","10600"))
+ lof.append(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()
-
- 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()
@@ -1117,7 +1152,7 @@ def InitNimManager(nimmgr):
scrlist = []
vcolist = unicablematrixproducts[y][z]
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])
if vcofreq == 0:
scrlist.append(("%d" %cnt,"SCR %d " %cnt +_("not used")))
@@ -1137,29 +1172,54 @@ def InitNimManager(nimmgr):
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 = []
vcolist = unicablelnbproducts[y][z]
tmp.vco[z] = ConfigSubList()
- for cnt in range(1,1+len(vcolist)):
+ for cnt in range(1,1+len(vcolist)-1):
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])
+
+ 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)))
+
section.unicableLnb[y] = tmp
-
+
+#TODO satpositions for satcruser
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
+ 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):
diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 471b59ec..d7506e31 100755
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -29,6 +29,7 @@ from time import localtime, strftime
class ConfigElement(object):
def __init__(self):
self.saved_value = None
+ self.save_forced = False
self.last_value = None
self.save_disabled = False
self.__notifiers = None
@@ -83,7 +84,7 @@ class ConfigElement(object):
# you need to override this if str(self.value) doesn't work
def save(self):
- if self.save_disabled or self.value == self.default:
+ if self.save_disabled or (self.value == self.default and not self.save_forced):
self.saved_value = None
else:
self.saved_value = self.tostring(self.value)
diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 749c09db..44f4251a 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -95,6 +95,7 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
self.advancedType = None
self.advancedManufacturer = None
self.advancedSCR = None
+ self.advancedConnected = None
if self.nim.isMultiType():
multiType = self.nimConfig.multiType
@@ -205,7 +206,7 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
checkList = (self.configMode, self.diseqcModeEntry, self.advancedSatsEntry, \
self.advancedLnbsEntry, self.advancedDiseqcMode, self.advancedUsalsEntry, \
self.advancedLof, self.advancedPowerMeasurement, self.turningSpeed, \
- self.advancedType, self.advancedSCR, self.advancedManufacturer, self.advancedUnicable, \
+ self.advancedType, self.advancedSCR, self.advancedManufacturer, self.advancedUnicable, self.advancedConnected, \
self.uncommittedDiseqcCommand, self.cableScanType, self.multiType)
if self["config"].getCurrent() == self.multiType:
from Components.NimManager import InitNimManager
@@ -285,6 +286,18 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
self.list.append(self.advancedType)
self.list.append(self.advancedSCR)
self.list.append(getConfigListEntry(_("Frequency"), manufacturer.vco[product_name][manufacturer.scr[product_name].index]))
+
+ choices = []
+ connectable = nimmanager.canConnectTo(self.slotid)
+ for id in connectable:
+ choices.append((str(id), nimmanager.getNimDescription(id)))
+ if len(choices):
+ self.advancedConnected = getConfigListEntry(_("connected"), self.nimConfig.advanced.unicableconnected)
+ self.list.append(self.advancedConnected)
+ if self.nimConfig.advanced.unicableconnected.value == True:
+ self.nimConfig.advanced.unicableconnectedTo.setChoices(choices)
+ self.list.append(getConfigListEntry(_("Connected to"),self.nimConfig.advanced.unicableconnectedTo))
+
else: #kein Unicable
self.list.append(getConfigListEntry(_("Voltage mode"), Sat.voltage))
self.list.append(getConfigListEntry(_("Increased voltage"), currLnb.increased_voltage))
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-19 08:17:02 +0000