X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ac2585b1cf9b605723d9fe593c04f138086976a6..7580cc33aacccf8b563f72761a964b1f90f1d719:/lib/python/Components/NimManager.py diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index d826dbe4..104f5f0a 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -4,8 +4,11 @@ from config import configElement from config import ConfigSubsection from config import ConfigSlider from config import configSelection +from config import configSequence +from config import configsequencearg from config import configSatlist + import xml.dom.minidom from xml.dom import EMPTY_NAMESPACE from skin import elementsWithTag @@ -116,6 +119,20 @@ class NimManager: nimText += ("DVB-S", "DVB-C", "DVB-T")[slot.nimType] + ")" list.append((nimText, slot)) return list + + def getSatListForNim(self, slotid): + print "slotid:", slotid + list = [] + print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.value] + print "diseqcA:", config.Nims[slotid].diseqcA.value + if (config.Nims[slotid].diseqcMode.value <= 3): + list.append(self.satList[config.Nims[slotid].diseqcA.value]) + if (0 < config.Nims[slotid].diseqcMode.value <= 3): + list.append(self.satList[config.Nims[slotid].diseqcB.value]) + 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]) + return list #callbacks for c++ config def nimConfigModeChanged(self, slotid, mode): @@ -155,11 +172,13 @@ def InitNimManager(nimmgr): if slot.nimType == nimmgr.nimType["DVB-S"]: config.Nims[x].configMode = configElement(cname + "configMode",configSelection, 0, ("Simple", "Advanced")); - config.Nims[x].diseqcMode = configElement(cname + "diseqcMode",configSelection, 2, ("Single", "Toneburst A/B", "DiSEqC A/B", "DiSEqC A/B/C/D")); + config.Nims[x].diseqcMode = configElement(cname + "diseqcMode",configSelection, 2, ("Single", "Toneburst A/B", "DiSEqC A/B", "DiSEqC A/B/C/D", "Positioner")); config.Nims[x].diseqcA = configElement(cname + "diseqcA",configSatlist, 192, nimmgr.satList); config.Nims[x].diseqcB = configElement(cname + "diseqcB",configSatlist, 130, nimmgr.satList); config.Nims[x].diseqcC = configElement(cname + "diseqcC",configSatlist, 0, nimmgr.satList); config.Nims[x].diseqcD = configElement(cname + "diseqcD",configSatlist, 0, nimmgr.satList); + config.Nims[x].longitude = configElement(cname + "longitude",configSequence, [0,0], configsequencearg.get("FLOAT", [(0,90),(0,999)])); + config.Nims[x].latitude = configElement(cname + "latitude",configSequence, [0,0], configsequencearg.get("FLOAT", [(0,90),(0,999)])); #perhaps the instance of the slot is more useful? config.Nims[x].configMode.addNotifier(boundFunction(nimConfigModeChanged,x))