X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/39548963f2015ea82a8d490b19f4acb7adc7e7fb..442f19d89958d1bc25d884a7eeb5937806673c13:/lib/python/Components/NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 1d70580f..ac81c624 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -251,11 +251,11 @@ class SecConfigure:
 						
 						if currentConfigSelectionElement(currLnb.diseqcRepeats) == "none":
 							sec.setRepeats(0)
-						elif currentConfigSelectionElement(currLnb.diseqcRepeats) == "One":
+						elif currentConfigSelectionElement(currLnb.diseqcRepeats) == "one":
 							sec.setRepeats(1)
-						elif currentConfigSelectionElement(currLnb.diseqcRepeats) == "Two":
+						elif currentConfigSelectionElement(currLnb.diseqcRepeats) == "two":
 							sec.setRepeats(2)
-						elif currentConfigSelectionElement(currLnb.diseqcRepeats) == "Three":
+						elif currentConfigSelectionElement(currLnb.diseqcRepeats) == "three":
 							sec.setRepeats(3)
 						
 					setCommandOrder=False
@@ -343,11 +343,13 @@ class NimManager:
 				tpos = int(attrs.get('position',""))
 				if tpos < 0:
 					tpos = 3600 + tpos
-				tname = attrs.get('name',"")
+				tname = attrs.get('name',"").encode("UTF-8")
 				self.satellites[tpos] = tname
 				self.satList.append( (tname, tpos) )
 				self.parsedSat = int(tpos)
 			elif (name == "transponder"):
+				modulation = int(attrs.get('modulation',"1"))
+				system = int(attrs.get('system',"0"))
 				freq = int(attrs.get('frequency',""))
 				sr = int(attrs.get('symbol_rate',""))
 				pol = int(attrs.get('polarization',""))
@@ -357,7 +359,7 @@ class NimManager:
 				else:
 					self.transponders[self.parsedSat] = [ ]
 
-				self.transponders[self.parsedSat].append((0, freq, sr, pol, fec))
+				self.transponders[self.parsedSat].append((0, freq, sr, pol, fec, system, modulation))
 
 	class parseCables(ContentHandler):
 		def __init__(self, cablesList, transponders):
@@ -368,7 +370,7 @@ class NimManager:
 		def startElement(self, name, attrs):
 			if (name == "cable"):
 				#print "found sat " + attrs.get('name',"") + " " + str(attrs.get('position',""))
-				tname = attrs.get('name',"")
+				tname = attrs.get('name',"").encode("UTF-8")
 				self.cablesList.append(str(tname))
 				self.parsedCab = str(tname)
 			elif (name == "transponder"):
@@ -693,9 +695,9 @@ def InitNimManager(nimmgr):
 			nim.diseqcC = configElement(cname + "diseqcC", configSatlist, 0, nimmgr.satList, False);
 			nim.diseqcD = configElement(cname + "diseqcD", configSatlist, 0, nimmgr.satList, False);
 			nim.positionerMode = configElement(cname + "positionerMode", configSelection, 0, (("usals", _("USALS")), ("manual", _("manual"))), False);
-			nim.longitude = configElement(cname + "longitude", configSequence, [5,100], configsequencearg.get("FLOAT", [(0,90),(0,999)]), False);
+			nim.longitude = configElement(cname + "longitude", configSequence, [5,100], configsequencearg.get("FLOAT", [(0,359),(0,999)]), False);
 			nim.longitudeOrientation = configElement(cname + "longitudeOrientation", configSelection, 0, (("east", _("East")), ("west", _("West"))), False)
-			nim.latitude = configElement(cname + "latitude", configSequence, [50,767], configsequencearg.get("FLOAT", [(0,90),(0,999)]), False);
+			nim.latitude = configElement(cname + "latitude", configSequence, [50,767], configsequencearg.get("FLOAT", [(0,359),(0,999)]), False);
 			nim.latitudeOrientation = configElement(cname + "latitudeOrientation", configSelection, 0, (("north", _("North")), ("south", _("South"))), False)
 			satNimList = nimmgr.getNimListOfType(nimmgr.nimType["DVB-S"], slot.slotid)
 			satNimListNames = []
@@ -754,9 +756,9 @@ def InitNimManager(nimmgr):
 				nim.advanced.lnb[x].commandOrder = configElement(cname + "advanced.lnb" + str(x) + ".commandOrder", configSelection, 0, ("committed, toneburst", "toneburst, committed", "committed, uncommitted, toneburst", "toneburst, committed, uncommitted", "uncommitted, committed, toneburst", "toneburst, uncommitted, commmitted"), False)
 				nim.advanced.lnb[x].uncommittedDiseqcCommand = configElement(cname + "advanced.lnb" + str(x) + ".uncommittedDiseqcCommand", configSelection, 0, ucsw, False)
 				nim.advanced.lnb[x].diseqcRepeats = configElement(cname + "advanced.lnb" + str(x) + ".diseqcRepeats", configSelection, 0, (("none", _("None")), ("one", _("One")), ("two", _("Two")), ("three", _("Three"))), False)
-				nim.advanced.lnb[x].longitude = configElement(cname + "advanced.lnb" + str(x) + ".longitude", configSequence, [5,100], configsequencearg.get("FLOAT", [(0,90),(0,999)]), False)
+				nim.advanced.lnb[x].longitude = configElement(cname + "advanced.lnb" + str(x) + ".longitude", configSequence, [5,100], configsequencearg.get("FLOAT", [(0,359),(0,999)]), False)
 				nim.advanced.lnb[x].longitudeOrientation = configElement(cname + "advanced.lnb" + str(x) + ".longitudeOrientation", configSelection, 0, (("east", _("East")), ("west", _("West"))), False)
-				nim.advanced.lnb[x].latitude = configElement(cname + "advanced.lnb" + str(x) + ".latitude", configSequence, [50,767], configsequencearg.get("FLOAT", [(0,90),(0,999)]), False)
+				nim.advanced.lnb[x].latitude = configElement(cname + "advanced.lnb" + str(x) + ".latitude", configSequence, [50,767], configsequencearg.get("FLOAT", [(0,359),(0,999)]), False)
 				nim.advanced.lnb[x].latitudeOrientation = configElement(cname + "advanced.lnb" + str(x) + ".latitudeOrientation", configSelection, 0, (("north", _("North")), ("south", _("South"))), False)
 				nim.advanced.lnb[x].powerMeasurement = configElement(cname + "advanced.lnb" + str(x) + ".powerMeasurement", configSelection, 0, (("yes", _("Yes")), ("no", _("No"))), False)
 				nim.advanced.lnb[x].powerThreshold = configElement(cname + "advanced.lnb" + str(x) + ".powerThreshold", configSequence, [50], configsequencearg.get("INTEGER", (0, 100)), False)
@@ -767,9 +769,11 @@ def InitNimManager(nimmgr):
 			for x in nimmgr.terrestrialsList:
 				list.append(x[0])
 			nim.terrestrial = configElement(cname + "terrestrial", configSelection, 0, list, False);
+			nim.terrestrial_5V = configElement(cname + "terrestrial_5V", configSelection, 1, (("on", _("On")), ("off", _("Off"))), True);
 		else:
 			print "pls add support for this frontend type!"		
 
 	nimmgr.sec = SecConfigure(nimmgr)
 
+
 nimmanager = NimManager()