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 == 1:
+ if nim.configMode.value == 2:
self.linkNIMs(x, nim.linkedTo.value)
nim = config.Nims[nim.linkedTo.value]
if nim.configMode.value == 0: #simple 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 = { }
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):
- if (mode != 1): # not linked
+ if (mode != 2): # not linked
print "Unlinking slot " + str(slotid)
# TODO call c++ to unlink nim in slot slotid
- if (mode == 1): # linked
+ if (mode == 2): # linked
pass
#FIXME!!!
#if (len(self.getNimListOfType(self.nimType["DVB-S"], slotid)) > 0):
nim = config.Nims[x]
if slot.nimType == nimmgr.nimType["DVB-S"]:
- nim.configMode = configElement(cname + "configMode", configSelection, 0, (_("Simple"), _("Loopthrough to Socket A"))) # "Advanced"));
+ nim.configMode = configElement(cname + "configMode", configSelection, 0, (_("Simple"), _("Nothing connected"), _("Loopthrough to Socket A"))) # "Advanced"));
#important - check if just the 2nd one is LT only and the first one is DVB-S
- if nim.configMode.value == 1: #linked
+ if nim.configMode.value == 2: #linked
if x == 0: #first one can never be linked to anything
nim.configMode.value = 0 #reset to simple
nim.configMode.save()