from config import ConfigSubsection
from config import ConfigSlider
from config import configSelection
+from config import currentConfigSelectionElement
+from config import getConfigSelectionElement
from config import configSequence
from config import configsequencearg
from config import configSatlist
return procFile
class SecConfigure:
- def addLNBSimple(self, slotid, orbpos, toneburstmode, diseqcmode, diseqcpos):
+ def addLNBSimple(self, slotid, diseqcmode, toneburstmode = 0, diseqcpos = 0, orbpos = 0, longitude = 0, latitude = 0, loDirection = 0, laDirection = 0):
#simple defaults
sec = eDVBSatelliteEquipmentControl.getInstance()
sec.addLNB()
sec.setToneburst(toneburstmode)
sec.setCommittedCommand(diseqcpos)
#print "set orbpos to:" + str(orbpos)
- sec.addSatellite(orbpos)
- self.satList.append(orbpos)
+ if (0 <= diseqcmode < 3):
+ sec.addSatellite(orbpos)
+ self.satList.append(orbpos)
+ elif (diseqcmode == 3): # diseqc 1.2
+ 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)
+ self.satList.append(int(x[1]))
+
+
+ def linkNIMs(self, nim1, nim2):
+ eDVBSatelliteEquipmentControl.getInstance().setTunerLinked(nim1, nim2)
+
def getSatList(self):
return self.satList
def update(self):
eDVBSatelliteEquipmentControl.getInstance().clear()
+
self.satList = []
for slot in self.NimManager.nimslots:
nim = config.Nims[x]
if slot.nimType == self.NimManager.nimType["DVB-S"]:
print "slot: " + str(x) + " configmode: " + str(nim.configMode.value)
- if nim.configMode.value == 0: #simple config
- if nim.diseqcMode.value == 0: #single
- self.addLNBSimple(x, int(nim.diseqcA.vals[nim.diseqcA.value][1]), 0, 0, 4)
- elif nim.diseqcMode.value == 1: #Toneburst A/B
- self.addLNBSimple(x, int(nim.diseqcA.vals[nim.diseqcA.value][1]), 1, 0, 4)
- self.addLNBSimple(x, int(nim.diseqcB.vals[nim.diseqcB.value][1]), 1, 0, 4)
- elif nim.diseqcMode.value == 2: #DiSEqC A/B
- self.addLNBSimple(x, int(nim.diseqcA.vals[nim.diseqcA.value][1]), 0, 1, 0)
- self.addLNBSimple(x, int(nim.diseqcB.vals[nim.diseqcB.value][1]), 0, 1, 1)
- elif nim.diseqcMode.value == 3: #DiSEqC A/B/C/D
- self.addLNBSimple(x, int(nim.diseqcA.vals[nim.diseqcA.value][1]), 0, 1, 0)
- self.addLNBSimple(x, int(nim.diseqcB.vals[nim.diseqcB.value][1]), 0, 1, 1)
- self.addLNBSimple(x, int(nim.diseqcC.vals[nim.diseqcC.value][1]), 0, 1, 2)
- self.addLNBSimple(x, int(nim.diseqcD.vals[nim.diseqcD.value][1]), 0, 1, 3)
- elif nim.diseqcMode.value == 4: #Positioner
- print "FIXME: positioner suppport"
+ if currentConfigSelectionElement(nim.configMode) == "loopthrough":
+ self.linkNIMs(x, nim.linkedTo.value)
+ nim = config.Nims[nim.linkedTo.value]
+ elif currentConfigSelectionElement(nim.configMode) == "simple": #simple config
+ if currentConfigSelectionElement(nim.diseqcMode) == "single": #single
+ self.addLNBSimple(slotid = x, orbpos = int(nim.diseqcA.vals[nim.diseqcA.value][1]), toneburstmode = 0, diseqcmode = 0, diseqcpos = 4)
+ elif currentConfigSelectionElement(nim.diseqcMode) == "toneburst_a_b": #Toneburst A/B
+ self.addLNBSimple(slotid = x, orbpos = int(nim.diseqcA.vals[nim.diseqcA.value][1]), toneburstmode = 1, diseqcmode = 0, diseqcpos = 4)
+ self.addLNBSimple(slotid = x, orbpos = int(nim.diseqcB.vals[nim.diseqcB.value][1]), toneburstmode = 1, diseqcmode = 0, diseqcpos = 4)
+ elif currentConfigSelectionElement(nim.diseqcMode) == "diseqc_a_b": #DiSEqC A/B
+ self.addLNBSimple(slotid = x, orbpos = int(nim.diseqcA.vals[nim.diseqcA.value][1]), toneburstmode = 0, diseqcmode = 1, diseqcpos = 0)
+ self.addLNBSimple(slotid = x, orbpos = int(nim.diseqcB.vals[nim.diseqcB.value][1]), toneburstmode = 0, diseqcmode = 1, diseqcpos = 1)
+ elif currentConfigSelectionElement(nim.diseqcMode) == "diseqc_a_b_c_d": #DiSEqC A/B/C/D
+ self.addLNBSimple(slotid = x, orbpos = int(nim.diseqcA.vals[nim.diseqcA.value][1]), toneburstmode = 0, diseqcmode = 1, diseqcpos = 0)
+ self.addLNBSimple(slotid = x, orbpos = int(nim.diseqcB.vals[nim.diseqcB.value][1]), toneburstmode = 0, diseqcmode = 1, diseqcpos = 1)
+ self.addLNBSimple(slotid = x, orbpos = int(nim.diseqcC.vals[nim.diseqcC.value][1]), toneburstmode = 0, diseqcmode = 1, diseqcpos = 2)
+ self.addLNBSimple(slotid = x, orbpos = int(nim.diseqcD.vals[nim.diseqcD.value][1]), toneburstmode = 0, diseqcmode = 1, diseqcpos = 3)
+ elif currentConfigSelectionElement(nim.diseqcMode) == "positioner": #Positioner
+ self.addLNBSimple(slotid = x, diseqcmode = 3, longitude = float(str(nim.longitude.value[0]) + "." + str(nim.longitude.value[1])), loDirection = nim.longitudeOrientation.value - 2, latitude = float(str(nim.latitude.value[0]) + "." + str(nim.latitude.value[1])), laDirection = nim.latitudeOrientation.value)
+ pass
+ elif currentConfigSelectionElement(nim.configMode) == "nothing":
pass
else: #advanced config
print "FIXME add support for advanced config"
def startElement(self, name, attrs):
if (name == "sat"):
#print "found sat " + attrs.get('name',"") + " " + str(attrs.get('position',""))
- tpos = attrs.get('position',"")
+ tpos = int(attrs.get('position',""))
+ if tpos < 0:
+ tpos = 3600 + tpos
tname = attrs.get('name',"")
self.satellites[tpos] = tname
self.satList.append( (tname, tpos) )
else:
self.transponders[self.parsedCab] = [ ]
- self.transponders[self.parsedCab].append((0, freq, sr, mod, fec))
+ self.transponders[self.parsedCab].append((1, freq, sr, mod, fec))
class parseTerrestrials(ContentHandler):
def __init__(self, terrestrialsList, transponders):
else:
self.transponders[self.parsedTer] = [ ]
- self.transponders[self.parsedTer].append((0, freq, bw, const, crh, crl, guard, transm, hierarchy, inv))
+ self.transponders[self.parsedTer].append((2, freq, bw, const, crh, crl, guard, transm, hierarchy, inv))
def getTransponders(self, pos):
return self.transponders[pos]
return self.sec.getSatList()
def getSatDescription(self, pos):
- return self.satellites[str(pos)]
+ return self.satellites[pos]
def readSatsfromFile(self):
self.satellites = { }
self.nimTypes[lastsocket] = "empty/unknown"
nimfile.close()
-
def getNimType(self, slotID):
- return self.nimType[self.nimTypes[slotID]]
-
+ if slotID >= self.nimCount:
+ return "empty/unknown"
+ else:
+ return self.nimType[self.nimTypes[slotID]]
+
def getNimName(self, slotID):
return self.nimNames[slotID]
if (config.Nims[slotid].diseqcMode.value == 3):
list.append(self.satList[config.Nims[slotid].diseqcC.value])
list.append(self.satList[config.Nims[slotid].diseqcD.value])
+ if (config.Nims[slotid].diseqcMode.value == 4):
+ for x in self.satList:
+ list.append(x)
return list
#callbacks for c++ config
def nimConfigModeChanged(self, slotid, mode):
- #print "nimConfigModeChanged set to " + str(mode)
- pass
+ 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
#print "nimDiseqcD set to " + str(val)
pass
-
def InitNimManager(nimmgr):
config.Nims = []
for x in range(nimmgr.nimCount):
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)
nim = config.Nims[x]
if slot.nimType == nimmgr.nimType["DVB-S"]:
- nim.configMode = configElement(cname + "configMode", configSelection, 0, (_("Simple"), _("Linked tuner"))) # _("Advanced")));
- nim.diseqcMode = configElement(cname + "diseqcMode", configSelection, 2, (_("Single"), _("Toneburst A/B"), _("DiSEqC A/B"), _("DiSEqC A/B/C/D"), _("Positioner")));
+ 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
+ if x == 0: #first one can never be linked to anything
+ nim.configMode.value = getConfigSelectionElement(nim.configMode, "simple") #reset to simple
+ nim.configMode.save()
+ else:
+ #FIXME: make it better
+ for y in nimmgr.nimslots:
+ if y.slotid == 0:
+ if y.nimType != nimmgr.nimType["DVB-S"]:
+ 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.longitude = configElement(cname + "longitude", configSequence, [0,0], configsequencearg.get("FLOAT", [(0,90),(0,999)]));
- nim.latitude = configElement(cname + "latitude", configSequence, [0,0], configsequencearg.get("FLOAT", [(0,90),(0,999)]));
-
+ 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"), _("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"))))
satNimList = nimmgr.getNimListOfType(nimmgr.nimType["DVB-S"], slot.slotid)
satNimListNames = []
for x in satNimList:
- satNimListNames.append(nimmgr.getNimName(x))
+ 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);
#perhaps the instance of the slot is more useful?
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.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, (("yes", _("Yes")), ("no", _("No"))))
+ 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, (("yes", _("Yes")), ("no", _("No"))))
+ nim.advanced.lnb[x].sequenceRepeat = configElement(cname + "advanced.lnb" + str(x) + ".sequenceRepeat", configSelection, 0, (("yes", _("Yes")), ("no", _("No"))))
+ 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