From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Fri, 16 Dec 2005 22:40:52 +0000 (+0000)
Subject: fix auto inversion,
X-Git-Tag: 2.6.0~4693
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/663ae4876adf2ec53e4ffcb0b1d1fefa291c8b8b?ds=sidebyside

fix auto inversion,
make lamedb inversion value compatible with e1
---

diff --git a/lib/dvb/frontendparms.h b/lib/dvb/frontendparms.h
index 466ae346..e98b6dbf 100644
--- a/lib/dvb/frontendparms.h
+++ b/lib/dvb/frontendparms.h
@@ -16,7 +16,7 @@ struct eDVBFrontendParametersSatellite
 	struct Inversion
 	{
 		enum {
-			On, Off, Unknown
+			Off, On, Unknown
 		};
 	};
 	struct FEC
diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 411cb52e..d76b40b6 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -28,7 +28,6 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
 
 	clear();
 
-#if 1
 // ASTRA
 	addLNB();
 	setLNBTunerMask(3);
@@ -62,7 +61,6 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
 	addSatellite(130);
 	setVoltageMode(eDVBSatelliteSwitchParameters::HV);
 	setToneMode(eDVBSatelliteSwitchParameters::HILO);
-#else
 
 // Rotor
 	addLNB();
@@ -84,12 +82,7 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
 	setUseInputpower(true);
 	setInputpowerDelta(50);
 
-	addSatellite(130);
-	setVoltageMode(eDVBSatelliteSwitchParameters::HV);
-	setToneMode(eDVBSatelliteSwitchParameters::HILO);
-	setRotorPosNum(0);
-
-	addSatellite(192);
+	addSatellite(235);
 	setVoltageMode(eDVBSatelliteSwitchParameters::HV);
 	setToneMode(eDVBSatelliteSwitchParameters::HILO);
 	setRotorPosNum(0);
@@ -103,7 +96,6 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
 	setVoltageMode(eDVBSatelliteSwitchParameters::HV);
 	setToneMode(eDVBSatelliteSwitchParameters::HILO);
 	setRotorPosNum(1); // stored pos 1
-#endif
 }
 
 int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int frontend_id )
@@ -261,7 +253,19 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 			if (sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Horizontal)
 				band |= 2;
 
-			parm.INVERSION = (!sat.inversion) ? INVERSION_ON : INVERSION_OFF;
+			switch (sat.inversion)
+			{
+				case eDVBFrontendParametersCable::Inversion::On:
+					parm.INVERSION = INVERSION_ON;
+					break;
+				case eDVBFrontendParametersCable::Inversion::Off:
+					parm.INVERSION = INVERSION_OFF;
+					break;
+				default:
+				case eDVBFrontendParametersCable::Inversion::Unknown:
+					parm.INVERSION = INVERSION_AUTO;
+					break;
+			}
 
 			switch (sat.fec)
 			{