eDVBSatelliteRotorParameters as rotorParam, \
eDVBResourceManager
-import xml.dom.minidom
-from xml.dom import EMPTY_NAMESPACE
-from skin import elementsWithTag
-from Tools import XMLTools
-
from xml.sax import make_parser
from xml.sax.handler import ContentHandler
-from Tools.BoundFunction import boundFunction
from time import localtime, mktime
from datetime import datetime
return procFile
class SecConfigure:
- def addLNBSimple(self, sec, slotid, diseqcmode, toneburstmode = diseqcParam.NO, diseqcpos = diseqcParam.SENDNO, orbpos = 0, longitude = 0, latitude = 0, loDirection = 0, laDirection = 0, turningSpeed = rotorParam.FAST):
+ def addLNBSimple(self, sec, slotid, diseqcmode, toneburstmode = diseqcParam.NO, diseqcpos = diseqcParam.SENDNO, orbpos = 0, longitude = 0, latitude = 0, loDirection = 0, laDirection = 0, turningSpeed = rotorParam.FAST, useInputPower=True, inputPowerDelta=50):
#simple defaults
sec.addLNB()
tunermask = 1 << slotid
sec.setLaDirection(laDirection)
sec.setLongitude(longitude)
sec.setLoDirection(loDirection)
- sec.setUseInputpower(True)
- sec.setInputpowerDelta(50)
+ sec.setUseInputpower(useInputPower)
+ sec.setInputpowerDelta(inputPowerDelta)
sec.setRotorTurningSpeed(turningSpeed)
for x in self.NimManager.satList:
nim_slots = self.NimManager.nim_slots
+ used_nim_slots = [ ]
+
for slot in nim_slots:
x = slot.slot
nim = slot.config
# this is stored in the *value* (not index!) of the config list
if nim.configMode.value == "equal":
self.equal[int(nim.equalTo.value)]=x
- if nim.configMode.value == "loopthrough":
+ elif nim.configMode.value == "loopthrough":
self.linkNIMs(sec, x, int(nim.linkedTo.value))
self.linked[int(nim.linkedTo.value)]=x
elif nim.configMode.value == "satposdepends":
self.setSatposDepends(sec, x, int(nim.satposDependsTo.value))
self.satposdepends[int(nim.satposDependsTo.value)]=x
+ if slot.type is not None:
+ used_nim_slots.append((slot.slot, slot.description, nim.configMode.value != "nothing" and True or False))
+
+ eDVBResourceManager.getInstance().setFrontendSlotInformations(used_nim_slots)
+
for slot in nim_slots:
x = slot.slot
nim = slot.config
loValue = rotorParam.EAST
else:
loValue = rotorParam.WEST
- turn_speed_dict = { "fast": rotorParam.FAST, "slow": rotorParam.SLOW }
- if turn_speed_dict.has_key(nim.turningSpeed.value):
- turning_speed = turn_speed_dict[nim.turningSpeed.value]
- else:
- beg_time = localtime(nim.fastTurningBegin.value)
- end_time = localtime(nim.fastTurningEnd.value)
- turning_speed = ((beg_time.tm_hour+1) * 60 + beg_time.tm_min + 1) << 16
- turning_speed |= (end_time.tm_hour+1) * 60 + end_time.tm_min + 1
+ inputPowerDelta=50
+ useInputPower=False
+ turning_speed=0
+ if nim.powerMeasurement.value:
+ useInputPower=True
+ inputPowerDelta=nim.powerThreshold.value
+ turn_speed_dict = { "fast": rotorParam.FAST, "slow": rotorParam.SLOW }
+ if turn_speed_dict.has_key(nim.turningSpeed.value):
+ turning_speed = turn_speed_dict[nim.turningSpeed.value]
+ else:
+ beg_time = localtime(nim.fastTurningBegin.value)
+ end_time = localtime(nim.fastTurningEnd.value)
+ turning_speed = ((beg_time.tm_hour+1) * 60 + beg_time.tm_min + 1) << 16
+ turning_speed |= (end_time.tm_hour+1) * 60 + end_time.tm_min + 1
self.addLNBSimple(sec, slotid = x, diseqcmode = 3,
longitude = nim.longitude.float,
loDirection = loValue,
latitude = nim.latitude.float,
laDirection = laValue,
- turningSpeed = turning_speed)
+ turningSpeed = turning_speed,
+ useInputPower = useInputPower,
+ inputPowerDelta = inputPowerDelta)
elif nim.configMode.value == "advanced": #advanced config
self.updateAdvanced(sec, x)
print "sec config completed"
x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS, configElement.value))
config.sec.delay_after_enable_voltage_before_switch_command = x
- x = ConfigInteger(default=200, limits = (0, 9999))
+ x = ConfigInteger(default=700, limits = (0, 9999))
x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_BETWEEN_SWITCH_AND_MOTOR_CMD, configElement.value))
config.sec.delay_between_switch_and_motor_command = x
x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER, configElement.value))
config.sec.delay_after_voltage_change_before_measure_idle_inputpower = x
- x = ConfigInteger(default=200, limits = (0, 9999))
+ x = ConfigInteger(default=750, limits = (0, 9999))
x.addNotifier(lambda configElement: secClass.setParam(secClass.DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_MOTOR_CMD, configElement.value))
config.sec.delay_after_enable_voltage_before_motor_command = x
for x in range(len(nimmgr.nim_slots)):
config.Nims.append(ConfigSubsection())
- used_nim_slots = [ ]
-
for slot in nimmgr.nim_slots:
x = slot.slot
nim = config.Nims[x]
# HACK: currently, we can only looptrough to socket A
- if slot.type is not None:
- used_nim_slots.append((slot.slot, slot.description))
-
if slot.isCompatible("DVB-S"):
if slot.slot == 0:
nim.configMode = ConfigSelection(
nim.longitudeOrientation = ConfigSelection(choices={"east": _("East"), "west": _("West")}, default = "east")
nim.latitude = ConfigFloat(default=[50,767], limits=[(0,359),(0,999)])
nim.latitudeOrientation = ConfigSelection(choices={"north": _("North"), "south": _("South")}, default="north")
+ nim.powerMeasurement = ConfigYesNo(default=True)
+ nim.powerThreshold = ConfigInteger(default=50, limits=(0, 100))
nim.turningSpeed = ConfigSelection(choices = [("fast", _("Fast")), ("slow", _("Slow")), ("fast epoch", _("Fast epoch")) ], default = "fast")
btime = datetime(1970, 1, 1, 7, 0);
nim.fastTurningBegin = ConfigDateTime(default = mktime(btime.timetuple()), formatstring = _("%H:%M"), increment = 900)
etime = datetime(1970, 1, 1, 19, 0);
nim.fastTurningEnd = ConfigDateTime(default = mktime(etime.timetuple()), formatstring = _("%H:%M"), increment = 900)
# get other frontends of the same type
- satNimList = nimmgr.getNimListOfType(slot.type, slot.slot)
+
+ satNimList = nimmgr.getNimListOfType("DVB-S", slot.slot)
satNimListNames = {}
for x in satNimList:
print "pls add support for this frontend type!"
# assert False
- eDVBResourceManager.getInstance().setFrontendSlotInformations(used_nim_slots)
-
nimmgr.sec = SecConfigure(nimmgr)
nimmanager = NimManager()
git.cweiske.de / enigma2.git / blobdiff