From: Felix Domke Date: Wed, 16 Nov 2005 10:24:13 +0000 (+0000) Subject: scan: add flags for optional network search. drop transponders on foreign satellites. X-Git-Tag: 2.6.0~5135 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/b0e09a2cd9a05a002222d79fb71848f4c7820ff3 scan: add flags for optional network search. drop transponders on foreign satellites. --- diff --git a/lib/components/scan.cpp b/lib/components/scan.cpp index fc2470f7..6676af51 100644 --- a/lib/components/scan.cpp +++ b/lib/components/scan.cpp @@ -77,7 +77,7 @@ void eComponentScan::addInitial(const eDVBFrontendParametersTerrestrial &p) } -int eComponentScan::start() +int eComponentScan::start(int flags) { if (m_initial.empty()) return -2; @@ -90,35 +90,6 @@ int eComponentScan::start() eDVBResourceManager::getInstance(mgr); -#if 0 - ePtr fe = new eDVBFrontendParameters(); -#if 1 - eDVBFrontendParametersSatellite fesat; - - fesat.frequency = 11817000; // 12070000; - fesat.symbol_rate = 27500000; - fesat.polarisation = eDVBFrontendParametersSatellite::Polarisation::Vertical; - fesat.fec = eDVBFrontendParametersSatellite::FEC::f3_4; - fesat.inversion = eDVBFrontendParametersSatellite::Inversion::Off; - fesat.orbital_position = 192; - - - fe->setDVBS(fesat); - -#else - eDVBFrontendParametersTerrestrial fet; - fet.frequency = 626000000; - fet.inversion = eDVBFrontendParametersTerrestrial::Inversion::Unknown; - fet.bandwidth = eDVBFrontendParametersTerrestrial::Bandwidth::Bw8MHz; - fet.code_rate_HP = fet.code_rate_LP = eDVBFrontendParametersTerrestrial::FEC::fAuto; - fet.modulation = eDVBFrontendParametersTerrestrial::Modulation::QAM16; - fet.transmission_mode = eDVBFrontendParametersTerrestrial::TransmissionMode::TM8k; - fet.guard_interval = eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_32; - fet.hierarchy = eDVBFrontendParametersTerrestrial::Hierarchy::HNone; - fe->setDVBT(fet); -#endif -#endif - eUsePtr channel; if (mgr->allocateRawChannel(channel)) @@ -131,7 +102,7 @@ int eComponentScan::start() m_scan = new eDVBScan(channel); m_scan->connectEvent(slot(*this, &eComponentScan::scanEvent), m_scan_event_connection); - m_scan->start(m_initial); + m_scan->start(m_initial, flags); return 0; } diff --git a/lib/components/scan.h b/lib/components/scan.h index d90331cd..04218b98 100644 --- a/lib/components/scan.h +++ b/lib/components/scan.h @@ -39,7 +39,10 @@ public: void addInitial(const eDVBFrontendParametersSatellite &p); void addInitial(const eDVBFrontendParametersCable &p); void addInitial(const eDVBFrontendParametersTerrestrial &p); - int start(); + + /* please keep the flags in sync with lib/dvb/scan.h ! */ + enum { scanNetworkSearch=1 }; + int start(int flags=0); }; #endif diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp index b30f702e..1c98dce0 100644 --- a/lib/dvb/scan.cpp +++ b/lib/dvb/scan.cpp @@ -83,7 +83,17 @@ RESULT eDVBScan::nextChannel() m_SDT = 0; m_BAT = 0; m_NIT = 0; - m_ready = readyBAT; + m_ready = 0; + + /* check what we need */ + m_ready_all = readySDT; + + if (m_flags & scanNetworkSearch) + m_ready_all |= readyNIT; + + if (m_flags & scanSearchBAT) + m_ready_all |= readyBAT; + if (m_ch_toScan.empty()) { eDebug("no channels left to scan."); @@ -121,21 +131,35 @@ RESULT eDVBScan::startFilter() { assert(m_demux); - m_SDT = new eTable(); - if (m_SDT->start(m_demux, eDVBSDTSpec())) - return -1; - CONNECT(m_SDT->tableReady, eDVBScan::SDTready); + /* only start required filters filter */ + + m_SDT = 0; + + if (m_ready_all & readySDT) + { + m_SDT = new eTable(); + if (m_SDT->start(m_demux, eDVBSDTSpec())) + return -1; + CONNECT(m_SDT->tableReady, eDVBScan::SDTready); + } m_NIT = 0; - m_NIT = new eTable(); - if (m_NIT->start(m_demux, eDVBNITSpec())) - return -1; - CONNECT(m_NIT->tableReady, eDVBScan::NITready); - - m_BAT = new eTable(); - if (m_BAT->start(m_demux, eDVBBATSpec())) - return -1; - CONNECT(m_BAT->tableReady, eDVBScan::BATready); + if (m_ready_all & readyNIT) + { + m_NIT = new eTable(); + if (m_NIT->start(m_demux, eDVBNITSpec())) + return -1; + CONNECT(m_NIT->tableReady, eDVBScan::NITready); + } + + m_BAT = 0; + if (m_ready_all & readyBAT) + { + m_BAT = new eTable(); + if (m_BAT->start(m_demux, eDVBBATSpec())) + return -1; + CONNECT(m_BAT->tableReady, eDVBScan::BATready); + } return 0; } @@ -277,10 +301,15 @@ void eDVBScan::channelDone() feparm->getHash(hash); eDVBNamespace ns = buildNamespace(onid, tsid, hash); - - addChannelToScan( - eDVBChannelID(ns, tsid, onid), - feparm); + + if (m_chid_current && ((ns.get() ^ m_chid_current.dvbnamespace.get()) & 0xFFFF0000)) + eDebug("dropping this transponder, it's on another satellite."); + else + { + addChannelToScan( + eDVBChannelID(ns, tsid, onid), + feparm); + } break; } default: @@ -294,7 +323,7 @@ void eDVBScan::channelDone() m_ready &= ~validNIT; } - if ((m_ready & readyAll) != readyAll) + if ((m_ready & m_ready_all) != m_ready_all) return; SCAN_eDebug("channel done!"); @@ -328,8 +357,9 @@ void eDVBScan::channelDone() nextChannel(); } -void eDVBScan::start(const eSmartPtrList &known_transponders) +void eDVBScan::start(const eSmartPtrList &known_transponders, int flags) { + m_flags = flags; m_ch_toScan.clear(); m_ch_scanned.clear(); m_ch_unavailable.clear(); @@ -389,12 +419,7 @@ RESULT eDVBScan::processSDT(eDVBNamespace dvbnamespace, const ServiceDescription { ServiceDescriptor &d = (ServiceDescriptor&)**desc; service->m_service_name = convertDVBUTF8(d.getServiceName()); - service->m_service_name_sort = convertDVBUTF8(d.getServiceName()); - - service->m_service_name_sort = removeDVBChars(service->m_service_name); - makeUpper(service->m_service_name_sort); - while ((!service->m_service_name_sort.empty()) && service->m_service_name_sort[0] == ' ') - service->m_service_name_sort.erase(0, 1); + service->genSortName(); service->m_provider_name = convertDVBUTF8(d.getServiceProviderName()); SCAN_eDebug("name '%s', provider_name '%s'", service->m_service_name.c_str(), service->m_provider_name.c_str()); diff --git a/lib/dvb/scan.h b/lib/dvb/scan.h index 07422a46..df832bd6 100644 --- a/lib/dvb/scan.h +++ b/lib/dvb/scan.h @@ -31,12 +31,12 @@ private: RESULT nextChannel(); RESULT startFilter(); - enum { readySDT=1, readyNIT=2, readyBAT=4, readyAll=7, + enum { readySDT=1, readyNIT=2, readyBAT=4, validSDT=8, validNIT=16, validBAT=32}; /* scan state variables */ int m_channel_state; - int m_ready; + int m_ready, m_ready_all; std::map > m_new_channels; std::map > m_new_services; @@ -61,11 +61,14 @@ private: Signal1 m_event; RESULT processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionSection &sdt); + + int m_flags; public: eDVBScan(iDVBChannel *channel); ~eDVBScan(); - void start(const eSmartPtrList &known_transponders); + enum { scanNetworkSearch = 1, scanSearchBAT = 2 }; + void start(const eSmartPtrList &known_transponders, int flags); enum { evtUpdate, evtFinish, evtFail }; RESULT connectEvent(const Slot1 &event, ePtr &connection); diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py index e51532f4..915a26a0 100644 --- a/lib/python/Components/ServiceScan.py +++ b/lib/python/Components/ServiceScan.py @@ -34,34 +34,37 @@ class ServiceScan: if self.state == self.Error: self.text.setText("ERROR - failed to scan (%s)!" % (self.Errors[self.errorcode]) ) - def __init__(self, progressbar, text, transponders): + def __init__(self, progressbar, text, transponders, flags): self.progressbar = progressbar self.text = text self.scan = eComponentScan() self.state = self.Idle + self.flags = flags self.scanStatusChanged() - - if 1: - parm = eDVBFrontendParametersSatellite() - - parm.frequency = 11817000 - parm.symbol_rate = 27500000 - parm.polarisation = 1 # eDVBFrontendParametersSatellite.Polarisation.Vertical - parm.fec = 3 # eDVBFrontendParametersSatellite.FEC.f3_4; - parm.inversion = 1 #eDVBFrontendParametersSatellite.Inversion.Off; - parm.orbital_position = 192 - else: - parm = eDVBFrontendParametersTerrestrial() - - parm.frequency = 626000000; - parm.inversion = 2 # eDVBFrontendParametersTerrestrial.Inversion.Unknown; - parm.bandwidth = 0 #eDVBFrontendParametersTerrestrial.Bandwidth.Bw8MHz; - parm.code_rate_HP = parm.code_rate_LP = 6 #eDVBFrontendParametersTerrestrial.FEC.fAuto; - parm.modulation = 1 #eDVBFrontendParametersTerrestrial.Modulation.QAM16; - parm.transmission_mode = 1 # eDVBFrontendParametersTerrestrial.TransmissionMode.TM8k; - parm.guard_interval = 0 # eDVBFrontendParametersTerrestrial.GuardInterval.GI_1_32; - parm.hierarchy = 0 #eDVBFrontendParametersTerrestrial.Hierarchy.HNone; +# if 1: +# parm = eDVBFrontendParametersSatellite() +# +# parm.frequency = 11817000 +# parm.symbol_rate = 27500000 +# parm.polarisation = 1 # eDVBFrontendParametersSatellite.Polarisation.Vertical +# parm.fec = 3 # eDVBFrontendParametersSatellite.FEC.f3_4; +# parm.inversion = 1 #eDVBFrontendParametersSatellite.Inversion.Off; +# parm.orbital_position = 192 +# self.scan.addInitial(parm) +# else: +# # until we have a terrestrial.xml: +# for x in [490000000, 530000000, 546000000, 570000000, 626000000]: +# parm = eDVBFrontendParametersTerrestrial() +# parm.frequency = x +# parm.inversion = 2 # eDVBFrontendParametersTerrestrial.Inversion.Unknown; +# parm.bandwidth = 0 #eDVBFrontendParametersTerrestrial.Bandwidth.Bw8MHz; +# parm.code_rate_HP = parm.code_rate_LP = 6 #eDVBFrontendParametersTerrestrial.FEC.fAuto; +# parm.modulation = 1 #eDVBFrontendParametersTerrestrial.Modulation.QAM16; +# parm.transmission_mode = 1 # eDVBFrontendParametersTerrestrial.TransmissionMode.TM8k; +# parm.guard_interval = 0 # eDVBFrontendParametersTerrestrial.GuardInterval.GI_1_32; +# parm.hierarchy = 0 #eDVBFrontendParametersTerrestrial.Hierarchy.HNone; +# self.scan.addInitial(parm) for x in transponders: self.scan.addInitial(x) @@ -71,7 +74,7 @@ class ServiceScan: def execBegin(self): self.scan.statusChanged.get().append(self.scanStatusChanged) self.state = self.Running - err = self.scan.start() + err = self.scan.start(self.flags) if err: self.state = self.Error self.errorcode = 0 diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index 856d68e3..2a325929 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -7,203 +7,203 @@ from Components.config import config from Components.config import getConfigListEntry from Components.NimManager import nimmanager from Components.Label import Label -from enigma import eDVBFrontendParametersSatellite +from enigma import eDVBFrontendParametersSatellite, eComponentScan def getInitialTransponderList(tlist, pos): print pos list = nimmanager.getTransponders(pos) - + for x in list: if x[0] == 0: #SAT parm = eDVBFrontendParametersSatellite() parm.frequency = x[1] parm.symbol_rate = x[2] - parm.polarisation = x[3] # eDVBFrontendParametersSatellite.Polarisation.Verti + parm.polarisation = x[3] # eDVBFrontendParametersSatellite.Polarisation.Vertical #parm.fec = x[4] # eDVBFrontendParametersSatellite.FEC.f3_4; parm.fec = 6 # AUTO #parm.inversion = 1 #eDVBFrontendParametersSatellite.Inversion.Off; parm.inversion = 2 #AUTO parm.orbital_position = pos tlist.append(parm) - + class ScanSetup(Screen): - def __init__(self, session): - Screen.__init__(self, session) - - self.updateSatList() - self.createConfig() - - - self["actions"] = NumberActionMap(["SetupActions"], - { - "ok": self.keyGo, - "cancel": self.keyCancel, - "left": self.keyLeft, - "right": self.keyRight, - "1": self.keyNumberGlobal, - "2": self.keyNumberGlobal, - "3": self.keyNumberGlobal, - "4": self.keyNumberGlobal, - "5": self.keyNumberGlobal, - "6": self.keyNumberGlobal, - "7": self.keyNumberGlobal, - "8": self.keyNumberGlobal, - "9": self.keyNumberGlobal, - "0": self.keyNumberGlobal - }, -1) - - self.list = [] - self["config"] = ConfigList(self.list) - self.createSetup() - - self["introduction"] = Label("Press OK to start the scan") - - def updateSatList(self): - self.satList = [] - for slot in nimmanager.nimslots: - self.satList.append(nimmanager.getSatListForNim(slot.slotid)) - - def createSetup(self): - self.list = [] - - self.list.append(getConfigListEntry("Type of scan", config.scan.type)) - self.list.append(getConfigListEntry("Tuner", config.scan.nims)) - - # single transponder scan - if (config.scan.type.value == 0): - if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"]): - self.list.append(getConfigListEntry("Satellite", config.scan.satselection[config.scan.nims.value])) - self.list.append(getConfigListEntry("Frequency", config.scan.sat.frequency)) - self.list.append(getConfigListEntry("Inversion", config.scan.sat.inversion)) - self.list.append(getConfigListEntry("Symbolrate", config.scan.sat.symbolrate)) - self.list.append(getConfigListEntry("Polarity", config.scan.sat.polarization)) - self.list.append(getConfigListEntry("FEC", config.scan.sat.fec)) - if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-C"]): - self.list.append(getConfigListEntry("Frequency", config.scan.cab.frequency)) - self.list.append(getConfigListEntry("Inversion", config.scan.cab.inversion)) - self.list.append(getConfigListEntry("Symbolrate", config.scan.cab.symbolrate)) - self.list.append(getConfigListEntry("Modulation", config.scan.cab.modulation)) - self.list.append(getConfigListEntry("FEC", config.scan.cab.fec)) - if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"]): - self.list.append(getConfigListEntry("Frequency", config.scan.ter.frequency)) - self.list.append(getConfigListEntry("Inversion", config.scan.ter.inversion)) - self.list.append(getConfigListEntry("Bandwidth", config.scan.ter.bandwidth)) - self.list.append(getConfigListEntry("Code rate high", config.scan.ter.fechigh)) - self.list.append(getConfigListEntry("Code rate low", config.scan.ter.feclow)) - self.list.append(getConfigListEntry("Modulation", config.scan.ter.modulation)) - self.list.append(getConfigListEntry("Transmission mode", config.scan.ter.transmission)) - self.list.append(getConfigListEntry("Guard interval mode", config.scan.ter.guard)) - self.list.append(getConfigListEntry("Hierarchy mode", config.scan.ter.hierarchy)) - - # single satellite scan - print config.scan.satselection - if (config.scan.type.value == 1): - self.updateSatList() - print config.scan.satselection[config.scan.nims.value] - self.list.append(getConfigListEntry("Satellite", config.scan.satselection[config.scan.nims.value])) - - - # multi sat scan - if (config.scan.type.value == 2): - # if (norotor) - tlist = [] - SatList = nimmanager.getSatListForNim(config.scan.nims.value) - - for x in SatList: - if self.Satexists(tlist, x[1]) == 0: - tlist.append(x[1]) - sat = configElement_nonSave(x[1], configSelection, 0, ("Enable", "Disable")) - self.list.append(getConfigListEntry(nimmanager.getSatDescription(x[1]), sat)) - - # if (rotor): - # for sat in nimmanager.satList: - # self.list.append(getConfigListEntry(sat[0], config.scan.scansat[sat[1]])) - - self["config"].list = self.list - self["config"].l.setList(self.list) - - def Satexists(self, tlist, pos): - for x in tlist: - if x == pos: - return 1 - return 0 - - def newConfig(self): - print self["config"].getCurrent() - if self["config"].getCurrent()[0] == "Type of scan": - self.createSetup() - if self["config"].getCurrent()[0] == "Tuner": - self.createSetup() - - def createConfig(self): - config.scan = ConfigSubsection() - config.scan.sat = ConfigSubsection() - config.scan.cab = ConfigSubsection() - config.scan.ter = ConfigSubsection() - - config.scan.type = configElement_nonSave("config.scan.type", configSelection, 0, ("Single transponder", "Single satellite", "Multisat")) - nimList = [ ] - for nim in nimmanager.nimList(): - nimList.append(nim[0]) - nimList.append("all") - config.scan.nims = configElement_nonSave("config.scan.nims", configSelection, 0, nimList) - - # sat - config.scan.sat.frequency = configElement_nonSave("config.scan.sat.frequency", configSequence, [11836], configsequencearg.get("INTEGER", (10000, 14000))) - config.scan.sat.inversion = configElement_nonSave("config.scan.sat.inversion", configSelection, 2, ("on", "off", "auto")) - config.scan.sat.symbolrate = configElement_nonSave("config.scan.sat.symbolrate", configSequence, [27500], configsequencearg.get("INTEGER", (1, 30000))) - config.scan.sat.polarization = configElement_nonSave("config.scan.sat.polarization", configSelection, 0, ("horizontal", "vertical", "circular left", "circular right")) - config.scan.sat.fec = configElement_nonSave("config.scan.sat.fec", configSelection, 7, ("None", "1/2", "2/3", "3/4", "5/6", "7/8", "auto")) - - - # cable - config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, [466], configsequencearg.get("INTEGER", (10000, 14000))) - config.scan.cab.inversion = configElement_nonSave("config.scan.cab.inversion", configSelection, 0, ("auto", "off", "on")) - config.scan.cab.modulation = configElement_nonSave("config.scan.cab.modulation", configSelection, 0, ("Auto", "16-QAM", "32-QAM", "64-QAM", "128-QAM", "256-QAM")) - config.scan.cab.fec = configElement_nonSave("config.scan.cab.fec", configSelection, 0, ("Auto", "1/2", "2/3", "3/4", "4/5", "5/6", "7/8", "8/9")) - config.scan.cab.symbolrate = configElement_nonSave("config.scan.cab.symbolrate", configSequence, [6900], configsequencearg.get("INTEGER", (1, 30000))) - - # terrestial - config.scan.ter.frequency = configElement_nonSave("config.scan.ter.frequency", configSequence, [466], configsequencearg.get("INTEGER", (10000, 14000))) - config.scan.ter.inversion = configElement_nonSave("config.scan.ter.inversion", configSelection, 0, ("auto", "off", "on")) - config.scan.ter.bandwidth = configElement_nonSave("config.scan.ter.bandwidth", configSelection, 0, ("Auto", "6 MHz", "7MHz", "8MHz")) - config.scan.ter.fechigh = configElement_nonSave("config.scan.ter.fechigh", configSelection, 0, ("Auto", "1/2", "2/3", "3/4", "4/5", "5/6", "7/8", "8/9")) - config.scan.ter.feclow = configElement_nonSave("config.scan.ter.feclow", configSelection, 0, ("Auto", "1/2", "2/3", "3/4", "4/5", "5/6", "7/8", "8/9")) - config.scan.ter.modulation = configElement_nonSave("config.scan.ter.modulation", configSelection, 0, ("Auto", "16-QAM", "32-QAM", "64-QAM", "128-QAM", "256-QAM")) - config.scan.ter.transmission = configElement_nonSave("config.scan.ter.transmission", configSelection, 0, ("Auto", "2K", "8K")) - config.scan.ter.guard = configElement_nonSave("config.scan.ter.guard", configSelection, 0, ("Auto", "1/4", "1/8", "1/16", "1/32")) - config.scan.ter.hierarchy = configElement_nonSave("config.scan.ter.hierarchy", configSelection, 0, ("Auto", "1", "2", "4")) - - config.scan.scansat = {} - for sat in nimmanager.satList: - #print sat[1] - config.scan.scansat[sat[1]] = configElement_nonSave("config.scan.scansat[" + str(sat[1]) + "]", configSelection, 0, ("yes", "no")) - - config.scan.satselection = [] - slotid = 0 - for slot in nimmanager.nimslots: - config.scan.satselection.append(configElement_nonSave("config.scan.satselection[" + str(slot.slotid) + "]", configSatlist, 0, self.satList[slot.slotid])) - - def keyLeft(self): - self["config"].handleKey(config.key["prevElement"]) - self.newConfig() - - def keyRight(self): - self["config"].handleKey(config.key["nextElement"]) - self.newConfig() - - def keyNumberGlobal(self, number): - print "You pressed number " + str(number) - if (self["config"].getCurrent()[1].parent.enabled == True): - self["config"].handleKey(config.key[str(number)]) - - def addSatTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position): + def __init__(self, session): + Screen.__init__(self, session) + + self.updateSatList() + self.createConfig() + + + self["actions"] = NumberActionMap(["SetupActions"], + { + "ok": self.keyGo, + "cancel": self.keyCancel, + "left": self.keyLeft, + "right": self.keyRight, + "1": self.keyNumberGlobal, + "2": self.keyNumberGlobal, + "3": self.keyNumberGlobal, + "4": self.keyNumberGlobal, + "5": self.keyNumberGlobal, + "6": self.keyNumberGlobal, + "7": self.keyNumberGlobal, + "8": self.keyNumberGlobal, + "9": self.keyNumberGlobal, + "0": self.keyNumberGlobal + }, -1) + + self.list = [] + self["config"] = ConfigList(self.list) + self.createSetup() + + self["introduction"] = Label("Press OK to start the scan") + + def updateSatList(self): + self.satList = [] + for slot in nimmanager.nimslots: + self.satList.append(nimmanager.getSatListForNim(slot.slotid)) + + def createSetup(self): + self.list = [] + + self.list.append(getConfigListEntry("Type of scan", config.scan.type)) + self.list.append(getConfigListEntry("Tuner", config.scan.nims)) + + # single transponder scan + if (config.scan.type.value == 0): + if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"]): + self.list.append(getConfigListEntry("Satellite", config.scan.satselection[config.scan.nims.value])) + self.list.append(getConfigListEntry("Frequency", config.scan.sat.frequency)) + self.list.append(getConfigListEntry("Inversion", config.scan.sat.inversion)) + self.list.append(getConfigListEntry("Symbolrate", config.scan.sat.symbolrate)) + self.list.append(getConfigListEntry("Polarity", config.scan.sat.polarization)) + self.list.append(getConfigListEntry("FEC", config.scan.sat.fec)) + if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-C"]): + self.list.append(getConfigListEntry("Frequency", config.scan.cab.frequency)) + self.list.append(getConfigListEntry("Inversion", config.scan.cab.inversion)) + self.list.append(getConfigListEntry("Symbolrate", config.scan.cab.symbolrate)) + self.list.append(getConfigListEntry("Modulation", config.scan.cab.modulation)) + self.list.append(getConfigListEntry("FEC", config.scan.cab.fec)) + if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"]): + self.list.append(getConfigListEntry("Frequency", config.scan.ter.frequency)) + self.list.append(getConfigListEntry("Inversion", config.scan.ter.inversion)) + self.list.append(getConfigListEntry("Bandwidth", config.scan.ter.bandwidth)) + self.list.append(getConfigListEntry("Code rate high", config.scan.ter.fechigh)) + self.list.append(getConfigListEntry("Code rate low", config.scan.ter.feclow)) + self.list.append(getConfigListEntry("Modulation", config.scan.ter.modulation)) + self.list.append(getConfigListEntry("Transmission mode", config.scan.ter.transmission)) + self.list.append(getConfigListEntry("Guard interval mode", config.scan.ter.guard)) + self.list.append(getConfigListEntry("Hierarchy mode", config.scan.ter.hierarchy)) + + # single satellite scan + print config.scan.satselection + if (config.scan.type.value == 1): + self.updateSatList() + print config.scan.satselection[config.scan.nims.value] + self.list.append(getConfigListEntry("Satellite", config.scan.satselection[config.scan.nims.value])) + + + # multi sat scan + if (config.scan.type.value == 2): + # if (norotor) + tlist = [] + SatList = nimmanager.getSatListForNim(config.scan.nims.value) + + for x in SatList: + if self.Satexists(tlist, x[1]) == 0: + tlist.append(x[1]) + sat = configElement_nonSave(x[1], configSelection, 0, ("Enable", "Disable")) + self.list.append(getConfigListEntry(nimmanager.getSatDescription(x[1]), sat)) + + # if (rotor): + # for sat in nimmanager.satList: + # self.list.append(getConfigListEntry(sat[0], config.scan.scansat[sat[1]])) + + self["config"].list = self.list + self["config"].l.setList(self.list) + + def Satexists(self, tlist, pos): + for x in tlist: + if x == pos: + return 1 + return 0 + + def newConfig(self): + print self["config"].getCurrent() + if self["config"].getCurrent()[0] == "Type of scan": + self.createSetup() + if self["config"].getCurrent()[0] == "Tuner": + self.createSetup() + + def createConfig(self): + config.scan = ConfigSubsection() + config.scan.sat = ConfigSubsection() + config.scan.cab = ConfigSubsection() + config.scan.ter = ConfigSubsection() + + config.scan.type = configElement_nonSave("config.scan.type", configSelection, 0, ("Single transponder", "Single satellite", "Multisat")) + nimList = [ ] + for nim in nimmanager.nimList(): + nimList.append(nim[0]) + nimList.append("all") + config.scan.nims = configElement_nonSave("config.scan.nims", configSelection, 0, nimList) + + # sat + config.scan.sat.frequency = configElement_nonSave("config.scan.sat.frequency", configSequence, [11836], configsequencearg.get("INTEGER", (10000, 14000))) + config.scan.sat.inversion = configElement_nonSave("config.scan.sat.inversion", configSelection, 2, ("on", "off", "auto")) + config.scan.sat.symbolrate = configElement_nonSave("config.scan.sat.symbolrate", configSequence, [27500], configsequencearg.get("INTEGER", (1, 30000))) + config.scan.sat.polarization = configElement_nonSave("config.scan.sat.polarization", configSelection, 0, ("horizontal", "vertical", "circular left", "circular right")) + config.scan.sat.fec = configElement_nonSave("config.scan.sat.fec", configSelection, 7, ("None", "1/2", "2/3", "3/4", "5/6", "7/8", "auto")) + + + # cable + config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, [466], configsequencearg.get("INTEGER", (10000, 14000))) + config.scan.cab.inversion = configElement_nonSave("config.scan.cab.inversion", configSelection, 0, ("auto", "off", "on")) + config.scan.cab.modulation = configElement_nonSave("config.scan.cab.modulation", configSelection, 0, ("Auto", "16-QAM", "32-QAM", "64-QAM", "128-QAM", "256-QAM")) + config.scan.cab.fec = configElement_nonSave("config.scan.cab.fec", configSelection, 0, ("Auto", "1/2", "2/3", "3/4", "4/5", "5/6", "7/8", "8/9")) + config.scan.cab.symbolrate = configElement_nonSave("config.scan.cab.symbolrate", configSequence, [6900], configsequencearg.get("INTEGER", (1, 30000))) + + # terrestial + config.scan.ter.frequency = configElement_nonSave("config.scan.ter.frequency", configSequence, [466], configsequencearg.get("INTEGER", (10000, 14000))) + config.scan.ter.inversion = configElement_nonSave("config.scan.ter.inversion", configSelection, 0, ("auto", "off", "on")) + config.scan.ter.bandwidth = configElement_nonSave("config.scan.ter.bandwidth", configSelection, 0, ("Auto", "6 MHz", "7MHz", "8MHz")) + config.scan.ter.fechigh = configElement_nonSave("config.scan.ter.fechigh", configSelection, 0, ("Auto", "1/2", "2/3", "3/4", "4/5", "5/6", "7/8", "8/9")) + config.scan.ter.feclow = configElement_nonSave("config.scan.ter.feclow", configSelection, 0, ("Auto", "1/2", "2/3", "3/4", "4/5", "5/6", "7/8", "8/9")) + config.scan.ter.modulation = configElement_nonSave("config.scan.ter.modulation", configSelection, 0, ("Auto", "16-QAM", "32-QAM", "64-QAM", "128-QAM", "256-QAM")) + config.scan.ter.transmission = configElement_nonSave("config.scan.ter.transmission", configSelection, 0, ("Auto", "2K", "8K")) + config.scan.ter.guard = configElement_nonSave("config.scan.ter.guard", configSelection, 0, ("Auto", "1/4", "1/8", "1/16", "1/32")) + config.scan.ter.hierarchy = configElement_nonSave("config.scan.ter.hierarchy", configSelection, 0, ("Auto", "1", "2", "4")) + + config.scan.scansat = {} + for sat in nimmanager.satList: + #print sat[1] + config.scan.scansat[sat[1]] = configElement_nonSave("config.scan.scansat[" + str(sat[1]) + "]", configSelection, 0, ("yes", "no")) + + config.scan.satselection = [] + slotid = 0 + for slot in nimmanager.nimslots: + config.scan.satselection.append(configElement_nonSave("config.scan.satselection[" + str(slot.slotid) + "]", configSatlist, 0, self.satList[slot.slotid])) + + def keyLeft(self): + self["config"].handleKey(config.key["prevElement"]) + self.newConfig() + + def keyRight(self): + self["config"].handleKey(config.key["nextElement"]) + self.newConfig() + + def keyNumberGlobal(self, number): + print "You pressed number " + str(number) + if (self["config"].getCurrent()[1].parent.enabled == True): + self["config"].handleKey(config.key[str(number)]) + + def addSatTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position): print "Add Sat: frequ: " + str(frequency) + " symbol: " + str(symbol_rate) + " pol: " + str(polarisation) + " fec: " + str(fec) + " inversion: " + str(inversion) print "orbpos: " + str(orbital_position) parm = eDVBFrontendParametersSatellite() parm.frequency = frequency * 1000 parm.symbol_rate = symbol_rate * 1000 - parm.polarisation = polarisation # eDVBFrontendParametersSatellite.Polarisation.Verti + parm.polarisation = polarisation # eDVBFrontendParametersSatellite.Polarisation.Verti parm.fec = fec # eDVBFrontendParametersSatellite.FEC.f3_4; #parm.fec = 6 # AUTO parm.inversion = inversion #eDVBFrontendParametersSatellite.Inversion.Off; @@ -212,13 +212,13 @@ class ScanSetup(Screen): tlist.append(parm) # FIXME use correct parameters - def addCabTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position): + def addCabTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position): print "Add Sat: frequ: " + str(frequency) + " symbol: " + str(symbol_rate) + " pol: " + str(polarisation) + " fec: " + str(fec) + " inversion: " + str(inversion) print "orbpos: " + str(orbital_position) parm = eDVBFrontendParametersCable() parm.frequency = frequency * 1000 parm.symbol_rate = symbol_rate * 1000 - parm.polarisation = polarisation # eDVBFrontendParametersSatellite.Polarisation.Verti + parm.polarisation = polarisation # eDVBFrontendParametersSatellite.Polarisation.Verti parm.fec = fec # eDVBFrontendParametersSatellite.FEC.f3_4; #parm.fec = 6 # AUTO parm.inversion = inversion #eDVBFrontendParametersSatellite.Inversion.Off; @@ -227,47 +227,47 @@ class ScanSetup(Screen): tlist.append(parm) # FIXME use correct parameters - def addTerTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position): + def addTerTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position): print "Add Sat: frequ: " + str(frequency) + " symbol: " + str(symbol_rate) + " pol: " + str(polarisation) + " fec: " + str(fec) + " inversion: " + str(inversion) print "orbpos: " + str(orbital_position) parm = eDVBFrontendParametersTerrestrial() parm.frequency = frequency * 1000 parm.symbol_rate = symbol_rate * 1000 - parm.polarisation = polarisation # eDVBFrontendParametersSatellite.Polarisation.Verti + parm.polarisation = polarisation # eDVBFrontendParametersSatellite.Polarisation.Verti parm.fec = fec # eDVBFrontendParametersSatellite.FEC.f3_4; #parm.fec = 6 # AUTO parm.inversion = inversion #eDVBFrontendParametersSatellite.Inversion.Off; #parm.inversion = 2 #AUTO parm.orbital_position = int(orbital_position) - tlist.append(parm) + tlist.append(parm) - def keyGo(self): - tlist = [] - if (config.scan.type.value == 0): # single transponder scan - if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"]): + def keyGo(self): + tlist = [] + if (config.scan.type.value == 0): # single transponder scan + if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"]): self.addSatTransponder(tlist, config.scan.sat.frequency.value[0], - config.scan.sat.symbolrate.value[0], - config.scan.sat.polarization.value, - config.scan.sat.fec.value, - config.scan.sat.inversion.value, - self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value][1]) - if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-C"]): + config.scan.sat.symbolrate.value[0], + config.scan.sat.polarization.value, + config.scan.sat.fec.value, + config.scan.sat.inversion.value, + self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value][1]) + if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-C"]): self.addCabTransponder(tlist, config.scan.cab.frequency.value[0], - config.scan.cab.symbolrate.value[0], - config.scan.cab.polarization.value, - config.scan.cab.fec.value, - config.scan.cab.inversion.value, - self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value][1]) - if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"]): + config.scan.cab.symbolrate.value[0], + config.scan.cab.polarization.value, + config.scan.cab.fec.value, + config.scan.cab.inversion.value, + self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value][1]) + if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"]): self.addTerTransponder(tlist, config.scan.sat.frequency.value[0], - config.scan.sat.symbolrate.value[0], - config.scan.sat.polarization.value, - config.scan.sat.fec.value, - config.scan.sat.inversion.value, - self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value][1]) + config.scan.sat.symbolrate.value[0], + config.scan.sat.polarization.value, + config.scan.sat.fec.value, + config.scan.sat.inversion.value, + self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value][1]) - if (config.scan.type.value == 1): - getInitialTransponderList(tlist, int(self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value][1])) + if (config.scan.type.value == 1): + getInitialTransponderList(tlist, int(self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value][1])) if (config.scan.type.value == 2): # multi sat scan SatList = nimmanager.getSatListForNim(config.scan.nims.value) @@ -278,18 +278,20 @@ class ScanSetup(Screen): getInitialTransponderList(tlist, x[1].parent.configPath) - for x in self["config"].list: - x[1].save() - - - self.session.openWithCallback(self.keyCancel, ServiceScan, tlist) + for x in self["config"].list: + x[1].save() - #self.close() + flags = 0 + flags |= eComponentScan.scanNetworkSearch + # flags |= eComponentScan.scanSearchBAT + self.session.openWithCallback(self.keyCancel, ServiceScan, tlist, flags) - def keyCancel(self): - for x in self["config"].list: - x[1].cancel() - self.close() + #self.close() + + def keyCancel(self): + for x in self["config"].list: + x[1].cancel() + self.close() class ScanSimple(Screen): @@ -300,9 +302,9 @@ class ScanSimple(Screen): if x[1].parent.value == 0: print " " + str(x[1].parent.configPath) getInitialTransponderList(tlist, x[1].parent.configPath) - - self.session.openWithCallback(self.keyCancel, ServiceScan, tlist) - + + self.session.openWithCallback(self.keyCancel, ServiceScan, tlist, eComponentScan.scanNetworkSearch) + def keyCancel(self): self.close() @@ -328,10 +330,10 @@ class ScanSimple(Screen): "left": self.keyLeft, "right": self.keyRight, }, -1) - + self.list = [] tlist = [] - + SatList = nimmanager.getConfiguredSats() for x in SatList: