fix rfmod audio (on and off was swapped)

[enigma2.git] / lib / python / Components / NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 9a970fd3fe9268e9959fb61bf65e37417fcbbb8c..e5de83e0ff3cbca5d42c9b67c8c15b3c0e3caefd 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -186,10 +186,10 @@ class SecConfigure:
                                        sec.setLNBLOFH(currLnb.lofh.value * 1000)
                                        sec.setLNBThreshold(currLnb.threshold.value * 1000)
                                        
-                               if currLnb.output_12v.value == "0V":
-                                       pass # nyi in drivers
-                               elif currLnb.output_12v.value == "12V":
-                                       pass # nyi in drivers
+#                              if currLnb.output_12v.value == "0V":
+#                                      pass # nyi in drivers
+#                              elif currLnb.output_12v.value == "12V":
+#                                      pass # nyi in drivers
                                        
                                if currLnb.increased_voltage.value:
                                        sec.setLNBIncreasedVoltage(lnbParam.ON)
@@ -421,7 +421,7 @@ class NimManager:
                return self.cablesList[0]
        
        def getCableTrustNit(self, nim):
-               return (config.Nims[nim].cabletype.value == "quick")
+               return config.Nims[nim].cabletype.value == "quick"
 
        def getTerrestrialDescription(self, nim):
                return self.terrestrialsList[config.Nims[nim].terrestrial.index][0]
@@ -584,9 +584,9 @@ class NimManager:
 
                        if configMode == "simple":
                                dm = config.Nims[slotid].diseqcMode.value
-                               if dm in ["single", "toneburst", "diseqc_a_b", "diseqc_a_b_c_d"]:
+                               if dm in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
                                        list.append(self.satList[config.Nims[slotid].diseqcA.index])
-                               if dm in ["toneburst", "diseqc_a_b", "diseqc_a_b_c_d"]:
+                               if dm in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
                                        list.append(self.satList[config.Nims[slotid].diseqcB.index])
                                if dm == "diseqc_a_b_c_d":
                                        list.append(self.satList[config.Nims[slotid].diseqcC.index])
@@ -768,7 +768,7 @@ def InitNimManager(nimmgr):
                                nim.advanced.lnb[x].lofl = ConfigInteger(default=9750, limits = (0, 99999))
                                nim.advanced.lnb[x].lofh = ConfigInteger(default=10600, limits = (0, 99999))
                                nim.advanced.lnb[x].threshold = ConfigInteger(default=11700, limits = (0, 99999))
-                               nim.advanced.lnb[x].output_12v = ConfigSelection(choices = [("0V", _("0 V")), ("12V", _("12 V"))], default="0V")
+#                              nim.advanced.lnb[x].output_12v = ConfigSelection(choices = [("0V", _("0 V")), ("12V", _("12 V"))], default="0V")
                                nim.advanced.lnb[x].increased_voltage = ConfigYesNo(default=False)
                                nim.advanced.lnb[x].toneburst = ConfigSelection(choices = [("none", _("None")), ("A", _("A")), ("B", _("B"))], default = "none")
                                nim.advanced.lnb[x].diseqcMode = ConfigSelection(choices = [("none", _("None")), ("1_0", _("1.0")), ("1_1", _("1.1")), ("1_2", _("1.2"))], default = "none")
@@ -794,7 +794,7 @@ def InitNimManager(nimmgr):
                                nim.advanced.lnb[x].powerThreshold = ConfigInteger(default=50, limits=(0, 100))
 
                elif slot.nimType == nimmgr.nimType["DVB-C"]:
-                       nim.cabletype = ConfigSelection(choices = [("quick", _("Quick")), ("complete", _("Complete"))])
+                       nim.cabletype = ConfigSelection(choices = [("quick", _("Quick")), ("complete", _("Complete"))], default = "complete")
                elif slot.nimType == nimmgr.nimType["DVB-T"]:
                        list = []
                        n = 0