Ticket #1945: bandstacked-lnb.patch

diseqc.cpp

@@ -382 +382 @@
     }
 
     // update capture card to point to tree, or 0 if there is no tree
-    VERBOSE(VB_IMPORTANT, "diseqcid: "<<devid);
+    //VERBOSE(VB_IMPORTANT, "diseqcid: "<<devid);
     query0.prepare(
         "UPDATE capturecard "
         "SET diseqcid = :DEVID "
@@ -1809 +1809 @@
  *  \brief LNB Class.
  */
 
-const TypeTable DiSEqCDevLNB::LNBTypeTable[4] =
+const TypeTable DiSEqCDevLNB::LNBTypeTable[5] =
 {
     { "fixed",        kTypeFixed                 },
     { "voltage",      kTypeVoltageControl        },
     { "voltage_tone", kTypeVoltageAndToneControl },
+    { "bandstacked",  kTypeBandstacked           },
     { QString::null,  kTypeVoltageAndToneControl },
 };
 
@@ -1943 +1944 @@
 {
     (void) tuning;
 #ifdef USING_DVB
-    if (kTypeVoltageAndToneControl == m_type)
-        return (tuning.params.frequency > m_lof_switch);
+    switch (m_type)
+    {
+        case kTypeVoltageAndToneControl:
+            return (tuning.params.frequency > m_lof_switch);
+        case kTypeBandstacked:
+            return IsHorizontal(tuning);
+        default:
+            return false;
+    }
 #endif // USING_DVB
 
     return false;

diseqc.h

@@ -343 +343 @@
         kTypeFixed                 = 0,
         kTypeVoltageControl        = 1,
         kTypeVoltageAndToneControl = 2,
+        kTypeBandstacked           = 3,
     };
     void SetType(dvbdev_lnb_t type)       { m_type       = type;       }
     void SetLOFSwitch(uint lof_switch)    { m_lof_switch = lof_switch; }
@@ -373 +374 @@
     uint         m_lof_hi;
     uint         m_lof_lo;
 
-    static const TypeTable LNBTypeTable[4];
+    static const TypeTable LNBTypeTable[5];
 };
 
 #endif // _DISEQC_H_

diseqcsettings.cpp

@@ -472 +472 @@
       DiSEqCDevLNB::kTypeVoltageControl,               0, 10750000,        0 },
     { DeviceTree::tr("C Band"),
       DiSEqCDevLNB::kTypeVoltageControl,               0,  5150000,        0 },
+    { DeviceTree::tr("DishPro Bandstacked"),
+      DiSEqCDevLNB::kTypeBandstacked,                  0, 11250000, 14350000 },
     { QString::null,
       DiSEqCDevLNB::kTypeVoltageControl,               0,        0,        0 },
 };
@@ -539 +541 @@
         addSelection(DeviceTree::tr("Universal (Voltage & Tone)"),
                      QString::number((uint) DiSEqCDevLNB::
                                      kTypeVoltageAndToneControl));
+        addSelection(DeviceTree::tr("Bandstacked"),
+                     QString::number((uint) DiSEqCDevLNB::
+                                     kTypeBandstacked));
     }
 
     virtual void load(void)
@@ -593 +598 @@
         setLabel(DeviceTree::tr("LNB LOF Low (MHz)"));
         QString help = DeviceTree::tr(
             "This defines the offset the frequency coming "
-            "from the LNB will be in low setting.");
+            "from the LNB will be in low setting. For bandstacked "
+            "LNBs this is the vertical/right polarization band.");
         setHelpText(help);
     }
 
@@ -621 +627 @@
         setLabel(DeviceTree::tr("LNB LOF High (MHz)"));
         QString help = DeviceTree::tr(
             "This defines the offset the frequency coming from "
-            "the LNB will be in high setting.");
+            "the LNB will be in high setting. For bandstacked "
+            "LNBs this is the horizontal/left polarization band.");
         setHelpText(help);
     }
 
@@ -709 +716 @@
             m_lof_hi->setEnabled(true);
             m_lof_lo->setEnabled(true);
             break;
+        case DiSEqCDevLNB::kTypeBandstacked:
+            m_lof_switch->setEnabled(false);
+            m_lof_hi->setEnabled(true);
+            m_lof_lo->setEnabled(true);
+            break;
     }
 }
 
 //////////////////////////////////////// DeviceTree
 
-
 DeviceTree::DeviceTree(DiSEqCDevTree &tree) : m_tree(tree)
 {
     connect(this, SIGNAL(editButtonPressed(int)),   SLOT(edit(void)));