elif currentConfigSelectionElement(nim.configMode) == "nothing":
pass
else: #advanced config
- print "FIXME add support for advanced config"
-
+ self.updateAdvanced(x)
+
+ def updateAdvanced(self, slotid):
+ sec = eDVBSatelliteEquipmentControl.getInstance()
+ lnbSat = {}
+ for x in range(1,33):
+ lnbSat[x] = []
+ for x in self.NimManager.satList:
+ lnb = config.Nims[slotid].advanced.sat[x[1]].lnb.value
+ if lnb != 0:
+ lnbSat[lnb].append(x[1])
+ for x in range(1,33):
+ if len(lnbSat[x]) > 0:
+ currLnb = config.Nims[slotid].advanced.lnb[x]
+ sec.addLNB()
+ sec.setLNBTunerMask(1 << slotid)
+ if currentConfigSelectionElement(currLnb.lof) == "universal_lnb":
+ sec.setLNBLOFL(9750000)
+ sec.setLNBLOFH(10600000)
+ sec.setLNBThreshold(11750000)
+ elif currentConfigSelectionElement(currLnb.lof) == "c_band":
+ sec.setLNBLOFL(5150000)
+ sec.setLNBLOFH(5150000)
+ sec.setLNBThreshold(5150000)
+ elif currentConfigSelectionElement(currLnb.lof) == "user_defined":
+ sec.setLNBLOFL(currLnb.lofl.value * 1000)
+ sec.setLNBLOFH(currLnb.lofh.value * 1000)
+ sec.setLNBThreshold(currLnb.threshold.value * 1000)
+
+ if currentConfigSelectionElement(currLnb.output_12v) == "0V":
+ pass
+ elif currentConfigSelectionElement(currLnb.output_12v) == "12V":
+ pass
+
+ if currentConfigSelectionElement(currLnb.increased_voltage) == "yes":
+ pass
+ else:
+ pass
+
+ if currentConfigSelectionElement(currLnb.diseqcMode) == "none":
+ pass
+ elif currentConfigSelectionElement(currLnb.diseqcMode) == "1_0":
+ pass
+ elif currentConfigSelectionElement(currLnb.diseqcMode) == "1_1":
+ pass
+ elif currentConfigSelectionElement(currLnb.diseqcMode) == "1_2":
+ pass
+
+ if currentConfigSelectionElement(currLnb.diseqcMode) != "none":
+ if currentConfigSelectionElement(currLnb.toneburst) == "none":
+ pass
+ elif currentConfigSelectionElement(currLnb.toneburst) == "A":
+ pass
+ elif currentConfigSelectionElement(currLnb.toneburst) == "B":
+ pass
+
+
+ if currentConfigSelectionElement(currLnb.commitedDiseqcCommand) == "none":
+ pass
+ elif currentConfigSelectionElement(currLnb.commitedDiseqcCommand) == "AA":
+ pass
+ elif currentConfigSelectionElement(currLnb.commitedDiseqcCommand) == "AB":
+ pass
+ elif currentConfigSelectionElement(currLnb.commitedDiseqcCommand) == "BA":
+ pass
+ elif currentConfigSelectionElement(currLnb.commitedDiseqcCommand) == "BB":
+ pass
+
+ if currentConfigSelectionElement(currLnb.fastDiseqc) == "yes":
+ pass
+ else:
+ pass
+
+ if currentConfigSelectionElement(currLnb.sequenceRepeat) == "yes":
+ pass
+ else:
+ pass
+
+ if currentConfigSelectionElement(currLnb.diseqcMode) == "1_0":
+ currCO = currLnb.commandOrder1_0.value
+ else:
+ currCO = currLnb.commandOrder.value
+
+ pass # do something with currLnb.uncommittedDiseqcCommand.value... holds 0 for none, 1 for input 1, 2 for input 2 etc.
+
+ if currentConfigSelectionElement(currLnb.diseqcRepeats) == "none":
+ pass
+ elif currentConfigSelectionElement(currLnb.diseqcRepeats) == "One":
+ pass
+ elif currentConfigSelectionElement(currLnb.diseqcRepeats) == "Two":
+ pass
+ elif currentConfigSelectionElement(currLnb.diseqcRepeats) == "Three":
+ pass
+
+ if currCO == 0: # committed, toneburst
+ pass
+ elif currCO == 1: # toneburst, committed
+ pass
+ elif currCO == 2: # committed, uncommitted, toneburst
+ pass
+ elif currCO == 3: # toneburst, committed, uncommitted
+ pass
+ elif currCO == 4: # uncommitted, committed, toneburst
+ pass
+ elif currCO == 5: # toneburst, uncommitted, commmitted
+ pass
+
+ if currentConfigSelectionElement(currLnb.diseqcMode) == "1_2":
+ sec.setLatitude(float(str(currLnb.latitude.value[0]) + "." + str(currLnb.latitude.value[1])))
+ sec.setLaDirection(nim.latitudeOrientation.value)
+ sec.setLongitude(float(str(currLnb.longitude.value[0]) + "." + str(currLnb.longitude.value[1])))
+ sec.setLoDirection(nim.longitudeOrientation.value - 2)
+
+ if currentConfigSelectionElement(currLnb.powerMeasurement) == "yes":
+ pass # set to currLnb.powerThreshold.value, which is an integer holding the mA value
+
+ # finally add the orbital positions
+ for y in lnbSat[x]:
+ sec.addSatellite(y)
+ currSat = config.Nims[slotid].advanced.sat[y]
+ if currentConfigSelectionElement(currSat.voltage) == "polarization":
+ pass
+ elif currentConfigSelectionElement(currSat.voltage) == "13V":
+ pass
+ elif currentConfigSelectionElement(currSat.voltage) == "18V":
+ pass
+
+ if currentConfigSelectionElement(currSat.tonemode) == "band":
+ pass
+ elif currentConfigSelectionElement(currSat.tonemode) == "on":
+ pass
+ elif currentConfigSelectionElement(currSat.tonemode) == "off":
+ pass
+
+ if currentConfigSelectionElement(currSat.usals) == "no":
+ pass # use currSat.rotorposition.value to set the stored rotor position
+ else:
+ pass # use usals for this sat!
+
+
def __init__(self, nimmgr):
self.NimManager = nimmgr
self.update()
nim = config.Nims[x]
if slot.nimType == nimmgr.nimType["DVB-S"]:
- nim.configMode = configElement(cname + "configMode", configSelection, 0, (("simple", _("Simple")), ("nothing", _("Nothing connected")), ("loopthrough", _("Loopthrough to Socket A")), ("advanced", _("Advanced")))) # "Advanced"));
+ 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"))))
#important - check if just the 2nd one is LT only and the first one is DVB-S
if currentConfigSelectionElement(nim.configMode) == "loopthrough": #linked
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.sats = configElement(cname + "advanced.sats", configSatlist, 192, nimmgr.satList);
+ nim.advanced.sat = {}
+ lnbs = ["not available"]
+ for y in range(1, 33):
+ lnbs.append("LNB " + str(y))
+ for x in nimmgr.satList:
+ nim.advanced.sat[x[1]] = ConfigSubsection()
+ nim.advanced.sat[x[1]].voltage = configElement(cname + "advanced.sat" + str(x[1]) + ".voltage", configSelection, 0, (("polarization", _("Polarization")), ("13V", _("13 V")), ("18V", _("18 V"))))
+ nim.advanced.sat[x[1]].tonemode = configElement(cname + "advanced.sat" + str(x[1]) + ".tonemode", configSelection, 0, (("band", _("Band")), ("on", _("On")), ("off", _("Off"))))
+ nim.advanced.sat[x[1]].usals = configElement(cname + "advanced.sat" + str(x[1]) + ".usals", configSelection, 0, (("yes", _("Yes")), ("no", _("No"))))
+ nim.advanced.sat[x[1]].rotorposition = configElement(cname + "advanced.sat" + str(x[1]) + ".rotorposition", configSequence, [1], configsequencearg.get("INTEGER", (1, 255)))
+ nim.advanced.sat[x[1]].lnb = configElement(cname + "advanced.sat" + str(x[1]) + ".lnb", configSelection, 0, lnbs)
+
+ nim.advanced.lnb = [0]
+ for x in range(1, 33):
+ nim.advanced.lnb.append(ConfigSubsection())
+ nim.advanced.lnb[x].lof = configElement(cname + "advanced.lnb" + str(x) + ".lof", configSelection, 0, (("universal_lnb", _("Universal LNB")), ("c_band", _("C-Band")), ("user_defined", _("User defined"))))
+ nim.advanced.lnb[x].lofl = configElement(cname + "advanced.lnb" + str(x) + ".lofl", configSequence, [9750], configsequencearg.get("INTEGER", (0, 99999)))
+ nim.advanced.lnb[x].lofh = configElement(cname + "advanced.lnb" + str(x) + ".lofh", configSequence, [10600], configsequencearg.get("INTEGER", (0, 99999)))
+ nim.advanced.lnb[x].threshold = configElement(cname + "advanced.lnb" + str(x) + ".threshold", configSequence, [11750], configsequencearg.get("INTEGER", (0, 99999)))
+ nim.advanced.lnb[x].output_12v = configElement(cname + "advanced.lnb" + str(x) + ".output_12v", configSelection, 0, (("0V", _("0 V")), ("12V", _("12 V"))))
+ nim.advanced.lnb[x].increased_voltage = configElement(cname + "advanced.lnb" + str(x) + ".increased_voltage", configSelection, 0, (("no", _("No")), ("yes", _("Yes"))))
+ nim.advanced.lnb[x].toneburst = configElement(cname + "advanced.lnb" + str(x) + ".toneburst", configSelection, 0, (("none", _("None")), ("A", _("A")), ("B", _("B"))))
+ 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"))))
+ nim.advanced.lnb[x].commitedDiseqcCommand = configElement(cname + "advanced.lnb" + str(x) + ".commitedDiseqcCommand", configSelection, 0, (("none", _("None")), ("AA", _("AA")), ("AB", _("AB")), ("BA", _("BA")), ("BB", _("BB"))))
+ nim.advanced.lnb[x].fastDiseqc = configElement(cname + "advanced.lnb" + str(x) + ".fastDiseqc", configSelection, 0, (("no", _("No")), ("yes", _("Yes"))))
+ nim.advanced.lnb[x].sequenceRepeat = configElement(cname + "advanced.lnb" + str(x) + ".sequenceRepeat", configSelection, 0, (("no", _("No")), ("yes", _("Yes"))))
+ nim.advanced.lnb[x].commandOrder1_0 = configElement(cname + "advanced.lnb" + str(x) + ".commandOrder1_0", configSelection, 0, ("committed, toneburst", "toneburst, committed"))
+ 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"))
+ 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)
+ nim.advanced.lnb[x].diseqcRepeats = configElement(cname + "advanced.lnb" + str(x) + ".diseqcRepeats", configSelection, 0, (("none", _("None")), ("one", _("One")), ("two", _("Two")), ("three", _("Three"))))
+ nim.advanced.lnb[x].longitude = configElement(cname + "advanced.lnb" + str(x) + ".longitude", configSequence, [5,100], configsequencearg.get("FLOAT", [(0,90),(0,999)]));
+ nim.advanced.lnb[x].longitudeOrientation = configElement(cname + "advanced.lnb" + str(x) + ".longitudeOrientation", configSelection, 0, (_("East"), _("West")))
+ nim.advanced.lnb[x].latitude = configElement(cname + "advanced.lnb" + str(x) + ".latitude", configSequence, [50,767], configsequencearg.get("FLOAT", [(0,90),(0,999)]));
+ nim.advanced.lnb[x].latitudeOrientation = configElement(cname + "advanced.lnb" + str(x) + ".latitudeOrientation", configSelection, 0, (("north", _("North")), ("south", _("South"))))
+ nim.advanced.lnb[x].powerMeasurement = configElement(cname + "advanced.lnb" + str(x) + ".powerMeasurement", configSelection, 0, (("yes", _("Yes")), ("no", _("No"))))
+ nim.advanced.lnb[x].powerThreshold = configElement(cname + "advanced.lnb" + str(x) + ".powerThreshold", configSequence, [50], configsequencearg.get("INTEGER", (0, 100)))
elif slot.nimType == nimmgr.nimType["DVB-C"]:
nim.cable = configElement(cname + "cable", configSelection, 0, nimmgr.cablesList);
elif slot.nimType == nimmgr.nimType["DVB-T"]:
git.cweiske.de / enigma2.git / blobdiff