From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Fri, 8 Aug 2008 23:42:20 +0000 (+0000)
Subject: fix tonemode setting
X-Git-Tag: 2.6.0~952
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/a57321af1e0bfebaadc5b747e51b9eb5bb7d3f3f

fix tonemode setting
---

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index dccffaf2..91964db6 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -539,7 +539,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
 						// check if voltage is already correct..
 						compare.voltage = vlt;
-						compare.steps = +7;
+						compare.steps = +8;
 						sec_sequence.push_back( eSecCommand(eSecCommand::IF_VOLTAGE_GOTO, compare) );
 
 						// check if voltage is disabled
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 088c71bf..b0c2cf35 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -84,8 +84,8 @@ class SecConfigure:
 			for x in self.NimManager.satList:
 				print "Add sat " + str(x[0])
 				self.addSatellite(sec, int(x[0]))
-				sec.setVoltageMode(0)
-				sec.setToneMode(0)
+				sec.setVoltageMode(switchParam.HV)
+				sec.setToneMode(switchParam.HILO)
 				sec.setRotorPosNum(0) # USALS
 		
 		sec.setLNBSlotMask(tunermask)
@@ -155,7 +155,6 @@ class SecConfigure:
 			nim = slot.config
 			if slot.isCompatible("DVB-S"):
 				print "slot: " + str(x) + " configmode: " + str(nim.configMode.value)
-				print "diseqcmode: ", nim.diseqcMode.value
 				if nim.configMode.value in [ "loopthrough", "satposdepends", "nothing" ]:
 					pass
 				else:
@@ -163,6 +162,7 @@ class SecConfigure:
 					if nim.configMode.value == "equal":
 						pass
 					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)
 						elif nim.diseqcMode.value == "toneburst_a_b":		#Toneburst A/B
@@ -371,12 +371,12 @@ class SecConfigure:
 						sec.setVoltageMode(switchParam._14V)
 					elif currSat.voltage.value == "18V":
 						sec.setVoltageMode(switchParam._18V)
-						
-					if currSat.tonemode == "band":
+
+					if currSat.tonemode.value == "band":
 						sec.setToneMode(switchParam.HILO)
-					elif currSat.tonemode == "on":
+					elif currSat.tonemode.value == "on":
 						sec.setToneMode(switchParam.ON)
-					elif currSat.tonemode == "off":
+					elif currSat.tonemode.value == "off":
 						sec.setToneMode(switchParam.OFF)
 						
 					if not currSat.usals.value and x < 34: