X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fsec.h;h=35213b39e1e65ea986f62e090efa0811e0b842d9;hp=ab1f1ac32c0676e2e4b5067ae8c33fb74730c6bf;hb=fb245070e55dcdcdf54d3db1961d8cc7264f5779;hpb=94f8049fca5c1522aef72334ab4f4697600618c0 diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h index ab1f1ac..35213b3 100644 --- a/lib/dvb/sec.h +++ b/lib/dvb/sec.h @@ -19,21 +19,33 @@ 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, - START_TUNE_TIMEOUT + IF_TONE_GOTO, IF_NOT_TONE_GOTO, + 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; }; struct pair { - int voltage; + union + { + int voltage; + int tone; + int val; + }; int steps; }; union @@ -174,6 +186,7 @@ class eDVBSatelliteRotorParameters #endif public: enum { NORTH, SOUTH, EAST, WEST }; + enum { FAST, SLOW }; #ifndef SWIG eDVBSatelliteRotorParameters() { setDefaultOptions(); } @@ -181,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; @@ -195,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; @@ -216,7 +231,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) @@ -234,6 +249,26 @@ class eDVBRegisteredFrontend; class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl { + DECLARE_REF(eDVBSatelliteEquipmentControl); +public: + enum { + DELAY_AFTER_CONT_TONE=0, // delay after continuous tone change + DELAY_AFTER_FINAL_VOLTAGE_CHANGE, // delay after voltage change at end of complete sequence + DELAY_BETWEEN_DISEQC_REPEATS, // delay between repeated diseqc commands + DELAY_AFTER_LAST_DISEQC_CMD, // delay after last diseqc command + DELAY_AFTER_TONEBURST, // delay after toneburst + DELAY_AFTER_ENABLE_VOLTAGE_BEFORE_SWITCH_CMDS, // delay after enable voltage before transmit toneburst/diseqc + DELAY_BETWEEN_SWITCH_AND_MOTOR_CMD, // delay after transmit toneburst / diseqc and before transmit motor command + DELAY_AFTER_VOLTAGE_CHANGE_BEFORE_MEASURE_IDLE_INPUTPOWER, // delay after voltage change before measure idle input power + 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: #ifndef SWIG static eDVBSatelliteEquipmentControl *instance; eDVBSatelliteLNBParameters m_lnbs[128]; // i think its enough @@ -241,26 +276,27 @@ class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl std::map::iterator m_curSat; eSmartPtrList &m_avail_frontends; bool m_rotorMoving; + int m_not_linked_slot_mask; + bool m_canMeasureInputPower; #endif #ifdef SWIG eDVBSatelliteEquipmentControl(); ~eDVBSatelliteEquipmentControl(); #endif - // helper function for setTunerLinked and setTunerDepends - RESULT setDependencyPointers( int no1, int no2, int dest_data_byte ); + static int m_params[MAX_PARAMS]; public: #ifndef SWIG eDVBSatelliteEquipmentControl(eSmartPtrList &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 static eDVBSatelliteEquipmentControl *getInstance() { return instance; } + static void setParam(int param, int value); 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); @@ -281,6 +317,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); @@ -289,10 +326,11 @@ public: /* Tuner Specific Parameters */ RESULT setTunerLinked(int from, int to); RESULT setTunerDepends(int from, int to); + void setSlotNotLinked(int tuner_no); - PyObject *get_different_satellites(int tu1, int tu2); void setRotorMoving(bool); // called from the frontend's bool isRotorMoving(); + bool canMeasureInputPower() { return m_canMeasureInputPower; } }; #endif