X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/452fdf6b7875f8185960f9b1649ba3d8fad4ab24..282d9e86ee6942a5c557d25cce0899857fab78dd:/lib/dvb/sec.h

diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index 31415c42..27dcedd5 100644
--- a/lib/dvb/sec.h
+++ b/lib/dvb/sec.h
@@ -19,15 +19,21 @@ public:
 		MEASURE_IDLE_INPUTPOWER, MEASURE_RUNNING_INPUTPOWER,
 		IF_MEASURE_IDLE_WAS_NOT_OK_GOTO, IF_INPUTPOWER_DELTA_GOTO,
 		UPDATE_CURRENT_ROTORPARAMS, INVALIDATE_CURRENT_ROTORPARMS,
+		UPDATE_CURRENT_SWITCHPARMS, INVALIDATE_CURRENT_SWITCHPARMS,
 		IF_ROTORPOS_VALID_GOTO,
 		IF_TUNER_LOCKED_GOTO,
 		IF_TONE_GOTO, IF_NOT_TONE_GOTO,
-		START_TUNE_TIMEOUT
+		START_TUNE_TIMEOUT,
+		SET_ROTOR_MOVING,
+		SET_ROTOR_STOPPED
 	};
 	int cmd;
 	struct rotor
 	{
-		int deltaA;   // difference in mA between running and stopped rotor
+		union {
+			int deltaA;   // difference in mA between running and stopped rotor
+			int lastSignal;
+		};
 		int okcount;  // counter
 		int steps;    // goto steps
 		int direction;
@@ -164,7 +170,7 @@ class eDVBSatelliteSwitchParameters
 #endif
 public:
 	enum t_22khz_signal {	HILO=0, ON=1, OFF=2	}; // 22 Khz
-	enum t_voltage_mode	{	HV=0, _14V=1, _18V=2, _0V=3 }; // 14/18 V
+	enum t_voltage_mode	{	HV=0, _14V=1, _18V=2, _0V=3, HV_13=4 }; // 14/18 V
 #ifndef SWIG
 	t_voltage_mode m_voltage_mode;
 	t_22khz_signal m_22khz_signal;
@@ -180,6 +186,7 @@ class eDVBSatelliteRotorParameters
 #endif
 public:
 	enum { NORTH, SOUTH, EAST, WEST };
+	enum { FAST, SLOW };
 #ifndef SWIG
 	eDVBSatelliteRotorParameters() { setDefaultOptions(); }
 
@@ -187,6 +194,7 @@ public:
 	{
 		bool m_use;	// can we use rotor inputpower to detect rotor running state ?
 		__u8 m_delta;	// delta between running and stopped rotor
+		unsigned int m_turning_speed; // SLOW, FAST, or fast turning epoch
 	};
 	eDVBSatelliteRotorInputpowerParameters m_inputpower_parameters;
 
@@ -201,6 +209,7 @@ public:
 
 	void setDefaultOptions() // set default rotor options
 	{
+		m_inputpower_parameters.m_turning_speed = FAST; // fast turning
 		m_inputpower_parameters.m_use = true;
 		m_inputpower_parameters.m_delta = 60;
 		m_gotoxx_parameters.m_lo_direction = EAST;
@@ -240,6 +249,7 @@ class eDVBRegisteredFrontend;
 
 class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl
 {
+	DECLARE_REF(eDVBSatelliteEquipmentControl);
 public:
 	enum {
 		DELAY_AFTER_CONT_TONE=0,  // delay after continuous tone change
@@ -253,20 +263,24 @@ public:
 		DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_MOTOR_CMD, // delay after enable voltage before transmit motor command
 		DELAY_AFTER_MOTOR_STOP_CMD, // delay after transmit motor stop
 		DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MOTOR_CMD, // delay after voltage change before transmit motor command
+		DELAY_BEFORE_SEQUENCE_REPEAT, // delay before the complete sequence is repeated (when enabled)
 		MOTOR_COMMAND_RETRIES, // max transmit tries of rotor command when the rotor dont start turning (with power measurement)
 		MOTOR_RUNNING_TIMEOUT, // max motor running time before timeout
 		DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_SWITCH_CMDS, // delay after change voltage before transmit toneburst/diseqc
+		DELAY_AFTER_DISEQC_RESET_CMD,
+		DELAY_AFTER_DISEQC_PERIPHERIAL_POWERON_CMD,
 		MAX_PARAMS
 	};
 private:
 #ifndef SWIG
 	static eDVBSatelliteEquipmentControl *instance;
-	eDVBSatelliteLNBParameters m_lnbs[128]; // i think its enough
+	eDVBSatelliteLNBParameters m_lnbs[144]; // i think its enough
 	int m_lnbidx; // current index for set parameters
 	std::map<int, eDVBSatelliteSwitchParameters>::iterator m_curSat;
-	eSmartPtrList<eDVBRegisteredFrontend> &m_avail_frontends;
+	eSmartPtrList<eDVBRegisteredFrontend> &m_avail_frontends, &m_avail_simulate_frontends;
 	bool m_rotorMoving;
 	int m_not_linked_slot_mask;
+	bool m_canMeasureInputPower;
 #endif
 #ifdef SWIG
 	eDVBSatelliteEquipmentControl();
@@ -275,10 +289,9 @@ private:
 	static int m_params[MAX_PARAMS];
 public:
 #ifndef SWIG
-	eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends);
-	DECLARE_REF(eDVBSatelliteEquipmentControl);
-	RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id);
-	int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *, int frontend_id);
+	eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends, eSmartPtrList<eDVBRegisteredFrontend> &avail_simulate_frontends);
+	RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id, unsigned int tunetimeout);
+	int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *, int frontend_id, int *highest_score_lnb=0);
 	bool currentLNBValid() { return m_lnbidx > -1 && m_lnbidx < (int)(sizeof(m_lnbs) / sizeof(eDVBSatelliteLNBParameters)); }
 #endif
 	static eDVBSatelliteEquipmentControl *getInstance() { return instance; }
@@ -307,6 +320,7 @@ public:
 	RESULT setLaDirection(int direction);
 	RESULT setUseInputpower(bool onoff);
 	RESULT setInputpowerDelta(int delta);  // delta between running and stopped rotor
+	RESULT setRotorTurningSpeed(int speed);  // set turning speed..
 /* Satellite Specific Parameters */
 	RESULT addSatellite(int orbital_position);
 	RESULT setVoltageMode(int mode);
@@ -317,9 +331,9 @@ public:
 	RESULT setTunerDepends(int from, int to);
 	void setSlotNotLinked(int tuner_no);
 
-	PyObject *get_exclusive_satellites(int tu1, int tu2);
 	void setRotorMoving(bool); // called from the frontend's
 	bool isRotorMoving();
+	bool canMeasureInputPower() { return m_canMeasureInputPower; }
 };
 
 #endif