Ticket #973: mythtv_multilnb_positioner_rev3.diff

libs/libmythtv/dvbdiseqc.cpp

@@ -13 +13 @@
  *          - DiSEqC 1.0 - 1.1.
  *      Kenneth Aafloy (ke-aa at frisurf.no)
  *          - Initial framework.
+ *      Zdzislaw Gorlicki (zdzisekg at yahoo.com)
+ *          - DiSEqC 1.2/1.3 + switch
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -73 +75 @@
                 return false;
             break;
         case 2: // v1.0 2 Way
+            if (!Diseqc1xSwitch(tuning, reset, havetuned, 2))
+                return false;
+            break;
         case 3: // v1.1 2 Way
             if (!Diseqc1xSwitch(tuning, reset, havetuned, 2))
                 return false;
             break;
         case 4: // v1.0 4 Way
+            if (!Diseqc1xSwitch(tuning, reset, havetuned, 4))
+                return false;
+            break;
         case 5: // v1.1 4 Way
             if (!Diseqc1xSwitch(tuning, reset, havetuned, 4))
                 return false;
             break;
         case 6: // 1.2 Positioner (HH Motor)
             if (!PositionerGoto(tuning,reset,havetuned))
-                return false;
+                return false;
             break;
         case 7: // 1.3 Positioner (HH Motor with USALS)
             if (!PositionerGotoAngular(tuning,reset,havetuned))
-                return false;
+                return false;
             break;
         case 8: // v1.1 10 Way
             if (!Diseqc1xSwitch(tuning, reset, havetuned, 10))
                 return false;
             break;
- 
+        case 10: // 1.2 Positioner (HH Motor with a switch behind it)
+            if (!PositionerGoto(tuning,reset,havetuned))
+                return false;
+            break;
+        case 11: // 1.3 Positioner (HH Motor with USALS and with a switch behind it)
+            if (!PositionerGotoAngular(tuning, reset, havetuned))
+                return false;
+            break;
         default:
             VERBOSE(VB_IMPORTANT, LOC_ERR + "Unsupported DiSEqC type("
                     <<tuning.diseqc_type<<")");
     }
-    
+
     return true;
 }
 
@@ -156 +171 @@
             VERBOSE(VB_IMPORTANT, LOC_ERR +
                     "Tone Switches only support two ports.");
 
+        // I think SEC_MINI_A is 0 in DB so we should compare against that. right?
         if (ioctl(fd_frontend, FE_DISEQC_SEND_BURST,
-                  (tuning.diseqc_port == 1 ? SEC_MINI_A : SEC_MINI_B )) < 0)
+                  (tuning.diseqc_port == 0 ? SEC_MINI_A : SEC_MINI_B )) < 0)
         {
             VERBOSE(VB_IMPORTANT, LOC_ERR +
                     "Setting Tone Switch failed." + ENO);
@@ -173 +189 @@
 }
 
 /*****************************************************************************
-                    Diseqc 1.x Compatible Methods
- ****************************************************************************/
+Legend:
+{}=Segment
+T=Set Tone
+V=Set Voltage
+w=Wait
+[]=Diseqc Message
+TB=Set Tone Burst
+T=Set Tone
+
+A typical diseqc messages should look like this:
+T V w [XX XX XX XX] w TB T
+
+I split this into three functions:
+1) SendDiSEqCPrepareBus => {T V}
+2) SenDiSEqCMessage     => {w [XX XX XX XX ] w}
+3) SendDiSEqCSetupBus   => {TB T}
+
+This way we can make the SenDiSEqCMessage as long as we want, for ex. when we
+use cascaded switches or a switch behind a positioner.
+ex. T V w [XX XX XX XX] w [XX XX XX XX] w TB T
 
-bool DVBDiSEqC::SendDiSEqCMessage(DVBTuning& tuning, dvb_diseqc_master_cmd &cmd)
+/****************************************************************************/
+//Resets switches and LNBS
+bool DVBDiSEqC::DiseqcReset()
 {
-    // Turn off tone burst
-    if (ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF) == -1) 
+    struct dvb_diseqc_master_cmd reset_cmd =
+        {{CMD_FIRST, MASTER_TO_LSS, RESET, 0x00, 0x00}, 3};
+
+    struct dvb_diseqc_master_cmd init_cmd =
+        {{CMD_FIRST, MASTER_TO_LSS, POWERON, 0x00, 0x00}, 3};
+
+    if (ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &init_cmd) <0)
     {
-        VERBOSE(VB_IMPORTANT, LOC_ERR + "FE_SET_TONE failed" + ENO);
+        VERBOSE(VB_IMPORTANT, LOC_ERR +
+                "DiSEqC -> Sending init command failed." + ENO);
         return false;
     }
+    usleep(DISEQC_LONG_WAIT);
 
-/* 
-   Old version of the code set the voltage to 13V everytime.
-   After looking at the EutelSat specs I saw no reason that
-   this was done. I have tested this with my DiSEqC switch
-   and all is fine. 
-*/
+    if (ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &reset_cmd) <0)
+    {
+        VERBOSE(VB_IMPORTANT, LOC_ERR +
+                "DiSEqC -> Sending reset command failed." + ENO);
+        return false;
+    }
+    usleep(DISEQC_LONG_WAIT);
 
-    if (ioctl(fd_frontend, FE_SET_VOLTAGE, tuning.voltage) == -1) 
+    if (ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &init_cmd) <0)
     {
-        VERBOSE(VB_IMPORTANT, LOC_ERR + "FE_SET_VOLTAGE failed" + ENO);
+        VERBOSE(VB_IMPORTANT, LOC_ERR +
+                "DiSEqC -> Sending init command failed." + ENO);
         return false;
-    }   
+    }
+    usleep(DISEQC_LONG_WAIT);
 
-    usleep(DISEQC_SHORT_WAIT);
+    VERBOSE(VB_CHANNEL, LOC + QString("DiSEqC -> Reset completed. Ready to send commands."));
+
+    return true;
+}
 
-    VERBOSE(VB_CHANNEL, LOC + QString("Sending 1.0 Command: %1 %2 %3 %4")
-            .arg(cmd.msg[0], 2, 16)
-            .arg(cmd.msg[1], 2, 16)
-            .arg(cmd.msg[2], 2, 16)
-            .arg(cmd.msg[3], 2, 16));
 
-    if (ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd) == -1) 
+bool DVBDiSEqC::SendDiSEqCPrepareBus(DVBTuning& tuning, bool reset)
+{
+    // Reset "visible" DiSEqC switches or LNBs
+    if (reset)
     {
-        VERBOSE(VB_IMPORTANT, LOC_ERR +
-                "FE_DISEQC_SEND_MASTER_CMD failed" + ENO);
+        if (!DiseqcReset())
+        {
+            VERBOSE(VB_IMPORTANT, LOC_ERR + "DiSEqC -> DiseqcReset() failed");
+            return false;
+        }
+    }
+
+    // Turn off Continuous tone
+    if (ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF) == -1)
+    {
+        VERBOSE(VB_IMPORTANT, LOC_ERR + "DiSEqC -> FE_SET_TONE failed" + ENO);
         return false;
     }
+    else
+    {
+        VERBOSE(VB_CHANNEL, LOC + QString("DiSEqC -> Continuous Tone set to: OFF"));
+    }
+
+    //  Set Voltage
+    if (ioctl(fd_frontend, FE_SET_VOLTAGE, tuning.voltage) == -1)
+    {
+        VERBOSE(VB_IMPORTANT, LOC_ERR + "DiSEqC -> FE_SET_VOLTAGE failed" + ENO);
+        return false;
+    }
+    else
+    {
+        VERBOSE(VB_CHANNEL, LOC + QString("DiSEqC -> Voltage set to: %1")
+                .arg(tuning.voltage==SEC_VOLTAGE_13?"13V":"18V"));
+    }
+
+    return true;
+}
 
+
+bool DVBDiSEqC::SendDiSEqCMessage(DVBTuning& tuning, dvb_diseqc_master_cmd &cmd)
+{
+    // Send the DiSEqC command
     usleep(DISEQC_SHORT_WAIT);
 
-    // Check to see if its a 1.1 or 1.2 device. If so repeat the message repeats times.
-    if ((tuning.diseqc_type == 3) || (tuning.diseqc_type == 5) || 
-        (tuning.diseqc_type == 6) || (tuning.diseqc_type == 7)) 
+    if (ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd) == -1) 
+    {
+        VERBOSE(VB_IMPORTANT, LOC_ERR +
+                "DiSEqC -> FE_DISEQC_SEND_MASTER_CMD failed" + ENO);
+        return false;
+    }
+    else
     {
+        if ((tuning.diseqc_type == 7) || (tuning.diseqc_type == 11)) 
+        {
+        VERBOSE(VB_CHANNEL, LOC + QString("DiSEqC -> Positioner GotoX position %1. Command: %2 %3 %4 %5 %6")
+                .arg(tuning.diseqc_pos)
+                .arg(cmd.msg[FRAME], 2, 16)
+                .arg(cmd.msg[ADDRESS], 2, 16)
+                .arg(cmd.msg[COMMAND], 2, 16)
+                .arg(cmd.msg[DATA_1], 2, 16)
+                .arg(cmd.msg[DATA_2], 2, 16));
+        }
+        else
+        {
+        VERBOSE(VB_CHANNEL, LOC + QString("DiSEqC -> Select Port # %1. Command: %2 %3 %4 %5")
+                .arg(tuning.diseqc_port)
+                .arg(cmd.msg[FRAME], 2, 16)
+                .arg(cmd.msg[ADDRESS], 2, 16)
+                .arg(cmd.msg[COMMAND], 2, 16)
+                .arg(cmd.msg[DATA_1], 2, 16));
+        }
+    }
 
+    // Check to see if its a 1.1, 1.2 or 1.3 device. If so repeat the message repeats times.
+    if ((tuning.diseqc_type == 3) || (tuning.diseqc_type == 5) || 
+        (tuning.diseqc_type == 6) || (tuning.diseqc_type == 7) || 
+        (tuning.diseqc_type == 10) || (tuning.diseqc_type == 11))
+    {
         int repeats = repeat;
-        while (repeats--) 
+        while (repeats--)
         {
-
-            if (tuning.diseqc_type == 7)
-            {
-                VERBOSE(VB_CHANNEL, LOC +
-                        QString("Sending 1.3 Repeat Command: %1 %2 %3 %4 %5")
-                        .arg(cmd.msg[0],2,16)
-                        .arg(cmd.msg[1],2,16)
-                        .arg(cmd.msg[2],2,16)
-                        .arg(cmd.msg[3],2,16)
-                        .arg(cmd.msg[4],2,16));
-            }
-            else
-            {
-                VERBOSE(VB_CHANNEL, LOC +
-                        QString("Sending 1.1/1.2 Repeat Command: %1 %2 %3 %4")
-                        .arg(cmd.msg[0],2,16)
-                        .arg(cmd.msg[1],2,16)
-                        .arg(cmd.msg[2],2,16)
-                        .arg(cmd.msg[3],2,16));
-            }
-
-            cmd.msg[0] = CMD_REPEAT;      
+            usleep(DISEQC_SHORT_WAIT);
+            cmd.msg[FRAME] = CMD_REPEAT;
             if (ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd) == -1) 
             {
                 VERBOSE(VB_IMPORTANT, LOC_ERR +
-                        "FE_DISEQC_SEND_MASTER_CMD failed" + ENO);
+                        "DiSEqC -> FE_DISEQC_SEND_MASTER_CMD failed" + ENO);
                 return false;
             }
-            usleep(DISEQC_SHORT_WAIT);
-     
-            cmd.msg[0] = CMD_FIRST;      
-            if (ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd) == -1) 
+            else
             {
-                VERBOSE(VB_IMPORTANT, LOC_ERR +
-                        "FE_DISEQC_SEND_MASTER_CMD failed" + ENO);
-                return false;
+                if ((tuning.diseqc_type == 7) || (tuning.diseqc_type == 11)) 
+                {
+                    VERBOSE(VB_CHANNEL, LOC + QString("DiSEqC -> Positioner GotoX position %1. Repeat Command: %2 %3 %4 %5 %6")
+                            .arg(tuning.diseqc_pos)
+                            .arg(cmd.msg[FRAME], 2, 16)
+                            .arg(cmd.msg[ADDRESS], 2, 16)
+                            .arg(cmd.msg[COMMAND], 2, 16)
+                            .arg(cmd.msg[DATA_1], 2, 16)
+                            .arg(cmd.msg[DATA_2], 2, 16));
+                }
+                else
+                {
+                    VERBOSE(VB_CHANNEL, LOC + QString("DiSEqC -> Select Port # %1. Repeat Command: %2 %3 %4 %5")
+                            .arg(tuning.diseqc_port)
+                            .arg(cmd.msg[FRAME], 2, 16)
+                            .arg(cmd.msg[ADDRESS], 2, 16)
+                            .arg(cmd.msg[COMMAND], 2, 16)
+                            .arg(cmd.msg[DATA_1], 2, 16));
+                }
             }
-            usleep(DISEQC_SHORT_WAIT);
         }
     }
 
-    if (ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A ) == -1) 
+    usleep(DISEQC_SHORT_WAIT);
+
+    return true;
+}
+
+
+bool DVBDiSEqC::SendDiSEqCSetupBus(DVBTuning& tuning)
+{
+    //Determin the Tone Burst for switches with more then 2 ports and send it
+    //This is not necessery for pure diseqc setup, but maybe required when using
+    //a simple tone switch behind a diseqc compliant switch.
+    //(This one I had hard time figuring out from the specs at eutelsat
+    //I guess the tone burst can be interpreted differently for different
+    //backward compatible diseqc switches. If backward compatible switches are present,
+    //we need to ensure they don't reset. I have yet come across a definit answer to this,
+    //but it looks like we need to use SEC_MINI_A(modulated 22khz) for all even ports(0,2,4,etc..)
+    //and SEC_MINI_B for odds. PLEASE ADVICE IF YOU KNOW FOR SURE.
+    if (ioctl(fd_frontend, FE_DISEQC_SEND_BURST, 
+              ((tuning.diseqc_port % 2) == 0 ? SEC_MINI_A : SEC_MINI_B )) < 0)
     {
         VERBOSE(VB_IMPORTANT, LOC_ERR +
-                "FE_DISEQC_SEND_BURST failed" + ENO);
+                "DiSEqC -> FE_DISEQC_SEND_BURST failed" + ENO);
         return false;
     }
+    else
+    {
+        VERBOSE(VB_CHANNEL, LOC + QString("DiSEqC -> Tone Burst set to: %1")
+                .arg((tuning.diseqc_port % 2) == 0 ? "A" : "B"));
+    }
 
     usleep(DISEQC_SHORT_WAIT);
 
+
+    //finally, set the continuous tone. This is also for backward compatibility.
+    //(Not sure why, but looking at the log,
+    //this is always set to ON. Any ideas here? I thought this is used to
+    //select between the High and Low LOF. In my setup LOFSwith=99999000 and
+    //LOFlo=LOFhi=10750000. In this case it should always select LOFlo, right?)
     if (ioctl(fd_frontend, FE_SET_TONE, tuning.tone) == -1) 
     {
-        VERBOSE(VB_IMPORTANT, LOC_ERR + "FE_SET_TONE failed" + ENO);
+        VERBOSE(VB_IMPORTANT, LOC_ERR + "DiSEqC -> FE_SET_TONE failed" + ENO);
         return false;
     }
+    else
+    {
+        VERBOSE(VB_CHANNEL, LOC + QString("DiSEqC -> Continuous Tone set to: %1")
+                .arg(tuning.tone == 0 ? "OFF" : "ON"));
+    }
 
     return true;
 }
 
-
-bool DVBDiSEqC::SendDiSEqCMessage(dvb_diseqc_master_cmd &cmd)
+/*****************************************************************************
+                    Diseqc 1.x Compatible Methods
+ ****************************************************************************/
+bool DVBDiSEqC::Diseqc1xSwitch(DVBTuning& tuning, bool reset, bool& havetuned, uint ports)
 {
-    // Turn off tone burst
-    if (ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF) == -1) 
+    if ((prev_tuning.diseqc_port != tuning.diseqc_port  ||
+         prev_tuning.tone != tuning.tone                ||
+         prev_tuning.voltage != tuning.voltage        ) || reset)
     {
-        VERBOSE(VB_IMPORTANT, LOC_ERR + "FE_SET_TONE failed" + ENO);
-        return false;
-    }
 
-    usleep(DISEQC_SHORT_WAIT);
+        if (tuning.diseqc_port >= ports )
+        {
+            VERBOSE(VB_IMPORTANT, LOC_ERR + "DiSEqC -> Unsupported port# for specifiad DiSEqC switch.");
+            return false;
+        }
 
-    VERBOSE(VB_CHANNEL, LOC + QString("Sending 1.0 Command: %1 %2 %3 %4")
-            .arg(cmd.msg[0], 2, 16)
-            .arg(cmd.msg[1], 2, 16)
-            .arg(cmd.msg[2], 2, 16)
-            .arg(cmd.msg[3], 2, 16));
+        dvb_diseqc_master_cmd cmd = 
+            {{CMD_FIRST, MASTER_TO_LSS, WRITE_N1, 0xf0, 0x00, 0x00}, 4};
 
-    if (ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd) == -1) 
-    {
-        VERBOSE(VB_IMPORTANT, LOC_ERR +
-                "FE_DISEQC_SEND_MASTER_CMD failed" + ENO);
-        return false;
-    }
+        if ( ports == 10 )
+        {
+            cmd.msg[COMMAND] = WRITE_N1;
+            cmd.msg[DATA_1] = 0xF0 | (tuning.diseqc_port & 0x0F);
+        }
+        else
+        {
+            cmd.msg[COMMAND] = WRITE_N0;
+            cmd.msg[DATA_1] =
+                0xF0 |
+                (((tuning.diseqc_port) * 4) & 0x0F)          |
+                ((tuning.voltage == SEC_VOLTAGE_18) ? 2 : 0) |
+                ((tuning.tone == SEC_TONE_ON) ? 1 : 0);
+        }
 
-    usleep(DISEQC_SHORT_WAIT);
-  
-    int repeats = repeat;
-    while (repeats--) 
-    {
-        VERBOSE(VB_CHANNEL, LOC +
-                QString("Sending 1.1/1.2/1.3 Repeat Command: %1 %2 %3 %4")
-                .arg(cmd.msg[0], 2, 16)
-                .arg(cmd.msg[1], 2, 16)
-                .arg(cmd.msg[2], 2, 16)
-                .arg(cmd.msg[3], 2, 16));
+        if (!SendDiSEqCPrepareBus(tuning, reset)) 
+        {
+            VERBOSE(VB_IMPORTANT, LOC_ERR + "DiSEqC -> Setting DiSEqC failed -> Segment I");
+            return false;
+        }
 
-        cmd.msg[0] = CMD_REPEAT;      
-        if (ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd) == -1) 
+        if (!SendDiSEqCMessage(tuning,cmd)) 
         {
-            VERBOSE(VB_IMPORTANT, LOC_ERR +
-                    "FE_DISEQC_SEND_MASTER_CMD failed" + ENO);
+            VERBOSE(VB_IMPORTANT, LOC_ERR + "DiSEqC -> Setting DiSEqC failed. -> Segment II");
             return false;
         }
-        usleep(DISEQC_SHORT_WAIT);
-    
-        cmd.msg[0] = CMD_FIRST;      
-        if (ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &cmd) == -1) 
+
+        if (!SendDiSEqCSetupBus(tuning)) 
         {
-            VERBOSE(VB_IMPORTANT, LOC_ERR +
-                    "FE_DISEQC_SEND_MASTER_CMD failed" + ENO);
+            VERBOSE(VB_IMPORTANT, LOC_ERR + "DiSEqC -> Setting DiSEqC failed -> Segment III");
             return false;
         }
-        usleep(DISEQC_SHORT_WAIT); 
-    }
 
-    if (ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A ) == -1) 
-    {
-        VERBOSE(VB_IMPORTANT, LOC_ERR + "FE_DISEQC_SEND_BURST failed" + ENO);
-        return false;
+        prev_tuning.diseqc_port = tuning.diseqc_port;
+        prev_tuning.tone = tuning.tone;
+        prev_tuning.voltage = tuning.voltage;
+        havetuned = true;
+
     }
 
+    havetuned |=
+        (prev_tuning.diseqc_port == tuning.diseqc_port) &&
+        (prev_tuning.voltage     == tuning.voltage)     &&
+        (prev_tuning.tone        == tuning.tone);
+
     return true;
 }
 
-bool DVBDiSEqC::Diseqc1xSwitch(DVBTuning& tuning, bool reset, 
-                               bool& havetuned, uint ports)
-{
-    if (reset) 
-    {
-        if (!DiseqcReset()) 
-        {
-            VERBOSE(VB_IMPORTANT, LOC_ERR + "DiseqcReset() failed");
-            return false;
-        }
-    }
-
-    VERBOSE(VB_CHANNEL, LOC +
-            QString("1.1 Switch (%1 ports) - Port %2 - %3 %4")
-            .arg(ports)
-            .arg(tuning.diseqc_port)
-            .arg(tuning.tone==SEC_TONE_ON?"Tone ON":"Tone OFF")
-            .arg(tuning.voltage==SEC_VOLTAGE_13?"13V":"18V"));
 
+/*****************************************************************************
+                             Diseqc Psitioner v1.2
+ ****************************************************************************/
+bool DVBDiSEqC::PositionerGoto(DVBTuning& tuning, bool reset, bool& havetuned)
+{
     if ((prev_tuning.diseqc_port != tuning.diseqc_port  ||
-         prev_tuning.tone != tuning.tone                ||
-         prev_tuning.voltage != tuning.voltage        ) || reset)
+         prev_tuning.tone        != tuning.tone         ||
+         prev_tuning.diseqc_pos  != tuning.diseqc_pos   ||
+         prev_tuning.voltage     != tuning.voltage    ) || reset)
     {
-        dvb_diseqc_master_cmd cmd =
-            {{CMD_FIRST, MASTER_TO_LSS, WRITE_N1, 0xf0, 0x00, 0x00}, 4};
+        dvb_diseqc_master_cmd cmd_1 = 
+            {{CMD_FIRST, MASTER_TO_POSITIONER, GOTO, tuning.diseqc_pos, 0x00, 0x00}, 4};
 
-        if (tuning.diseqc_port >= ports )
+        if (!SendDiSEqCPrepareBus(tuning, reset)) 
         {
-            VERBOSE(VB_IMPORTANT, LOC_ERR + "Unsupported switch");
+            VERBOSE(VB_IMPORTANT, LOC_ERR + "DiSEqC -> Setting DiSEqC failed -> Segment I");
             return false;
         }
 
-        switch (ports)
+        if (!SendDiSEqCMessage(tuning,cmd_1)) 
         {
-            case 10:
-                cmd.msg[COMMAND] = WRITE_N1;
-                cmd.msg[DATA_1] = 0xF0 | (tuning.diseqc_port & 0x0F);
-                break;
-            case 4:
-            case 2: 
-                cmd.msg[COMMAND] = WRITE_N0;
-                cmd.msg[DATA_1] =
-                    0xF0 |
-                    (((tuning.diseqc_port) * 4) & 0x0F)          |
-                    ((tuning.voltage == SEC_VOLTAGE_18) ? 2 : 0) |
-                    ((tuning.tone == SEC_TONE_ON) ? 1 : 0);
-                break;
-            default:
-                VERBOSE(VB_IMPORTANT, LOC_ERR +
-                        "Unsupported number of ports for DiSEqC 1.1 Switch");
+            VERBOSE(VB_IMPORTANT, LOC_ERR + "DiSEqC -> Setting DiSEqC failed. -> Segment II");
+            return false;
         }
 
-        if (!SendDiSEqCMessage(tuning,cmd)) 
+        //if there is a switch behind a positioner, we send a command to it as well
+        if (tuning.diseqc_type == 10)
         {
-            VERBOSE(VB_IMPORTANT, LOC_ERR + "Setting DiSEqC failed.");
+            dvb_diseqc_master_cmd cmd_2 =
+                {{CMD_FIRST, MASTER_TO_LSS, WRITE_N0, 0xf0, 0x00, 0x00}, 4};
+
+            cmd_2.msg[DATA_1] =
+                0xF0 |
+                (((tuning.diseqc_port) * 4) & 0x0F)          |
+                ((tuning.voltage == SEC_VOLTAGE_18) ? 2 : 0) |
+                ((tuning.tone == SEC_TONE_ON) ? 1 : 0);
+
+            //set the diseqc type for the switch behind rotor.
+            tuning.diseqc_type = 5;
+
+            if (!SendDiSEqCMessage(tuning,cmd_2)) 
+            {
+                VERBOSE(VB_IMPORTANT, LOC_ERR + "DiSEqC -> Setting DiSEqC failed. -> Segment II");
+                return false;
+            }
+
+            //reset the diseqc type back to 1.2 positioner
+            tuning.diseqc_type = 10;
+        }
+
+        if (!SendDiSEqCSetupBus(tuning)) 
+        {
+            VERBOSE(VB_IMPORTANT, LOC_ERR + "DiSEqC -> Setting DiSEqC failed -> Segment III");
             return false;
         }
 
         prev_tuning.diseqc_port = tuning.diseqc_port;
+        prev_tuning.diseqc_pos = tuning.diseqc_pos;
         prev_tuning.tone = tuning.tone;
         prev_tuning.voltage = tuning.voltage;
-        havetuned = true;
-
     }
 
     havetuned |=
         (prev_tuning.diseqc_port == tuning.diseqc_port) &&
+        (prev_tuning.diseqc_pos  == tuning.diseqc_pos)  &&
         (prev_tuning.voltage     == tuning.voltage)     &&
         (prev_tuning.tone        == tuning.tone);
 
     return true;
 }
 
-bool DVBDiSEqC::DiseqcReset()
+
+/*****************************************************************************
+                                Diseqc Positioner v1.3 (Goto X)
+ ****************************************************************************/
+
+bool DVBDiSEqC::PositionerGotoAngular(DVBTuning& tuning, bool reset, bool& havetuned)
 {
-    struct dvb_diseqc_master_cmd reset_cmd =
-        {{CMD_FIRST, MASTER_TO_LSS, RESET, 0x00, 0x00}, 3};
- 
-    struct dvb_diseqc_master_cmd init_cmd =
-        {{CMD_FIRST, MASTER_TO_LSS, POWERON, 0x00, 0x00}, 3};
+/*
+    // TODO: Send information here to FE saying motor is moving and
+    //       to expect a longer than average tuning delay
+    if (prev_tuning.diseqc_pos != tuning.diseqc_pos)
+        VERBOSE(VB_CHANNEL, LOC + "DiSEqC Motor Moving");
+*/
 
-    if (ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &init_cmd) <0)
+    int CMD1=0x00 , CMD2=0x00;        // Bytes sent to motor
+    double USALS=0.0;
+    int DecimalLookup[10] =
+        { 0x00, 0x02, 0x03, 0x05, 0x06, 0x08, 0x0A, 0x0B, 0x0D, 0x0E };
+
+    // Equation lifted from VDR rotor plugin by
+    // Thomas Bergwinkl <Thomas.Bergwinkl@t-online.de>
+
+    double P = gContext->GetSetting("Latitude", "").toFloat() * TO_RADS;           // Earth Station Latitude
+    double Ue = gContext->GetSetting("Longitude", "").toFloat() * TO_RADS;           // Earth Station Longitude
+    double Us = tuning.diseqc_pos * TO_RADS;          // Satellite Longitude
+
+    double az = M_PI + atan( tan (Us-Ue) / sin(P) );
+    double x = acos( cos(Us-Ue) * cos(P) );
+    double el = atan( (cos(x) - 0.1513 ) /sin(x) );
+    double Azimuth = atan((-cos(el)*sin(az))/(sin(el)*cos(P)-cos(el)*sin(P)*cos(az)))* TO_DEC;
+
+    if (Azimuth > 0.0)
+        CMD1=0xE0;    // East
+    else 
+        CMD1=0xD0;      // West
+
+    USALS = fabs(Azimuth);
+
+    while (USALS > 16) 
     {
-        VERBOSE(VB_IMPORTANT, LOC_ERR +
-                "Setup: Sending init command failed." + ENO);
-        return false;
+        CMD1++;
+        USALS -=16;
     }
-    usleep(DISEQC_LONG_WAIT);
 
-    if (ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &reset_cmd) <0)
+    while (USALS >= 1.0) 
     {
-        VERBOSE(VB_IMPORTANT, LOC_ERR +
-                "Setup: Sending reset command failed." + ENO);
-        return false;
+        CMD2+=0x10;
+        USALS--;
     }
-    usleep(DISEQC_LONG_WAIT);
 
-    if (ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &init_cmd) <0)
+    CMD2 += DecimalLookup[(int)round(USALS*10)];
+
+    if ((prev_tuning.diseqc_port != tuning.diseqc_port  ||
+         prev_tuning.tone        != tuning.tone         ||
+         prev_tuning.diseqc_pos  != tuning.diseqc_pos   ||
+         prev_tuning.voltage     != tuning.voltage    ) || reset)
     {
-        VERBOSE(VB_IMPORTANT, LOC_ERR +
-                "Setup: Sending init command failed." + ENO);
-        return false;
+        dvb_diseqc_master_cmd cmd_1 = 
+            {{CMD_FIRST, MASTER_TO_POSITIONER, GOTO_ANGULAR, CMD1 , CMD2 , 0x00}, 5};
+
+        if (!SendDiSEqCPrepareBus(tuning, reset)) 
+        {
+            VERBOSE(VB_IMPORTANT, LOC_ERR + "DiSEqC -> Setting DiSEqC failed -> Segment I");
+            return false;
+        }
+
+        if (!SendDiSEqCMessage(tuning,cmd_1)) 
+        {
+            VERBOSE(VB_IMPORTANT, LOC_ERR + "DiSEqC -> Setting DiSEqC failed. -> Segment II");
+            return false;
+        }
+
+        //if there is a switch behind a positioner, we send a command to it as well
+        if (tuning.diseqc_type == 11)
+        {
+            dvb_diseqc_master_cmd cmd_2 =
+                {{CMD_FIRST, MASTER_TO_LSS, WRITE_N0, 0xf0, 0x00, 0x00}, 4};
+
+            cmd_2.msg[DATA_1] =
+                0xF0 |
+                (((tuning.diseqc_port) * 4) & 0x0F)          |
+                ((tuning.voltage == SEC_VOLTAGE_18) ? 2 : 0) |
+                ((tuning.tone == SEC_TONE_ON) ? 1 : 0);
+
+            //set the diseqc type for the switch behind rotor.
+            tuning.diseqc_type = 5;
+
+            if (!SendDiSEqCMessage(tuning,cmd_2)) 
+            {
+                VERBOSE(VB_IMPORTANT, LOC_ERR + "DiSEqC -> Setting DiSEqC failed. -> Segment II");
+                return false;
+            }
+
+            //reset the diseqc type back to 1.3 positioner
+            tuning.diseqc_type = 11;
+
+        }
+
+        if (!SendDiSEqCSetupBus(tuning)) 
+        {
+            VERBOSE(VB_IMPORTANT, LOC_ERR + "DiSEqC -> Setting DiSEqC failed -> Segment III");
+            return false;
+        }
+
+        prev_tuning.diseqc_port = tuning.diseqc_port;
+        prev_tuning.diseqc_pos = tuning.diseqc_pos;
+        prev_tuning.tone = tuning.tone;
+        prev_tuning.voltage = tuning.voltage;
     }
-    usleep(DISEQC_LONG_WAIT);
+
+    havetuned |=
+        (prev_tuning.diseqc_port == tuning.diseqc_port) &&
+        (prev_tuning.diseqc_pos  == tuning.diseqc_pos)  &&
+        (prev_tuning.voltage     == tuning.voltage)     &&
+        (prev_tuning.tone        == tuning.tone);
 
     return true;
 }
 
+
+
 /*****************************************************************************
                             Positioner Control
  *****************************************************************************/
-
+/*
+// Currently not used so not needed, also will need to be modified
+// to be used with current way of sending DiSEqC messages
 bool DVBDiSEqC::PositionerDriveEast(int timestep)
 {
     if (!DiseqcReset()) 
@@ -475 +698 @@
         VERBOSE(VB_IMPORTANT, LOC_ERR + "Setting DiSEqC failed.");
         return false;
     }
-    
+
     return true;
 }
 
@@ -499 +722 @@
     return true;
 }
 
-bool DVBDiSEqC::PositionerGoto(DVBTuning& tuning, bool reset, bool& havetuned)
-{
-    // A reset seems to be required for my positioner to work consistently
-    VERBOSE(VB_CHANNEL, LOC + QString("1.2 Motor - Goto Stored Position %1")
-            .arg(tuning.diseqc_port));
-
-    if ((prev_tuning.diseqc_port != tuning.diseqc_port ||
-         prev_tuning.tone != tuning.tone ||
-         prev_tuning.voltage != tuning.voltage) || reset)
-    {
-        if (!DiseqcReset()) 
-        {
-            VERBOSE(VB_IMPORTANT, LOC_ERR + "DiseqcReset() failed");
-            return false;
-        }
-        
-        dvb_diseqc_master_cmd cmd = 
-            {{CMD_FIRST, MASTER_TO_POSITIONER, GOTO, tuning.diseqc_port, 
-              0x00, 0x00}, 4};
-
-        if (!SendDiSEqCMessage(tuning,cmd)) 
-        {
-            VERBOSE(VB_IMPORTANT, LOC_ERR + "Setting DiSEqC failed.");
-            return false;
-        }
-
-        prev_tuning.diseqc_port = tuning.diseqc_port;
-        prev_tuning.tone = tuning.tone;
-        prev_tuning.voltage = tuning.voltage;
-    }
-
-    havetuned |=
-        (prev_tuning.diseqc_port == tuning.diseqc_port) &&
-        (prev_tuning.voltage     == tuning.voltage)     &&
-        (prev_tuning.tone        == tuning.tone);
-
-    return true;
-}
-
 bool DVBDiSEqC::PositionerStore(DVBTuning& tuning)
 {
     if (!DiseqcReset()) 
@@ -649 +833 @@
 
     return true;
 }
-
-/*****************************************************************************
-                                Diseqc v1.3 (Goto X)
- ****************************************************************************/
-
-bool DVBDiSEqC::PositionerGotoAngular(DVBTuning& tuning, bool reset, 
-                                      bool& havetuned) 
-{
-    // TODO: Send information here to FE saying motor is moving and
-    //       to expect a longer than average tuning delay
-    if (prev_tuning.diseqc_pos != tuning.diseqc_pos)
-        VERBOSE(VB_CHANNEL, LOC + "DiSEqC Motor Moving");
-
-    int CMD1=0x00 , CMD2=0x00;        // Bytes sent to motor
-    double USALS=0.0;
-    int DecimalLookup[10] =
-        { 0x00, 0x02, 0x03, 0x05, 0x06, 0x08, 0x0A, 0x0B, 0x0D, 0x0E };
-
-    // Equation lifted from VDR rotor plugin by
-    // Thomas Bergwinkl <Thomas.Bergwinkl@t-online.de>
-
-    double P = gContext->GetSetting("Latitude", "").toFloat() * TO_RADS;           // Earth Station Latitude
-    double Ue = gContext->GetSetting("Longitude", "").toFloat() * TO_RADS;           // Earth Station Longitude
-    double Us = tuning.diseqc_pos * TO_RADS;          // Satellite Longitude
-
-    double az = M_PI + atan( tan (Us-Ue) / sin(P) );
-    double x = acos( cos(Us-Ue) * cos(P) );
-    double el = atan( (cos(x) - 0.1513 ) /sin(x) );
-    double Azimuth = atan((-cos(el)*sin(az))/(sin(el)*cos(P)-cos(el)*sin(P)*cos(az)))* TO_DEC;
-
-//    printf("Offset = %f\n",Azimuth);
-
-    if (Azimuth > 0.0)
-        CMD1=0xE0;    // East
-    else 
-        CMD1=0xD0;      // West
-
-    USALS = fabs(Azimuth);
- 
-    while (USALS > 16) 
-    {
-        CMD1++;
-        USALS -=16;
-    }
-
-    while (USALS >= 1.0) 
-    {
-        CMD2+=0x10;
-        USALS--;
-    }
-
-    CMD2 += DecimalLookup[(int)round(USALS*10)];
-  
-    if (!DiseqcReset()) 
-    {
-        VERBOSE(VB_IMPORTANT, LOC_ERR + "DiseqcReset() failed");
-        return false;
-    }
-
-    // required db changes - get lat and lon for ground station location in db 
-    // and added to tuning
-    // sat_pos be passed into tuning, and be a float not an int./
-
-    VERBOSE(VB_CHANNEL, LOC + QString("1.3 Motor - Goto Angular Position %1")
-            .arg(tuning.diseqc_pos));
-
-    if ((prev_tuning.diseqc_port != tuning.diseqc_port  ||
-         prev_tuning.tone        != tuning.tone         ||
-         prev_tuning.diseqc_pos  != tuning.diseqc_pos   ||
-         prev_tuning.voltage     != tuning.voltage    ) || reset)
-    {
-
-        dvb_diseqc_master_cmd cmd = 
-            {{CMD_FIRST, MASTER_TO_POSITIONER, GOTO_ANGULAR, CMD1 , CMD2 , 
-              0x00}, 5};
-
-        if (!SendDiSEqCMessage(tuning,cmd)) 
-        {
-            VERBOSE(VB_IMPORTANT, LOC_ERR + "Setting DiSEqC failed.");
-            return false;
-        }
-
-        prev_tuning.diseqc_port = tuning.diseqc_port;
-        prev_tuning.diseqc_pos = tuning.diseqc_pos;
-        prev_tuning.tone = tuning.tone;
-        prev_tuning.voltage = tuning.voltage;
-    }
-
-    havetuned |=
-        (prev_tuning.diseqc_port == tuning.diseqc_port) &&
-        (prev_tuning.diseqc_pos  == tuning.diseqc_pos)  &&
-        (prev_tuning.voltage     == tuning.voltage)     &&
-        (prev_tuning.tone        == tuning.tone);
-
-    return true;
-}
+*/

libs/libmythtv/dvbdiseqc.h

@@ -31 +31 @@
     DVBTuning prev_tuning;
     int repeat;
 
-    
-    bool SendDiSEqCMessage(DVBTuning& tuning, dvb_diseqc_master_cmd &cmd);
-    bool SendDiSEqCMessage(dvb_diseqc_master_cmd &cmd);
-    
     bool ToneVoltageLnb(DVBTuning& tuning, bool reset, bool& havetuned);
     bool ToneSwitch(DVBTuning& tuning, bool reset, bool& havetuned);
-    bool Diseqc1xSwitch(DVBTuning& tuning, bool reset, bool& havetuned,
-                        uint ports);
+
+    bool SendDiSEqCPrepareBus(DVBTuning& tuning, bool reset);
+    bool SendDiSEqCMessage(DVBTuning& tuning, dvb_diseqc_master_cmd &cmd);
+    bool SendDiSEqCSetupBus(DVBTuning& tuning);
+
+    bool Diseqc1xSwitch(DVBTuning& tuning, bool reset, bool& havetuned, uint ports);
     bool PositionerGoto(DVBTuning& tuning, bool reset, bool& havetuned);
+    bool PositionerGotoAngular(DVBTuning& tuning, bool reset, bool& havetuned);
+/*
+//currently not used
     bool PositionerStore(DVBTuning& tuning);
     bool PositionerStopMovement();
     bool PositionerStoreEastLimit();
     bool PositionerStoreWestLimit();
-    bool PositionerDisableLimits();   
+    bool PositionerDisableLimits();
     bool PositionerDriveEast(int timestep);
     bool PositionerDriveWest(int timestep);
-    bool PositionerGotoAngular(DVBTuning& tuning, bool reset, 
-                               bool& havetuned);
-
     // Still need to be written
     bool Positioner_Status();
+*/
 
     enum diseqc_cmd_bytes {
         FRAME               = 0x0,
@@ -72 +73 @@
         REPLY_CRCERR_RPT    = 0xe6,
         REPLY_CMDERR_RPT    = 0xe7
     };
-        
+
     enum diseqc_address {
         MASTER_TO_ALL        = 0x00,
         MASTER_TO_LSS        = 0x10,

libs/libmythtv/videosource.cpp

@@ -1242 +1242 @@
         addSelection("DiSEqC v1.2 Positioner","6");
         addSelection("DiSEqC v1.3 Positioner (Goto X)","7");
         addSelection("DiSEqC v1.1 or 2.1 (10-way method2)","8");
+        addSelection("DiSEqC v1.2 Positioner + DiSEqC switch.","10");
+        addSelection("DiSEqC v1.3 Positioner (Goto X) + DiSEqC switch.","11");
         setHelpText(QObject::tr("Select the input type for DVB-S cards. "
                     "Leave as Single LNB/Input for DVB-C or DVB-T. "
                     "The inputs are mapped from Input Connections option "
@@ -1687 +1689 @@
     {
         setLabel(QObject::tr("DiSEqC Satellite Location"));
         setValue("0.0");
-        setHelpText(QObject::tr("The longitude of the satellite "
-                    "you are aiming at.  For western hemisphere use "
-                    "a negative value.  Value is in decimal."));
+        setHelpText(QObject::tr("For 1.2 positioner enter the number as it is stored in the positioner for this satellite"
+                    "or for the GotoX (DiSEqC 1.3/USALS) positioner, this is a longitude of the satellite "
+                    "you are aiming at.  For western hemisphere use a negative value.  Value is in decimal."));
 //        setVisible(false);
     };
 //    void fillSelections(const QString& pos) {
@@ -1698 +1700 @@
 };
 
 
-class DiSEqCPort: public LabelSetting, public CISetting
+class DiSEqCPort: public LineEditSetting, public CISetting
 {
   public:
     DiSEqCPort(const CardInput& parent)
         : CISetting(parent, "diseqc_port")
     {
-        setVisible(false);
-    };
-    void fillSelections(const QString& port) {
-        setValue(port);
+        setLabel(QObject::tr("DiSEqC Port"));
+        setValue("0");
+        setHelpText(QObject::tr("Port number of a DiSEqC switch. "
+                    "For 2 Port switches set to 0 or 1. For 4 port switches, 0 to 3."));
     };
 };
 
@@ -1994 +1996 @@
         {
             if (dvbType == CardUtil::QPSK)
             {
-                //Check for DiSEqC type
-                diseqcpos->setVisible(true);
-                lnblofswitch->setVisible(true);
-                lnbloflo->setVisible(true);
-                lnblofhi->setVisible(true);
-                if (CardUtil::GetDISEqCType(_cardid) == CardUtil::POSITIONER_X)
-                    diseqcpos->setEnabled(true);
-                else
-                    diseqcpos->setEnabled(false);
-            }
-            else
-            {
-                diseqcpos->setVisible(false);
-                lnblofswitch->setVisible(false);
-                lnbloflo->setVisible(false);
-                lnblofhi->setVisible(false);
+                 //Check for DiSEqC type
+                 diseqcpos->setVisible(true);
+                 diseqcport->setVisible(true);
+                 lnblofswitch->setVisible(true);
+                 lnbloflo->setVisible(true);
+                 lnblofhi->setVisible(true);
+                 if (CardUtil::GetDISEqCType(_cardid) == CardUtil::POSITIONER_1_2 || 
+                      CardUtil::GetDISEqCType(_cardid) == CardUtil::POSITIONER_X)
+                 {
+                     diseqcpos->setEnabled(true);
+                     diseqcport->setEnabled(false);
+                 }
+                 else if (CardUtil::GetDISEqCType(_cardid) == CardUtil::POSITIONER_1_2_SWITCH || 
+                      CardUtil::GetDISEqCType(_cardid) == CardUtil::POSITIONER_X_SWITCH)
+                 {
+                     diseqcpos->setEnabled(true);
+                     diseqcport->setEnabled(true);
+                 }
+                 else
+                 {
+                     diseqcpos->setEnabled(false);
+                     diseqcport->setEnabled(false);
+                 }
+             }
+             else
+             {
+                 diseqcpos->setVisible(false);
+                 lnblofswitch->setVisible(false);
+                 lnbloflo->setVisible(false);
+                 lnblofhi->setVisible(false);
             }
         }
     }
@@ -2433 +2449 @@
                 list.append(DVBDiSEqCInputList(
                                 stxt.arg(i+1,2), QString::number(i), ""));
             break;
+        case 10:
+            for (i = 1; i < 50; ++i)
+                list.append(DVBDiSEqCInputList(
+                                mtxt.arg(i), "", QString::number(i)));
+            break;
+        case 11:
+            for (i = 1; i < 100; ++i)
+                list.append(DVBDiSEqCInputList(
+                                itxt.arg(i), "", QString::number(i)));
+            break;
+
         default:
             list.append(DVBDiSEqCInputList(
                             QString("DVBInput"), QString(""), QString("")));

libs/libmythtv/videosource.h

@@ -53 +53 @@
         POSITIONER_X,
         POSITIONER_1_2_SWITCH_2,
         POSITIONER_X_SWITCH_2,
+        POSITIONER_1_2_SWITCH,
+        POSITIONER_X_SWITCH,
     };
     /// \brief dvb card type
     static const QString DVB;