X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7dd3be2ced167827d6e2555a23e98304a10640bc..d6dd733f6a7ade7f07b0721e576d66e56cf8b563:/lib/python/Components/NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 73031861..bd1a3638 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -10,7 +10,7 @@ from enigma import eDVBSatelliteEquipmentControl as secClass, \
 	eDVBSatelliteDiseqcParameters as diseqcParam, \
 	eDVBSatelliteSwitchParameters as switchParam, \
 	eDVBSatelliteRotorParameters as rotorParam, \
-	eDVBResourceManager, eDVBDB
+	eDVBResourceManager, eDVBDB, eEnv
 
 from time import localtime, mktime
 from datetime import datetime
@@ -390,6 +390,7 @@ class SecConfigure:
 
 					if currLnb.diseqcMode.value == "1_0":
 						currCO = currLnb.commandOrder1_0.value
+						sec.setRepeats(0)
 					else:
 						currCO = currLnb.commandOrder.value
 
@@ -1082,7 +1083,7 @@ def InitNimManager(nimmgr):
 
 	unicablelnbproducts = {}
 	unicablematrixproducts = {}
-	doc = xml.etree.cElementTree.parse("/usr/share/enigma2/unicable.xml")
+	doc = xml.etree.cElementTree.parse(eEnv.resolve("${datadir}/enigma2/unicable.xml"))
 	root = doc.getroot()
 
 	entry = root.find("lnb")
@@ -1360,25 +1361,32 @@ def InitNimManager(nimmgr):
 		slot_id = configElement.slot_id
 		if nimmgr.nim_slots[slot_id].description == 'Alps BSBE2':
 			open("/proc/stb/frontend/%d/tone_amplitude" %(fe_id), "w").write(configElement.value)
-			
+
 	def tunerTypeChanged(nimmgr, configElement):
 		fe_id = configElement.fe_id
-		print "tunerTypeChanged feid %d to mode %s" % (fe_id, configElement.value)
-		try:
-			oldvalue = open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "r").readline()
-			open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "w").write("0")
-		except:
-			print "[info] no /sys/module/dvb_core/parameters/dvb_shutdown_timeout available"
-		frontend = eDVBResourceManager.getInstance().allocateRawChannel(fe_id).getFrontend()
-		frontend.closeFrontend()
-		open("/proc/stb/frontend/%d/mode" % (fe_id), "w").write(configElement.value)
-		frontend.reopenFrontend()
-		try:
-			open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "w").write(oldvalue)
-		except:
-			print "[info] no /sys/module/dvb_core/parameters/dvb_shutdown_timeout available"
-		nimmgr.enumerateNIMs()
-	
+
+		cur_type = int(open("/proc/stb/frontend/%d/mode" % (fe_id), "r").read())
+		if cur_type != int(configElement.value):
+			print "tunerTypeChanged feid %d from %d to mode %d" % (fe_id, cur_type, int(configElement.value))
+
+			try:
+				oldvalue = open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "r").readline()
+				open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "w").write("0")
+			except:
+				print "[info] no /sys/module/dvb_core/parameters/dvb_shutdown_timeout available"
+
+			frontend = eDVBResourceManager.getInstance().allocateRawChannel(fe_id).getFrontend()
+			frontend.closeFrontend()
+			open("/proc/stb/frontend/%d/mode" % (fe_id), "w").write(configElement.value)
+			frontend.reopenFrontend()
+			try:
+				open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "w").write(oldvalue)
+			except:
+				print "[info] no /sys/module/dvb_core/parameters/dvb_shutdown_timeout available"
+			nimmgr.enumerateNIMs()
+		else:
+			print "tuner type is already already %d" %cur_type
+
 	empty_slots = 0
 	for slot in nimmgr.nim_slots:
 		x = slot.slot