From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Sat, 5 Nov 2005 14:24:17 +0000 (+0000)
Subject: remove local changes
X-Git-Tag: 2.6.0~5425
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/353f9c0f06a4f859b803f15299ecd1895786cc2d

remove local changes
---

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 0c387ca2..9b4957c2 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -22,43 +22,22 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl()
 {
 	clear();
 
-#undef ROTOR
-
 // ASTRA
 	addLNB();
 	setLNBTunerMask(1);
 	setLNBLOFL(9750000);
 	setLNBThreshold(11750000);
-#ifdef ROTOR
 	setLNBLOFH(10600000);
-	setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_2);
-#else
-	setLNBLOFH(10607000);
 	setDiSEqCMode(eDVBSatelliteDiseqcParameters::V1_0);
-#endif
 	setToneburst(eDVBSatelliteDiseqcParameters::NO);
 	setRepeats(0);
-#ifdef ROTOR
 	setCommittedCommand(eDVBSatelliteDiseqcParameters::AA);
-#else
-	setCommittedCommand(eDVBSatelliteDiseqcParameters::BB);
-#endif
 	setCommandOrder(0); // committed, toneburst
-	setFastDiSEqC(true);
-#ifdef ROTOR
-	setLongitude(8.683);
-	setLatitude(51.017);
-	setLoDirection(eDVBSatelliteRotorParameters::EAST);
-	setLaDirection(eDVBSatelliteRotorParameters::NORTH);
-	setUseInputpower(true);
-	setInputpowerDelta(50);
-#endif
+	setFastDiSEqC(false);
 	addSatellite(192);
 	setVoltageMode(eDVBSatelliteSwitchParameters::HV);
 	setToneMode(eDVBSatelliteSwitchParameters::HILO);
-#ifdef ROTOR
-	setRotorPosNum(0); // use gotoXX
-#else
+
 // HOTBIRD
 	addLNB();
 	setLNBTunerMask(1);
@@ -70,14 +49,10 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl()
 	setRepeats(0);
 	setCommittedCommand(eDVBSatelliteDiseqcParameters::AB);
 	setCommandOrder(0); // committed, toneburst
-	setFastDiSEqC(true);
-#endif
+	setFastDiSEqC(false);
 	addSatellite(130);
 	setVoltageMode(eDVBSatelliteSwitchParameters::HV);
 	setToneMode(eDVBSatelliteSwitchParameters::HILO);
-#ifdef ROTOR
-	setRotorPosNum(0); // use gotoXX
-#endif
 }
 
 RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat)