</menu>-->
<menu text="Service Searching">
<id val="scan" />
- <item text="Satelliteconfig"><screen module="Satconfig" screen="NimSelection" /></item>
+ <item text="Nimconfig"><screen module="Satconfig" screen="NimSelection" /></item>
<item text="Automatic Scan"><screen module="ScanSetup" screen="ScanSimple" /></item>
<!--<item text="Automatic Scan"><screen module="ServiceScan" /></item>-->
<item text="Manual Scan"><screen module="ScanSetup" /></item>
if (!isRunning)
can_delete = 1;
m_PrevVersion = (data[5] & 0x3E) >> 1;
- m_PrivateReader->stop();
- startPrivateTimer.start(UPDATE_INTERVAL, 1);
+ startPrivateReader();
}
}
}
res=prepare_terrestrial(feparm);
if (!res)
{
+ std::string enable_5V;
+ char configStr[255];
+ snprintf(configStr, 255, "config.Nim%c.terrestrial_5V", 'A'+m_fe);
m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
- eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)m_data[LINKED_PREV_PTR];
- if (linked_fe == (eDVBRegisteredFrontend*)-1)
- {
- std::string enable_5V;
- ePythonConfigQuery::getConfigValue("config.terrestrial.enable_5V", enable_5V);
- if (enable_5V == "yes")
- m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
- else
- m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltageOff) );
- }
+ ePythonConfigQuery::getConfigValue(configStr, enable_5V);
+ if (enable_5V == "on")
+ m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
else
m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltageOff) );
m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
pass
def InitNimManager(nimmgr):
- have_terrestrial_tuner = False
- config.terrestrial = ConfigSubsection()
config.Nims = []
for x in range(nimmgr.nimCount):
config.Nims.append(ConfigSubsection())
nimmgr.nimPortCChanged(slotid, configElement.vals[configElement.value][1])
def nimPortDChanged(slotid, configElement):
nimmgr.nimPortDChanged(slotid, configElement.vals[configElement.value][1])
- def terrestrial_5v_changed(configElement):
- configElement.save()
for slot in nimmgr.nimslots:
x = slot.slotid
elif slot.nimType == nimmgr.nimType["DVB-C"]:
nim.cable = configElement(cname + "cable", configSelection, 0, nimmgr.cablesList, False);
elif slot.nimType == nimmgr.nimType["DVB-T"]:
- have_terrestrial_tuner = True
list = []
for x in nimmgr.terrestrialsList:
list.append(x[0])
nim.terrestrial = configElement(cname + "terrestrial", configSelection, 0, list, False);
+ nim.terrestrial_5V = configElement(cname + "terrestrial_5V", configSelection, 1, (("on", _("On")), ("off", _("Off"))), True);
else:
print "pls add support for this frontend type!"
- if have_terrestrial_tuner:
- config.terrestrial.enable_5V = configElement("config.terrestrial.enable_5V", configSelection, 1, (("yes", _("Yes")), ("no", _("No"))), True);
- config.terrestrial.enable_5V.addNotifier(terrestrial_5v_changed)
-
nimmgr.sec = SecConfigure(nimmgr)
-
nimmanager = NimManager()
elif self.nim_type == nimmanager.nimType["DVB-T"]:
self.have_advanced = False
self.list.append(getConfigListEntry(_("Terrestrial provider"), self.nimConfig.terrestrial))
+ self.list.append(getConfigListEntry(_("Enable 5V for active antenna"), self.nimConfig.terrestrial_5V))
else:
self.have_advanced = False
self.list.append(getConfigListEntry(_("Hierarchy mode"), config.scan.ter.hierarchy))
elif currentConfigSelectionElement(config.scan.typeterrestrial) == "complete":
self.list.append(getConfigListEntry(_("Clear before scan"), config.scan.clearallservices))
- self.list.append(getConfigListEntry(_("Enable 5V for active antenna"), config.terrestrial.enable_5V))
# if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"] and currentConfigSelectionElement(config.scan.type) == "single_transponder") or \
# (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-C"] and currentConfigSelectionElement(config.scan.typecable) == "single_transponder") or \
tlist = []
nimcount = nimmanager.getNimSocketCount()
- have_terrestrial = False
if nimcount > 0:
nimtype = nimmanager.getNimType(0)
scan_possible=True
config.scan.clearallservices = configElement_nonSave("config.scan.clearallservices", configSelection, 0, (("no", _("no")), ("yes", _("yes")), ("yes_hold_feeds", _("yes (keep feeds)"))))
self.list.append(getConfigListEntry(_("Clear before scan"), config.scan.clearallservices))
nim = configElement_nonSave(0, configSelection, 0, (("yes", _("yes")), ("no", _("no"))))
- if nimtype == nimmanager.nimType["DVB-T"]:
- have_terrestrial = True
- elif nimtype == nimmanager.nimType["DVB-S"] and not len(nimmanager.getSatListForNim(0)):
+ if nimtype == nimmanager.nimType["DVB-S"] and not len(nimmanager.getSatListForNim(0)):
scan_possible=False
if scan_possible:
self.list.append(getConfigListEntry(_("Scan NIM") + " 0 (" + nimmanager.getNimTypeName(0) + ")", nim))
if nimcount > 1 and self.ScanNimTwoNeeded():
nim = configElement_nonSave(1, configSelection, 0, (("yes", _("yes")), ("no", _("no"))))
self.list.append(getConfigListEntry(_("Scan NIM") + " 1 (" + nimmanager.getNimTypeName(1) + ")", nim))
- if nimmanager.getNimType(1) == nimmanager.nimType["DVB-T"]:
- have_terrestrial = True
-
- if have_terrestrial:
- self.list.append(getConfigListEntry(_("Enable 5V for active antenna"), config.terrestrial.enable_5V))
self["config"] = ConfigList(self.list)
self["header"] = Label(_("Automatic Scan"))