X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/16978fb1276ebaa1a97f30c8d7873f94111dd6bf..23ffc5c03cb0947521448055aad21843708cabdd:/lib/dvb/sec.h

diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index 88617407..18935b97 100644
--- a/lib/dvb/sec.h
+++ b/lib/dvb/sec.h
@@ -180,6 +180,7 @@ class eDVBSatelliteRotorParameters
 #endif
 public:
 	enum { NORTH, SOUTH, EAST, WEST };
+	enum { FAST, SLOW };
 #ifndef SWIG
 	eDVBSatelliteRotorParameters() { setDefaultOptions(); }
 
@@ -187,6 +188,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 +203,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;
@@ -222,7 +225,7 @@ public:
 #ifndef SWIG
 	t_12V_relais_state m_12V_relais_state;	// 12V relais output on/off
 
-	__u8 tuner_mask; // useable by tuner ( 1 | 2 | 4...)
+	__u8 slot_mask; // useable by slot ( 1 | 2 | 4...)
 
 	unsigned int m_lof_hi,	// for 2 band universal lnb 10600 Mhz (high band offset frequency)
 				m_lof_lo,	// for 2 band universal lnb  9750 Mhz (low band offset frequency)
@@ -240,6 +243,7 @@ class eDVBRegisteredFrontend;
 
 class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl
 {
+	DECLARE_REF(eDVBSatelliteEquipmentControl);
 public:
 	enum {
 		DELAY_AFTER_CONT_TONE=0,  // delay after continuous tone change
@@ -253,7 +257,9 @@ 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
+		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
 		MAX_PARAMS
 	};
 private:
@@ -264,6 +270,8 @@ private:
 	std::map<int, eDVBSatelliteSwitchParameters>::iterator m_curSat;
 	eSmartPtrList<eDVBRegisteredFrontend> &m_avail_frontends;
 	bool m_rotorMoving;
+	int m_not_linked_slot_mask;
+	bool m_canMeasureInputPower;
 #endif
 #ifdef SWIG
 	eDVBSatelliteEquipmentControl();
@@ -273,8 +281,7 @@ private:
 public:
 #ifndef SWIG
 	eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends);
-	DECLARE_REF(eDVBSatelliteEquipmentControl);
-	RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id);
+	RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id, unsigned int tunetimeout);
 	int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *, int frontend_id);
 	bool currentLNBValid() { return m_lnbidx > -1 && m_lnbidx < (int)(sizeof(m_lnbs) / sizeof(eDVBSatelliteLNBParameters)); }
 #endif
@@ -283,7 +290,7 @@ public:
 	RESULT clear();
 /* LNB Specific Parameters */
 	RESULT addLNB();
-	RESULT setLNBTunerMask(int tunermask);
+	RESULT setLNBSlotMask(int slotmask);
 	RESULT setLNBLOFL(int lofl);
 	RESULT setLNBLOFH(int lofh);
 	RESULT setLNBThreshold(int threshold);
@@ -304,6 +311,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);
@@ -312,10 +320,12 @@ public:
 /* Tuner Specific Parameters */
 	RESULT setTunerLinked(int from, int to);
 	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