From b5b9131ed13e9184efd1ae6a20ca2ce64342ab5e Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Fri, 8 Aug 2008 19:14:23 +0000 Subject: [PATCH] revert 128 LNB change... this was per Tuner so now its possible to configure up to 36 LNBs per Tuner (32 + 4 just for motorized dishes) (max 144 LNBs now for all Tuners) --- lib/dvb/sec.h | 2 +- lib/python/Components/NimManager.py | 14 +++++++------- lib/python/Screens/Satconfig.py | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h index 35213b3..cba9fa4 100644 --- a/lib/dvb/sec.h +++ b/lib/dvb/sec.h @@ -271,7 +271,7 @@ public: private: #ifndef SWIG static eDVBSatelliteEquipmentControl *instance; - eDVBSatelliteLNBParameters m_lnbs[128]; // i think its enough + eDVBSatelliteLNBParameters m_lnbs[144]; // i think its enough int m_lnbidx; // current index for set parameters std::map::iterator m_curSat; eSmartPtrList &m_avail_frontends; diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index f8dab12..ea234c1 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -213,7 +213,7 @@ class SecConfigure: def updateAdvanced(self, sec, slotid): lnbSat = {} - for x in range(1,129): + for x in range(1,37): lnbSat[x] = [] #wildcard for all satellites ( for rotor ) @@ -230,7 +230,7 @@ class SecConfigure: print "add", x[0], "to", lnb lnbSat[lnb].append(x[0]) - for x in range(1,129): + for x in range(1,37): if len(lnbSat[x]) > 0: currLnb = config.Nims[slotid].advanced.lnb[x] sec.addLNB() @@ -379,7 +379,7 @@ class SecConfigure: elif currSat.tonemode == "off": sec.setToneMode(switchParam.OFF) - if not currSat.usals.value and x < 125: + if not currSat.usals.value and x < 34: sec.setRotorPosNum(currSat.rotorposition.value) else: sec.setRotorPosNum(0) #USALS @@ -894,7 +894,7 @@ def InitNimManager(nimmgr): nim.advanced.sats = getConfigSatlist(192,nimmgr.satList+tmp) nim.advanced.sat = ConfigSubDict() lnbs = [("0", "not available")] - for y in range(1, 125): + for y in range(1, 33): lnbs.append((str(y), "LNB " + str(y))) for x in nimmgr.satList: @@ -911,7 +911,7 @@ def InitNimManager(nimmgr): nim.advanced.sat[x].tonemode = ConfigSelection(choices={"band": _("Band"), "on": _("On"), "off": _("Off")}, default = "band") nim.advanced.sat[x].usals = ConfigYesNo(default=True) nim.advanced.sat[x].rotorposition = ConfigInteger(default=1, limits=(1, 255)) - lnbnum = 125+x-3601 + lnbnum = 33+x-3601 nim.advanced.sat[x].lnb = ConfigSelection(choices = [("0", "not available"), (str(lnbnum), "LNB %d"%(lnbnum))], default="0") csw = [("none", _("None")), ("AA", _("AA")), ("AB", _("AB")), ("BA", _("BA")), ("BB", _("BB"))] @@ -924,7 +924,7 @@ def InitNimManager(nimmgr): nim.advanced.lnb = ConfigSubList() nim.advanced.lnb.append(ConfigNothing()) - for x in range(1, 129): + for x in range(1, 37): nim.advanced.lnb.append(ConfigSubsection()) nim.advanced.lnb[x].lof = ConfigSelection(choices={"universal_lnb": _("Universal LNB"), "c_band": _("C-Band"), "user_defined": _("User defined")}, default="universal_lnb") nim.advanced.lnb[x].lofl = ConfigInteger(default=9750, limits = (0, 99999)) @@ -933,7 +933,7 @@ def InitNimManager(nimmgr): # 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") - if x > 124: + if x > 32: nim.advanced.lnb[x].diseqcMode = ConfigSelection(choices = [("1_2", _("1.2"))], default = "1_2") else: nim.advanced.lnb[x].diseqcMode = ConfigSelection(choices = [("none", _("None")), ("1_0", _("1.0")), ("1_1", _("1.1")), ("1_2", _("1.2"))], default = "none") diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py index 37208cd..21c4090 100644 --- a/lib/python/Screens/Satconfig.py +++ b/lib/python/Screens/Satconfig.py @@ -214,7 +214,7 @@ class NimSetup(Screen, ConfigListScreen): self.list.append(getConfigListEntry(_("Voltage mode"), Sat.voltage)) self.list.append(getConfigListEntry(_("Tone mode"), Sat.tonemode)) if currLnb and currLnb.diseqcMode.value == "1_2": - if lnbnum < 125: + if lnbnum < 33: self.advancedUsalsEntry = getConfigListEntry(_("Use usals for this sat"), Sat.usals) self.list.append(self.advancedUsalsEntry) if not Sat.usals.value: @@ -224,7 +224,7 @@ class NimSetup(Screen, ConfigListScreen): self.advancedLnbsEntry = getConfigListEntry(_("LNB"), Sat.lnb) self.list.append(self.advancedLnbsEntry) if currLnb: - if lnbnum < 125: + if lnbnum < 33: self.advancedDiseqcMode = getConfigListEntry(_("DiSEqC mode"), currLnb.diseqcMode) self.list.append(self.advancedDiseqcMode) if currLnb.diseqcMode.value != "none": -- 2.7.4