more flexible diseqc / sat config

25 files changed, 81 insertions, 60 deletions

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 41925aeb..17297e67 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -39,7 +39,7 @@ class SecConfigure:
 		sec.addSatellite(orbpos)
 		self.configuredSatellites.add(orbpos)
 
-	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):
+	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, fastDiSEqC = False, setVoltageTone = True):
 		if orbpos is None or orbpos == 3601:
 			return
 		#simple defaults
@@ -56,10 +56,16 @@ class SecConfigure:
 		sec.setLNBThreshold(11700000)
 		sec.setLNBIncreasedVoltage(lnbParam.OFF)
 		sec.setRepeats(0)
-		sec.setFastDiSEqC(0)
+		sec.setFastDiSEqC(fastDiSEqC)
 		sec.setSeqRepeat(0)
-		sec.setVoltageMode(switchParam.HV)
-		sec.setToneMode(switchParam.HILO)
+
+		if setVoltageTone:
+			sec.setVoltageMode(switchParam.HV)
+			sec.setToneMode(switchParam.HILO)
+		else:
+			sec.setVoltageMode(switchParam._14V)
+			sec.setToneMode(switchParam.OFF)
+
 		sec.setCommandOrder(0)
 
 		#user values
@@ -167,18 +173,25 @@ class SecConfigure:
 					elif nim.configMode.value == "simple":		#simple config
 						print "diseqcmode: ", nim.diseqcMode.value
 						if nim.diseqcMode.value == "single":			#single
-							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.NONE, diseqcpos = diseqcParam.SENDNO)
+							if nim.simpleSingleSendDiSEqC.value:
+								self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA)
+							else:
+								self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.NONE, diseqcpos = diseqcParam.SENDNO)
 						elif nim.diseqcMode.value == "toneburst_a_b":		#Toneburst A/B
 							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.A, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO)
 							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.B, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO)
 						elif nim.diseqcMode.value == "diseqc_a_b":		#DiSEqC A/B
-							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA)
-							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB)
+							fastDiSEqC = nim.simpleDiSEqCOnlyOnSatChange.value
+							setVoltageTone = nim.simpleDiSEqCSetVoltageTone.value
+							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
+							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
 						elif nim.diseqcMode.value == "diseqc_a_b_c_d":		#DiSEqC A/B/C/D
-							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA)
-							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB)
-							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcC.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BA)
-							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcD.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BB)
+							fastDiSEqC = nim.simpleDiSEqCOnlyOnSatChange.value
+							setVoltageTone = nim.simpleDiSEqCSetVoltageTone.value
+							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
+							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
+							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcC.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BA, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
+							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcD.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BB, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
 						elif nim.diseqcMode.value == "positioner":		#Positioner
 							if nim.latitudeOrientation.value == "north":
 								laValue = rotorParam.NORTH
@@ -893,6 +906,9 @@ def InitNimManager(nimmgr):
 				if id != x:
 					choices.append((str(id), nimmgr.getNimDescription(id)))
 			nim.connectedTo = ConfigSelection(choices = choices)
+			nim.simpleSingleSendDiSEqC = ConfigYesNo(default=False)
+			nim.simpleDiSEqCSetVoltageTone = ConfigYesNo(default=True)
+			nim.simpleDiSEqCOnlyOnSatChange = ConfigYesNo(default=False)
 			nim.diseqcA = getConfigSatlist(192, [(3601, _('nothing connected'), 1)] + nimmgr.satList)
 			nim.diseqcB = getConfigSatlist(130, [(3601, _('nothing connected'), 1)] + nimmgr.satList)
 			nim.diseqcC = ConfigSatlist(list = [(3601, _('nothing connected'), 1)] + nimmgr.satList)
diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 6dc9f416..6489f28f 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -14,16 +14,21 @@ from datetime import datetime
 
 class NimSetup(Screen, ConfigListScreen):
 	def createSimpleSetup(self, list, mode):
+		nim = self.nimConfig
 		if mode == "single":
-			list.append(getConfigListEntry(_("Satellite"), self.nimConfig.diseqcA))
+			list.append(getConfigListEntry(_("Satellite"), nim.diseqcA))
+			list.append(getConfigListEntry(_("Send DiSEqC"), nim.simpleSingleSendDiSEqC))
 		else:
-			list.append(getConfigListEntry(_("Port A"), self.nimConfig.diseqcA))
+			list.append(getConfigListEntry(_("Port A"), nim.diseqcA))
 
 		if mode in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
-			list.append(getConfigListEntry(_("Port B"), self.nimConfig.diseqcB))
+			list.append(getConfigListEntry(_("Port B"), nim.diseqcB))
 			if mode == "diseqc_a_b_c_d":
-				list.append(getConfigListEntry(_("Port C"), self.nimConfig.diseqcC))
-				list.append(getConfigListEntry(_("Port D"), self.nimConfig.diseqcD))
+				list.append(getConfigListEntry(_("Port C"), nim.diseqcC))
+				list.append(getConfigListEntry(_("Port D"), nim.diseqcD))
+			if mode != "toneburst_a_b":
+				list.append(getConfigListEntry(_("Set Voltage and 22KHz"), nim.simpleDiSEqCSetVoltageTone))
+				list.append(getConfigListEntry(_("Send DiSEqC only on satellite change"), nim.simpleDiSEqCOnlyOnSatChange))
 
 	def createPositionerSetup(self, list):
 		nim = self.nimConfig
@@ -88,7 +93,7 @@ class NimSetup(Screen, ConfigListScreen):
 			self.list.append(self.configMode)
 
 			if self.nimConfig.configMode.value == "simple":			#simple setup
-				self.diseqcModeEntry = getConfigListEntry(_("DiSEqC Mode"), self.nimConfig.diseqcMode)
+				self.diseqcModeEntry = getConfigListEntry(_("Mode"), self.nimConfig.diseqcMode)
 				self.list.append(self.diseqcModeEntry)
 				if self.nimConfig.diseqcMode.value in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
 					self.createSimpleSetup(self.list, self.nimConfig.diseqcMode.value)
diff --git a/po/ar.po b/po/ar.po
index 0c9f0248..7ff6583e 100755
--- a/po/ar.po
+++ b/po/ar.po
@@ -820,7 +820,7 @@ msgstr "دايزك أ/ب"
 msgid "DiSEqC A/B/C/D"
 msgstr "دايزك أ/ب/ج/د"
 
-msgid "DiSEqC Mode"
+msgid "Mode"
 msgstr "وضع الدايزك"
 
 msgid "DiSEqC mode"
diff --git a/po/ca.po b/po/ca.po
index 331ebe3c..7935a925 100755
--- a/po/ca.po
+++ b/po/ca.po
@@ -851,8 +851,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "Mode DiSEqC"
+msgid "Mode"
+msgstr "Mode"
 
 msgid "DiSEqC mode"
 msgstr "mode DiSEqC"
diff --git a/po/cs.po b/po/cs.po
index 1638798b..711b8204 100755
--- a/po/cs.po
+++ b/po/cs.po
@@ -840,8 +840,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC Mód"
+msgid "Mode"
+msgstr "Mód"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC Mód"
diff --git a/po/da.po b/po/da.po
index 55016cd8..c4d8a941 100755
--- a/po/da.po
+++ b/po/da.po
@@ -849,8 +849,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC Type"
+msgid "Mode"
+msgstr "Type"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC type"
diff --git a/po/de.po b/po/de.po
index e5f33eec..e506fd97 100755
--- a/po/de.po
+++ b/po/de.po
@@ -879,8 +879,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC-Modus"
+msgid "Mode"
+msgstr "Modus"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC-Modus"
diff --git a/po/el.po b/po/el.po
index 3053587f..322659a8 100755
--- a/po/el.po
+++ b/po/el.po
@@ -841,8 +841,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC Mode"
+msgid "Mode"
+msgstr "Mode"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC mode"
diff --git a/po/en.po b/po/en.po
index daff3168..a6b3fd61 100644
--- a/po/en.po
+++ b/po/en.po
@@ -815,7 +815,7 @@ msgstr ""
 msgid "DiSEqC A/B/C/D"
 msgstr ""
 
-msgid "DiSEqC Mode"
+msgid "Mode"
 msgstr ""
 
 msgid "DiSEqC mode"
diff --git a/po/enigma2.pot b/po/enigma2.pot
index 375931bd..9c131a79 100644
--- a/po/enigma2.pot
+++ b/po/enigma2.pot
@@ -783,7 +783,7 @@ msgid "DiSEqC A/B/C/D"
 msgstr ""
 
 #: ../lib/python/Screens/Satconfig.py:74
-msgid "DiSEqC Mode"
+msgid "Mode"
 msgstr ""
 
 #: ../lib/python/Screens/Satconfig.py:180
diff --git a/po/es.po b/po/es.po
index 59a83032..1e42b605 100644
--- a/po/es.po
+++ b/po/es.po
@@ -856,8 +856,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "Modo DiSEqC"
+msgid "Mode"
+msgstr "Modo"
 
 msgid "DiSEqC mode"
 msgstr "Modo DiSEqC"
diff --git a/po/fi.po b/po/fi.po
index 19a3ddd9..4f9e0234 100755
--- a/po/fi.po
+++ b/po/fi.po
@@ -854,8 +854,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC-tila"
+msgid "Mode"
+msgstr "Tila"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC-tila"
diff --git a/po/fr.po b/po/fr.po
index b71e1ce1..885e305a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -854,8 +854,8 @@ msgstr ""
 msgid "DiSEqC A/B/C/D"
 msgstr ""
 
-msgid "DiSEqC Mode"
-msgstr "Mode DiSEqC"
+msgid "Mode"
+msgstr "Mode"
 
 msgid "DiSEqC mode"
 msgstr "Mode DiSEqC"
diff --git a/po/hr.po b/po/hr.po
index 26b554f3..e051eea6 100755
--- a/po/hr.po
+++ b/po/hr.po
@@ -840,8 +840,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC Mod"
+msgid "Mode"
+msgstr "Mod"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC mod"
diff --git a/po/hu.po b/po/hu.po
index 345f90b4..098761c1 100755
--- a/po/hu.po
+++ b/po/hu.po
@@ -852,8 +852,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC mód"
+msgid "Mode"
+msgstr "Mód"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC mód"
diff --git a/po/is.po b/po/is.po
index 71e0d6d3..facb2468 100755
--- a/po/is.po
+++ b/po/is.po
@@ -848,8 +848,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC Gerð"
+msgid "Mode"
+msgstr "Gerð"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC gerð"
diff --git a/po/it.po b/po/it.po
index 0b1bde29..b81e982c 100755
--- a/po/it.po
+++ b/po/it.po
@@ -847,8 +847,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "Modalità DiSEqc"
+msgid "Mode"
+msgstr "ModalitÃ"
 
 msgid "DiSEqC mode"
 msgstr "Modalità DiSEqC"
diff --git a/po/lt.po b/po/lt.po
index 2cdc4f79..61714a9a 100755
--- a/po/lt.po
+++ b/po/lt.po
@@ -856,8 +856,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC pasirinkimas"
+msgid "Mode"
+msgstr "Pasirinkimas"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC pasirinkimas"
diff --git a/po/nl.po b/po/nl.po
index e63e24b5..8627e0f0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -861,8 +861,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC-modus"
+msgid "Mode"
+msgstr "Modus"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC-modus"
diff --git a/po/no.po b/po/no.po
index a16e0884..520816f4 100755
--- a/po/no.po
+++ b/po/no.po
@@ -844,8 +844,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC-Modus"
+msgid "Mode"
+msgstr "Modus"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC-Modus"
diff --git a/po/pl.po b/po/pl.po
index eef53bc4..b3332c12 100755
--- a/po/pl.po
+++ b/po/pl.po
@@ -851,8 +851,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "Tryb DiSEqC"
+msgid "Mode"
+msgstr "Tryb"
 
 msgid "DiSEqC mode"
 msgstr "Tryb DiSEqC"
diff --git a/po/pt.po b/po/pt.po
index d37a8e87..72df8b21 100755
--- a/po/pt.po
+++ b/po/pt.po
@@ -847,8 +847,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "Modo DiSEqC"
+msgid "Mode"
+msgstr "Modo"
 
 msgid "DiSEqC mode"
 msgstr "Modo DiSEqC"
diff --git a/po/ru.po b/po/ru.po
index d5c8fff9..2407e7dc 100755
--- a/po/ru.po
+++ b/po/ru.po
@@ -823,8 +823,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC-режим"
+msgid "Mode"
+msgstr "режим"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC-режим"
diff --git a/po/sv.po b/po/sv.po
index 8f8cb010..1474d7f0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -868,8 +868,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC Läge"
+msgid "Mode"
+msgstr "Läge"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC läge"
diff --git a/po/tr.po b/po/tr.po
index aa9ffc7d..720e17ba 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -866,8 +866,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC Modu"
+msgid "Mode"
+msgstr "Modu"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC modu"