X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/45b15800295dbe7e8aa64c7c97e62ed7a9f0a137..dfe677a09df269b0e1d675b6ca02f5fcb6acb5c5:/lib/python/Components/NimManager.py diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index f73a0f62..b3be2603 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -75,7 +75,7 @@ class SecConfigure: self.satList.append(int(x[1])) def linkNIMs(self, sec, nim1, nim2): - print "link", nim1, "to", nim2 + print "link tuner", nim1, "to tuner", nim2 sec.setTunerLinked(nim1, nim2) def getSatList(self): @@ -83,7 +83,8 @@ class SecConfigure: def update(self): sec = eDVBSatelliteEquipmentControl.getInstance() - sec.clear() + sec.clear() ## this do unlinking NIMs too !! + print "sec config cleared" self.satList = [] self.linked = { } @@ -126,15 +127,16 @@ class SecConfigure: else: loValue = rotorParam.WEST self.addLNBSimple(sec, slotid = x, diseqcmode = 3, - longitude = float(str(nim.longitude.value[0]) + "." + str(nim.longitude.value[1])), + longitude = configsequencearg.getFloat(nim.longitude), loDirection = loValue, - latitude = float(str(nim.latitude.value[0]) + "." + str(nim.latitude.value[1])), + latitude = configsequencearg.getFloat(nim.latitude), laDirection = laValue) # pass elif currentConfigSelectionElement(nim.configMode) == "nothing": pass else: #advanced config self.updateAdvanced(sec, x) + print "sec config completed" def updateAdvanced(self, sec, slotid): lnbSat = {} @@ -252,8 +254,10 @@ class SecConfigure: sec.setCommandOrder(currCO) if currentConfigSelectionElement(currLnb.diseqcMode) == "1_2": - sec.setLatitude(float(str(currLnb.latitude.value[0]) + "." + str(currLnb.latitude.value[1]))) - sec.setLongitude(float(str(currLnb.longitude.value[0]) + "." + str(currLnb.longitude.value[1]))) + latitude = configsequencearg.getFloat(currLnb.latitude) + sec.setLatitude(latitude) + longitude = configsequencearg.getFloat(currLnb.longitude) + sec.setLongitude(longitude) if currentConfigSelectionElement(currLnb.latitudeOrientation) == "north": sec.setLaDirection(rotorParam.NORTH) else: @@ -288,7 +292,7 @@ class SecConfigure: sec.setToneMode(switchParam.OFF) if currentConfigSelectionElement(currSat.usals) == "no": - sec.setRotorPosNum(currSat.rotorposition.value) + sec.setRotorPosNum(currSat.rotorposition.value[0]) else: sec.setRotorPosNum(0) #USALS @@ -536,19 +540,20 @@ class NimManager: 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) +# #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) @@ -572,10 +577,10 @@ def InitNimManager(nimmgr): for x in range(nimmgr.nimCount): config.Nims.append(ConfigSubsection()) - def nimConfigModeChanged(slotid, configElement): - nimmgr.nimConfigModeChanged(slotid, configElement.value) - def nimLinkedToChanged(slotid, configElement): - nimmgr.nimLinkedToChanged(slotid, configElement.value) +# 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) @@ -619,7 +624,7 @@ def InitNimManager(nimmgr): 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.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")))) satNimList = nimmgr.getNimListOfType(nimmgr.nimType["DVB-S"], slot.slotid) @@ -629,13 +634,13 @@ def InitNimManager(nimmgr): nim.linkedTo = configElement(cname + "linkedTo", configSelection, 0, satNimListNames); #perhaps the instance of the slot is more useful? - nim.configMode.addNotifier(boundFunction(nimConfigModeChanged,x)) +# nim.configMode.addNotifier(boundFunction(nimConfigModeChanged,x)) nim.diseqcMode.addNotifier(boundFunction(nimDiseqcModeChanged,x)) nim.diseqcA.addNotifier(boundFunction(nimPortAChanged,int(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)) +# nim.linkedTo.addNotifier(boundFunction(nimLinkedToChanged,x)) # advanced config: nim.advanced = ConfigSubsection() @@ -673,9 +678,9 @@ def InitNimManager(nimmgr): 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].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", _("East")), ("west", _("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)))