add option no_rotor_command_on_tune to eDVBFrontendParameters.setDVBS to disable

sending any command to rotor turing tune (for use in manual diseqc rotor setup)

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 6db2d0915d60eb9114789b457af67ef1fc4dd058..cb853e2bf83809c377783bd419f2ee3bb4a1699d 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -167,9 +167,10 @@ RESULT eDVBFrontendParameters::getDVBT(eDVBFrontendParametersTerrestrial &p) con
        return 0;
 }
 
        return 0;
 }
 

-RESULT eDVBFrontendParameters::setDVBS(const eDVBFrontendParametersSatellite &p)
+RESULT eDVBFrontendParameters::setDVBS(const eDVBFrontendParametersSatellite &p, bool no_rotor_command_on_tune)

 {
        sat = p;
 {
        sat = p;

+       sat.no_rotor_command_on_tune = no_rotor_command_on_tune;

        m_type = iDVBFrontend::feSatellite;
        return 0;
 }
        m_type = iDVBFrontend::feSatellite;
        return 0;
 }

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 1889b971492b8955b20c53596d114157c4842b99..2c8d89e326f1b77328452a834dd2e1fe1af11934 100644 (file)
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -20,7 +20,7 @@ public:
        RESULT getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const;
        RESULT getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const;
 
        RESULT getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const;
        RESULT getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const;
 

-       RESULT setDVBS(const eDVBFrontendParametersSatellite &p);
+       RESULT setDVBS(const eDVBFrontendParametersSatellite &p, bool no_rotor_command_on_tune=false);

        RESULT setDVBC(const eDVBFrontendParametersCable &p);
        RESULT setDVBT(const eDVBFrontendParametersTerrestrial &p);
        
        RESULT setDVBC(const eDVBFrontendParametersCable &p);
        RESULT setDVBT(const eDVBFrontendParametersTerrestrial &p);
        

diff --git a/lib/dvb/frontendparms.h b/lib/dvb/frontendparms.h
index ae0891c59f68e75de6894881b47e37e1c5602130..649aff77ece2475a87a21becdcfa22297946e855 100644 (file)
--- a/lib/dvb/frontendparms.h
+++ b/lib/dvb/frontendparms.h
@@ -28,6 +28,7 @@ struct eDVBFrontendParametersSatellite
                        fAuto, f1_2, f2_3, f3_4, f5_6, f7_8, f8_9, fNone
                };
        };
                        fAuto, f1_2, f2_3, f3_4, f5_6, f7_8, f8_9, fNone
                };
        };

+       bool no_rotor_command_on_tune;

        unsigned int frequency, symbol_rate;
        int polarisation, fec, inversion, orbital_position;
 };
        unsigned int frequency, symbol_rate;
        int polarisation, fec, inversion, orbital_position;
 };

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index b995b8067d5f66e470990c51f74132c2a378cf39..732946111cbf305b0fdb484675ddd7cce4ecf904 100644 (file)
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -397,7 +397,8 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
                                int RotorCmd=-1;
                                bool useGotoXX = false;
 
                                int RotorCmd=-1;
                                bool useGotoXX = false;

-                               if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2 )
+                               if ( di_param.m_diseqc_mode == eDVBSatelliteDiseqcParameters::V1_2
+                                       && !sat.no_rotor_command_on_tune )

                                {
                                        if (depend_satpos_mode || linked)
                                                // in this both modes we dont really turn the rotor.... but in canTune we need the satpos
                                {
                                        if (depend_satpos_mode || linked)
                                                // in this both modes we dont really turn the rotor.... but in canTune we need the satpos