git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
getConfigListEntry now supports more than two arguments
[enigma2.git]
/
lib
/
python
/
Components
/
NimManager.py
diff --git
a/lib/python/Components/NimManager.py
b/lib/python/Components/NimManager.py
index 783288ec5d643c271d6a6df68c07dde49adeb6b1..9a970fd3fe9268e9959fb61bf65e37417fcbbb8c 100644
(file)
--- a/
lib/python/Components/NimManager.py
+++ b/
lib/python/Components/NimManager.py
@@
-1,4
+1,4
@@
-from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, Config
Dummy, ConfigSubDict
+from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, Config
Nothing, ConfigSubDict, ConfigOnOff
from enigma import eDVBSatelliteEquipmentControl, \
eDVBSatelliteLNBParameters as lnbParam, \
from enigma import eDVBSatelliteEquipmentControl, \
eDVBSatelliteLNBParameters as lnbParam, \
@@
-16,6
+16,14
@@
from xml.sax.handler import ContentHandler
from Tools.BoundFunction import boundFunction
from Tools.BoundFunction import boundFunction
+def getConfigSatlist(orbpos, satlist):
+ default_orbpos = None
+ for x in satlist:
+ if x[0] == orbpos:
+ default_orbpos = orbpos
+ break
+ return ConfigSatlist(satlist, default_orbpos)
+
def tryOpen(filename):
try:
procFile = open(filename)
def tryOpen(filename):
try:
procFile = open(filename)
@@
-32,7
+40,6
@@
class SecConfigure:
tunermask |= (1 << self.equal[slotid])
elif self.linked.has_key(slotid):
tunermask |= (1 << self.linked[slotid])
tunermask |= (1 << self.equal[slotid])
elif self.linked.has_key(slotid):
tunermask |= (1 << self.linked[slotid])
- sec.setLNBTunerMask(tunermask)
sec.setLNBLOFL(9750000)
sec.setLNBLOFH(10600000)
sec.setLNBThreshold(11700000)
sec.setLNBLOFL(9750000)
sec.setLNBLOFH(10600000)
sec.setLNBThreshold(11700000)
@@
-56,7
+63,6
@@
class SecConfigure:
elif (diseqcmode == 3): # diseqc 1.2
if self.satposdepends.has_key(slotid):
tunermask |= (1 << self.satposdepends[slotid])
elif (diseqcmode == 3): # diseqc 1.2
if self.satposdepends.has_key(slotid):
tunermask |= (1 << self.satposdepends[slotid])
- sec.setLNBTunerMask(tunermask)
sec.setLatitude(latitude)
sec.setLaDirection(laDirection)
sec.setLongitude(longitude)
sec.setLatitude(latitude)
sec.setLaDirection(laDirection)
sec.setLongitude(longitude)
@@
-72,6
+78,8
@@
class SecConfigure:
sec.setRotorPosNum(0) # USALS
self.satList.append(int(x[0]))
sec.setRotorPosNum(0) # USALS
self.satList.append(int(x[0]))
+ sec.setLNBTunerMask(tunermask)
+
def setSatposDepends(self, sec, nim1, nim2):
print "tuner", nim1, "depends on satpos of", nim2
sec.setTunerDepends(nim1, nim2)
def setSatposDepends(self, sec, nim1, nim2):
print "tuner", nim1, "depends on satpos of", nim2
sec.setTunerDepends(nim1, nim2)
@@
-97,13
+105,13
@@
class SecConfigure:
nim = config.Nims[x]
if slot.nimType == self.NimManager.nimType["DVB-S"]:
if nim.configMode.value == "equal":
nim = config.Nims[x]
if slot.nimType == self.NimManager.nimType["DVB-S"]:
if nim.configMode.value == "equal":
- self.equal[nim.equalTo.
value
]=x
+ self.equal[nim.equalTo.
index
]=x
if nim.configMode.value == "loopthrough":
if nim.configMode.value == "loopthrough":
- self.linkNIMs(sec, x, nim.linkedTo.
value
)
- self.linked[nim.linkedTo.
value
]=x
+ self.linkNIMs(sec, x, nim.linkedTo.
index
)
+ self.linked[nim.linkedTo.
index
]=x
elif nim.configMode.value == "satposdepends":
self.setSatposDepends(sec, x, nim.satposDependsTo.index)
elif nim.configMode.value == "satposdepends":
self.setSatposDepends(sec, x, nim.satposDependsTo.index)
- self.satposdepends[nim.satposDependsTo.
value
]=x
+ self.satposdepends[nim.satposDependsTo.
index
]=x
for slot in self.NimManager.nimslots:
x = slot.slotid
for slot in self.NimManager.nimslots:
x = slot.slotid
@@
-212,14
+220,13
@@
class SecConfigure:
# Committed Diseqc Command
cdc = currLnb.commitedDiseqcCommand.value
# Committed Diseqc Command
cdc = currLnb.commitedDiseqcCommand.value
- c = [
- ("none", diseqcParam.SENDNO),
- ("AA", diseqcParam.AA),
- ("AB", diseqcParam.AB),
- ("BA", diseqcParam.BA),
- ("BB", diseqcParam.BB)]
-
- if cdc in c:
+ c = { "none": diseqcParam.SENDNO,
+ "AA": diseqcParam.AA,
+ "AB": diseqcParam.AB,
+ "BA": diseqcParam.BA,
+ "BB": diseqcParam.BB }
+
+ if c.has_key(cdc):
sec.setCommittedCommand(c[cdc])
else:
sec.setCommittedCommand(long(cdc))
sec.setCommittedCommand(c[cdc])
else:
sec.setCommittedCommand(long(cdc))
@@
-354,14
+361,14
@@
class NimManager:
self.parsedCab = str(tname)
elif (name == "transponder"):
freq = int(attrs.get('frequency',""))
self.parsedCab = str(tname)
elif (name == "transponder"):
freq = int(attrs.get('frequency',""))
- sr = int(attrs.get('symbol_rate',""))
- mod = int(attrs.get('modulation',"3")) # QAM64 default
- fec = int(attrs.get('fec_inner',"0")) # AUTO default
+
#
sr = int(attrs.get('symbol_rate',""))
+
#
mod = int(attrs.get('modulation',"3")) # QAM64 default
+
#
fec = int(attrs.get('fec_inner',"0")) # AUTO default
if self.parsedCab in self.transponders:
pass
else:
self.transponders[self.parsedCab] = [ ]
if self.parsedCab in self.transponders:
pass
else:
self.transponders[self.parsedCab] = [ ]
- self.transponders[self.parsedCab].append((1, freq
, sr, mod, fec
))
+ self.transponders[self.parsedCab].append((1, freq))
class parseTerrestrials(ContentHandler):
def __init__(self, terrestrialsList, transponders):
class parseTerrestrials(ContentHandler):
def __init__(self, terrestrialsList, transponders):
@@
-411,13
+418,16
@@
class NimManager:
return self.transpondersterrestrial[region]
def getCableDescription(self, nim):
return self.transpondersterrestrial[region]
def getCableDescription(self, nim):
- return self.cablesList[config.Nims[nim].cable.value]
+ return self.cablesList[0]
+
+ def getCableTrustNit(self, nim):
+ return (config.Nims[nim].cabletype.value == "quick")
def getTerrestrialDescription(self, nim):
def getTerrestrialDescription(self, nim):
- return self.terrestrialsList[config.Nims[nim].terrestrial.
value
][0]
+ return self.terrestrialsList[config.Nims[nim].terrestrial.
index
][0]
def getTerrestrialFlags(self, nim):
def getTerrestrialFlags(self, nim):
- return self.terrestrialsList[config.Nims[nim].terrestrial.
value
][1]
+ return self.terrestrialsList[config.Nims[nim].terrestrial.
index
][1]
def getConfiguredSats(self):
return self.sec.getSatList()
def getConfiguredSats(self):
return self.sec.getSatList()
@@
-609,7
+619,7
@@
class NimManager:
lnbnum = int(nim.advanced.sat[x[0]].lnb.value)
if lnbnum != 0:
lnb = nim.advanced.lnb[lnbnum]
lnbnum = int(nim.advanced.sat[x[0]].lnb.value)
if lnbnum != 0:
lnb = nim.advanced.lnb[lnbnum]
- if lnb.diseqcMode.value == "
diseqc_a_b_c_d
":
+ if lnb.diseqcMode.value == "
1_2
":
list.append(x)
return list
list.append(x)
return list
@@
-662,16
+672,15
@@
def InitNimManager(nimmgr):
"advanced": _("advanced")},
default = "simple")
else:
"advanced": _("advanced")},
default = "simple")
else:
-
nim.configMode = ConfigSelection(
choices = {
"equal": _("equal to Socket A"),
nim.configMode = ConfigSelection(
choices = {
"equal": _("equal to Socket A"),
- "looptrough": _("loopthrough to socket A"),
+ "loopt
h
rough": _("loopthrough to socket A"),
"nothing": _("nothing connected"),
"satposdepends": _("second cable of motorized LNB"),
"simple": _("simple"),
"advanced": _("advanced")},
"nothing": _("nothing connected"),
"satposdepends": _("second cable of motorized LNB"),
"simple": _("simple"),
"advanced": _("advanced")},
- default = "looptrough")
+ default = "loopt
h
rough")
#important - check if just the 2nd one is LT only and the first one is DVB-S
if nim.configMode.value in ["loopthrough", "satposdepends", "equal"]:
#important - check if just the 2nd one is LT only and the first one is DVB-S
if nim.configMode.value in ["loopthrough", "satposdepends", "equal"]:
@@
-696,8
+705,9
@@
def InitNimManager(nimmgr):
("diseqc_a_b_c_d", _("DiSEqC A/B/C/D")),
("positioner", _("Positioner"))],
default = "diseqc_a_b")
("diseqc_a_b_c_d", _("DiSEqC A/B/C/D")),
("positioner", _("Positioner"))],
default = "diseqc_a_b")
- nim.diseqcA = ConfigSatlist(default = 192, list = nimmgr.satList)
- nim.diseqcB = ConfigSatlist(default = 130, list = nimmgr.satList)
+
+ nim.diseqcA = getConfigSatlist(192, nimmgr.satList)
+ nim.diseqcB = getConfigSatlist(130, nimmgr.satList)
nim.diseqcC = ConfigSatlist(list = nimmgr.satList)
nim.diseqcD = ConfigSatlist(list = nimmgr.satList)
nim.positionerMode = ConfigSelection(
nim.diseqcC = ConfigSatlist(list = nimmgr.satList)
nim.diseqcD = ConfigSatlist(list = nimmgr.satList)
nim.positionerMode = ConfigSelection(
@@
-728,7
+738,7
@@
def InitNimManager(nimmgr):
# advanced config:
nim.advanced = ConfigSubsection()
# advanced config:
nim.advanced = ConfigSubsection()
- nim.advanced.sats =
ConfigSatlist(default = 192, list =
nimmgr.satList)
+ nim.advanced.sats =
getConfigSatlist(192,
nimmgr.satList)
nim.advanced.sat = ConfigSubDict()
lnbs = [("0", "not available")]
for y in range(1, 33):
nim.advanced.sat = ConfigSubDict()
lnbs = [("0", "not available")]
for y in range(1, 33):
@@
-745,13
+755,13
@@
def InitNimManager(nimmgr):
csw = [("none", _("None")), ("AA", _("AA")), ("AB", _("AB")), ("BA", _("BA")), ("BB", _("BB"))]
for y in range(0, 16):
csw.append((str(0xF0|y), "Input " + str(y+1)))
csw = [("none", _("None")), ("AA", _("AA")), ("AB", _("AB")), ("BA", _("BA")), ("BB", _("BB"))]
for y in range(0, 16):
csw.append((str(0xF0|y), "Input " + str(y+1)))
-
+
ucsw = [("0", _("None"))]
for y in range(1, 17):
ucsw.append((str(y), "Input " + str(y)))
ucsw = [("0", _("None"))]
for y in range(1, 17):
ucsw.append((str(y), "Input " + str(y)))
-
+
nim.advanced.lnb = ConfigSubList()
nim.advanced.lnb = ConfigSubList()
- nim.advanced.lnb.append(Config
Dummy
())
+ nim.advanced.lnb.append(Config
Nothing
())
for x in range(1, 33):
nim.advanced.lnb.append(ConfigSubsection())
nim.advanced.lnb[x].lof = ConfigSelection(choices={"universal_lnb": _("Universal LNB"), "c_band": _("C-Band"), "user_defined": _("User defined")}, default="universal_lnb")
for x in range(1, 33):
nim.advanced.lnb.append(ConfigSubsection())
nim.advanced.lnb[x].lof = ConfigSelection(choices={"universal_lnb": _("Universal LNB"), "c_band": _("C-Band"), "user_defined": _("User defined")}, default="universal_lnb")
@@
-784,11
+794,13
@@
def InitNimManager(nimmgr):
nim.advanced.lnb[x].powerThreshold = ConfigInteger(default=50, limits=(0, 100))
elif slot.nimType == nimmgr.nimType["DVB-C"]:
nim.advanced.lnb[x].powerThreshold = ConfigInteger(default=50, limits=(0, 100))
elif slot.nimType == nimmgr.nimType["DVB-C"]:
- nim.cable
= ConfigSelection(choices = nimmgr.cablesList
)
+ nim.cable
type = ConfigSelection(choices = [("quick", _("Quick")), ("complete", _("Complete"))]
)
elif slot.nimType == nimmgr.nimType["DVB-T"]:
list = []
elif slot.nimType == nimmgr.nimType["DVB-T"]:
list = []
+ n = 0
for x in nimmgr.terrestrialsList:
for x in nimmgr.terrestrialsList:
- list.append(x[0])
+ list.append((str(n), x[0]))
+ n += 1
nim.terrestrial = ConfigSelection(choices = list)
nim.terrestrial_5V = ConfigOnOff()
else:
nim.terrestrial = ConfigSelection(choices = list)
nim.terrestrial_5V = ConfigOnOff()
else: