136 replies to this topic

[Rob van der Does]

E2 doesn't support DiSEqC 2.x, so it's no use mentioning them.

[littlesat]

As far i know it can controll 2.1, but it does not read the feedback...

[Rob van der Does]

As far i know it can controll 2.1, but it does not read the feedback...

Exactly, and that's the only difference between 1.x & 2.x, so there's no support for 2.x. The commands sent are the same.

Edited by SatKiekerd, 1 May 2014 - 11:10.

[Huevos]

Dima you are just complicating things. If you read the side of the switch it says 1.0/2.0 or 1.1/2.1 if the switch is DiSEqC 2 compatible.

DiSEqC 2 just means a switch has talkback, but the sent command is identical. E2 doesn't have DiSEqC 2 and I very much doubt if any of the hardware is capable.

Edited by Huevos, 1 May 2014 - 11:17.

[littlesat]

I agree with huevos...

[Dimitrij]

Ок

[Dimitrij]

slight improvement...

--- a/NimManager.py
+++ b/NimManager.py
@@ -1216,7 +1216,7 @@
 	advanced_lnb_toneburst_choices = [("none", _("None")), ("A", _("A")), ("B", _("B"))]
 	advanced_lnb_allsat_diseqcmode_choices = [("1_2", _("1.2"))]
 	advanced_lnb_diseqcmode_choices = [("none", _("None")), ("1_0", _("1.0")), ("1_1", _("1.1")), ("1_2", _("1.2"))]
-	advanced_lnb_commandOrder1_0_choices = [("ct", "committed, toneburst"), ("tc", "toneburst, committed")]
+	advanced_lnb_commandOrder1_0_choices = [("ct", "DiSEqC 1.0, toneburst"), ("tc", "toneburst, DiSEqC 1.0")]
 	advanced_lnb_commandOrder_choices = [
 		("ct", "DiSEqC 1.0, toneburst"), ("tc", "toneburst, DiSEqC 1.0"),
 		("cut", "DiSEqC 1.0, DiSEqC 1.1, toneburst"), ("tcu", "toneburst, DiSEqC 1.0, DiSEqC 1.1"),
--- a/Satconfig.py
+++ b/Satconfig.py
@@ -22,7 +22,6 @@
 
 		if mode == "single":
 			list.append(getConfigListEntry(_("Satellite"), nim.diseqcA))
-			list.append(getConfigListEntry(_("Send DiSEqC"), nim.simpleSingleSendDiSEqC))
 		else:
 			list.append(getConfigListEntry(_("Port A"), nim.diseqcA))

 

[Huevos]

Hide 'command order' when not related to the current config. And cure a potential bug.

 

--- Satconfig.old.py	Fri May 02 03:06:44 2014
+++ Satconfig.py	Fri May 02 03:07:51 2014
@@ -91,7 +90,10 @@
 		self.turningSpeed = None
 		self.turnFastEpochBegin = None
 		self.turnFastEpochEnd = None
+		self.toneburst = None
+		self.committedDiseqcCommand = None
 		self.uncommittedDiseqcCommand = None
+		self.commandOrder = None
 		self.cableScanType = None
 		self.have_advanced = False
 		self.advancedUnicable = None
@@ -208,7 +210,7 @@
 					 self.advancedLnbsEntry, self.advancedDiseqcMode, self.advancedUsalsEntry,
 					 self.advancedLof, self.advancedPowerMeasurement, self.turningSpeed,
 					 self.advancedType, self.advancedSCR, self.advancedManufacturer, self.advancedUnicable, self.advancedConnected,
-					 self.uncommittedDiseqcCommand, self.cableScanType, self.multiType)
+					 self.toneburst, self.committedDiseqcCommand, self.uncommittedDiseqcCommand, self.commandOrder, self.cableScanType, self.multiType)
 		if self["config"].getCurrent() == self.multiType:
 			from Components.NimManager import InitNimManager
 			InitNimManager(nimmanager)
@@ -333,10 +335,14 @@
 				self.list.append(self.advancedDiseqcMode)
 			if currLnb.diseqcMode.value != "none":
 				self.list.append(getConfigListEntry(_("Fast DiSEqC"), currLnb.fastDiseqc))
-				self.list.append(getConfigListEntry(_("Toneburst"), currLnb.toneburst))
-				self.list.append(getConfigListEntry(_("DiSEqC 1.0 command"), currLnb.commitedDiseqcCommand))
+				self.toneburst = getConfigListEntry(_("Toneburst"), currLnb.toneburst)
+				self.list.append(self.toneburst)
+				self.committedDiseqcCommand = getConfigListEntry(_("DiSEqC 1.0 command"), currLnb.commitedDiseqcCommand)
+				self.list.append(self.committedDiseqcCommand)
+				
 				if currLnb.diseqcMode.value == "1_0":
-					self.list.append(getConfigListEntry(_("Command order"), currLnb.commandOrder1_0))
+					if currLnb.toneburst.index and currLnb.commitedDiseqcCommand.index:
+						self.list.append(getConfigListEntry(_("Command order"), currLnb.commandOrder1_0))
 				else:
 					self.uncommittedDiseqcCommand = getConfigListEntry(_("DiSEqC 1.1 command"), currLnb.uncommittedDiseqcCommand)
 					self.list.append(self.uncommittedDiseqcCommand)
@@ -350,8 +356,10 @@
 							currLnb.commandOrder.value = "tc"
 						else:
 							currLnb.commandOrder.value = "ct"
-					self.list.append(getConfigListEntry(_("Command order"), currLnb.commandOrder))
-					if currLnb.uncommittedDiseqcCommand.value != "0":
+					self.commandOrder = getConfigListEntry(_("Command order"), currLnb.commandOrder)
+					if 1 < ((1 if currLnb.uncommittedDiseqcCommand.index else 0) + (1 if currLnb.commitedDiseqcCommand.index else 0) + (1 if currLnb.toneburst.index else 0)):
+						self.list.append(self.commandOrder)
+					if currLnb.uncommittedDiseqcCommand.index:
 						self.list.append(getConfigListEntry(_("DiSEqC 1.1 repeats"), currLnb.diseqcRepeats))
 				self.list.append(getConfigListEntry(_("Sequence repeat"), currLnb.sequenceRepeat))
 				if currLnb.diseqcMode.value == "1_2":

Edited by Huevos, 2 May 2014 - 02:41.

[gerard0610]

‘All satellites’ is on 1st of may change in ‘All satellites DiSEqC mode 1.2.

My proposal is that this should be ‘All satellites mode USALS’.

Eventally ‘All satellites  DiSEqC mode USALS’

This because ‘All satellites’ is not working with DiSEqc 1.2 but it is working with  UALS in this configuration.

This makes it more clear for less experienced people in my opinion.

Edited by gerard0610, 2 May 2014 - 14:16.

[Huevos]

‘All satellites’ is on 1st of may change in ‘All satellites DiSEqC mode 1.2.

My proposal is that this should be ‘All satellites mode USALS’.

Eventally ‘All satellites  DiSEqC mode USALS’

This because ‘All satellites’ is not working with DiSEqc 1.2 but it is working with  UALS in this configuration.

This makes it more clear for less experienced people in my opinion.

Agreed.

[Huevos]

Here is the PY file for post #128. Please can you commit this Littlesat.

Attached Files

•  Satconfig.py.zip   6.08KB   2 downloads

Edited by Huevos, 2 May 2014 - 14:32.

[Huevos]

Is Littlesat on holiday???

[littlesat]

I am not at home... So I cannot do anything right now...

[Huevos]

I am not at home... So I cannot do anything right now...

Ok. There's a few more things to add anyway so this can wait until they're done.

[Huevos]

Just a few changes to remove clutter and lower confusion. Command order is only shown where necessary. And the 'Positioner plugin' options only shown on demand. And rename a couple of things to make them clearer for me as an English native speaker.

 

--- NimManager.old.py	Tue May 06 22:13:31 2014
+++ NimManager.py	Tue May 06 22:30:56 2014
@@ -1208,9 +1208,9 @@
 	turning_speed_choices = [("fast", _("Fast")), ("slow", _("Slow")), ("fast epoch", _("Fast epoch"))]
 
 	advanced_satlist_choices = nimmgr.satList + [
-		(3601, _('All satellites 1 (DiSEqC mode 1.2)'), 1), (3602, _('All satellites 2 (DiSEqC mode 1.2)'), 1),
-		(3603, _('All satellites 3 (DiSEqC mode 1.2)'), 1), (3604, _('All satellites 4 (DiSEqC mode 1.2)'), 1)]
-	advanced_lnb_choices = [("0", _("not available"))] + [(str(y), "LNB " + str(y)) for y in range(1, 65)]
+		(3601, _('All satellites 1 (USALS)'), 1), (3602, _('All satellites 2 (USALS)'), 1),
+		(3603, _('All satellites 3 (USALS)'), 1), (3604, _('All satellites 4 (USALS)'), 1)]
+	advanced_lnb_choices = [("0", _("not configured"))] + [(str(y), "LNB " + str(y)) for y in range(1, 65)]
 	advanced_voltage_choices = [("polarization", _("Polarization")), ("13V", _("13 V")), ("18V", _("18 V"))]
 	advanced_tonemode_choices = [("band", _("Band")), ("on", _("On")), ("off", _("Off"))]
 	advanced_lnb_toneburst_choices = [("none", _("None")), ("A", _("A")), ("B", _("B"))]
@@ -1396,7 +1396,7 @@
 				tmp.usals = ConfigYesNo(default=True)
 				tmp.rotorposition = ConfigInteger(default=1, limits=(1, 255))
 				lnbnum = 65+x-3601
-				lnb = ConfigSelection([("0", _("not available")), (str(lnbnum), "LNB %d"%(lnbnum))], "0")
+				lnb = ConfigSelection([("0", _("not configured")), (str(lnbnum), "LNB %d"%(lnbnum))], "0")
 				lnb.slot_id = slot_id
 				lnb.addNotifier(configLNBChanged, initial_call = False)
 				tmp.lnb = lnb

 

--- Satconfig.old.py	Tue May 06 22:07:10 2014
+++ Satconfig.py	Tue May 06 22:08:35 2014
@@ -6,7 +6,7 @@
 from Components.MenuList import MenuList
 from Components.NimManager import nimmanager
 from Components.config import getConfigListEntry, config, ConfigNothing, ConfigSelection, updateConfigElement,\
-	ConfigSatlist
+	ConfigSatlist, ConfigYesNo 
 from Components.Sources.List import List
 from Screens.MessageBox import MessageBox
 from Screens.ChoiceBox import ChoiceBox
@@ -56,10 +56,15 @@
 			if nim.powerMeasurement.value:
 				nim.powerMeasurement.value = False
 				nim.powerMeasurement.save()
-		list.append(getConfigListEntry(_("Tuning step size") + " [" + chr(176) + "]", nim.tuningstepsize))
-		list.append(getConfigListEntry(_("Memory positions"), nim.rotorPositions))
-		list.append(getConfigListEntry(_("Horizontal turning speed") + " [" + chr(176) + "/sec]", nim.turningspeedH))
-		list.append(getConfigListEntry(_("Vertical turning speed") + " [" + chr(176) + "/sec]", nim.turningspeedV))
+		if not hasattr(self, 'additionalMotorOptions'):
+			self.additionalMotorOptions = ConfigYesNo(False)
+		self.showAdditionalMotorOptions = getConfigListEntry(_("Extra motor options"), self.additionalMotorOptions)
+		self.list.append(self.showAdditionalMotorOptions)
+		if self.additionalMotorOptions.value:
+			self.list.append(getConfigListEntry("   " + _("Horizontal turning speed") + " [" + chr(176) + "/sec]", nim.turningspeedH))
+			self.list.append(getConfigListEntry("   " + _("Vertical turning speed") + " [" + chr(176) + "/sec]", nim.turningspeedV))
+			self.list.append(getConfigListEntry("   " + _("Turning step size") + " [" + chr(176) + "]", nim.tuningstepsize))
+			self.list.append(getConfigListEntry("   " + _("Max memory positions"), nim.rotorPositions))
 
 	def createConfigMode(self):
 		if self.nim.isCompatible("DVB-S"):
@@ -90,7 +95,10 @@
 		self.turningSpeed = None
 		self.turnFastEpochBegin = None
 		self.turnFastEpochEnd = None
+		self.toneburst = None
+		self.committedDiseqcCommand = None
 		self.uncommittedDiseqcCommand = None
+		self.commandOrder = None
 		self.cableScanType = None
 		self.have_advanced = False
 		self.advancedUnicable = None
@@ -98,6 +106,7 @@
 		self.advancedManufacturer = None
 		self.advancedSCR = None
 		self.advancedConnected = None
+		self.showAdditionalMotorOptions = None
 
 		if self.nim.isMultiType():
 			multiType = self.nimConfig.multiType
@@ -207,7 +216,8 @@
 			self.advancedLnbsEntry, self.advancedDiseqcMode, self.advancedUsalsEntry, \
 			self.advancedLof, self.advancedPowerMeasurement, self.turningSpeed, \
 			self.advancedType, self.advancedSCR, self.advancedManufacturer, self.advancedUnicable, self.advancedConnected, \
-			self.uncommittedDiseqcCommand, self.cableScanType, self.multiType)
+			self.toneburst, self.committedDiseqcCommand, self.uncommittedDiseqcCommand, \
+			self.commandOrder, self.showAdditionalMotorOptions, self.cableScanType, self.multiType)
 		if self["config"].getCurrent() == self.multiType:
 			from Components.NimManager import InitNimManager
 			InitNimManager(nimmanager)
@@ -332,10 +342,13 @@
 				self.list.append(self.advancedDiseqcMode)
 			if currLnb.diseqcMode.value != "none":
 				self.list.append(getConfigListEntry(_("Fast DiSEqC"), currLnb.fastDiseqc))
-				self.list.append(getConfigListEntry(_("Toneburst"), currLnb.toneburst))
-				self.list.append(getConfigListEntry(_("DiSEqC 1.0 command"), currLnb.commitedDiseqcCommand))
+				self.toneburst = getConfigListEntry(_("Toneburst"), currLnb.toneburst)
+				self.list.append(self.toneburst)
+				self.committedDiseqcCommand = getConfigListEntry(_("DiSEqC 1.0 command"), currLnb.commitedDiseqcCommand)
+				self.list.append(self.committedDiseqcCommand)
 				if currLnb.diseqcMode.value == "1_0":
-					self.list.append(getConfigListEntry(_("Command order"), currLnb.commandOrder1_0))
+					if currLnb.toneburst.index and currLnb.commitedDiseqcCommand.index:
+						self.list.append(getConfigListEntry(_("Command order"), currLnb.commandOrder1_0))
 				else:
 					self.uncommittedDiseqcCommand = getConfigListEntry(_("DiSEqC 1.1 command"), currLnb.uncommittedDiseqcCommand)
 					self.list.append(self.uncommittedDiseqcCommand)
@@ -349,8 +362,10 @@
 							currLnb.commandOrder.value = "tc"
 						else:
 							currLnb.commandOrder.value = "ct"
-					self.list.append(getConfigListEntry(_("Command order"), currLnb.commandOrder))
-					if currLnb.uncommittedDiseqcCommand.value != "0":
+					self.commandOrder = getConfigListEntry(_("Command order"), currLnb.commandOrder)
+					if 1 < ((1 if currLnb.uncommittedDiseqcCommand.index else 0) + (1 if currLnb.commitedDiseqcCommand.index else 0) + (1 if currLnb.toneburst.index else 0)):
+						self.list.append(self.commandOrder)
+					if currLnb.uncommittedDiseqcCommand.index:
 						self.list.append(getConfigListEntry(_("DiSEqC 1.1 repeats"), currLnb.diseqcRepeats))
 				self.list.append(getConfigListEntry(_("Sequence repeat"), currLnb.sequenceRepeat))
 				if currLnb.diseqcMode.value == "1_2":
@@ -380,10 +395,15 @@
 						self.list.append(getConfigListEntry(" ", currLnb.latitudeOrientation))
 					else:
 						self.list.append(getConfigListEntry(_("Stored position"), Sat.rotorposition))
-					self.list.append(getConfigListEntry(_("Tuning step size") + " [" + chr(176) + "]", currLnb.tuningstepsize))
-					self.list.append(getConfigListEntry(_("Memory positions"), currLnb.rotorPositions))
-					self.list.append(getConfigListEntry(_("Horizontal turning speed") + " [" + chr(176) + "/sec]", currLnb.turningspeedH))
-					self.list.append(getConfigListEntry(_("Vertical turning speed") + " [" + chr(176) + "/sec]", currLnb.turningspeedV))
+					if not hasattr(self, 'additionalMotorOptions'):
+						self.additionalMotorOptions = ConfigYesNo(False)
+					self.showAdditionalMotorOptions = getConfigListEntry(_("Extra motor options"), self.additionalMotorOptions)
+					self.list.append(self.showAdditionalMotorOptions)
+					if self.additionalMotorOptions.value:
+						self.list.append(getConfigListEntry("   " + _("Horizontal turning speed") + " [" + chr(176) + "/sec]", currLnb.turningspeedH))
+						self.list.append(getConfigListEntry("   " + _("Vertical turning speed") + " [" + chr(176) + "/sec]", currLnb.turningspeedV))
+						self.list.append(getConfigListEntry("   " + _("Turning step size") + " [" + chr(176) + "]", currLnb.tuningstepsize))
+						self.list.append(getConfigListEntry("   " + _("Max memory positions"), currLnb.rotorPositions))
 
 	def fillAdvancedList(self):
 		self.list = [ ]

 

Attached Files

•  tuner-config.zip   19.87KB   11 downloads

Edited by Huevos, 6 May 2014 - 21:59.

[littlesat]

If i commit the latest zip... Is that ok?

[Huevos]

If i commit the latest zip... Is that ok?

Yes please. The diff file is against the current files in the git.

Edited by Huevos, 6 May 2014 - 23:23.