#simple defaults
sec.addLNB()
tunermask = 1 << slotid
- if self.linked.has_key(slotid):
+ if self.equal.has_key(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(11750000)
+ sec.setLNBIncreasedVoltage(lnbParam.OFF)
sec.setRepeats(0)
sec.setFastDiSEqC(0)
sec.setSeqRepeat(0)
sec.setVoltageMode(switchParam.HV)
sec.setToneMode(switchParam.HILO)
sec.setCommandOrder(0)
+
#user values
sec.setDiSEqCMode(diseqcmode)
sec.setToneburst(toneburstmode)
sec.addSatellite(orbpos)
self.satList.append(orbpos)
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.setLoDirection(loDirection)
sec.setUseInputpower(True)
sec.setInputpowerDelta(50)
-
+
for x in self.NimManager.satList:
print "Add sat " + str(x[1])
sec.addSatellite(int(x[1]))
sec.setVoltageMode(0)
sec.setToneMode(0)
+ sec.setRotorPosNum(0) # USALS
self.satList.append(int(x[1]))
+ def setSatposDepends(self, sec, nim1, nim2):
+ print "tuner", nim1, "depends on satpos of", nim2
+ sec.setTunerDepends(nim1, nim2)
+
def linkNIMs(self, sec, nim1, nim2):
print "link tuner", nim1, "to tuner", nim2
sec.setTunerLinked(nim1, nim2)
self.satList = []
self.linked = { }
+ self.satposdepends = { }
+ self.equal = { }
for slot in self.NimManager.nimslots:
x = slot.slotid
nim = config.Nims[x]
if slot.nimType == self.NimManager.nimType["DVB-S"]:
+ if currentConfigSelectionElement(nim.configMode) == "equal":
+ self.equal[nim.equalTo.value]=x
if currentConfigSelectionElement(nim.configMode) == "loopthrough":
self.linkNIMs(sec, x, nim.linkedTo.value)
self.linked[nim.linkedTo.value]=x
+ elif currentConfigSelectionElement(nim.configMode) == "satposdepends":
+ self.setSatposDepends(sec, x, nim.satposDependsTo.value)
+ self.satposdepends[nim.satposDependsTo.value]=x
for slot in self.NimManager.nimslots:
x = slot.slotid
nim = config.Nims[x]
if slot.nimType == self.NimManager.nimType["DVB-S"]:
print "slot: " + str(x) + " configmode: " + str(nim.configMode.value)
- if currentConfigSelectionElement(nim.configMode) == "loopthrough":
+ if currentConfigSelectionElement(nim.configMode) in [ "loopthrough", "satposdepends", "equal", "nothing" ]:
pass
elif currentConfigSelectionElement(nim.configMode) == "simple": #simple config
if currentConfigSelectionElement(nim.diseqcMode) == "single": #single
loDirection = loValue,
latitude = configsequencearg.getFloat(nim.latitude),
laDirection = laValue)
-# pass
- elif currentConfigSelectionElement(nim.configMode) == "nothing":
- pass
elif currentConfigSelectionElement(nim.configMode) == "advanced": #advanced config
self.updateAdvanced(sec, x)
print "sec config completed"
sec.addLNB()
tunermask = 1 << slotid
- if self.linked.has_key(slotid):
+ if self.equal.has_key(slotid):
+ tunermask |= (1 << self.equal[slotid])
+ elif self.linked.has_key(slotid):
tunermask |= (1 << self.linked[slotid])
- sec.setLNBTunerMask(tunermask)
if currentConfigSelectionElement(currLnb.lof) == "universal_lnb":
sec.setLNBLOFL(9750000)
sec.setDiSEqCMode(diseqcParam.V1_1)
elif currentConfigSelectionElement(currLnb.diseqcMode) == "1_2":
sec.setDiSEqCMode(diseqcParam.V1_2)
-
+
+ if self.satposdepends.has_key(slotid): # only useable with rotors
+ tunermask |= (1 << self.satposdepends[slotid])
+
if currentConfigSelectionElement(currLnb.diseqcMode) != "none":
if currentConfigSelectionElement(currLnb.toneburst) == "none":
sec.setToneburst(diseqcParam.NO)
sec.setCommittedCommand(diseqcParam.BA)
elif currentConfigSelectionElement(currLnb.commitedDiseqcCommand) == "BB":
sec.setCommittedCommand(diseqcParam.BB)
-
+ else:
+ sec.setCommittedCommand(long(currentConfigSelectionElement(currLnb.commitedDiseqcCommand)))
+
if currentConfigSelectionElement(currLnb.fastDiseqc) == "yes":
sec.setFastDiSEqC(True)
else:
sec.setInputpowerDelta(currLnb.powerThreshold.value[0])
else:
sec.setUseInputpower(False)
-
+
+ sec.setLNBTunerMask(tunermask)
+
# finally add the orbital positions
for y in lnbSat[x]:
sec.addSatellite(y)
pass
else:
self.transponders[self.parsedCab] = [ ]
-
self.transponders[self.parsedCab].append((1, freq, sr, mod, fec))
class parseTerrestrials(ContentHandler):
self.transponders[self.parsedTer].append((2, freq, bw, const, crh, crl, guard, transm, hierarchy, inv))
def getTransponders(self, pos):
- return self.transponders[pos]
+ if self.transponders.has_key(pos):
+ return self.transponders[pos]
+ else:
+ return []
+
+ def getTranspondersCable(self, cable):
+ return self.transponderscable[cable]
+
+ def getCableDescription(self, nim):
+ return self.cablesList[config.Nims[nim].cable.value]
def getConfiguredSats(self):
return self.sec.getSatList()
def getNimType(self, slotID):
if slotID >= self.nimCount:
- return "empty/unknown"
+ return self.nimType["empty/unknown"]
else:
return self.nimType[self.nimTypes[slotID]]
+ def getNimTypeName(self, slotID):
+ if slotID >= self.nimCount:
+ return "empty/unknown"
+ else:
+ return self.nimTypes[slotID]
+
def getNimName(self, slotID):
return self.nimNames[slotID]
list.append(x)
return list
-# #callbacks for c++ config
-# def nimConfigModeChanged(self, slotid, mode):
-# if (mode != 2): # not linked
-# print "Unlinking slot " + str(slotid)
-# # TODO call c++ to unlink nim in slot slotid
-# if (mode == 2): # linked
-# pass
-# #FIXME!!!
-# #if (len(self.getNimListOfType(self.nimType["DVB-S"], slotid)) > 0):
-# # print "Linking slot " + str(slotid) + " to " + str(nimmgr.getConfigPrefix(slotid).value)
-# # TODO call c++ to link nim in slot slotid with nim in slot nimmgr.getConfigPrefix(slotid).value
-
-# def nimLinkedToChanged(self, slotid, val):
-# print "Linking slot " + str(slotid) + " to " + str(val)
-
def nimDiseqcModeChanged(self, slotid, mode):
#print "nimDiseqcModeChanged set to " + str(mode)
pass
# def nimConfigModeChanged(slotid, configElement):
# nimmgr.nimConfigModeChanged(slotid, configElement.value)
-# def nimLinkedToChanged(slotid, configElement):
-# nimmgr.nimLinkedToChanged(slotid, configElement.value)
def nimDiseqcModeChanged(slotid, configElement):
nimmgr.nimDiseqcModeChanged(slotid, configElement.value)
if slot.nimType == nimmgr.nimType["DVB-S"]:
if slot.slotid == 0:
- nim.configMode = configElement(cname + "configMode", configSelection, 0, (("simple", _("Simple")), ("advanced", _("Advanced"))))
- else:
- nim.configMode = configElement(cname + "configMode", configSelection, 0, (("simple", _("Simple")), ("nothing", _("Nothing connected")), ("loopthrough", _("Loopthrough to Socket A")), ("advanced", _("Advanced"))))
-
+ nim.configMode = configElement(cname + "configMode", configSelection, 0, (
+ ("simple", _("Simple")), ("advanced", _("Advanced"))), False)
+ else:
+ nim.configMode = configElement(cname + "configMode", configSelection, 0, (
+ ("equal", _("Equal to Socket A")),
+ ("loopthrough", _("Loopthrough to Socket A")),
+ ("nothing", _("Nothing connected")),
+ ("satposdepends", _("Secondary cable from motorized LNB")),
+ ("simple", _("Simple")),
+ ("advanced", _("Advanced"))), False)
#important - check if just the 2nd one is LT only and the first one is DVB-S
- if currentConfigSelectionElement(nim.configMode) == "loopthrough": #linked
+ if currentConfigSelectionElement(nim.configMode) in ["loopthrough", "satposdepends", "equal"]:
if x == 0: #first one can never be linked to anything
nim.configMode.value = getConfigSelectionElement(nim.configMode, "simple") #reset to simple
nim.configMode.save()
nim.configMode.value = getConfigSelectionElement(nim.configMode, "simple") #reset to simple
nim.configMode.save()
- nim.diseqcMode = configElement(cname + "diseqcMode", configSelection, 2, (("single", _("Single")), ("toneburst_a_b", _("Toneburst A/B")), ("diseqc_a_b", _("DiSEqC A/B")), ("diseqc_a_b_c_d", _("DiSEqC A/B/C/D")), ("positioner", _("Positioner"))));
- nim.diseqcA = configElement(cname + "diseqcA", configSatlist, 192, nimmgr.satList);
- nim.diseqcB = configElement(cname + "diseqcB", configSatlist, 130, nimmgr.satList);
- nim.diseqcC = configElement(cname + "diseqcC", configSatlist, 0, nimmgr.satList);
- nim.diseqcD = configElement(cname + "diseqcD", configSatlist, 0, nimmgr.satList);
- nim.positionerMode = configElement(cname + "positionerMode", configSelection, 0, (("usals", _("USALS")), ("manual", _("manual"))));
- nim.longitude = configElement(cname + "longitude", configSequence, [5,100], configsequencearg.get("FLOAT", [(0,90),(0,999)]));
- nim.longitudeOrientation = configElement(cname + "longitudeOrientation", configSelection, 0, (("east", _("East")), ("west", _("West"))))
- nim.latitude = configElement(cname + "latitude", configSequence, [50,767], configsequencearg.get("FLOAT", [(0,90),(0,999)]));
- nim.latitudeOrientation = configElement(cname + "latitudeOrientation", configSelection, 0, (("north", _("North")), ("south", _("South"))))
+ nim.diseqcMode = configElement(cname + "diseqcMode", configSelection, 2, (("single", _("Single")), ("toneburst_a_b", _("Toneburst A/B")), ("diseqc_a_b", _("DiSEqC A/B")), ("diseqc_a_b_c_d", _("DiSEqC A/B/C/D")), ("positioner", _("Positioner"))), False);
+ nim.diseqcA = configElement(cname + "diseqcA", configSatlist, 192, nimmgr.satList, False);
+ nim.diseqcB = configElement(cname + "diseqcB", configSatlist, 130, nimmgr.satList, False);
+ nim.diseqcC = configElement(cname + "diseqcC", configSatlist, 0, nimmgr.satList, False);
+ nim.diseqcD = configElement(cname + "diseqcD", configSatlist, 0, nimmgr.satList, False);
+ nim.positionerMode = configElement(cname + "positionerMode", configSelection, 0, (("usals", _("USALS")), ("manual", _("manual"))), False);
+ nim.longitude = configElement(cname + "longitude", configSequence, [5,100], configsequencearg.get("FLOAT", [(0,90),(0,999)]), False);
+ nim.longitudeOrientation = configElement(cname + "longitudeOrientation", configSelection, 0, (("east", _("East")), ("west", _("West"))), False)
+ nim.latitude = configElement(cname + "latitude", configSequence, [50,767], configsequencearg.get("FLOAT", [(0,90),(0,999)]), False);
+ nim.latitudeOrientation = configElement(cname + "latitudeOrientation", configSelection, 0, (("north", _("North")), ("south", _("South"))), False)
satNimList = nimmgr.getNimListOfType(nimmgr.nimType["DVB-S"], slot.slotid)
satNimListNames = []
for x in satNimList:
satNimListNames.append((("Slot_" + ("A", "B", "C", "D")[x] + "_" + nimmgr.getNimName(x)), _("Slot ") + ("A", "B", "C", "D")[x] + ": " + nimmgr.getNimName(x)))
- nim.linkedTo = configElement(cname + "linkedTo", configSelection, 0, satNimListNames);
+ nim.equalTo = configElement(cname + "equalTo", configSelection, 0, satNimListNames, False);
+ nim.linkedTo = configElement(cname + "linkedTo", configSelection, 0, satNimListNames, False);
+ nim.satposDependsTo = configElement(cname + "satposDependsTo", configSelection, 0, satNimListNames, False);
#perhaps the instance of the slot is more useful?
# nim.configMode.addNotifier(boundFunction(nimConfigModeChanged,x))
nim.diseqcB.addNotifier(boundFunction(nimPortBChanged,x))
nim.diseqcC.addNotifier(boundFunction(nimPortCChanged,x))
nim.diseqcD.addNotifier(boundFunction(nimPortDChanged,x))
-# nim.linkedTo.addNotifier(boundFunction(nimLinkedToChanged,x))
# advanced config:
nim.advanced = ConfigSubsection()
nim.advanced.sat[x[1]].usals = configElement(cname + "advanced.sat" + str(x[1]) + ".usals", configSelection, 0, (("yes", _("Yes")), ("no", _("No"))), False)
nim.advanced.sat[x[1]].rotorposition = configElement(cname + "advanced.sat" + str(x[1]) + ".rotorposition", configSequence, [1], configsequencearg.get("INTEGER", (1, 255)), False)
nim.advanced.sat[x[1]].lnb = configElement(cname + "advanced.sat" + str(x[1]) + ".lnb", configSelection, 0, lnbs, False)
-
+
+ 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 = [("none", _("None"))]
+ for y in range(1, 17):
+ ucsw.append("Input " + str(y))
+
nim.advanced.lnb = [0]
for x in range(1, 33):
nim.advanced.lnb.append(ConfigSubsection())
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)
nim.advanced.lnb[x].diseqcMode = configElement(cname + "advanced.lnb" + str(x) + ".diseqcMode", configSelection, 0, (("none", _("None")), ("1_0", _("1.0")), ("1_1", _("1.1")), ("1_2", _("1.2"))), False)
- nim.advanced.lnb[x].commitedDiseqcCommand = configElement(cname + "advanced.lnb" + str(x) + ".commitedDiseqcCommand", configSelection, 0, (("none", _("None")), ("AA", _("AA")), ("AB", _("AB")), ("BA", _("BA")), ("BB", _("BB"))), False)
+ nim.advanced.lnb[x].commitedDiseqcCommand = configElement(cname + "advanced.lnb" + str(x) + ".commitedDiseqcCommand", configSelection, 0, csw, False)
nim.advanced.lnb[x].fastDiseqc = configElement(cname + "advanced.lnb" + str(x) + ".fastDiseqc", configSelection, 0, (("no", _("No")), ("yes", _("Yes"))), False)
nim.advanced.lnb[x].sequenceRepeat = configElement(cname + "advanced.lnb" + str(x) + ".sequenceRepeat", configSelection, 0, (("no", _("No")), ("yes", _("Yes"))), False)
nim.advanced.lnb[x].commandOrder1_0 = configElement(cname + "advanced.lnb" + str(x) + ".commandOrder1_0", configSelection, 0, ("committed, toneburst", "toneburst, committed"), False)
nim.advanced.lnb[x].commandOrder = configElement(cname + "advanced.lnb" + str(x) + ".commandOrder", configSelection, 0, ("committed, toneburst", "toneburst, committed", "committed, uncommitted, toneburst", "toneburst, committed, uncommitted", "uncommitted, committed, toneburst", "toneburst, uncommitted, commmitted"), False)
- disCmd = ["none"]
- for y in range(1, 17):
- disCmd.append("Input " + str(y))
- nim.advanced.lnb[x].uncommittedDiseqcCommand = configElement(cname + "advanced.lnb" + str(x) + ".uncommittedDiseqcCommand", configSelection, 0, disCmd, False)
+ nim.advanced.lnb[x].uncommittedDiseqcCommand = configElement(cname + "advanced.lnb" + str(x) + ".uncommittedDiseqcCommand", configSelection, 0, ucsw, False)
nim.advanced.lnb[x].diseqcRepeats = configElement(cname + "advanced.lnb" + str(x) + ".diseqcRepeats", configSelection, 0, (("none", _("None")), ("one", _("One")), ("two", _("Two")), ("three", _("Three"))), False)
nim.advanced.lnb[x].longitude = configElement(cname + "advanced.lnb" + str(x) + ".longitude", configSequence, [5,100], configsequencearg.get("FLOAT", [(0,90),(0,999)]), False)
nim.advanced.lnb[x].longitudeOrientation = configElement(cname + "advanced.lnb" + str(x) + ".longitudeOrientation", configSelection, 0, (("east", _("East")), ("west", _("West"))), False)
nim.advanced.lnb[x].powerMeasurement = configElement(cname + "advanced.lnb" + str(x) + ".powerMeasurement", configSelection, 0, (("yes", _("Yes")), ("no", _("No"))), False)
nim.advanced.lnb[x].powerThreshold = configElement(cname + "advanced.lnb" + str(x) + ".powerThreshold", configSequence, [50], configsequencearg.get("INTEGER", (0, 100)), False)
elif slot.nimType == nimmgr.nimType["DVB-C"]:
- nim.cable = configElement(cname + "cable", configSelection, 0, nimmgr.cablesList);
+ nim.cable = configElement(cname + "cable", configSelection, 0, nimmgr.cablesList, False);
elif slot.nimType == nimmgr.nimType["DVB-T"]:
- nim.cable = configElement(cname + "terrestrial", configSelection, 0, nimmgr.terrestrialsList);
+ nim.cable = configElement(cname + "terrestrial", configSelection, 0, nimmgr.terrestrialsList, False);
else:
print "pls add support for this frontend type!"
git.cweiske.de / enigma2.git / blobdiff