X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/94284f21b07f1756120e8b6f5dd53e485a9ff66d..0dab0da693276fc886981780dd665e9bf23b7b3e:/lib/dvb/sec.cpp?ds=sidebyside

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index be022a16..876d7d29 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -21,9 +21,20 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl()
 {
 	m_lnblist.push_back(eDVBSatelliteLNBParameters());
 	eDVBSatelliteLNBParameters &lnb_ref = m_lnblist.front();
-	eDVBSatelliteParameters &astra1 = lnb_ref.m_satellites[192];
-	eDVBSatelliteDiseqcParameters &diseqc_ref = astra1.m_diseqc_parameters;
-	eDVBSatelliteSwitchParameters &switch_ref = astra1.m_switch_parameters;
+	eDVBSatelliteDiseqcParameters &diseqc_ref = lnb_ref.m_diseqc_parameters;
+	eDVBSatelliteRotorParameters &rotor_ref = lnb_ref.m_rotor_parameters;
+
+	eDVBSatelliteRotorParameters::eDVBSatelliteRotorInputpowerParameters &rotor_input_ref = rotor_ref.m_inputpower_parameters;
+	eDVBSatelliteRotorParameters::eDVBSatelliteRotorGotoxxParameters &rotor_gotoxx_ref = rotor_ref.m_gotoxx_parameters;
+
+	rotor_input_ref.m_use = true;
+	rotor_input_ref.m_threshold = 50;
+
+	rotor_gotoxx_ref.m_can_use = true;
+	rotor_gotoxx_ref.m_lo_direction = eDVBSatelliteRotorParameters::EAST;
+	rotor_gotoxx_ref.m_la_direction = eDVBSatelliteRotorParameters::NORTH;
+	rotor_gotoxx_ref.m_longitude = 8.683;
+	rotor_gotoxx_ref.m_latitude = 51.017;
 
 	lnb_ref.m_lof_hi = 10600000;
 	lnb_ref.m_lof_lo = 9750000;
@@ -36,10 +47,19 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl()
 	diseqc_ref.m_swap_cmds = false;
 	diseqc_ref.m_toneburst_param = eDVBSatelliteDiseqcParameters::NO;
 	diseqc_ref.m_uncommitted_cmd = 0;
-	diseqc_ref.m_use_fast = 1;
+	diseqc_ref.m_use_fast = 0;
+
+	eDVBSatelliteSwitchParameters &hotbird_ref = lnb_ref.m_satellites[130];
+	hotbird_ref.m_22khz_signal = eDVBSatelliteSwitchParameters::HILO;
+	hotbird_ref.m_voltage_mode = eDVBSatelliteSwitchParameters::HV;
 
-	switch_ref.m_22khz_signal = eDVBSatelliteSwitchParameters::HILO;
-	switch_ref.m_voltage_mode = eDVBSatelliteSwitchParameters::HV;
+	eDVBSatelliteSwitchParameters &astra_ref = lnb_ref.m_satellites[192];
+	astra_ref.m_22khz_signal = eDVBSatelliteSwitchParameters::HILO;
+	astra_ref.m_voltage_mode = eDVBSatelliteSwitchParameters::HV;
+
+	eDVBSatelliteSwitchParameters &tuerksat_ref = lnb_ref.m_satellites[420];
+	tuerksat_ref.m_22khz_signal = eDVBSatelliteSwitchParameters::HILO;
+	tuerksat_ref.m_voltage_mode = eDVBSatelliteSwitchParameters::HV;
 }
 
 RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat)
@@ -48,13 +68,15 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 	for (;it != m_lnblist.end(); ++it )
 	{
 		eDVBSatelliteLNBParameters &lnb_param = *it;
-		std::map<int, eDVBSatelliteParameters>::iterator sit =
+		eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters;
+		eDVBSatelliteRotorParameters &rotor_param = lnb_param.m_rotor_parameters;
+
+		std::map<int, eDVBSatelliteSwitchParameters>::iterator sit =
 			lnb_param.m_satellites.find(sat.orbital_position);
 		if ( sit != lnb_param.m_satellites.end())
 		{
-			eDVBSatelliteDiseqcParameters &di_param = sit->second.m_diseqc_parameters;
-			eDVBSatelliteSwitchParameters &sw_param = sit->second.m_switch_parameters;
-			eDVBSatelliteRotorParameters &rotor_param = sit->second.m_rotor_parameters;
+			eDVBSatelliteSwitchParameters &sw_param = sit->second;
+
 			int hi=0,
 				voltage = iDVBFrontend::voltageOff,
 				tone = iDVBFrontend::toneOff,